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@)

10 files changed, 161 insertions, 80 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%%
diff --git a/www/p5-libapreq2/Makefile b/www/p5-libapreq2/Makefile
index 7f89f7d4385a..222a281e0091 100644
--- a/www/p5-libapreq2/Makefile
+++ b/www/p5-libapreq2/Makefile
@@ -1,14 +1,52 @@
-# Created by: Autrijus Tang <autrijus@autrijus.org>
 # $FreeBSD$
 
+PORTNAME=	libapreq2
+PORTVERSION=	2.13
+PORTREVISION=	4
 CATEGORIES=	www perl5 devel
+MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
+MASTER_SITE_SUBDIR=libapreq
+DISTFILE=	libapreq2-${PORTVERSION}
+PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	skv@FreeBSD.org
-COMMENT=	Generic Apache2 Request Library with perl binding
+MAINTAINER=	pi@FreeBSD.org
+COMMENT=	Perl binding for the Generic Apache2 Request Library
 
-MASTERDIR=	${.CURDIR}/../libapreq2
+LICENSE=	APACHE20
 
-WITH_MODPERL2=	yes
-MAKE_ENV+=	MAKE=${MAKE_CMD} ## MakeMaker blows it without this
+USES=		gmake libtool perl5
+USE_APACHE=	22+
+USE_PERL5=	fixpacklist
+USE_LDCONFIG=	yes
+USE_AUTOTOOLS=	autoconf
+CONFIGURE_ARGS+=	--with-apache2-apxs=${APXS} \
+			--with-expat=${LOCALBASE} \
+			--enable-perl-glue --with-perl=${PERL5}
 
