needed in order to update Perl and seems to work with 5.12.2 as well.
OK?
regression tests look similar to 2.0.4: most things work, there are
problems with some of the t/apr tests (Can't load ...arch/auto/APR/APR.so')
but seeing as these already fail no need to handle that as part of this
update.
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/ap2-mod_perl/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile 11 Mar 2013 11:44:41 -0000 1.21
+++ Makefile 21 Mar 2013 11:18:30 -0000
@@ -2,9 +2,8 @@
COMMENT= module that embeds a Perl interpreter into Apache2
-DISTNAME= mod_perl-2.0.4
+DISTNAME= mod_perl-2.0.7
PKGNAME= ap2-${DISTNAME}
-REVISION= 5
CATEGORIES= www net
WANTLIB= c m perl util db expat apr-1 aprutil-1
@@ -20,7 +19,6 @@ PERMIT_PACKAGE_CDROM= Yes
SHARED_ONLY= Yes
CONFIGURE_ARGS+= MP_APXS=${LOCALBASE}/sbin/apxs2
-USE_GROFF = Yes
LIB_DEPENDS= devel/apr \
devel/apr-util
RUN_DEPENDS= www/apache-httpd
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/ap2-mod_perl/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 5 May 2008 21:21:43 -0000 1.3
+++ distinfo 21 Mar 2013 11:18:30 -0000
@@ -1,5 +1,2 @@
-MD5 (mod_perl-2.0.4.tar.gz) = GgViWuaEMIX5hfXaghRQKg==
-RMD160 (mod_perl-2.0.4.tar.gz) = ERuPM+LcxD73oKfVV860Z/DFXG0=
-SHA1 (mod_perl-2.0.4.tar.gz) = ZSmaFuxBSmkKSKK75jrKo8a7iXs=
-SHA256 (mod_perl-2.0.4.tar.gz) = faIEaqZdvvZP9bcUAL7UtrgkQeYxPIykvsuF+0qJoPA=
-SIZE (mod_perl-2.0.4.tar.gz) = 3727717
+SHA256 (mod_perl-2.0.7.tar.gz) = U0FL6duEMFS5J/I6Ne23uC2Z4y4DGzzYHV/yRz9R48Y=
+SIZE (mod_perl-2.0.7.tar.gz) = 3784950
Index: patches/patch-Makefile_PL
===================================================================
RCS file: /cvs/ports/www/ap2-mod_perl/patches/patch-Makefile_PL,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Makefile_PL
--- patches/patch-Makefile_PL 29 Jan 2007 16:31:58 -0000 1.1
+++ patches/patch-Makefile_PL 21 Mar 2013 11:18:30 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-Makefile_PL,v 1.1 2007/01/29 16:31:58 simon Exp $
---- Makefile.PL.orig Mon Nov 20 00:31:43 2006
-+++ Makefile.PL Sun Jan 14 18:33:46 2007
-@@ -23,7 +23,7 @@ BEGIN {
- };
+--- Makefile.PL.orig Wed Jun 6 03:16:33 2012
++++ Makefile.PL Thu Mar 21 11:03:10 2013
+@@ -24,7 +24,7 @@ BEGIN {
+
}
-use lib qw(lib Apache-Test/lib);
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_PL,v 1.1 2007/0
use Config;
use File::Spec::Functions;
-@@ -116,15 +116,6 @@ sub get_DEFINE {
+@@ -118,15 +118,6 @@ sub get_DEFINE {
sub configure {
@@ -26,7 +26,7 @@ $OpenBSD: patch-Makefile_PL,v 1.1 2007/0
set_modperl_version();
if ($old_modperl_version) {
-@@ -798,7 +789,7 @@ sub MY::postamble {
+@@ -822,7 +813,7 @@ sub MY::postamble {
my $string = $self->ModPerl::BuildMM::MY::postamble;
$string .= <<'EOF';
Index: patches/patch-src_modules_perl_modperl_apache_compat_h
===================================================================
RCS file: patches/patch-src_modules_perl_modperl_apache_compat_h
diff -N patches/patch-src_modules_perl_modperl_apache_compat_h
--- patches/patch-src_modules_perl_modperl_apache_compat_h 5 May 2008
21:21:43 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_modules_perl_modperl_apache_compat_h,v 1.1 2008/05/05
21:21:43 simon Exp $
---- src/modules/perl/modperl_apache_compat.h.orig Fri May 2 22:44:18 2008
-+++ src/modules/perl/modperl_apache_compat.h Fri May 2 22:44:43 2008
-@@ -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
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/ap2-mod_perl/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 30 Aug 2008 08:25:48 -0000 1.5
+++ pkg/PLIST 21 Mar 2013 11:18:30 -0000
@@ -73,11 +73,17 @@ ${P5ARCH}/APR/Socket.pm
${P5ARCH}/APR/Status.pm
${P5ARCH}/APR/String.pm
${P5ARCH}/APR/Table.pm
+${P5ARCH}/APR/ThreadMutex.pm
${P5ARCH}/APR/ThreadRWLock.pm
${P5ARCH}/APR/URI.pm
${P5ARCH}/APR/UUID.pm
${P5ARCH}/APR/Util.pm
${P5ARCH}/APR/XSLoader.pm
+${P5ARCH}/Apache/
+${P5ARCH}/Apache/Reload.pm
+${P5ARCH}/Apache/SizeLimit/
+${P5ARCH}/Apache/SizeLimit.pm
+${P5ARCH}/Apache/SizeLimit/Core.pm
${P5ARCH}/Apache2/
${P5ARCH}/Apache2/Access.pm
${P5ARCH}/Apache2/Build.pm
@@ -99,6 +105,7 @@ ${P5ARCH}/Apache2/PerlSections/
${P5ARCH}/Apache2/PerlSections.pm
${P5ARCH}/Apache2/PerlSections/Dump.pm
${P5ARCH}/Apache2/Process.pm
+${P5ARCH}/Apache2/Reload.pm
${P5ARCH}/Apache2/RequestIO.pm
${P5ARCH}/Apache2/RequestRec.pm
${P5ARCH}/Apache2/RequestUtil.pm
@@ -203,6 +210,9 @@ ${P5ARCH}/auto/APR/String/String.so
${P5ARCH}/auto/APR/Table/
${P5ARCH}/auto/APR/Table/Table.bs
${P5ARCH}/auto/APR/Table/Table.so
+${P5ARCH}/auto/APR/ThreadMutex/
+${P5ARCH}/auto/APR/ThreadMutex/ThreadMutex.bs
+${P5ARCH}/auto/APR/ThreadMutex/ThreadMutex.so
${P5ARCH}/auto/APR/ThreadRWLock/
${P5ARCH}/auto/APR/ThreadRWLock/ThreadRWLock.bs
${P5ARCH}/auto/APR/ThreadRWLock/ThreadRWLock.so
@@ -342,6 +352,7 @@ ${P5ARCH}/mod_perl2.pm
@man man/man3p/Apache2::Module.3p
@man man/man3p/Apache2::PerlSections.3p
@man man/man3p/Apache2::Process.3p
+@man man/man3p/Apache2::Reload.3p
@man man/man3p/Apache2::RequestIO.3p
@man man/man3p/Apache2::RequestRec.3p
@man man/man3p/Apache2::RequestUtil.3p
@@ -357,6 +368,9 @@ ${P5ARCH}/mod_perl2.pm
@man man/man3p/Apache2::Util.3p
@man man/man3p/Apache2::compat.3p
@man man/man3p/Apache2::porting.3p
+@man man/man3p/Apache::Reload.3p
+@man man/man3p/Apache::SizeLimit.3p
+@man man/man3p/Apache::SizeLimit::Core.3p
@man man/man3p/Bundle::Apache2.3p
@man man/man3p/ModPerl::BuildMM.3p
@man man/man3p/ModPerl::CScan.3p
