View | Details | Raw Unified | Return to bug 57925 | Differences between
and this patch

Collapse All | Expand All

(-)./p5-CGI-SpeedyCGI/Makefile (-2 / +2 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	CGI-SpeedyCGI
8
PORTNAME=	CGI-SpeedyCGI
9
PORTVERSION=	2.21
9
PORTVERSION=	2.22
10
PORTREVISION=	3
10
PORTREVISION=	0
11
CATEGORIES=	www perl5
11
CATEGORIES=	www perl5
12
MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
12
MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
13
MASTER_SITE_SUBDIR=	CGI
13
MASTER_SITE_SUBDIR=	CGI
(-)./p5-CGI-SpeedyCGI/distinfo (-1 / +1 lines)
Line 1 Link Here
1
MD5 (CGI-SpeedyCGI-2.21.tar.gz) = ff43eaa899c5ff38f208ed692ab12bb4
1
MD5 (CGI-SpeedyCGI-2.22.tar.gz) = 2f80df78874e3efa80f180923c4967a1
(-)./p5-CGI-SpeedyCGI/files/patch-Makefile.PL (-24 / +8 lines)
Lines 1-6 Link Here
1
--- Makefile.PL.orig	Sat Mar  1 09:16:07 2003
1
--- Makefile.PL.orig	Sun Oct  5 14:40:46 2003
2
+++ Makefile.PL	Sat Mar  1 09:17:19 2003
2
+++ Makefile.PL	Mon Oct 13 09:23:45 2003
3
@@ -6,26 +6,26 @@
3
@@ -6,28 +6,28 @@
4
     import SpeedyMake qw(%write_makefile_common);
4
     import SpeedyMake qw(%write_makefile_common);
5
 }
5
 }
6
 
6
 
Lines 29-65 Link Here
29
 
29
 
30
 my @dirs = qw(src speedy_backend speedy);
30
 my @dirs = qw(src speedy_backend speedy);
31
 my $macro = $write_makefile_common{macro};
31
 my $macro = $write_makefile_common{macro};
32
 my $apache_module = 0;
32
-if (<STDIN> =~ /y/i) {
33
-if (<STDIN> =~ /y/i) {
33
-    die "ERROR: Could not find a working copy of 'apxs' in your path.\n"
34
-    die "ERROR: Command 'apxs -q CC' failed.\n"
34
-	unless $macro->{APACHE_APXS_WORKS};
35
-	unless $macro->{APACHE_APXS_WORKS};
35
-    print "Compiling for Apache version $macro->{APACHE_VERSION}\n";
36
-    print "Compiling for Apache version $macro->{APACHE_VERSION}\n";
36
-    push(@dirs, $macro->{MOD_SPEEDYCGI_DIR});
37
-    push(@dirs, $macro->{MOD_SPEEDYCGI_DIR});
38
-    $apache_module = 1;
37
-}
39
-}
38
+#if (<STDIN> =~ /y/i) {
40
+#if (<STDIN> =~ /y/i) {
39
+#    die "ERROR: Could not find a working copy of 'apxs' in your path.\n"
41
+#    die "ERROR: Command 'apxs -q CC' failed.\n"
40
+#	unless $macro->{APACHE_APXS_WORKS};
42
+#	unless $macro->{APACHE_APXS_WORKS};
41
+#    print "Compiling for Apache version $macro->{APACHE_VERSION}\n";
43
+#    print "Compiling for Apache version $macro->{APACHE_VERSION}\n";
42
+#    push(@dirs, $macro->{MOD_SPEEDYCGI_DIR});
44
+#    push(@dirs, $macro->{MOD_SPEEDYCGI_DIR});
45
+#    $apache_module = 1;
43
+#}
46
+#}
44
 
47
 
45
 WriteMakefile(
48
 WriteMakefile(
46
     NAME		=> 'CGI::SpeedyCGI',
49
     NAME		=> 'CGI::SpeedyCGI',
47
@@ -47,12 +47,12 @@
48
 sub postamble {
49
     my $extra = SpeedyMake->optdefs_cmds('src');
50
     my $test_install_extra;
51
-    if (my $mod_dir = $macro->{MOD_SPEEDYCGI_DIR}) {
52
-	$extra .=
53
-	    "\ninstall ::\n\tcd $mod_dir && \$(MAKE) install\n";
54
-	$test_install_extra =
55
-	    "\t\@cd $mod_dir && \$(MAKE) test_install \$(PASTHRU)\n";
56
-    }
57
+#    if (my $mod_dir = $macro->{MOD_SPEEDYCGI_DIR}) {
58
+#	$extra .=
59
+#	    "\ninstall ::\n\tcd $mod_dir && \$(MAKE) install\n";
60
+#	$test_install_extra =
61
+#	    "\t\@cd $mod_dir && \$(MAKE) test_install \$(PASTHRU)\n";
62
+#    }
63
 
64
 '
65
 test_install:
(-)./p5-CGI-SpeedyCGI/files/patch-speedy_opt.c (-20 lines)
Lines 1-20 Link Here
1
--- src/speedy_opt.c	Mon Sep 30 07:19:54 2002
2
+++ /tmp/speedy_opt.c	Tue May 20 11:11:28 2003
3
@@ -165,6 +165,8 @@ static void cmdline_split(
4
 		    ++p;
5
 	    if (*p)
6
 		strlist_append(doing_speedy_opts ? speedy_opts : perl_args, *p);
7
+	    else
8
+		break;
9
 	}
10
 
11
 	if (*p) {
12
@@ -422,7 +424,7 @@ const char * const *speedy_opt_script_ar
13
 }
14
 
15
 SPEEDY_INLINE const char *speedy_opt_script_fname(void) {
16
-    return exec_argv.ptrs[script_argv_loc];
17
+    return exec_argv.len > script_argv_loc ? exec_argv.ptrs[script_argv_loc] : NULL;
18
 }
19
 
20
 #ifdef SPEEDY_BACKEND
(-)./p5-CGI-SpeedyCGI/files/patch-src::SpeedyMake.pl (-3 / +3 lines)
Lines 1-6 Link Here
1
--- src/SpeedyMake.pl.orig	Sun Mar 30 08:17:01 2003
1
--- src/SpeedyMake.pl.orig	Sun Oct 12 08:45:06 2003
2
+++ src/SpeedyMake.pl	Sun Mar 30 08:18:59 2003
2
+++ src/SpeedyMake.pl	Mon Oct 13 09:29:39 2003
3
@@ -214,6 +214,7 @@
3
@@ -223,6 +223,7 @@
4
     join(' ',
4
     join(' ',
5
 	"-DSPEEDY_PROGNAME=\\\"" . $class->my_name_full . "\\\"",
5
 	"-DSPEEDY_PROGNAME=\\\"" . $class->my_name_full . "\\\"",
6
 	"-DSPEEDY_VERSION=\\\"\$(VERSION)\\\"",
6
 	"-DSPEEDY_VERSION=\\\"\$(VERSION)\\\"",

Return to bug 57925