-.include "${MASTERDIR}/Makefile"
+MAKE_ENV+=     MAKE=${GMAKE} ## MakeMaker blows it without this
+
+BUILD_DEPENDS+=	libapreq2>0:${PORTSDIR}/www/libapreq2 \
+		${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
+
+RUN_DEPENDS+=	${BUILD_DEPENDS}
+
+post-patch:
+	@${REINPLACE_CMD} -i '' -e "s!%%APACHEINCLUDEDIR%%!${APACHEINCLUDEDIR}!" \
+		${WRKSRC}/glue/perl/Makefile.PL
+post-stage:
+	# remove all the non-perl stuff
+	${RM} ${STAGEDIR}${PREFIX}/bin/apreq2-config
+	${RM} -rf ${STAGEDIR}${PREFIX}/include/apreq2
+	${RM} ${STAGEDIR}${PREFIX}/include/apache22/apreq2/apreq_module_apache2.h
+	${RM} ${STAGEDIR}${PREFIX}/lib/libapreq2*
+	${RM} ${STAGEDIR}${PREFIX}/libexec/apache22/mod_apreq2*
+	${FIND} ${STAGEDIR} -name '*.bs' -type f -size 0c -exec ${RM} {} \;
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/mach/auto/APR/Request/Request.so
+.for i in Apache2 CGI Cookie Error Hook Param Parser
+	${STRIP_CMD} \
+		${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/mach/auto/APR/Request/${i}/${i}.so
+.endfor
+
+.include <bsd.port.mk>
diff --git a/www/p5-libapreq2/distinfo b/www/p5-libapreq2/distinfo
new file mode 100644
index 000000000000..188a7fe2574b
--- /dev/null
+++ b/www/p5-libapreq2/distinfo
@@ -0,0 +1,2 @@
+SHA256 (libapreq2-2.13.tar.gz) = 5731e6833b32d88e4a5c690e45ddf20fcf969ce3da666c5627d775e92da0cf6e
+SIZE (libapreq2-2.13.tar.gz) = 891320
diff --git a/www/p5-libapreq2/files/patch-glue-Makefile.in b/www/p5-libapreq2/files/patch-glue-Makefile.in
new file mode 100644
index 000000000000..9a6685990cd7
--- /dev/null
+++ b/www/p5-libapreq2/files/patch-glue-Makefile.in
@@ -0,0 +1,11 @@
+--- ./glue/Makefile.in.orig	2009-04-13 06:32:19.000000000 +0000
++++ ./glue/Makefile.in	2009-04-13 06:32:29.000000000 +0000
+@@ -266,7 +266,7 @@
+ 
+ perl_install:
+ 	cd perl; INSTALL=1 @PERL@ @PERL_OPTS@ Makefile.PL -apxs @APACHE2_APXS@ @MM_OPTS@
+-	cd perl; $(MAKE) install
++	cd perl; $(MAKE) pure_install
+ 
+ perl_clean:
+ 	-cd perl; $(MAKE) clean
diff --git a/www/p5-libapreq2/files/patch-glue-perl-Makefile.PL b/www/p5-libapreq2/files/patch-glue-perl-Makefile.PL
new file mode 100644
index 000000000000..4387e267b7e6
--- /dev/null
+++ b/www/p5-libapreq2/files/patch-glue-perl-Makefile.PL
@@ -0,0 +1,13 @@
+--- glue/perl/Makefile.PL.orig	2006-08-09 04:26:45.000000000 +0000
++++ glue/perl/Makefile.PL	2008-08-25 18:07:08.000000000 +0000
+@@ -415,8 +450,8 @@
+     'NAME'      => '$class',
+     'VERSION'   => '$version',
+     'TYPEMAPS'  => [qw(@$mp2_typemaps $typemap)],
+-    'INC'       => "-I$base_dir/glue/perl/xs -I$inc_dir -I$xs_dir $apache_includes",
+-    'LIBS'      => "$apreq_libs $apr_libs",
++    'INC'       => "-I$base_dir/glue/perl/xs -I$inc_dir -I$xs_dir $apache_includes -I\\\$(LOCALBASE)/%%APACHEINCLUDEDIR%%/modules/perl",
++    'LIBS'      => "$apreq_libs $apr_libs -L\\\$(LOCALBASE)/lib",
+ } ;
+ $txt .= "'depend'  => $deps,\n" if ($deps) ;
+ $txt .= qq{    
diff --git a/www/p5-libapreq2/files/patch-library-Makefile.in b/www/p5-libapreq2/files/patch-library-Makefile.in
new file mode 100644
index 000000000000..caa5d3320bed
--- /dev/null
+++ b/www/p5-libapreq2/files/patch-library-Makefile.in
@@ -0,0 +1,11 @@
+--- library/Makefile.in.orig
++++ library/Makefile.in
+@@ -133,7 +133,7 @@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ -L$(prefix)
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
diff --git a/www/p5-libapreq2/files/patch-module-Makefile.in b/www/p5-libapreq2/files/patch-module-Makefile.in
new file mode 100644
index 000000000000..7ba20eb0c595
--- /dev/null
+++ b/www/p5-libapreq2/files/patch-module-Makefile.in
@@ -0,0 +1,11 @@
+--- module/Makefile.in.orig
++++ module/Makefile.in
+@@ -43,7 +43,7 @@
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/include/apreq_config.h
+ CONFIG_CLEAN_FILES =
+-PROGRAMS = $(noinst_PROGRAMS)
++PROGRAMS = 
+ test_cgi_SOURCES = test_cgi.c
+ test_cgi_OBJECTS = test_cgi.$(OBJEXT)
+ test_cgi_LDADD = $(LDADD)
diff --git a/www/p5-libapreq2/pkg-descr b/www/p5-libapreq2/pkg-descr
new file mode 100644
index 000000000000..1c689ab2667c
--- /dev/null
+++ b/www/p5-libapreq2/pkg-descr
@@ -0,0 +1,11 @@
+p5-libapreq2 - Perl elements for the Generic Apache2 Request Library
+
+This package contains the Perl elements of the Generic Apache2
+Request Library.
+
+ - parsing of application/x-www-form-urlencoded data
+ - parsing of multipart/form-data
+ - parsing of HTTP Cookies
+
+WWW: http://httpd.apache.org/apreq/
+WWW: http://search.cpan.org/dist/libapreq2/
diff --git a/www/p5-libapreq2/pkg-plist b/www/p5-libapreq2/pkg-plist
new file mode 100644
index 000000000000..6b807129b3b7
--- /dev/null
+++ b/www/p5-libapreq2/pkg-plist
@@ -0,0 +1,51 @@
+%%PERL5_MAN3%%/APR::Request.3.gz
+%%PERL5_MAN3%%/APR::Request::Apache2.3.gz
+%%PERL5_MAN3%%/APR::Request::CGI.3.gz
+%%PERL5_MAN3%%/APR::Request::Cookie.3.gz
+%%PERL5_MAN3%%/APR::Request::Error.3.gz
+%%PERL5_MAN3%%/APR::Request::Hook.3.gz
+%%PERL5_MAN3%%/APR::Request::Param.3.gz
+%%PERL5_MAN3%%/APR::Request::Parser.3.gz
+%%PERL5_MAN3%%/Apache2::Cookie.3.gz
+%%PERL5_MAN3%%/Apache2::Request.3.gz
+%%PERL5_MAN3%%/Apache2::Upload.3.gz
+%%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.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Hook.pod
+%%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/%%AP_NAME%%/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Apache2/Apache2.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/CGI/CGI.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Cookie/Cookie.so
+%%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/Param/Param.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Parser/Parser.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Request.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq2
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Parser
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Param
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Hook
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Error
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Cookie
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/CGI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Apache2
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache2
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/APR/Request
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/APR