- add stage support

3 files changed, 36 insertions, 38 deletions

diff --git a/www/libapreq2/Makefile b/www/libapreq2/Makefile
index a6d6c092d718..24e45f426809 100644
--- a/www/libapreq2/Makefile
+++ b/www/libapreq2/Makefile
@@ -11,11 +11,12 @@ MASTER_SITE_SUBDIR=libapreq
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Generic Apache2 Request Library
 
+LICENSE=	AL2
+
 USE_APACHE=	22+
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	autoconf libtool
-NO_STAGE=	yes
 CONFIGURE_ARGS+=	--with-apache2-apxs=${APXS} --with-expat=${LOCALBASE}
 
 MAKE_ENV+=     MAKE=${GMAKE} ## MakeMaker blows it without this
@@ -23,33 +24,21 @@ MAKE_ENV+=     MAKE=${GMAKE} ## MakeMaker blows it without this
 SHLIB_MAJOR=	11
 PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 
+# www/p5-libapreq2
 .if defined (WITH_MODPERL2)
-PKGNAMEPREFIX+=	p5-
+PLIST_SUB+=	WITH_MODPERL2=""
+PKGNAMEPREFIX=	p5-
+USES+=		perl5
 
 P5_APREQ_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2 \
 		p5-ExtUtils-XSBuilder>=0:${PORTSDIR}/devel/p5-ExtUtils-XSBuilder \
 		p5-Parse-RecDescent>=0:${PORTSDIR}/devel/p5-Parse-RecDescent
+
 BUILD_DEPENDS+=	${P5_APREQ_DEPENDS}
 RUN_DEPENDS+=	${P5_APREQ_DEPENDS}
 
-USES+=		perl5
 CONFIGURE_ARGS+=	--enable-perl-glue --with-perl=${PERL5}
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}
-MAN3=		APR::Request.3 \
-		APR::Request::Apache2.3 \
-		APR::Request::CGI.3 \
-		APR::Request::Cookie.3 \
-		APR::Request::Error.3 \
-		APR::Request::Hook.3 \
-		APR::Request::Param.3 \
-		APR::Request::Parser.3 \
-		Apache2::Cookie.3 \
-		Apache2::Upload.3 \
-		Apache2::Request.3
-
-PLIST_SUB+=	WITH_MODPERL2=""
-
 post-patch:
 	@${REINPLACE_CMD} -i '' -e "s!%%APACHEINCLUDEDIR%%!${APACHEINCLUDEDIR}!" \
 		${WRKSRC}/glue/perl/Makefile.PL
diff --git a/www/libapreq2/pkg-plist b/www/libapreq2/pkg-plist
index 58a26ded684a..03247e0108c3 100644
--- a/www/libapreq2/pkg-plist
+++ b/www/libapreq2/pkg-plist
@@ -12,9 +12,17 @@ lib/libapreq2.a
 lib/libapreq2.la
 lib/libapreq2.so
 lib/libapreq2.so.%%SHLIB_MAJOR%%
-%%APACHEMODDIR%%/mod_apreq2.a
-%%APACHEMODDIR%%/mod_apreq2.la
-%%APACHEMODDIR%%/mod_apreq2.so
+%%WITH_MODPERL2%%%%PERL5_MAN3%%/APR::Request.3.gz
+%%WITH_MODPERL2%%%%PERL5_MAN3%%/APR::Request::Apache2.3.gz
+%%WITH_MODPERL2%%%%PERL5_MAN3%%/APR::Request::CGI.3.gz
+%%WITH_MODPERL2%%%%PERL5_MAN3%%/APR::Request::Cookie.3.gz
+%%WITH_MODPERL2%%%%PERL5_MAN3%%/APR::Request::Error.3.gz
+%%WITH_MODPERL2%%%%PERL5_MAN3%%/APR::Request::Hook.3.gz
+%%WITH_MODPERL2%%%%PERL5_MAN3%%/APR::Request::Param.3.gz
+%%WITH_MODPERL2%%%%PERL5_MAN3%%/APR::Request::Parser.3.gz
+%%WITH_MODPERL2%%%%PERL5_MAN3%%/Apache2::Cookie.3.gz
+%%WITH_MODPERL2%%%%PERL5_MAN3%%/Apache2::Request.3.gz
+%%WITH_MODPERL2%%%%PERL5_MAN3%%/Apache2::Upload.3.gz
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request.pm
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request.pod
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Apache2.pm
@@ -25,8 +33,8 @@ lib/libapreq2.so.%%SHLIB_MAJOR%%
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Cookie.pod
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Error.pm
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Error.pod
-%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Hook.pod
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Hook.pm
+%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Hook.pod
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Param.pm
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Param.pod
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Parser.pm
@@ -42,27 +50,29 @@ lib/libapreq2.so.%%SHLIB_MAJOR%%
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Cookie/Cookie.so
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Error/Error.bs
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Error/Error.so
-%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Hook/Hook.so
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Hook/Hook.bs
+%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Hook/Hook.so
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Param/Param.bs
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Param/Param.so
-%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Parser/Parser.so
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Parser/Parser.bs
+%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Parser/Parser.so
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Request.bs
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Request.so
-%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq2/.packlist
-%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/
-%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/APR/
-%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/
-%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Apache2/
-%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/CGI/
-%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Cookie/
-%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Error/
-%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Hook/
-%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Param/
-%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Parser/
-%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/
+%%APACHEMODDIR%%/mod_apreq2.a
+%%APACHEMODDIR%%/mod_apreq2.la
+%%APACHEMODDIR%%/mod_apreq2.so
 %%WITH_MODPERL2%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq2
+%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Parser
+%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Param
+%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Hook
+%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Error
+%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Cookie
+%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/CGI
+%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Apache2
+%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request
+%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache2
+%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/APR/Request
+%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/APR
+@dirrm include/apreq2
 @dirrm %%APACHEINCLUDEDIR%%/apreq2
 @dirrmtry %%APACHEINCLUDEDIR%%
-@dirrm include/apreq2
diff --git a/www/p5-libapreq2/Makefile b/www/p5-libapreq2/Makefile
index a53ff8d0fec2..00d5dbd7c00a 100644
--- a/www/p5-libapreq2/Makefile
+++ b/www/p5-libapreq2/Makefile
@@ -11,5 +11,4 @@ MASTERDIR=	${.CURDIR}/../libapreq2
 WITH_MODPERL2=	yes
 MAKE_ENV+=	MAKE=${GMAKE} ## MakeMaker blows it without this
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"