Attachment #87000 for bug #123535




#

PORTNAME=	mod_perl
PORTVERSION=	2.0.4
PORTREVISION=	3
PORTEPOCH=	3
CATEGORIES=	www perl5
MASTER_SITES=	http://perl.apache.org/dist/ \

		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::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 \

		ModPerl::Util.3 mod_perl2.3 Apache2::ConnectionUtil.3

.include <bsd.port.pre.mk>

.if exists(${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

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}/lib/ModPerl/BuildMM.pm.orig

post-install:
	${MKDIR} ${PREFIX}/${APACHEINCLUDEDIR}/modules/perl

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (mod_perl-2.0.3.tar.gz) = b40e2adf67c6be15a0041af1c67b6997	1	MD5 (mod_perl-2.0.4.tar.gz) = 1a05625ae6843085f985f5da8214502a
2	SHA256 (mod_perl-2.0.3.tar.gz) = df257f233ed6a5c9f8589d6e059563f816bf417f164fc3364a2a434de13045f2	2	SHA256 (mod_perl-2.0.4.tar.gz) = 7da2046aa65dbef64ff5b71400bed4b6b82441e6313c8ca4becb85fb4a89a0f0
3	SIZE (mod_perl-2.0.3.tar.gz) = 3714974	3	SIZE (mod_perl-2.0.4.tar.gz) = 3727717

Lines 126-132 Link Here

(-)pkg-plist (-1 lines)
126	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/PerlSections.pm	126	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/PerlSections.pm
127	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/PerlSections/Dump.pm	127	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/PerlSections/Dump.pm
128	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Process.pm	128	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Process.pm
129	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Reload.pm
130	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/RequestIO.pm	129	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/RequestIO.pm
131	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/RequestRec.pm	130	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/RequestRec.pm
132	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/RequestUtil.pm	131	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/RequestUtil.pm




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};
 

Added Link Here

