- update to mod_perl-2.0.5

committed with hat apache@

PR:		ports/155026 ports/155586 ports/157246

6 files changed, 19 insertions, 91 deletions

diff --git a/www/mod_perl2/Makefile b/www/mod_perl2/Makefile
index 85b67a7358e3..80e2e20c4d0d 100644
--- a/www/mod_perl2/Makefile
+++ b/www/mod_perl2/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	mod_perl
-PORTVERSION=	2.0.4
-PORTREVISION=	2
+PORTVERSION=	2.0.5
 PORTEPOCH=	3
 CATEGORIES=	www perl5
-MASTER_SITES=	http://perl.apache.org/dist/ \
-		http://perl.apache.org/dist/old/
+MASTER_SITES=	${MASTER_SITE_APACHE}
+MASTER_SITE_SUBDIR= perl
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	2
 
@@ -19,9 +18,11 @@ MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Embeds a Perl interpreter in the Apache2 server
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/BSD/Resource.pm:${PORTSDIR}/devel/p5-BSD-Resource
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-MAKE_JOBS_SAFE=  yes
+CONFLICTS=	p5-Apache-Reload-0.*
+
+MAKE_JOBS_SAFE=	yes
 
 SUB_FILES=	pkg-message
 SUB_LIST=	APACHEMODDIR=${APACHEMODDIR}
@@ -45,12 +46,14 @@ MAN3=		APR.3 APR::Base64.3 APR::Brigade.3 APR::Bucket.3 \
 		Apache2::Directive.3 Apache2::Filter.3 Apache2::FilterRec.3 \
 		Apache2::HookRun.3 Apache2::Log.3 Apache2::MPM.3 \
 		Apache2::Module.3 Apache2::PerlSections.3 Apache2::Process.3 \
+		Apache2::Reload.3 \
 		Apache2::RequestIO.3 Apache2::RequestRec.3 \
 		Apache2::RequestUtil.3 Apache2::Resource.3 \
 		Apache2::Response.3 Apache2::ServerRec.3 \
 		Apache2::ServerUtil.3 Apache2::SizeLimit.3 Apache2::Status.3 \
 		Apache2::SubProcess.3 Apache2::SubRequest.3 Apache2::URI.3 \
 		Apache2::Util.3 Apache2::compat.3 Apache2::porting.3 \
+		Apache::Reload.3 Apache::SizeLimit.3 Apache::SizeLimit::Core.3 \
 		Apache::Test.3 Apache::TestConfig.3 Apache::TestMB.3 \
 		Apache::TestMM.3 Apache::TestReport.3 Apache::TestRequest.3 \
 		Apache::TestRun.3 Apache::TestRunPHP.3 Apache::TestRunPerl.3 \
@@ -89,18 +92,6 @@ PLIST_SUB+=	THREADMUTEX="@comment "
 PLIST_SUB+=	THREADRWLOCK="@comment "
 .endif
 
