Index: mod_perl2/Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_perl2/Makefile,v retrieving revision 1.72 diff -u -r1.72 Makefile --- mod_perl2/Makefile 25 May 2010 20:17:34 -0000 1.72 +++ mod_perl2/Makefile 9 May 2011 21:41:37 -0000 @@ -6,8 +6,7 @@ # 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/ \ @@ -19,7 +18,9 @@ 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} + +CONFLICTS= p5-Apache-Reload-0.1* MAKE_JOBS_SAFE= yes @@ -45,12 +46,14 @@ 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+= 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 \ Index: mod_perl2/distinfo =================================================================== RCS file: /home/pcvs/ports/www/mod_perl2/distinfo,v retrieving revision 1.30 diff -u -r1.30 distinfo --- mod_perl2/distinfo 19 Mar 2011 12:34:44 -0000 1.30 +++ mod_perl2/distinfo 9 May 2011 21:41:37 -0000 @@ -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 Index: mod_perl2/pkg-plist =================================================================== RCS file: /home/pcvs/ports/www/mod_perl2/pkg-plist,v retrieving revision 1.35 diff -u -r1.35 pkg-plist --- mod_perl2/pkg-plist 3 Jul 2008 01:48:34 -0000 1.35 +++ mod_perl2/pkg-plist 9 May 2011 21:41:37 -0000 @@ -127,6 +127,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 @@ -144,6 +145,10 @@ %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/XSLoader.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/compat.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/porting.pm +%%SITE_PERL%%/%%PERL_ARCH%%/Apache/SizeLimit +%%SITE_PERL%%/%%PERL_ARCH%%/Apache/SizeLimit/Core.pm +%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Reload.pm +%%SITE_PERL%%/%%PERL_ARCH%%/Apache/SizeLimit.pm %%SITE_PERL%%/%%PERL_ARCH%%/Bundle/Apache2.pm %%SITE_PERL%%/%%PERL_ARCH%%/Bundle/ApacheTest.pm %%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/BuildMM.pm @@ -338,6 +343,7 @@ @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/SizeLimit @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/APR @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%% Index: mod_perl2/files/patch-lib__ModPerl__BuildMM.pm =================================================================== RCS file: mod_perl2/files/patch-lib__ModPerl__BuildMM.pm diff -N mod_perl2/files/patch-lib__ModPerl__BuildMM.pm --- mod_perl2/files/patch-lib__ModPerl__BuildMM.pm 7 Jun 2008 15:31:21 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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}; - } - Index: mod_perl2/files/patch-r760926 =================================================================== RCS file: mod_perl2/files/patch-r760926 diff -N mod_perl2/files/patch-r760926 --- mod_perl2/files/patch-r760926 16 May 2009 02:07:21 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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('