(-)files/patch-lib__ModPerl__BuildMM.pm (+11 lines)
1	--- ./lib/ModPerl/BuildMM.pm.orig 2008-05-08 13:00:34.000000000 -0400
2	+++ ./lib/ModPerl/BuildMM.pm 2008-05-08 13:01:03.000000000 -0400
3	@@ -359,7 +359,7 @@
4
5	$apr_config \|\|= $build->get_apr_config();
6
7	- if ($path =~ m/(Thread\|Global)Mutex/) {
8	+ if ($path =~ m/(Thread\|Global)(Mutex\|RWLock)/) {
9	return unless $apr_config->{HAS_THREADS};
10	}
11

Added Link Here

(-)files/patch-src__modules__perl__modperl_apache_compat.h (+10 lines)
1	--- ./src/modules/perl/modperl_apache_compat.h.orig 2008-05-08 12:59:16.000000000 -0400
2	+++ ./src/modules/perl/modperl_apache_compat.h 2008-05-08 12:59:30.000000000 -0400
3	@@ -22,6 +22,7 @@
4	#if !APR_HAS_THREADS
5	typedef unsigned long apr_os_thread_t;
6	typedef void * apr_thread_mutex_t;
7	+typedef void * apr_thread_rwlock_t;
8	#endif
9
10	/* back compat adjustements for older Apache versions

Removed Link Here

(-)files/patch-xs-APR-APR-Makefile.PL (-11 lines)
1	--- xs/APR/APR/Makefile.PL.orig Sun Nov 19 15:31:02 2006
2	+++ xs/APR/APR/Makefile.PL Sun Dec 3 15:30:46 2006
3	@@ -15,7 +15,7 @@
4
5	my %args;
6
7	-%args = map { split /=/, $_ } @ARGV;
8	+%args = map { split /=/, $_, 2 } @ARGV;
9
10	$args{NAME} = 'APR';
11	$args{VERSION_FROM} = 'APR.pm';

Return to bug 123535

Lines 6-13 Link Here

(-)Makefile (-6 / +13 lines)
6	#	6	#
7		7
8	PORTNAME= mod_perl	8	PORTNAME= mod_perl
9	PORTVERSION= 2.0.3	9	PORTVERSION= 2.0.4
10	PORTREVISION= 3
11	PORTEPOCH= 3	10	PORTEPOCH= 3
12	CATEGORIES= www perl5	11	CATEGORIES= www perl5
13	MASTER_SITES= http://perl.apache.org/dist/ \	12	MASTER_SITES= http://perl.apache.org/dist/ \
Lines 42-48 Link Here
42	Apache2::Directive.3 Apache2::Filter.3 Apache2::FilterRec.3 \	41	Apache2::Directive.3 Apache2::Filter.3 Apache2::FilterRec.3 \
43	Apache2::HookRun.3 Apache2::Log.3 Apache2::MPM.3 \	42	Apache2::HookRun.3 Apache2::Log.3 Apache2::MPM.3 \
44	Apache2::Module.3 Apache2::PerlSections.3 Apache2::Process.3 \	43	Apache2::Module.3 Apache2::PerlSections.3 Apache2::Process.3 \
45	Apache2::Reload.3 Apache2::RequestIO.3 Apache2::RequestRec.3 \	44	Apache2::RequestIO.3 Apache2::RequestRec.3 \
46	Apache2::RequestUtil.3 Apache2::Resource.3 \	45	Apache2::RequestUtil.3 Apache2::Resource.3 \
47	Apache2::Response.3 Apache2::ServerRec.3 \	46	Apache2::Response.3 Apache2::ServerRec.3 \
48	Apache2::ServerUtil.3 Apache2::SizeLimit.3 Apache2::Status.3 \	47	Apache2::ServerUtil.3 Apache2::SizeLimit.3 Apache2::Status.3 \
Lines 62-70 Link Here
62	ModPerl::Util.3 mod_perl2.3 Apache2::ConnectionUtil.3	61	ModPerl::Util.3 mod_perl2.3 Apache2::ConnectionUtil.3
63		62
64	.include <bsd.port.pre.mk>	63	.include <bsd.port.pre.mk>
65
66	.if exists(${LOCALBASE}/include/apr-1/apr.h)	64	.if exists(${LOCALBASE}/include/apr-1/apr.h)
67	APR_H= ${LOCALBASE}/include/apr-1/apr.h	65
		66	APR_l= ${LOCALBASE}/include/apr-1/apr.h
68	.elif exists(${LOCALBASE}/include/apr/apr.h)	67	.elif exists(${LOCALBASE}/include/apr/apr.h)
69	APR_H= ${LOCALBASE}/include/apr/apr.h	68	APR_H= ${LOCALBASE}/include/apr/apr.h
70	.endif	69	.endif
Lines 81-88 Link Here
81	PLIST_SUB+= THREADMUTEX="@comment "	80	PLIST_SUB+= THREADMUTEX="@comment "
82	.endif	81	.endif
83		82
		83	pre-fetch:
		84	@${ECHO} ""
		85	@${ECHO} "Note, Aapche(2)::Reload was mistakenly ommited from ${PORTVERSION}"
		86	@${ECHO} "cd ${PORTSDIR}/www/p5-Apache-Reload ; ${MAKE} install"
		87	@${ECHO} "After installing mod_perl"
		88	@${ECHO} "This will be fixed in the next version...."
		89	@${ECHO} ""
		90
84	pre-configure:	91	pre-configure:
85	${RM} ${WRKSRC}/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm.orig	92	${RM} ${WRKSRC}/lib/ModPerl/BuildMM.pm.orig
86		93
87	post-install:	94	post-install:
88	${MKDIR} ${PREFIX}/${APACHEINCLUDEDIR}/modules/perl	95	${MKDIR} ${PREFIX}/${APACHEINCLUDEDIR}/modules/perl

Removed Link Here

(-)files/patch-RegistryCooker.pm (-12 lines)
1	diff -Naurp ModPerl-Registry/lib/ModPerl/RegistryCooker.pm.orig ModPerl-Registry/lib/ModPerl/RegistryCooker.pm
2	--- ModPerl-Registry/lib/ModPerl/RegistryCooker.pm.orig 2006-11-19 18:31:41.000000000 -0500
3	+++ ModPerl-Registry/lib/ModPerl/RegistryCooker.pm 2007-03-30 19:08:05.000000000 -0400
4	@@ -337,7 +337,7 @@ sub namespace_from_uri {
5	my $self = shift;
6
7	my $path_info = $self->{REQ}->path_info;
8	- my $script_name = $path_info && $self->{URI} =~ /$path_info$/
9	+ my $script_name = $path_info && $self->{URI} =~ /\Q$path_info\E$/
10	? substr($self->{URI}, 0, length($self->{URI}) - length($path_info))
11	: $self->{URI};
12