5 files changed, 14 insertions, 36 deletions

diff --git a/www/mod_perl2/Makefile b/www/mod_perl2/Makefile
index 485a5e2a0dd2..a362dc78a7b7 100644
--- a/www/mod_perl2/Makefile
+++ b/www/mod_perl2/Makefile
@@ -6,26 +6,31 @@
 #
 
 PORTNAME=	mod_perl
-PORTVERSION=	1.99r17
+PORTVERSION=	1.99r18
 CATEGORIES=	www perl5
 MASTER_SITES=	http://perl.apache.org/dist/ \
 		http://perl.apache.org/dist/old/
 PKGNAMESUFFIX=	2
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/r/_/}
+DISTNAME=	${PORTNAME}-2.0.0-RC1
 
 MAINTAINER=	lars.eggert@gmx.net
 COMMENT=	Embeds a Perl interpreter in the Apache2 server
 
+# no idea why they still call it r18 when the tarball is 2.0.0-RC1
+# PORTVERSION=	2.0.0r1
+# DISTNAME=	${PORTNAME}-${PORTVERSION:S/r/-RC/}
+
 USE_APACHE=	yes
 WITH_APACHE2=	yes
 PERL_CONFIGURE=	yes
+GMAKE=		yes
 
 CONFIGURE_ARGS=	MP_APXS=${LOCALBASE}/sbin/apxs \
 		MP_INST_APACHE2=1 PREFIX=${PREFIX}
 
 MAN3=		Apache::Build.3 Apache::Test.3 Apache::TestConfig.3 \
 		Apache::TestMB.3 Apache::TestMM.3 Apache::TestReport.3 \
-		Apache::TestRequest.3 Apache::TestRun.3 \
+		Apache::TestRequest.3 Apache::TestRun.3 Apache::TestRunPHP.3 \
 		Apache::TestRunPerl.3 Apache::TestSmoke.3 \
 		Apache::TestTrace.3 Apache::TestUtil.3 Bundle::Apache2.3 \
 		Bundle::ApacheTest.3 ModPerl::CScan.3 ModPerl::Code.3 \
@@ -38,11 +43,6 @@ MAN3=		Apache::Build.3 Apache::Test.3 Apache::TestConfig.3 \
 IGNORE=		requires perl 5.8.x or later. Install lang/perl5.8 then try again
 .endif
 
-# no idea why r16 and r17 require this - the perl build should do this copy
-pre-install:
-	${CP} ${WRKSRC}/WrapXS/APR/ThreadMutex/ThreadMutex.pm \
-		${WRKSRC}/blib/lib/Apache2/APR/
-
 post-install:
 	${MKDIR} ${PREFIX}/include/apache2/modules/perl
 	${INSTALL_DATA} ${WRKSRC}/src/modules/perl/*.h \
diff --git a/www/mod_perl2/distinfo b/www/mod_perl2/distinfo
index 07fd584c683e..f111b352bcd0 100644
--- a/www/mod_perl2/distinfo
+++ b/www/mod_perl2/distinfo
@@ -1,2 +1,2 @@
-MD5 (mod_perl-1.99_17.tar.gz) = ffb9d5c825b93d91e6c3a8885f7d5296
-SIZE (mod_perl-1.99_17.tar.gz) = 1368804
+MD5 (mod_perl-2.0.0-RC1.tar.gz) = 6b3453396263cf0cdd3ae433eeadbedf
+SIZE (mod_perl-2.0.0-RC1.tar.gz) = 1401333
diff --git a/www/mod_perl2/files/patch-ab b/www/mod_perl2/files/patch-ab
deleted file mode 100644
index 78c14cd3023d..000000000000
--- a/www/mod_perl2/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./xs/APR/aprext/Makefile.PL	Wed Sep  1 19:52:04 2004
-+++ ./xs/APR/aprext/Makefile.PL.orig	Wed Sep  1 19:51:51 2004
-@@ -19,7 +19,7 @@
-     $src{$cfile} = "$srcdir/$cfile";
- }
- 
--my @skip = qw(dynamic test);
-+my @skip = qw(test);
- push @skip, q{static}
-     unless (Apache::Build::BUILD_APREXT);
- 
diff --git a/www/mod_perl2/files/patch-ac b/www/mod_perl2/files/patch-ac
deleted file mode 100644
index 5d42095f09e8..000000000000
--- a/www/mod_perl2/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- c	Sat Nov 27 13:42:59 2004
-+++ ./ModPerl-Registry/lib/ModPerl/RegistryCooker.pm	Sat Nov 27 13:43:11 2004
-@@ -558,7 +558,7 @@
- 
- my %switches = (
-    'T' => sub {
--       Apache::warn("-T switch is ignored, " .
-+       Apache::ServerRec::warn("-T switch is ignored, " .
-                     "enable with 'PerlSwitches -T' in httpd.conf\n")
-              unless ${^TAINT};
-        "";
diff --git a/www/mod_perl2/pkg-plist b/www/mod_perl2/pkg-plist
index 27870fa752fe..038b46e52525 100644
--- a/www/mod_perl2/pkg-plist
+++ b/www/mod_perl2/pkg-plist
@@ -56,6 +56,7 @@ include/apache2/modules/perl/modperl_util.h
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestCommonPost.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestConfig.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestConfigC.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestConfigPHP.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestConfigParse.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestConfigPerl.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestHandler.pm
@@ -67,6 +68,7 @@ include/apache2/modules/perl/modperl_util.h
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestReportPerl.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestRequest.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestRun.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestRunPHP.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestRunPerl.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestSSLCA.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestServer.pm
@@ -93,7 +95,6 @@ include/apache2/modules/perl/modperl_util.h
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/APR/Socket.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/APR/String.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/APR/Table.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/APR/ThreadMutex.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/APR/URI.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/APR/UUID.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/APR/Util.pm
@@ -120,9 +121,11 @@ include/apache2/modules/perl/modperl_util.h
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/RequestIO.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/RequestRec.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/RequestUtil.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Resource.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Response.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/ServerRec.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/ServerUtil.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/SizeLimit.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/SourceTables.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Status.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/SubProcess.pm
@@ -250,8 +253,6 @@ include/apache2/modules/perl/modperl_util.h
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/ModPerl/Global/Global.so
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/ModPerl/Util/Util.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/ModPerl/Util/Util.so
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/libaprext/libaprext.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/libaprext/libaprext.so
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/mod_perl.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Bundle/Apache2.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Bundle/ApacheTest.pm
@@ -259,7 +260,6 @@ include/apache2/modules/perl/modperl_util.h
 libexec/apache2/mod_perl.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/mod_perl
 @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/libaprext
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/ModPerl/Util
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/ModPerl/Global
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/ModPerl/Const