'); - $r->print( - map { qq[$status{$_}
\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 = ( - '', - "", -@@ -289,7 +289,7 @@ - my ($r) = @_; - - local $_; -- my $uri = $r->uri; -+ my $uri = $r->location; - my $cache = __PACKAGE__->registry_cache; - - my @retval = "

Compiled registry scripts grouped by their handler

"; -@@ -765,7 +765,7 @@ - my ($self, $package, $r) = @_; - - my @m = qw(
); -- my $uri = $r->uri; -+ my $uri = $r->location; - my $is_main = $package eq "main"; - - my $do_dump = has($r, "dumper"); Index: mod_perl2/files/patch-src__modules__perl__modperl_apache_compat.h =================================================================== RCS file: mod_perl2/files/patch-src__modules__perl__modperl_apache_compat.h diff -N mod_perl2/files/patch-src__modules__perl__modperl_apache_compat.h --- mod_perl2/files/patch-src__modules__perl__modperl_apache_compat.h 7 Jun 2008 15:31:21 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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 Index: otrs/Makefile =================================================================== RCS file: /home/pcvs/ports/devel/otrs/Makefile,v retrieving revision 1.41 diff -u -r1.41 Makefile --- otrs/Makefile 12 Apr 2011 17:55:16 -0000 1.41 +++ otrs/Makefile 9 May 2011 21:41:37 -0000 @@ -7,6 +7,7 @@ PORTNAME= otrs PORTVERSION= 3.0.7 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://ftp.otrs.org/pub/otrs/ \ ftp://ftp.samurai.com/pub/otrs/ \ @@ -34,7 +35,6 @@ p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \ p5-CSS-Minifier-XS>=0:${PORTSDIR}/textproc/p5-CSS-Minifier-XS \ p5-JavaScript-Minifier-XS>=0:${PORTSDIR}/textproc/p5-JavaScript-Minifier-XS \ - p5-Apache-Reload>=0:${PORTSDIR}/www/p5-Apache-Reload \ ${SITE_PERL}/Text/Diff.pm:${PORTSDIR}/textproc/p5-Text-Diff \ ${SITE_PERL}/XML/FeedPP.pm:${PORTSDIR}/textproc/p5-XML-FeedPP RUN_DEPENDS:= ${BUILD_DEPENDS} @@ -90,6 +90,8 @@ .if ${APACHE_VERSION} > 13 RUN_DEPENDS+= ${APACHE_PKGNAMEPREFIX}mod_perl2>=2.0.0:${PORTSDIR}/www/mod_perl2 +.else +BUILD_DEPENDS+= p5-Apache-Reload>=0:${PORTSDIR}/www/p5-Apache-Reload .endif .ifdef WITH_REPORTS_MODULES Index: p5-Apache-Reload/Makefile =================================================================== RCS file: /home/pcvs/ports/www/p5-Apache-Reload/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- p5-Apache-Reload/Makefile 21 Feb 2011 22:38:19 -0000 1.13 +++ p5-Apache-Reload/Makefile 9 May 2011 21:41:37 -0000 @@ -7,6 +7,7 @@ PORTNAME= Apache-Reload PORTVERSION= 0.11 +PORTREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,6 +15,7 @@ MAINTAINER= perl@FreeBSD.org COMMENT= Reload changed modules +CONFLICTS= ap2[02]-mod_perl2-2.0.[5-9]* MAKE_JOBS_SAFE= yes PERL_CONFIGURE= yes @@ -24,6 +26,7 @@ .include .if defined(WITH_MODPERL2) || ${APACHE_VERSION} > 13 +FORBIDDEN= Apache-Reload is included in mod_perl2 BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2 RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2 MAKE_ENV+= MOD_PERL=2 Index: p5-Bundle-Sledge/Makefile =================================================================== RCS file: /home/pcvs/ports/www/p5-Bundle-Sledge/Makefile,v retrieving revision 1.16 diff -u -r1.16 Makefile --- p5-Bundle-Sledge/Makefile 2 Mar 2011 23:26:47 -0000 1.16 +++ p5-Bundle-Sledge/Makefile 9 May 2011 21:41:37 -0000 @@ -7,7 +7,7 @@ PORTNAME= Bundle-Sledge PORTVERSION= 0.04 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -18,15 +18,15 @@ BUILD_DEPENDS= ${PM_DEPENDS} RUN_DEPENDS= ${PM_DEPENDS} -USE_APACHE= 13+ +USE_APACHE_RUN= 13+ .include .if ${APACHE_VERSION} == 13 PM_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq +PM_DEPENDS+= ${SITE_PERL}/Apache/Reload.pm:${PORTSDIR}/www/p5-Apache-Reload .else PM_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache2/Request.pm:${PORTSDIR}/www/p5-libapreq2 .endif -PM_DEPENDS+= ${SITE_PERL}/Apache/Reload.pm:${PORTSDIR}/www/p5-Apache-Reload PM_DEPENDS+= ${SITE_PERL}/Test/Inline.pm:${PORTSDIR}/devel/p5-Test-Inline PM_DEPENDS+= ${SITE_PERL}/Carp/Assert.pm:${PORTSDIR}/devel/p5-Carp-Assert PM_DEPENDS+= ${SITE_PERL}/Class/Fields.pm:${PORTSDIR}/devel/p5-Class-Fields