Move www/p5-libapreq2 to www/libapreq2,

PR:		ports/90734
Submitted by:	me

2 files changed, 78 insertions, 65 deletions

diff --git a/www/libapreq2/Makefile b/www/libapreq2/Makefile
index e82c426bc28f..ba16b9974c50 100644
--- a/www/libapreq2/Makefile
+++ b/www/libapreq2/Makefile
@@ -7,39 +7,52 @@
 
 PORTNAME=	libapreq2
 PORTVERSION=	2.06
-CATEGORIES=	www perl5 devel
+CATEGORIES=	www devel
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
 MASTER_SITE_SUBDIR=libapreq
-PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-dev
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generic Apache2 Request Library
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2 \
-		${SITE_PERL}/ExtUtils/XSBuilder:${PORTSDIR}/devel/p5-ExtUtils-XSBuilder \
-		${SITE_PERL}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
 WITH_APACHE2=	yes
 INSTALLS_SHLIB=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--enable-perl-glue --with-apache2-apxs=${APXS}
-USE_PERL5=	yes
+CONFIGURE_ARGS+=	--with-apache2-apxs=${APXS}
 USE_APACHE=	yes
+
+.if defined (WITH_MODPERL2)
+PKGNAMEPREFIX=	p5-
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2 \
+		${SITE_PERL}/ExtUtils/XSBuilder:${PORTSDIR}/devel/p5-ExtUtils-XSBuilder \
+		${SITE_PERL}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
+CONFIGURE_ARGS+=	--enable-perl-glue
+USE_PERL5=	yes
+PLIST_SUB+=	WITH_MODPERL2=""
 WRKSRC=		${WRKDIR}/${DISTNAME:C/_[0-9]+//}
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-
-MAN3=	APR::Request::Apache2.3 APR::Request::CGI.3 APR::Request::Cookie.3 \
-	APR::Request::Error.3 APR::Request::Param.3 APR::Request.3 \
-	APR::Request::Hook.3 APR::Request::Parser.3 Apache2::Cookie.3 \
-	Apache2::Upload.3 Apache2::Request.3
+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
 
 post-configure:
 	cd ${CONFIGURE_WRKSRC}/glue/perl && \
 		${PERL5} Makefile.PL -apxs ${APXS} && \
 		${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
+.else
+PLIST_SUB+=	WITH_MODPERL2="@comment "
+.endif
 
 .include <bsd.port.mk>
diff --git a/www/libapreq2/pkg-plist b/www/libapreq2/pkg-plist
index 39b2e4d1df71..183e92bf0d2b 100644
--- a/www/libapreq2/pkg-plist
+++ b/www/libapreq2/pkg-plist
@@ -8,58 +8,58 @@ include/apreq2/apreq_param.h
 include/apreq2/apreq_parser.h
 include/apreq2/apreq_util.h
 include/apreq2/apreq_version.h
-lib/libapreq2.so.3
-lib/libapreq2.so
 lib/libapreq2.a
+lib/libapreq2.so
+lib/libapreq2.so.3
 libexec/apache2/mod_apreq2.so
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/DummyVersions.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Apache2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Apache2.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/CGI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/CGI.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Cookie.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Cookie.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Error.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Error.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Hook.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Hook.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Param.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Param.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Parser.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Cookie.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Request.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Upload.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Apache2/Apache2.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Apache2/Apache2.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/CGI/CGI.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/CGI/CGI.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Cookie/Cookie.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Cookie/Cookie.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Error/Error.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Error/Error.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Hook/Hook.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Hook/Hook.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Param/Param.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Param/Param.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Parser/Parser.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Parser/Parser.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Request.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Request.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq2/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/APR/ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Apache2/ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/CGI/ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Cookie/ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Error/ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Hook/ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Param/ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Parser/ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/ 2>/dev/null || true
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq2
+%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/DummyVersions.pm
+%%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
+%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Apache2.pod
+%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/CGI.pm
+%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/CGI.pod
+%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Cookie.pm
+%%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/Param.pm
+%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Param.pod
+%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Parser.pm
+%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Parser.pod
+%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Cookie.pm
+%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Request.pm
+%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Upload.pm
+%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Apache2/Apache2.bs
+%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Apache2/Apache2.so
+%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/CGI/CGI.bs
+%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/CGI/CGI.so
+%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Cookie/Cookie.bs
+%%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/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/Request.bs
+%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Request.so
+%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq2/.packlist
+%%WITH_MODPERL2%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/ 2>/dev/null || true
+%%WITH_MODPERL2%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/APR/ 2>/dev/null || true
+%%WITH_MODPERL2%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/ 2>/dev/null || true
+%%WITH_MODPERL2%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Apache2/ 2>/dev/null || true
+%%WITH_MODPERL2%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/CGI/ 2>/dev/null || true
+%%WITH_MODPERL2%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Cookie/ 2>/dev/null || true
+%%WITH_MODPERL2%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Error/ 2>/dev/null || true
+%%WITH_MODPERL2%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Hook/ 2>/dev/null || true
+%%WITH_MODPERL2%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Param/ 2>/dev/null || true
+%%WITH_MODPERL2%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Parser/ 2>/dev/null || true
+%%WITH_MODPERL2%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/ 2>/dev/null || true
+%%WITH_MODPERL2%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq2
 @dirrm include/apache2/apreq2
 @dirrm include/apreq2