7 files changed, 42 insertions, 26 deletions

diff --git a/www/p5-CGI-SpeedyCGI/Makefile b/www/p5-CGI-SpeedyCGI/Makefile
index 045fa004b9ee..88588f6f9ed5 100644
--- a/www/p5-CGI-SpeedyCGI/Makefile
+++ b/www/p5-CGI-SpeedyCGI/Makefile
@@ -11,7 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Speed up perl CGI scripts by running them persistently
 
-BROKEN=	not staged
+LICENSE=	GPLv2
+
 MAKE_JOBS_UNSAFE=	yes
 USES=		perl5
 USE_PERL5=	configure patch
@@ -20,18 +21,11 @@ OPTIONS_DEFINE=	APACHE
 OPTIONS_DEFAULT=APACHE
 APACHE_DESC=	Build mod_speedycgi
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MAPACHE}
-USE_APACHE=	22
-PLIST_SUB+=	APACHE=""
-.else
-PLIST_SUB+=	APACHE="@comment "
-CONFIGURE_ENV+=	WITHOUT_APACHE=yes
-.endif
+OPTIONS_SUB=	yes
+APACHE_USE=	APACHE=22
+APACHE_CONFIGURE_ENV_OFF=	WITHOUT_APACHE=yes
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/__inline__//g' \
@@ -41,23 +35,26 @@ post-patch:
 	@${PERL} -pi -e 's,APXS=apxs,APXS=${APXS},;' \
 		${WRKSRC}/mod_speedycgi/Makefile.tmpl
 	${CP} ${FILESDIR}/speedy_dump.c ${WRKSRC}/speedy_dump/
-.if ${PERL_LEVEL} >= 501000
 	@${REINPLACE_CMD} -i '' -e 's=New(123,=Newx(=g' \
 		${WRKSRC}/src/speedy_backend_main.h