-pre-fetch:
-	@${ECHO} ""
-	@${ECHO} "Note, Aapche(2)::Reload was mistakenly ommited from ${PORTVERSION}"
-	@${ECHO} "cd ${PORTSDIR}/www/p5-Apache-Reload ; ${MAKE} install"
-	@${ECHO} "After installing mod_perl"
-	@${ECHO} "This will be fixed in the next version...."
-	@${ECHO} ""
-
-pre-configure:
-	${RM} ${WRKSRC}/lib/ModPerl/BuildMM.pm.orig
-	${RM} ${WRKSRC}/lib/Apache2/Status.pm.orig
-
 post-install:
 	${MKDIR} ${PREFIX}/${APACHEINCLUDEDIR}/modules/perl
 	${INSTALL_DATA} ${WRKSRC}/src/modules/perl/*.h \
diff --git a/www/mod_perl2/distinfo b/www/mod_perl2/distinfo
index 81bda6873d1f..09721a23de88 100644
--- a/www/mod_perl2/distinfo
+++ b/www/mod_perl2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mod_perl-2.0.4.tar.gz) = 7da2046aa65dbef64ff5b71400bed4b6b82441e6313c8ca4becb85fb4a89a0f0
-SIZE (mod_perl-2.0.4.tar.gz) = 3727717
+SHA256 (mod_perl-2.0.5.tar.gz) = fa95be3d6d00f083afaea4b17fd594b505998e396feb71260857604566aa8afa
+SIZE (mod_perl-2.0.5.tar.gz) = 3778910
diff --git a/www/mod_perl2/files/patch-lib__ModPerl__BuildMM.pm b/www/mod_perl2/files/patch-lib__ModPerl__BuildMM.pm
deleted file mode 100644
index 2f9d33371448..000000000000
--- a/www/mod_perl2/files/patch-lib__ModPerl__BuildMM.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./lib/ModPerl/BuildMM.pm.orig	2008-05-08 13:00:34.000000000 -0400
-+++ ./lib/ModPerl/BuildMM.pm	2008-05-08 13:01:03.000000000 -0400
-@@ -359,7 +359,7 @@
- 
-     $apr_config ||= $build->get_apr_config();
- 
--    if ($path =~ m/(Thread|Global)Mutex/) {
-+    if ($path =~ m/(Thread|Global)(Mutex|RWLock)/) { 
-         return unless $apr_config->{HAS_THREADS};
-     }
- 
diff --git a/www/mod_perl2/files/patch-r760926 b/www/mod_perl2/files/patch-r760926
deleted file mode 100644
index 2c72c4eaeed4..000000000000
--- a/www/mod_perl2/files/patch-r760926
+++ /dev/null
@@ -1,47 +0,0 @@
---- lib/Apache2/Status.pm	2009/04/01 15:32:12	760925
-+++ lib/Apache2/Status.pm	2009/04/01 15:39:56	760926
-@@ -29,7 +29,7 @@
- 
- use Apache2::Const -compile => qw(OK);
- 
--$Apache2::Status::VERSION = '4.00'; # mod_perl 2.0
-+$Apache2::Status::VERSION = '4.01'; # mod_perl 2.0
- 
- use constant IS_WIN32 => ($^O eq "MSWin32");
- 
-@@ -126,7 +126,7 @@
-         $r->print(symdump($r, $qs));
-     }
-     else {
--        my $uri = $r->uri;
-+        my $uri = $r->location;
-         $r->print('<p>');
-         $r->print(
-             map { qq[<a href="$uri?$_">$status{$_}</a><br />\n] } sort { lc $a cmp lc $b } keys %status
-@@ -198,7 +198,7 @@
- sub status_inc {
-     my ($r) = @_;
- 
--    my $uri = $r->uri;
-+    my $uri = $r->location;
-     my @retval = (
-         '<table border="1">',
-         "<tr>",
-@@ -289,7 +289,7 @@
-     my ($r) = @_;
- 
-     local $_;
--    my $uri = $r->uri;
-+    my $uri = $r->location;
-     my $cache = __PACKAGE__->registry_cache;
- 
-     my @retval = "<h2>Compiled registry scripts grouped by their handler</h2>";
-@@ -765,7 +765,7 @@
-     my ($self, $package, $r) = @_;
- 
-     my @m = qw(<table>);
--    my $uri = $r->uri;
-+    my $uri = $r->location;
-     my $is_main = $package eq "main";
- 
-     my $do_dump = has($r, "dumper");
diff --git a/www/mod_perl2/files/patch-src__modules__perl__modperl_apache_compat.h b/www/mod_perl2/files/patch-src__modules__perl__modperl_apache_compat.h
deleted file mode 100644
index bf2215abb044..000000000000
--- a/www/mod_perl2/files/patch-src__modules__perl__modperl_apache_compat.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/modules/perl/modperl_apache_compat.h.orig	2008-05-08 12:59:16.000000000 -0400
-+++ ./src/modules/perl/modperl_apache_compat.h	2008-05-08 12:59:30.000000000 -0400
-@@ -22,6 +22,7 @@
- #if !APR_HAS_THREADS
- typedef unsigned long apr_os_thread_t;
- typedef void * apr_thread_mutex_t;
-+typedef void * apr_thread_rwlock_t;
- #endif
- 
- /* back compat adjustements for older Apache versions
diff --git a/www/mod_perl2/pkg-plist b/www/mod_perl2/pkg-plist
index 6ee49e4b4c8a..85c49ed67dfc 100644
--- a/www/mod_perl2/pkg-plist
+++ b/www/mod_perl2/pkg-plist
@@ -76,6 +76,9 @@ bin/mp2bug
 %%SITE_PERL%%/%%PERL_ARCH%%/APR/UUID.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/APR/Util.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/APR/XSLoader.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Reload.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/SizeLimit.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache/SizeLimit/Core.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/Test.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/Test5005compat.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestBuild.pm
@@ -127,6 +130,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
+%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Reload.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/RequestIO.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/RequestRec.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/RequestUtil.pm
@@ -313,8 +317,8 @@ bin/mp2bug
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Util
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/UUID
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/URI
-%%THREADMUTEX%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/ThreadMutex
 %%THREADRWLOCK%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/ThreadRWLock
+%%THREADMUTEX%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/ThreadMutex
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Table
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/String
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Status
@@ -337,8 +341,9 @@ bin/mp2bug
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/ModPerl
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/PerlSections
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache2
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/SizeLimit
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/APR
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
 @dirrm %%APACHEINCLUDEDIR%%/modules/perl