7 files changed, 39 insertions, 34 deletions
diff --git a/www/mod_perl2/Makefile b/www/mod_perl2/Makefile
index a802ea9d3f5c..6e0d20aa4e24 100644
--- a/www/mod_perl2/Makefile
+++ b/www/mod_perl2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mod_perl
-PORTVERSION=	2.0.3
-PORTREVISION=	3
+PORTVERSION=	2.0.4
 PORTEPOCH=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	http://perl.apache.org/dist/ \
@@ -42,7 +41,7 @@ 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::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 \
@@ -59,12 +58,13 @@ MAN3=		APR.3 APR::Base64.3 APR::Brigade.3 APR::Bucket.3 \
 		ModPerl::PerlRunPrefork.3 ModPerl::Registry.3 \
 		ModPerl::RegistryBB.3 ModPerl::RegistryCooker.3 \
 		ModPerl::RegistryLoader.3 ModPerl::RegistryPrefork.3 \
-		ModPerl::Util.3 mod_perl2.3 Apache2::ConnectionUtil.3
+		ModPerl::Util.3 mod_perl2.3 Apache2::ConnectionUtil.3 \
+		APR::ThreadRWLock.3
 
 .include <bsd.port.pre.mk>
-
 .if exists(${LOCALBASE}/include/apr-1/apr.h)
-APR_H=		${LOCALBASE}/include/apr-1/apr.h
+
+APR_l=		${LOCALBASE}/include/apr-1/apr.h
 .elif exists(${LOCALBASE}/include/apr/apr.h)
 APR_H=		${LOCALBASE}/include/apr/apr.h
 .endif
@@ -81,8 +81,16 @@ PLIST_SUB+=	THREADMUTEX=""
 PLIST_SUB+=	THREADMUTEX="@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}/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm.orig
+	${RM} ${WRKSRC}/lib/ModPerl/BuildMM.pm.orig
 
 post-install:
 	${MKDIR} ${PREFIX}/${APACHEINCLUDEDIR}/modules/perl
diff --git a/www/mod_perl2/distinfo b/www/mod_perl2/distinfo
index eb259511fe44..5234a5e2ecc0 100644
--- a/www/mod_perl2/distinfo
+++ b/www/mod_perl2/distinfo
@@ -1,3 +1,3 @@
-MD5 (mod_perl-2.0.3.tar.gz) = b40e2adf67c6be15a0041af1c67b6997
-SHA256 (mod_perl-2.0.3.tar.gz) = df257f233ed6a5c9f8589d6e059563f816bf417f164fc3364a2a434de13045f2
-SIZE (mod_perl-2.0.3.tar.gz) = 3714974
+MD5 (mod_perl-2.0.4.tar.gz) = 1a05625ae6843085f985f5da8214502a
+SHA256 (mod_perl-2.0.4.tar.gz) = 7da2046aa65dbef64ff5b71400bed4b6b82441e6313c8ca4becb85fb4a89a0f0
+SIZE (mod_perl-2.0.4.tar.gz) = 3727717
diff --git a/www/mod_perl2/files/patch-RegistryCooker.pm b/www/mod_perl2/files/patch-RegistryCooker.pm
deleted file mode 100644
index cf86c8a04306..000000000000
--- a/www/mod_perl2/files/patch-RegistryCooker.pm
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naurp ModPerl-Registry/lib/ModPerl/RegistryCooker.pm.orig ModPerl-Registry/lib/ModPerl/RegistryCooker.pm
---- ModPerl-Registry/lib/ModPerl/RegistryCooker.pm.orig	2006-11-19 18:31:41.000000000 -0500
-+++ ModPerl-Registry/lib/ModPerl/RegistryCooker.pm	2007-03-30 19:08:05.000000000 -0400
-@@ -337,7 +337,7 @@ sub namespace_from_uri {
-     my $self = shift;
- 
-     my $path_info = $self->{REQ}->path_info;
--    my $script_name = $path_info && $self->{URI} =~ /$path_info$/
-+    my $script_name = $path_info && $self->{URI} =~ /\Q$path_info\E$/
-         ? substr($self->{URI}, 0, length($self->{URI}) - length($path_info))
-         : $self->{URI};
- 
diff --git a/www/mod_perl2/files/patch-lib__ModPerl__BuildMM.pm b/www/mod_perl2/files/patch-lib__ModPerl__BuildMM.pm
new file mode 100644
index 000000000000..2f9d33371448
--- /dev/null
+++ b/www/mod_perl2/files/patch-lib__ModPerl__BuildMM.pm
@@ -0,0 +1,11 @@
+--- ./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-src__modules__perl__modperl_apache_compat.h b/www/mod_perl2/files/patch-src__modules__perl__modperl_apache_compat.h
new file mode 100644
index 000000000000..bf2215abb044
--- /dev/null
+++ b/www/mod_perl2/files/patch-src__modules__perl__modperl_apache_compat.h
@@ -0,0 +1,10 @@
+--- ./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/files/patch-xs-APR-APR-Makefile.PL b/www/mod_perl2/files/patch-xs-APR-APR-Makefile.PL
deleted file mode 100644
index 34530507ea4f..000000000000
--- a/www/mod_perl2/files/patch-xs-APR-APR-Makefile.PL
+++ /dev/null
@@ -1,11 +0,0 @@
---- xs/APR/APR/Makefile.PL.orig	Sun Nov 19 15:31:02 2006
-+++ xs/APR/APR/Makefile.PL	Sun Dec  3 15:30:46 2006
-@@ -15,7 +15,7 @@
- 
- my %args;
- 
--%args = map { split /=/, $_ } @ARGV;
-+%args = map { split /=/, $_, 2 } @ARGV;
- 
- $args{NAME}         = 'APR';
- $args{VERSION_FROM} = 'APR.pm';
diff --git a/www/mod_perl2/pkg-plist b/www/mod_perl2/pkg-plist
index 5b6796dc65ee..00bdc7421a64 100644
--- a/www/mod_perl2/pkg-plist
+++ b/www/mod_perl2/pkg-plist
@@ -126,7 +126,6 @@ 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