www/libapreq2, www/p5-libapreq2: separate ports

- separate the former master port libapreq2 from p5-libapreq2
- become maintainer for www/p5-libapreq2

Tests for dependend ports where OK.

Approved by:	culot (mentor), ohauer (apache@)

2 files changed, 6 insertions, 73 deletions

diff --git a/www/libapreq2/Makefile b/www/libapreq2/Makefile
index 255d12e5e307..eaa89356e99d 100644
--- a/www/libapreq2/Makefile
+++ b/www/libapreq2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libapreq2
 PORTVERSION=	2.13
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www devel
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
 MASTER_SITE_SUBDIR=libapreq
@@ -19,28 +19,11 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	autoconf
 CONFIGURE_ARGS+=	--with-apache2-apxs=${APXS} --with-expat=${LOCALBASE}
 
-MAKE_ENV+=     MAKE=${MAKE_CMD} ## MakeMaker blows it without this
+SHLIB_MAJOR=	11
+PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 
-# www/p5-libapreq2
-.if defined (WITH_MODPERL2)
-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}
-
-CONFIGURE_ARGS+=	--enable-perl-glue --with-perl=${PERL5}
-
-post-patch:
-	@${REINPLACE_CMD} -i '' -e "s!%%APACHEINCLUDEDIR%%!${APACHEINCLUDEDIR}!" \
-		${WRKSRC}/glue/perl/Makefile.PL
-.else
-PLIST_SUB+=	WITH_MODPERL2="@comment "
-.endif
+post-stage:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libapreq2.so.3.8.0
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/apache22/mod_apreq2.so
 
 .include <bsd.port.mk>
diff --git a/www/libapreq2/pkg-plist b/www/libapreq2/pkg-plist
index 562379318713..7c06a2ea45b4 100644
--- a/www/libapreq2/pkg-plist
+++ b/www/libapreq2/pkg-plist
@@ -12,58 +12,8 @@ lib/libapreq2.a
 lib/libapreq2.so
 lib/libapreq2.so.3
 lib/libapreq2.so.3.8.0
-%%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
-%%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.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
-%%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.so
-%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/CGI/CGI.so
-%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Cookie/Cookie.so
-%%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/Param/Param.so
-%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Parser/Parser.so
-%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Request.so
 %%APACHEMODDIR%%/mod_apreq2.a
 %%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%%