[PATCH] www/mod_perl2: update to 2.0.5
milki
milki at rescomp.berkeley.edu
Fri Feb 25 12:51:32 UTC 2011
>Submitter-Id: current-users
>Originator: milki
>Organization: UC Berkeley - RSSP-IT
>Confidential: no
>Synopsis: [PATCH] www/mod_perl2: update to 2.0.5
>Severity: non-critical
>Priority: low
>Category: ports
>Class: update
>Release: FreeBSD 7.3-RELEASE-p4 amd64
>Environment:
System: FreeBSD dev-www7.rescomp.berkeley.edu 7.3-RELEASE-p4 FreeBSD 7.3-RELEASE-p4 #15: Tue Nov 30 11:51:59 PST 2010
>Description:
- Update to 2.0.5
Removed file(s):
- files/patch-lib__ModPerl__BuildMM.pm
- files/patch-r760926
- files/patch-src__modules__perl__modperl_apache_compat.h
Port maintainer (apache at FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- ap22-mod_perl2-2.0.5,3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/www/mod_perl2/Makefile /tmp/milki/ports/mod_perl2/Makefile
--- /usr/ports/www/mod_perl2/Makefile 2010-05-25 13:17:34.000000000 -0700
+++ /tmp/milki/ports/mod_perl2/Makefile 2011-02-25 04:09:25.000000000 -0800
@@ -1,13 +1,12 @@
# New ports collection makefile for: mod_perl2
-# Date created: February 13th 2003
+# Date created: 2003-02-13
# Whom: Lars Eggert <larse at isi.edu>
#
# $FreeBSD: ports/www/mod_perl2/Makefile,v 1.72 2010/05/25 20:17:34 pgollucci Exp $
#
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/ \
@@ -21,7 +20,7 @@
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/BSD/Resource.pm:${PORTSDIR}/devel/p5-BSD-Resource
RUN_DEPENDS= ${BUILD_DEPENDS}
-MAKE_JOBS_SAFE= yes
+MAKE_JOBS_SAFE= yes
SUB_FILES= pkg-message
SUB_LIST= APACHEMODDIR=${APACHEMODDIR}
@@ -40,11 +39,14 @@
APR::OS.3 APR::PerlIO.3 APR::Pool.3 APR::SockAddr.3 \
APR::Socket.3 APR::Status.3 APR::String.3 APR::Table.3 \
APR::ThreadMutex.3 APR::URI.3 APR::UUID.3 APR::Util.3 \
+ Apache::Reload.3 \
+ Apache::SizeLimit.3 Apache::SizeLimit::Core.3 \
Apache2::Access.3 Apache2::Build.3 Apache2::CmdParms.3 \
Apache2::Command.3 Apache2::Connection.3 Apache2::Const.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 \
@@ -89,18 +91,6 @@
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 -ruN --exclude=CVS /usr/ports/www/mod_perl2/distinfo /tmp/milki/ports/mod_perl2/distinfo
--- /usr/ports/www/mod_perl2/distinfo 2008-06-07 08:31:21.000000000 -0700
+++ /tmp/milki/ports/mod_perl2/distinfo 2011-02-25 03:09:41.000000000 -0800
@@ -1,3 +1,2 @@
-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
+SHA256 (mod_perl-2.0.5.tar.gz) = fa95be3d6d00f083afaea4b17fd594b505998e396feb71260857604566aa8afa
+SIZE (mod_perl-2.0.5.tar.gz) = 3778910
diff -ruN --exclude=CVS /usr/ports/www/mod_perl2/files/patch-Makefile.PL /tmp/milki/ports/mod_perl2/files/patch-Makefile.PL
--- /usr/ports/www/mod_perl2/files/patch-Makefile.PL 2010-05-04 20:35:10.000000000 -0700
+++ /tmp/milki/ports/mod_perl2/files/patch-Makefile.PL 2011-02-25 03:11:49.000000000 -0800
@@ -1,6 +1,6 @@
---- m Wed May 18 11:55:48 2005
-+++ Makefile.PL Wed May 18 11:56:07 2005
-@@ -668,11 +668,11 @@
+--- Makefile.PL.orig 2011-02-25 03:11:00.000000000 -0800
++++ Makefile.PL 2011-02-25 03:11:15.000000000 -0800
+@@ -687,11 +687,11 @@
cd "$(MODPERL_SRC)" && $(MAKE)
modperl_lib_install:
diff -ruN --exclude=CVS /usr/ports/www/mod_perl2/files/patch-lib__ModPerl__BuildMM.pm /tmp/milki/ports/mod_perl2/files/patch-lib__ModPerl__BuildMM.pm
--- /usr/ports/www/mod_perl2/files/patch-lib__ModPerl__BuildMM.pm 2008-06-07 08:31:21.000000000 -0700
+++ /tmp/milki/ports/mod_perl2/files/patch-lib__ModPerl__BuildMM.pm 1969-12-31 16:00:00.000000000 -0800
@@ -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 -ruN --exclude=CVS /usr/ports/www/mod_perl2/files/patch-r760926 /tmp/milki/ports/mod_perl2/files/patch-r760926
--- /usr/ports/www/mod_perl2/files/patch-r760926 2009-05-15 19:07:21.000000000 -0700
+++ /tmp/milki/ports/mod_perl2/files/patch-r760926 1969-12-31 16:00:00.000000000 -0800
@@ -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 -ruN --exclude=CVS /usr/ports/www/mod_perl2/files/patch-src__modules__perl__modperl_apache_compat.h /tmp/milki/ports/mod_perl2/files/patch-src__modules__perl__modperl_apache_compat.h
--- /usr/ports/www/mod_perl2/files/patch-src__modules__perl__modperl_apache_compat.h 2008-06-07 08:31:21.000000000 -0700
+++ /tmp/milki/ports/mod_perl2/files/patch-src__modules__perl__modperl_apache_compat.h 1969-12-31 16:00:00.000000000 -0800
@@ -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 -ruN --exclude=CVS /usr/ports/www/mod_perl2/pkg-plist /tmp/milki/ports/mod_perl2/pkg-plist
--- /usr/ports/www/mod_perl2/pkg-plist 2008-07-02 18:48:34.000000000 -0700
+++ /tmp/milki/ports/mod_perl2/pkg-plist 2011-02-25 04:05:14.000000000 -0800
@@ -76,6 +76,9 @@
%%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 @@
%%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
@@ -334,13 +338,13 @@
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Brigade
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Base64
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR
+ at dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/SizeLimit
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/ModPerl
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/PerlSections
- at dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2
- at dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache
+ at dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache2
+ at dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/APR
- at dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
@dirrm %%APACHEINCLUDEDIR%%/modules/perl
@dirrmtry %%APACHEINCLUDEDIR%%/modules
@dirrmtry %%APACHEINCLUDEDIR%%
--- ap22-mod_perl2-2.0.5,3.patch ends here ---
More information about the freebsd-apache
mailing list