Update to mod_perl-1.25.

Like any port that relies on Perl5's MakeMaker, this was horribly
PREFIX-unclean.  It's now PREFIX-clean for everything except libperl.so,
which will require a rethink of pkg-install.

6 files changed, 28 insertions, 16 deletions

diff --git a/www/mod_perl/Makefile b/www/mod_perl/Makefile
index 9eb4d0568ac3..0274b91add35 100644
--- a/www/mod_perl/Makefile
+++ b/www/mod_perl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mod_perl
-PORTVERSION=	1.24
+PORTVERSION=	1.25
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Apache
@@ -26,13 +26,15 @@ MAN3=		Apache.3 Apache::Constants.3  Apache::ExtUtils.3 \
 		Apache::Registry.3 Apache::SizeLimit.3 \
 		Apache::Status.3 Apache::Symbol.3 Apache::Symdump.3 \
 		Apache::Table.3 Apache::URI.3 Apache::Util.3 \
-		Apache::httpd_conf.3 Apache::src.3 Bundle::Apache.3 \
+		Apache::httpd_conf.3 Apache::src.3 Apache::test.3 \
+		Bundle::Apache.3 \
 		Apache::Debug.3 mod_perl.3 Apache::SIG.3 Apache::Resource.3 \
 		Apache::RegistryLoader.3 Apache::StatINC.3 Apache::Include.3 \
 		Apache::PerlSections.3 cgi_to_mod_perl.3 \
 		mod_perl_cvs.3 mod_perl_method_handlers.3 mod_perl_traps.3 \
 		mod_perl_tuning.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+PERLSITEDIR=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}
 
 .include <bsd.port.pre.mk>
 
@@ -43,6 +45,9 @@ BROKEN=		"see PR 14924; use p5-Apache instead"
 do-configure:
 	@ cd ${WRKSRC}; \
 	${PERL5} Makefile.PL USE_APXS=1 EVERYTHING=1 \
+	    PREFIX=${PREFIX} INSTALLSITELIB=${PERLSITEDIR} \
+	    INSTALLSITEARCH=${PERLSITEDIR}/${PERL_ARCH} \
+	    INSTALLMAN3DIR=${MANPREFIX}/man/man3 \
 	    WITH_APXS=${LOCALBASE}/sbin/apxs \
 	    PERL_EXTRA_CFLAGS='-DDEFAULT_PATH=\"/bin:/usr/bin:/usr/local/bin\"'
 
diff --git a/www/mod_perl/distinfo b/www/mod_perl/distinfo
index 787871909b0f..4279e84b28d7 100644
--- a/www/mod_perl/distinfo
+++ b/www/mod_perl/distinfo
@@ -1 +1 @@
-MD5 (mod_perl-1.24.tar.gz) = 08d0ac4c9e2436fdb038021ae8826a8c
+MD5 (mod_perl-1.25.tar.gz) = c6a29600f54c62cb9b8a96eaf2be023a
diff --git a/www/mod_perl/pkg-plist b/www/mod_perl/pkg-plist
index 66e0bab641e0..6397e9dc41a2 100644
--- a/www/mod_perl/pkg-plist
+++ b/www/mod_perl/pkg-plist
@@ -66,13 +66,14 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl_tuning.pod
 libexec/apache/libperl.so
 @dirrm include/apache/modules/perl
 @dirrm include/apache/modules
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Constants
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Leak
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Symbol
+@dirrm include/apache
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Leak
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Symbol
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/mod_perl
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Constants
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bundle
diff --git a/www/mod_perl2/Makefile b/www/mod_perl2/Makefile
index 9eb4d0568ac3..0274b91add35 100644
--- a/www/mod_perl2/Makefile
+++ b/www/mod_perl2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mod_perl
-PORTVERSION=	1.24
+PORTVERSION=	1.25
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Apache
@@ -26,13 +26,15 @@ MAN3=		Apache.3 Apache::Constants.3  Apache::ExtUtils.3 \
 		Apache::Registry.3 Apache::SizeLimit.3 \
 		Apache::Status.3 Apache::Symbol.3 Apache::Symdump.3 \
 		Apache::Table.3 Apache::URI.3 Apache::Util.3 \
-		Apache::httpd_conf.3 Apache::src.3 Bundle::Apache.3 \
+		Apache::httpd_conf.3 Apache::src.3 Apache::test.3 \
+		Bundle::Apache.3 \
 		Apache::Debug.3 mod_perl.3 Apache::SIG.3 Apache::Resource.3 \
 		Apache::RegistryLoader.3 Apache::StatINC.3 Apache::Include.3 \
 		Apache::PerlSections.3 cgi_to_mod_perl.3 \
 		mod_perl_cvs.3 mod_perl_method_handlers.3 mod_perl_traps.3 \
 		mod_perl_tuning.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+PERLSITEDIR=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}
 
 .include <bsd.port.pre.mk>
 
@@ -43,6 +45,9 @@ BROKEN=		"see PR 14924; use p5-Apache instead"
 do-configure:
 	@ cd ${WRKSRC}; \
 	${PERL5} Makefile.PL USE_APXS=1 EVERYTHING=1 \
+	    PREFIX=${PREFIX} INSTALLSITELIB=${PERLSITEDIR} \
+	    INSTALLSITEARCH=${PERLSITEDIR}/${PERL_ARCH} \
+	    INSTALLMAN3DIR=${MANPREFIX}/man/man3 \
 	    WITH_APXS=${LOCALBASE}/sbin/apxs \
 	    PERL_EXTRA_CFLAGS='-DDEFAULT_PATH=\"/bin:/usr/bin:/usr/local/bin\"'
 
diff --git a/www/mod_perl2/distinfo b/www/mod_perl2/distinfo
index 787871909b0f..4279e84b28d7 100644
--- a/www/mod_perl2/distinfo
+++ b/www/mod_perl2/distinfo
@@ -1 +1 @@
-MD5 (mod_perl-1.24.tar.gz) = 08d0ac4c9e2436fdb038021ae8826a8c
+MD5 (mod_perl-1.25.tar.gz) = c6a29600f54c62cb9b8a96eaf2be023a
diff --git a/www/mod_perl2/pkg-plist b/www/mod_perl2/pkg-plist
index 66e0bab641e0..6397e9dc41a2 100644
--- a/www/mod_perl2/pkg-plist
+++ b/www/mod_perl2/pkg-plist
@@ -66,13 +66,14 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl_tuning.pod
 libexec/apache/libperl.so
 @dirrm include/apache/modules/perl
 @dirrm include/apache/modules
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Constants
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Leak
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Symbol
+@dirrm include/apache
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Leak
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Symbol
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/mod_perl
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Constants
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bundle