Date: Thu, 8 May 2008 20:51:15 -0400 (EDT) From: "Philip M. Gollucci" <pgollucci@p6m7g8.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/123535: [MAINTAINER] www/mod_perl2: update to 2.0.4 Message-ID: <200805090051.m490pEIV071086@piccollo.p6m7g8.net> Resent-Message-ID: <200805090100.m49102Pj083024@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 123535 >Category: ports >Synopsis: [MAINTAINER] www/mod_perl2: update to 2.0.4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri May 09 01:00:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Philip M. Gollucci >Release: FreeBSD 8.0-CURRENT i386 >Organization: Riderway Inc. >Environment: System: FreeBSD piccollo.p6m7g8.net 8.0-CURRENT FreeBSD 8.0-CURRENT #1: Sun Mar 2 09:48:59 EST >Description: - Update to 2.0.4 - Changes: http://perl.apache.org/dist/mod_perl-2.0-current/Changes - Bugs: Apache(2)::Reload was left out of this version by accident See upcoming PR for www/p5-Apache-Reload update - NOTE: MAINTAINER has not yet tested perl-ithread, or perl 5.10 but has tested apr w/ and w/out threads and apache 1.3.x, apache 2.0.x (prefork), and apache 2.2.x (prefork) Added file(s): - files/patch-lib__ModPerl__BuildMM.pm - files/patch-src__modules__perl__modperl_apache_compat.h [Will be fixed in 2.0.5] http://svn.apache.org/viewvc?rev=654655&view=rev Removed file(s): - files/patch-RegistryCooker.pm - files/patch-xs-APR-APR-Makefile.PL [Fixed in 2.0.4] Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- mod_perl2-2.0.4,3.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/www/mod_perl2/Makefile,v retrieving revision 1.61 diff -u -u -r1.61 Makefile --- Makefile 23 Jan 2008 18:28:53 -0000 1.61 +++ Makefile 8 May 2008 19:49:16 -0000 @@ -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 @@ 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 \ @@ -62,9 +61,9 @@ ModPerl::Util.3 mod_perl2.3 Apache2::ConnectionUtil.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 +80,16 @@ 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 Index: distinfo =================================================================== RCS file: /home/ncvs/ports/www/mod_perl2/distinfo,v retrieving revision 1.28 diff -u -u -r1.28 distinfo --- distinfo 2 Dec 2006 00:33:01 -0000 1.28 +++ distinfo 8 May 2008 19:49:16 -0000 @@ -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 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/www/mod_perl2/pkg-plist,v retrieving revision 1.33 diff -u -u -r1.33 pkg-plist --- pkg-plist 19 Jan 2008 19:30:20 -0000 1.33 +++ pkg-plist 8 May 2008 19:49:16 -0000 @@ -126,7 +126,6 @@ %%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 Index: files/patch-RegistryCooker.pm =================================================================== RCS file: files/patch-RegistryCooker.pm diff -N files/patch-RegistryCooker.pm --- files/patch-RegistryCooker.pm 27 Jun 2007 20:42:58 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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}; - Index: files/patch-lib__ModPerl__BuildMM.pm =================================================================== RCS file: files/patch-lib__ModPerl__BuildMM.pm diff -N files/patch-lib__ModPerl__BuildMM.pm --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-lib__ModPerl__BuildMM.pm 8 May 2008 19:49:16 -0000 @@ -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}; + } + Index: files/patch-src__modules__perl__modperl_apache_compat.h =================================================================== RCS file: files/patch-src__modules__perl__modperl_apache_compat.h diff -N files/patch-src__modules__perl__modperl_apache_compat.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-src__modules__perl__modperl_apache_compat.h 8 May 2008 19:49:16 -0000 @@ -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 Index: files/patch-xs-APR-APR-Makefile.PL =================================================================== RCS file: files/patch-xs-APR-APR-Makefile.PL diff -N files/patch-xs-APR-APR-Makefile.PL --- files/patch-xs-APR-APR-Makefile.PL 4 Dec 2006 00:07:10 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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'; --- mod_perl2-2.0.4,3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200805090051.m490pEIV071086>