4 files changed, 57 insertions, 9 deletions

diff --git a/www/mod_perl2/Makefile b/www/mod_perl2/Makefile
index beb02274cd3b..a6a664486d28 100644
--- a/www/mod_perl2/Makefile
+++ b/www/mod_perl2/Makefile
@@ -3,30 +3,53 @@
 
 PORTNAME=	mod_perl
 PORTVERSION=	2.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	APACHE/perl
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	2
 
+PATCH_SITES=	${MASTER_SITE_LOCAL}
+PATCH_SITE_SUBDIR=	ohauer
+
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Embeds a Perl interpreter in the Apache2 server
 
+LICENSE=	APACHE20
+
 BUILD_DEPENDS=	p5-BSD-Resource>=0:${PORTSDIR}/devel/p5-BSD-Resource
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 SUB_FILES=	pkg-message
 SUB_LIST=	APACHEMODDIR=${APACHEMODDIR}
-USE_APACHE=	22
+USE_APACHE=	22+
 USES=		gmake perl5
 USE_PERL5=	configure
 USE_CSTD=	gnu89
 
 .include <bsd.port.pre.mk>
 
+# In case apache22 is in use and you want to test
+# the new mod_perl, change '> 22' to '>= 22'
 .if ${APACHE_VERSION} > 22
-BROKEN=	Does not build with apache24
+# patch shaped against upstream mod_perl
+# Last Changed Rev: 1602105
+PATCHREV=	1618150
+PATCHFILES+= 	${PORTNAME}-${PORTVERSION}-r${PATCHREV}.diff.gz
+PLIST_SUB+=	AP24=""
+PMSED=		's/%AP24%//'
+NO_PACKAGE=	yes
+.else
+PLIST_SUB+=	AP24="@comment "
+PMSED=		'/%AP24%/d'
+.endif
+
+# Provider is build iff apache24 is in use
+.if ${APACHE_VERSION:M22}
+PLIST_SUB+=	AP22="@comment "
+.else
+PLIST_SUB+=	AP22=""
 .endif
 
 # Using apxs in this way is problematic if apache2 is installed under a
@@ -57,17 +80,19 @@ post-patch:
 	${REINPLACE_CMD} -e 's/APR_INLINE//g' \
 		${PATCH_WRKSRC}/src/modules/perl/modperl_common_util.h
 	${REINPLACE_CMD} -e "s|/usr/local/apache/bin/apxs|${APXS}|" \
-			-e "s|'bin', 'apxs'|'sbin', 'apxs'|" \
-			${WRKSRC}/lib/Apache2/Build.pm
+		-e "s|'bin', 'apxs'|'sbin', 'apxs'|" \
+		${WRKSRC}/lib/Apache2/Build.pm
 
 pre-configure:
-	@${FIND} ${WRKSRC} -type f \( -name \*.bak -o -name \*.orig \) -delete
+	${FIND} ${WRKSRC} -type f \( -name \*.bak -o -name \*.orig \) -delete
 
 post-configure:
 	${REINPLACE_CMD} -e 's/-pthread -Wl,-E//g' \
 		${PATCH_WRKSRC}/xs/APR/APR/Makefile
 
 post-install:
