set www/libapreq2 as MASTERDIR.

6 files changed, 4 insertions, 142 deletions

diff --git a/www/p5-libapreq2/Makefile b/www/p5-libapreq2/Makefile
index e82c426bc28f..cc78500087e6 100644
--- a/www/p5-libapreq2/Makefile
+++ b/www/p5-libapreq2/Makefile
@@ -5,41 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	libapreq2
-PORTVERSION=	2.06
 CATEGORIES=	www perl5 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
+COMMENT=	Generic Apache2 Request Library with perl binding
 
-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}
+MASTERDIR=	${.CURDIR}/../libapreq2
 
-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
-USE_APACHE=	yes
-WRKSRC=		${WRKDIR}/${DISTNAME:C/_[0-9]+//}
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+WITH_MODPERL2=	yes
 
-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
-
-post-configure:
-	cd ${CONFIGURE_WRKSRC}/glue/perl && \
-		${PERL5} Makefile.PL -apxs ${APXS} && \
-		${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/www/p5-libapreq2/distinfo b/www/p5-libapreq2/distinfo
deleted file mode 100644
index 010f00440882..000000000000
--- a/www/p5-libapreq2/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (libapreq2-2.06-dev.tar.gz) = e245db341c4967e0a23b7f767d6486d9
-SHA256 (libapreq2-2.06-dev.tar.gz) = 201d4ee716e5031246f94096ed9a34167a1b75b817e0e97c67af882d635084db
-SIZE (libapreq2-2.06-dev.tar.gz) = 711422
diff --git a/www/p5-libapreq2/files/patch-glue-perl-Makefile.PL b/www/p5-libapreq2/files/patch-glue-perl-Makefile.PL
deleted file mode 100644
index 452b081b44a9..000000000000
--- a/www/p5-libapreq2/files/patch-glue-perl-Makefile.PL
+++ /dev/null
@@ -1,13 +0,0 @@
---- glue/perl/Makefile.PL	Mon May  2 20:24:29 2005
-+++ glue/perl/Makefile.PL	Sat May 21 17:57:39 2005
-@@ -443,8 +443,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\\\$(PREFIX)/include/apache2/modules/perl",
-+    'LIBS'      => "$apreq_libs $apr_libs -L\\\$(PREFIX)/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
deleted file mode 100644
index f6efd93c0d77..000000000000
--- a/www/p5-libapreq2/files/patch-library-Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- library/Makefile.in.orig	Sat May 21 17:21:51 2005
-+++ library/Makefile.in	Sat May 21 17:22:18 2005
-@@ -137,10 +137,10 @@
- libapreq2_la_OBJECTS = $(am_libapreq2_la_OBJECTS)
- 
- DEFS = @DEFS@
--DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
-+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(prefix)/include/apache2/modules/perl
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -L$(prefix)/lib
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cookie.Plo ./$(DEPDIR)/error.Plo \
diff --git a/www/p5-libapreq2/pkg-descr b/www/p5-libapreq2/pkg-descr
deleted file mode 100644
index ef561fb2f66a..000000000000
--- a/www/p5-libapreq2/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-libapreq2 - Generic Apache2 Request Library
-
-This package contains modules for manipulating client request data via
-the Apache API with Perl and C.  Functionality includes:
-
- - 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/
-
--- Autrijus Tang
-autrijus@autrijus.org
diff --git a/www/p5-libapreq2/pkg-plist b/www/p5-libapreq2/pkg-plist
deleted file mode 100644
index 39b2e4d1df71..000000000000
--- a/www/p5-libapreq2/pkg-plist
+++ /dev/null
@@ -1,65 +0,0 @@
-bin/apreq2-config
-include/apache2/apreq2/apreq_module_apache2.h
-include/apreq2/apreq.h
-include/apreq2/apreq_cookie.h
-include/apreq2/apreq_error.h
-include/apreq2/apreq_module.h
-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
-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
-@dirrm include/apache2/apreq2
-@dirrm include/apreq2