3 files changed, 16 insertions, 20 deletions

diff --git a/www/mod_perl2/Makefile b/www/mod_perl2/Makefile
index 66fb22baf604..44378fa82e7d 100644
--- a/www/mod_perl2/Makefile
+++ b/www/mod_perl2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mod_perl
-PORTVERSION=	1.99r08
+PORTVERSION=	1.99r09
 CATEGORIES=	www perl5
 MASTER_SITES=	http://perl.apache.org/dist/ \
 		http://perl.apache.org/dist/old/
@@ -24,20 +24,16 @@ USE_PERL5=	YES
 INSTALLS_SHLIB=	YES
 LDCONFIG_DIRS=	%%PREFIX%%/libexec/apache2/
 
-MAN3=		APR::PerlIO.3 APR::Table.3 Apache::Build.3 Apache::Log.3 \
-		Apache::Reload.3 Apache::RequestRec.3 Apache::ServerUtil.3 \
-		Apache::SubProcess.3 Apache::Test.3 \
-		Apache::TestSmoke.3 Apache::TestTrace.3 Apache::TestUtil.3 \
-		Apache::compat.3 Bundle::ApacheTest.3 ModPerl::Code.3 \
-		ModPerl::PerlRun.3 ModPerl::Registry.3 \
-		ModPerl::RegistryCooker.3
+MAN3=		Apache::Build.3 Apache::Test.3 Apache::TestSmoke.3 \
+		Apache::TestTrace.3 Apache::TestUtil.3 Bundle::Apache2.3 \
+		Bundle::ApacheTest.3 ModPerl::Code.3
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 APACHE2_PORT?=	${PORTSDIR}/www/apache2
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} > 500600
+.if ${PERL_LEVEL} > 500601
 MAN3+=		ModPerl::Config.3 Apache::TestConfig.3
 .endif
 
@@ -57,6 +53,7 @@ post-install:
 	${MKDIR} ${PREFIX}/include/apache2/modules/perl
 	${INSTALL_DATA} ${WRKSRC}/src/modules/perl/*.h \
 		${PREFIX}/include/apache2/modules/perl
+	${MKDIR} ${PREFIX}/libexec/apache2
 	${INSTALL_PROGRAM} ${WRKSRC}/src/modules/perl/mod_perl.so \
 		${PREFIX}/libexec/apache2/mod_perl.so
 
diff --git a/www/mod_perl2/distinfo b/www/mod_perl2/distinfo
index d2235a396ae8..78395a09243e 100644
--- a/www/mod_perl2/distinfo
+++ b/www/mod_perl2/distinfo
@@ -1 +1 @@
-MD5 (mod_perl-1.99_08.tar.gz) = e32ef1bf6493673a83362ae2f1f1a86b
+MD5 (mod_perl-1.99_09.tar.gz) = 475a62af71425e71552f0062ee6b8d6f
diff --git a/www/mod_perl2/pkg-plist b/www/mod_perl2/pkg-plist
index 5b1f7c2c3ff1..a36a0fa79413 100644
--- a/www/mod_perl2/pkg-plist
+++ b/www/mod_perl2/pkg-plist
@@ -1,4 +1,7 @@
+bin/mp2bug
+bin/mp2doc
 include/apache2/modules/perl/mod_perl.h
+include/apache2/modules/perl/modperl_apache_compat.h
 include/apache2/modules/perl/modperl_apache_includes.h
 include/apache2/modules/perl/modperl_bucket.h
 include/apache2/modules/perl/modperl_callback.h
@@ -35,13 +38,6 @@ include/apache2/modules/perl/modperl_tipool.h
 include/apache2/modules/perl/modperl_trace.h
 include/apache2/modules/perl/modperl_types.h
 include/apache2/modules/perl/modperl_util.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/APR/PerlIO.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/APR/Table.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Log.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Reload.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/RequestRec.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/ServerUtil.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/SubProcess.pod
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Test.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Test5005compat.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/TestBuild.pm
@@ -68,7 +64,6 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/TestSmokePerl.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/TestSort.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/TestTrace.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/TestUtil.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/compat.pod
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/APR.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/APR/Base64.pm
@@ -112,12 +107,14 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/Apache/Response.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/Apache/Server.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/Apache/ServerUtil.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/Apache/SourceTables.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/Apache/Status.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/Apache/SubProcess.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/Apache/SubRequest.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/Apache/URI.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/Apache/Util.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/Apache/XSLoader.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/Apache/compat.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/ModPerl/BuildMM.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/ModPerl/BuildOptions.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/ModPerl/Code.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/ModPerl/Config.pm
@@ -127,6 +124,7 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/ModPerl/Global.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/ModPerl/MM.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/ModPerl/Manifest.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/ModPerl/MapUtil.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/ModPerl/MethodLookup.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/ModPerl/ParseSource.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/ModPerl/PerlRun.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/ModPerl/Registry.pm
@@ -217,6 +215,7 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/auto/Apache/URI/URI.bs
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/auto/Apache/URI/URI.so
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/auto/Apache/Util/Util.bs
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/auto/Apache/Util/Util.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/auto/Apache/typemap
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/auto/ModPerl/Const/Const.bs
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/auto/ModPerl/Const/Const.so
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/auto/ModPerl/Global/Global.bs
@@ -224,10 +223,11 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/auto/ModPerl/Global/Globa
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/auto/ModPerl/Util/Util.bs
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/auto/ModPerl/Util/Util.so
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/mod_perl.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/typemap
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bundle/Apache2.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bundle/ApacheTest.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/mod_perl/.packlist
 libexec/apache2/mod_perl.so
+@dirrm libexec/apache2
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/mod_perl
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/auto/ModPerl/Util
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/auto/ModPerl/Global
@@ -280,5 +280,4 @@ libexec/apache2/mod_perl.so
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2/APR
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache2
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/APR
 @dirrm include/apache2/modules/perl