+# adjust pkg-message
+	${REINPLACE_CMD} -e ${PMSED} ${WRKDIR}/pkg-message
 	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR}/modules/perl
 	${INSTALL_DATA} ${WRKSRC}/src/modules/perl/*.h \
 		${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR}/modules/perl
diff --git a/www/mod_perl2/distinfo b/www/mod_perl2/distinfo
index a34731afff8a..8044119c194c 100644
--- a/www/mod_perl2/distinfo
+++ b/www/mod_perl2/distinfo
@@ -1,2 +1,4 @@
 SHA256 (mod_perl-2.0.8.tar.gz) = 35dc1b7a40a90a395ce88bba2df84f22289975f34d1757de6d715560c20a20e6
 SIZE (mod_perl-2.0.8.tar.gz) = 3790026
+SHA256 (mod_perl-2.0.8-r1618150.diff.gz) = 7ce5f40a72f8779e09465aba7328947c3490976a6269783d4d6cf95830d2b350
+SIZE (mod_perl-2.0.8-r1618150.diff.gz) = 142858
diff --git a/www/mod_perl2/files/pkg-message.in b/www/mod_perl2/files/pkg-message.in
index f7554ecb9caf..0a041970f33c 100644
--- a/www/mod_perl2/files/pkg-message.in
+++ b/www/mod_perl2/files/pkg-message.in
@@ -1,5 +1,4 @@
-#########################################################
-
+===================================================================
 Simple config:
 
   LoadModule perl_module %%APACHEMODDIR%%/mod_perl.so
@@ -14,4 +13,8 @@ or online:
 
   http://perl.apache.org/docs/2.0/user/intro/start_fast.html
 
-#########################################################
+%AP24%  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+%AP24%    Use this mod_perl2 version at own risk, it is a current
+%AP24%     development snapshot and not marked production ready!
+%AP24%  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+===================================================================
diff --git a/www/mod_perl2/pkg-plist b/www/mod_perl2/pkg-plist
index 737a306c0841..ac6c7435b08f 100644
--- a/www/mod_perl2/pkg-plist
+++ b/www/mod_perl2/pkg-plist
@@ -142,6 +142,7 @@ bin/mp2bug
 %%PERL5_MAN3%%/ModPerl::RegistryLoader.3.gz
 %%PERL5_MAN3%%/ModPerl::RegistryPrefork.3.gz
 %%PERL5_MAN3%%/ModPerl::Util.3.gz
+%%AP24%%%%PERL5_MAN3%%/MyTest::Util.3.gz
 %%PERL5_MAN3%%/mod_perl2.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/APR.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/APR/Base64.pm
@@ -222,6 +223,7 @@ bin/mp2bug
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/PerlSections.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/PerlSections/Dump.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Process.pm
+%%AP22%%%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Provider.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Reload.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/RequestIO.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/RequestRec.pm
@@ -250,6 +252,8 @@ bin/mp2bug
 %%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/Const.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/FunctionMap.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/Global.pm
+%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/InterpPool.pm
+%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/Interpreter.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/MM.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/Manifest.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/MapUtil.pm
@@ -265,9 +269,12 @@ bin/mp2bug
 %%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/StructureMap.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/TestReport.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/TestRun.pm
+%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/TiPool.pm
+%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/TiPoolConfig.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/TypeMap.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/Util.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/WrapXS.pm
+%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/MyTest/Util.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/APR.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Base64/Base64.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Brigade/Brigade.so
@@ -307,6 +314,7 @@ bin/mp2bug
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/MPM/MPM.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Module/Module.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Process/Process.so
+%%AP22%%%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Provider/Provider.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/RequestIO/RequestIO.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/RequestRec/RequestRec.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/RequestUtil/RequestUtil.so
@@ -320,6 +328,10 @@ bin/mp2bug
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/typemap
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Const/Const.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Global/Global.so
+%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/InterpPool/InterpPool.so
+%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Interpreter/Interpreter.so
+%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/TiPool/TiPool.so
+%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/TiPoolConfig/TiPoolConfig.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Util/Util.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/mod_perl2/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/mod_perl2.pm
@@ -336,6 +348,7 @@ bin/mp2bug
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache2
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/ModPerl
+%%AP24%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/MyTest
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Base64
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Brigade
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Bucket
@@ -375,6 +388,7 @@ bin/mp2bug
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/MPM
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Module
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Process
+%%AP22%%%%AP24%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Provider
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/RequestIO
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/RequestRec
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/RequestUtil
@@ -388,6 +402,10 @@ bin/mp2bug
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Const
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Global
+%%AP24%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/InterpPool
+%%AP24%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Interpreter
+%%AP24%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/TiPool
+%%AP24%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/TiPoolConfig
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Util
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/mod_perl2