Upgrade to 1.23.

3 files changed, 64 insertions, 23 deletions

diff --git a/www/p5-Apache/Makefile b/www/p5-Apache/Makefile
index b308079ce5c0..af6f7548c5ba 100644
--- a/www/p5-Apache/Makefile
+++ b/www/p5-Apache/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	p5-Apache
-PORTVERSION=	1.21
+PORTVERSION=	1.23
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Apache
-DISTNAME=	mod_perl-1.21
+DISTNAME=	mod_perl-${PORTVERSION}
 
 MAINTAINER=	jfitz@FreeBSD.org
 
@@ -21,19 +21,40 @@ BUILD_DEPENDS=	${PREFIX}/sbin/apxs:${PORTSDIR}/www/${APACHE_PORT} \
 		${PREFIX}/bin/lwp-download:${PORTSDIR}/www/p5-libwww
 
 USE_PERL5=	YES
-MAN3=		Apache.3 Apache::Constants.3 Apache::Debug.3 \
-		Apache::ExtUtils.3 Apache::FakeRequest.3 Apache::Include.3 \
-		Apache::Leak.3 Apache::Log.3 Apache::Options.3 \
-		Apache::PerlRun.3 Apache::PerlRunXS.3 Apache::PerlSections.3 \
+MAN3=		Apache.3 \
+		Apache::Constants.3 \
+		Apache::Debug.3 \
+		Apache::ExtUtils.3 \
+		Apache::FakeRequest.3 \
+		Apache::File.3 \
+		Apache::Include.3 \
+		Apache::Leak.3 \
+		Apache::Log.3 \
+		Apache::Options.3 \
+		Apache::PerlRun.3 \
+		Apache::PerlRunXS.3 \
+		Apache::PerlSections.3 \
 		Apache::RedirectLogFix.3 \
-		Apache::Registry.3 Apache::RegistryLoader.3 \
-		Apache::Resource.3 Apache::SIG.3 Apache::SizeLimit.3 \
+		Apache::Registry.3 \
+		Apache::RegistryLoader.3 \
+		Apache::Resource.3 \
+		Apache::SIG.3 \
+		Apache::SizeLimit.3 \
 		Apache::StatINC.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 \
-		cgi_to_mod_perl.3 mod_perl.3 mod_perl_cvs.3 \
-		mod_perl_method_handlers.3 mod_perl_traps.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 \
+		cgi_to_mod_perl.3 \
+		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}
 
@@ -41,6 +62,9 @@ do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL USE_APXS=1 WITH_APXS=${PREFIX}/sbin/apxs EVERYTHING=1
 
 post-install:
+		${MKDIR} ${PREFIX}/include/apache/modules/perl
+		${INSTALL_DATA} ${WRKSRC}/src/modules/perl/*.h \
+		    ${PREFIX}/include/apache/modules/perl
 		${MKDIR} ${PREFIX}/share/doc/mod_perl
 		${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/share/doc/mod_perl
 .if !defined(BATCH)
diff --git a/www/p5-Apache/distinfo b/www/p5-Apache/distinfo
index 5617eb59a45d..0d759edd1f95 100644
--- a/www/p5-Apache/distinfo
+++ b/www/p5-Apache/distinfo
@@ -1 +1 @@
-MD5 (mod_perl-1.21.tar.gz) = 3695bb66e8eecf6cceec97e54d48f48e
+MD5 (mod_perl-1.23.tar.gz) = 8065af3fd29f162c3686f725b8d3ed07
diff --git a/www/p5-Apache/pkg-plist b/www/p5-Apache/pkg-plist
index 63354fc230e6..24097c6fc112 100644
--- a/www/p5-Apache/pkg-plist
+++ b/www/p5-Apache/pkg-plist
@@ -1,8 +1,12 @@
-share/doc/mod_perl/post-install-notes
+include/apache/modules/perl/apache_inc.h
+include/apache/modules/perl/mod_perl.h
+include/apache/modules/perl/mod_perl_version.h
+include/apache/modules/perl/mod_perl_xs.h
+include/apache/modules/perl/perl_PL.h
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Connection.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Constants/Exports.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Constants.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Constants/Exports.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Debug.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/ExtUtils.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/FakeRequest.pm
@@ -37,6 +41,20 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/httpd_conf.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/src.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/test.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bundle/Apache.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Leak/Leak.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Leak/Leak.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Symbol/Symbol.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Symbol/Symbol.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/ap_config_auto.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/apache_inc.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/mod_perl.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/mod_perl_version.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/mod_perl_xs.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/perl_PL.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/mod_perl.exp
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/typemap
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/mod_perl/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/cgi_to_mod_perl.pod
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl.pod
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl_cvs.pod
@@ -45,18 +63,17 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl_hooks.pm.PL
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl_method_handlers.pod
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl_traps.pod
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl_tuning.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/cgi_to_mod_perl.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/mod_perl/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Leak/Leak.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Leak/Leak.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Symbol/Symbol.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Symbol/Symbol.so
 libexec/apache/libperl.so
+share/doc/mod_perl/post-install-notes
+@dirrm include/apache/modules/perl
+@dirrm include/apache/modules
 @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/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
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/mod_perl
 @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
 @dirrm share/doc/mod_perl