Attachment #36018 for bug #57925




#

PORTNAME=	CGI-SpeedyCGI
PORTVERSION=	2.22
PORTREVISION=	3
CATEGORIES=	www perl5
MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR=	CGI


PERL_CONFIGURE=	yes

.include <bsd.port.pre.mk>

APXS?=		${LOCALBASE}/sbin/apxs

# define WITHOUT_APACHE to prevent mod_speedycgi from being built even if Apache is installed

.if !exists(${APXS}) || defined(WITHOUT_APACHE)
PLIST_SUB+=	APACHE="@comment "
CONFIGURE_ENV+=	WITHOUT_APACHE=yes
.else
PLIST_SUB+=	APACHE=""
.if exists(${APXS})
APXS_WORKS!=	${APXS} -q TARGET 2>/dev/null || echo no
.endif
.if exists(${APXS}) && ${APXS_WORKS} != no
AP_LIBEXEC!=	${APXS} -q LIBEXECDIR
.else
AP_LIBEXEC?=	${PREFIX}/libexec/apache
.endif
PLIST_SUB+=	AP_LIBEXEC=${AP_LIBEXEC:S/^${PREFIX}\///}
.endif

post-configure:
	@${PERL} -pi -e 's,^PREFIX = /usr$$,PREFIX = ${PREFIX},g;' \
		     -e 's,/usr/local,${PREFIX},g;' \
		${WRKSRC}/Makefile ${WRKSRC}/*/Makefile

post-install:
	@${INSTALL_PROGRAM} ${WRKSRC}/speedy/speedy ${PREFIX}/bin/speedy_suid
	@${CHMOD} 4755 ${PREFIX}/bin/speedy_suid

.include <bsd.port.post.mk>

Line 1 Link Here

(-)p5-CGI-SpeedyCGI/distinfo (-1 / +1 lines)
1	MD5 (CGI-SpeedyCGI-2.21.tar.gz) = ff43eaa899c5ff38f208ed692ab12bb4	1	MD5 (CGI-SpeedyCGI-2.22.tar.gz) = 2f80df78874e3efa80f180923c4967a1




--- Makefile.PL.orig	Sat Oct 18 12:27:13 2003
+++ Makefile.PL	Sat Oct 18 12:28:18 2003
@@ -6,22 +6,23 @@
     import SpeedyMake qw(%write_makefile_common);
 }
 

 
 my @dirs = qw(src speedy_backend speedy);
 my $macro = $write_makefile_common{macro};
 my $apache_module = 0;
-if (<STDIN> =~ /y/i) {
-    die "ERROR: Could not find a working copy of 'apxs' in your path.\n"
-	unless $macro->{APACHE_APXS_WORKS};
-    print "Compiling for Apache version $macro->{APACHE_VERSION}\n";
-    push(@dirs, $macro->{MOD_SPEEDYCGI_DIR});
-}
+#if (<STDIN> =~ /y/i) {
+unless ($ENV{WITHOUT_APACHE}) {
     die "ERROR: Command 'apxs -q CC' failed.\n"
 	unless $macro->{APACHE_APXS_WORKS};
     print "Compiling for Apache version $macro->{APACHE_VERSION}\n";
+#}
 
 WriteMakefile(
     NAME		=> 'CGI::SpeedyCGI',
@@ -47,12 +47,12 @@
 sub postamble {
     my $extra = SpeedyMake->optdefs_cmds('src');
     my $test_install_extra;
-    if (my $mod_dir = $macro->{MOD_SPEEDYCGI_DIR}) {
-	$extra .=
-	    "\ninstall ::\n\tcd $mod_dir && \$(MAKE) install\n";
-	$test_install_extra =
-	    "\t\@cd $mod_dir && \$(MAKE) test_install \$(PASTHRU)\n";
-    }
+#    if (my $mod_dir = $macro->{MOD_SPEEDYCGI_DIR}) {
+#	$extra .=
+#	    "\ninstall ::\n\tcd $mod_dir && \$(MAKE) install\n";
+#	$test_install_extra =
+#	    "\t\@cd $mod_dir && \$(MAKE) test_install \$(PASTHRU)\n";
+#    }
 
 '
 test_install:




--- src/speedy_opt.c	Mon Sep 30 07:19:54 2002
+++ /tmp/speedy_opt.c	Tue May 20 11:11:28 2003
@@ -165,6 +165,8 @@ static void cmdline_split(
 		    ++p;
 	    if (*p)
 		strlist_append(doing_speedy_opts ? speedy_opts : perl_args, *p);
+	    else
+		break;
 	}
 
 	if (*p) {
@@ -422,7 +424,7 @@ const char * const *speedy_opt_script_ar
 }
 
 SPEEDY_INLINE const char *speedy_opt_script_fname(void) {
-    return exec_argv.ptrs[script_argv_loc];
+    return exec_argv.len > script_argv_loc ? exec_argv.ptrs[script_argv_loc] : NULL;
 }
 
 #ifdef SPEEDY_BACKEND

Lines 1-8 Link Here

(-)p5-CGI-SpeedyCGI/pkg-plist (-5 / +8 lines)
1	lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/SpeedyCGI/.packlist	1	%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/SpeedyCGI/.packlist
2	lib/perl5/site_perl/%%PERL_VER%%/CGI/SpeedyCGI.pm	2	%%SITE_PERL%%/CGI/SpeedyCGI.pm
3	bin/speedy	3	bin/speedy
4	bin/speedy_backend	4	bin/speedy_backend
5	bin/speedy_suid	5	bin/speedy_suid
6	@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/SpeedyCGI	6	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/SpeedyCGI
7	@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null \|\| true	7	@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null \|\| true
8	@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/CGI 2>/dev/null \|\| true	8	@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null \|\| true
		9	%%APACHE%%%%AP_LIBEXEC%%/mod_speedycgi.so
		10	%%APACHE%%@exec %D/sbin/apxs -e -a -n speedycgi %D/%F
		11	%%APACHE%%@unexec %D/sbin/apxs -e -A -n speedycgi %D/%F

Return to bug 57925

Lines 6-13 Link Here

(-)p5-CGI-SpeedyCGI/Makefile (-4 / +27 lines)
6	#	6	#
7		7
8	PORTNAME= CGI-SpeedyCGI	8	PORTNAME= CGI-SpeedyCGI
9	PORTVERSION= 2.21	9	PORTVERSION= 2.22
10	PORTREVISION= 3
11	CATEGORIES= www perl5	10	CATEGORIES= www perl5
12	MASTER_SITES= ${MASTER_SITE_PERL_CPAN}	11	MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
13	MASTER_SITE_SUBDIR= CGI	12	MASTER_SITE_SUBDIR= CGI
Lines 18-28 Link Here
18		17
19	PERL_CONFIGURE= yes	18	PERL_CONFIGURE= yes
20		19
		20	.include <bsd.port.pre.mk>
		21
		22	APXS?= ${LOCALBASE}/sbin/apxs
		23
		24	# define WITHOUT_APACHE to prevent mod_speedycgi from being built even if Apache is installed
		25
		26	.if !exists(${APXS}) \|\| defined(WITHOUT_APACHE)
		27	PLIST_SUB+= APACHE="@comment "
		28	CONFIGURE_ENV+= WITHOUT_APACHE=yes
		29	.else
		30	PLIST_SUB+= APACHE=""
		31	.if exists(${APXS})
		32	APXS_WORKS!= ${APXS} -q TARGET 2>/dev/null \|\| echo no
		33	.endif
		34	.if exists(${APXS}) && ${APXS_WORKS} != no
		35	AP_LIBEXEC!= ${APXS} -q LIBEXECDIR
		36	.else
		37	AP_LIBEXEC?= ${PREFIX}/libexec/apache
		38	.endif
		39	PLIST_SUB+= AP_LIBEXEC=${AP_LIBEXEC:S/^${PREFIX}\///}
		40	.endif
		41
21	post-configure:	42	post-configure:
22	@${PERL} -pi.bak -e 's,^PREFIX = /usr$$,PREFIX = ${PREFIX},g' ${WRKSRC}/*/Makefile	43	@${PERL} -pi -e 's,^PREFIX = /usr$$,PREFIX = ${PREFIX},g;' \
		44	-e 's,/usr/local,${PREFIX},g;' \
		45	${WRKSRC}/Makefile ${WRKSRC}/*/Makefile
23		46
24	post-install:	47	post-install:
25	@${INSTALL_PROGRAM} ${WRKSRC}/speedy/speedy ${PREFIX}/bin/speedy_suid	48	@${INSTALL_PROGRAM} ${WRKSRC}/speedy/speedy ${PREFIX}/bin/speedy_suid
26	@${CHMOD} 4755 ${PREFIX}/bin/speedy_suid	49	@${CHMOD} 4755 ${PREFIX}/bin/speedy_suid
27		50
28	.include <bsd.port.mk>	51	.include <bsd.port.post.mk>

Lines 1-6 Link Here

(-)p5-CGI-SpeedyCGI/files/patch-Makefile.PL (-35 / +8 lines)
1	--- Makefile.PL.orig Sat Mar 1 09:16:07 2003	1	--- Makefile.PL.orig Sat Oct 18 12:27:13 2003
2	+++ Makefile.PL Sat Mar 1 09:17:19 2003	2	+++ Makefile.PL Sat Oct 18 12:28:18 2003
3	@@ -6,26 +6,26 @@	3	@@ -6,22 +6,23 @@
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	- unless $macro->{APACHE_APXS_WORKS};
35	- print "Compiling for Apache version $macro->{APACHE_VERSION}\n";
36	- push(@dirs, $macro->{MOD_SPEEDYCGI_DIR});
37	-}
38	+#if (<STDIN> =~ /y/i) {	34	+#if (<STDIN> =~ /y/i) {
39	+# die "ERROR: Could not find a working copy of 'apxs' in your path.\n"	35	+unless ($ENV{WITHOUT_APACHE}) {
40	+# unless $macro->{APACHE_APXS_WORKS};	36	die "ERROR: Command 'apxs -q CC' failed.\n"
41	+# print "Compiling for Apache version $macro->{APACHE_VERSION}\n";	37	unless $macro->{APACHE_APXS_WORKS};
42	+# push(@dirs, $macro->{MOD_SPEEDYCGI_DIR});	38	print "Compiling for Apache version $macro->{APACHE_VERSION}\n";
43	+#}
44
45	WriteMakefile(
46	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:

Lines 1-20 Link Here

(-)p5-CGI-SpeedyCGI/files/patch-speedy_opt.c (-20 lines)
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