-.endif
+	${REINPLACE_CMD} -e 's|@APXS_STAGE@|-S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR}|' \
+		${WRKSRC}/mod_speedycgi/Makefile.tmpl
+
+pre-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 
 post-configure:
 	@${PERL} -pi -e 's,^PREFIX = /usr$$,PREFIX = ${PREFIX},g;' \
 		${WRKSRC}/Makefile ${WRKSRC}/*/Makefile
 
 post-build:
-	@cd ${WRKSRC}/speedy_dump && ${CC} ${CFLAGS} -o speedy_dump \
-		-I../src speedy_dump.c
+	@(cd ${WRKSRC}/speedy_dump && ${CC} ${CFLAGS} -o speedy_dump \
+		-I../src speedy_dump.c)
 
 post-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/speedy/speedy ${PREFIX}/bin/speedy_suidperl
-	@${CHMOD} 4755 ${PREFIX}/bin/speedy_suidperl
+	@${INSTALL_PROGRAM} ${WRKSRC}/speedy/speedy ${STAGEDIR}${PREFIX}/bin/speedy_suidperl
+	@${CHMOD} 4755 ${STAGEDIR}${PREFIX}/bin/speedy_suidperl
 	@${INSTALL_PROGRAM} ${WRKSRC}/speedy_dump/speedy_dump \
-		${PREFIX}/bin/speedy_dump
+		${STAGEDIR}${PREFIX}/bin/speedy_dump
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/p5-CGI-SpeedyCGI/files/patch-mod_speedycgi__Makefile.tmpl b/www/p5-CGI-SpeedyCGI/files/patch-mod_speedycgi__Makefile.tmpl
new file mode 100644
index 000000000000..7de9922fe979
--- /dev/null
+++ b/www/p5-CGI-SpeedyCGI/files/patch-mod_speedycgi__Makefile.tmpl
@@ -0,0 +1,19 @@
+--- ./mod_speedycgi/Makefile.tmpl.orig	2014-04-15 15:09:03.000000000 +0200
++++ ./mod_speedycgi/Makefile.tmpl	2014-04-15 15:10:36.000000000 +0200
+@@ -26,6 +26,7 @@
+ #   the used tools
+ APXS=apxs
+ APACHECTL=apachectl
++APXS_STAGE=@APXS_STAGE@
+ 
+ #   additional defines, includes and libraries
+ INC=-I../src -I.
+@@ -37,7 +38,7 @@
+ 
+ #   install the shared object file into Apache 
+ install: all
+-	$(APXS) -i -a -n 'speedycgi' $(SHARED_OBJ_TARGET)
++	$(APXS) $(APXS_STAGE) -i -n 'speedycgi' $(SHARED_OBJ_TARGET)
+ 
+ #   cleanup
+ clean:
diff --git a/www/p5-CGI-SpeedyCGI/files/patch-src::SpeedyMake.pl b/www/p5-CGI-SpeedyCGI/files/patch-src__SpeedyMake.pl
index 41f7688a19e0..41f7688a19e0 100644
--- a/www/p5-CGI-SpeedyCGI/files/patch-src::SpeedyMake.pl
+++ b/www/p5-CGI-SpeedyCGI/files/patch-src__SpeedyMake.pl
diff --git a/www/p5-CGI-SpeedyCGI/files/patch-mod_speedycgi2.c b/www/p5-CGI-SpeedyCGI/files/patch-src__mod_speedycgi2.c
index 5712f6c74299..5712f6c74299 100644
--- a/www/p5-CGI-SpeedyCGI/files/patch-mod_speedycgi2.c
+++ b/www/p5-CGI-SpeedyCGI/files/patch-src__mod_speedycgi2.c
diff --git a/www/p5-CGI-SpeedyCGI/files/patch-src_speedy_main.c b/www/p5-CGI-SpeedyCGI/files/patch-src__speedy_main.c
index 750fbc0b4a65..750fbc0b4a65 100644
--- a/www/p5-CGI-SpeedyCGI/files/patch-src_speedy_main.c
+++ b/www/p5-CGI-SpeedyCGI/files/patch-src__speedy_main.c
diff --git a/www/p5-CGI-SpeedyCGI/files/patch-src_speedy_perl.c b/www/p5-CGI-SpeedyCGI/files/patch-src__speedy_perl.c
index 8b2ffeedb094..8b2ffeedb094 100644
--- a/www/p5-CGI-SpeedyCGI/files/patch-src_speedy_perl.c
+++ b/www/p5-CGI-SpeedyCGI/files/patch-src__speedy_perl.c
diff --git a/www/p5-CGI-SpeedyCGI/pkg-plist b/www/p5-CGI-SpeedyCGI/pkg-plist
index 3ae6d1a4256e..4b1fee9a0074 100644
--- a/www/p5-CGI-SpeedyCGI/pkg-plist
+++ b/www/p5-CGI-SpeedyCGI/pkg-plist
@@ -1,12 +1,12 @@
-%%APACHE%%%%APACHEMODDIR%%/mod_speedycgi.so
-%%APACHE%%@exec %D/sbin/apxs -e -a -n speedycgi %D/%F
-%%APACHE%%@unexec %D/sbin/apxs -e -A -n speedycgi %D/%F
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/SpeedyCGI/.packlist
-%%SITE_PERL%%/CGI/SpeedyCGI.pm
 bin/speedy
 bin/speedy_backend
-bin/speedy_suidperl
 bin/speedy_dump
+bin/speedy_suidperl
+%%SITE_PERL%%/CGI/SpeedyCGI.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/SpeedyCGI/.packlist
+%%APACHE%%%%APACHEMODDIR%%/mod_speedycgi.so
+%%APACHE%%@exec %D/sbin/apxs -e -a -n speedycgi %D/%F
+%%APACHE%%@unexec %D/sbin/apxs -e -A -n speedycgi %D/%F
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/SpeedyCGI
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
 @dirrmtry %%SITE_PERL%%/CGI