Attachment #113466 for bug #155026

View | Details | Raw Unified | Return to bug 155026
Collapse All | Expand All




# New ports collection makefile for:	mod_perl2
# Date created:				2003-02-13
# Whom:					Lars Eggert <larse@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.5
PORTREVISION=	2
PORTEPOCH=	3
CATEGORIES=	www perl5
MASTER_SITES=	http://perl.apache.org/dist/ \

BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/BSD/Resource.pm:${PORTSDIR}/devel/p5-BSD-Resource
RUN_DEPENDS=	${BUILD_DEPENDS}

MAKE_JOBS_SAFE=	yes

SUB_FILES=	pkg-message
SUB_LIST=	APACHEMODDIR=${APACHEMODDIR}

		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 \

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 \

Lines 1-3 Link Here

(-)/tmp/milki/ports/mod_perl2/distinfo (-3 / +2 lines)
1	MD5 (mod_perl-2.0.4.tar.gz) = 1a05625ae6843085f985f5da8214502a	1	SHA256 (mod_perl-2.0.5.tar.gz) = fa95be3d6d00f083afaea4b17fd594b505998e396feb71260857604566aa8afa
2	SHA256 (mod_perl-2.0.4.tar.gz) = 7da2046aa65dbef64ff5b71400bed4b6b82441e6313c8ca4becb85fb4a89a0f0	2	SIZE (mod_perl-2.0.5.tar.gz) = 3778910
3	SIZE (mod_perl-2.0.4.tar.gz) = 3727717

Lines 1-6 Link Here

(-)/tmp/milki/ports/mod_perl2/files/patch-Makefile.PL (-3 / +3 lines)
1	--- m Wed May 18 11:55:48 2005	1	--- Makefile.PL.orig 2011-02-25 03:11:00.000000000 -0800
2	+++ Makefile.PL Wed May 18 11:56:07 2005	2	+++ Makefile.PL 2011-02-25 03:11:15.000000000 -0800
3	@@ -668,11 +668,11 @@	3	@@ -687,11 +687,11 @@
4	cd "$(MODPERL_SRC)" && $(MAKE)	4	cd "$(MODPERL_SRC)" && $(MAKE)
5		5
6	modperl_lib_install:	6	modperl_lib_install:

Lines 1-11 Link Here

(-)/tmp/milki/ports/mod_perl2/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

Lines 1-47 Link Here

(-)/tmp/milki/ports/mod_perl2/files/patch-r760926 (-47 lines)
1	--- lib/Apache2/Status.pm 2009/04/01 15:32:12 760925
2	+++ lib/Apache2/Status.pm 2009/04/01 15:39:56 760926
3	@@ -29,7 +29,7 @@
4
5	use Apache2::Const -compile => qw(OK);
6
7	-$Apache2::Status::VERSION = '4.00'; # mod_perl 2.0
8	+$Apache2::Status::VERSION = '4.01'; # mod_perl 2.0
9
10	use constant IS_WIN32 => ($^O eq "MSWin32");
11
12	@@ -126,7 +126,7 @@
13	$r->print(symdump($r, $qs));
14	}
15	else {
16	- my $uri = $r->uri;
17	+ my $uri = $r->location;
18	$r->print('<p>');
19	$r->print(
20	map { qq[<a href="$uri?$_">$status{$_}</a><br />\n] } sort { lc $a cmp lc $b } keys %status
21	@@ -198,7 +198,7 @@
22	sub status_inc {
23	my ($r) = @_;
24
25	- my $uri = $r->uri;
26	+ my $uri = $r->location;
27	my @retval = (
28	'<table border="1">',
29	"<tr>",
30	@@ -289,7 +289,7 @@
31	my ($r) = @_;
32
33	local $_;
34	- my $uri = $r->uri;
35	+ my $uri = $r->location;
36	my $cache = __PACKAGE__->registry_cache;
37
38	my @retval = "<h2>Compiled registry scripts grouped by their handler</h2>";
39	@@ -765,7 +765,7 @@
40	my ($self, $package, $r) = @_;
41
42	my @m = qw(<table>);
43	- my $uri = $r->uri;
44	+ my $uri = $r->location;
45	my $is_main = $package eq "main";
46
47	my $do_dump = has($r, "dumper");

Lines 1-10 Link Here

(-)/tmp/milki/ports/mod_perl2/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

Return to bug 155026

Lines 1-13 Link Here

(-)/tmp/milki/ports/mod_perl2/Makefile (-16 / +6 lines)
1	# New ports collection makefile for: mod_perl2	1	# New ports collection makefile for: mod_perl2
2	# Date created: February 13th 2003	2	# Date created: 2003-02-13
3	# Whom: Lars Eggert <larse@isi.edu>	3	# Whom: Lars Eggert <larse@isi.edu>
4	#	4	#
5	# $FreeBSD: ports/www/mod_perl2/Makefile,v 1.72 2010/05/25 20:17:34 pgollucci Exp $	5	# $FreeBSD: ports/www/mod_perl2/Makefile,v 1.72 2010/05/25 20:17:34 pgollucci Exp $
6	#	6	#
7		7
8	PORTNAME= mod_perl	8	PORTNAME= mod_perl
9	PORTVERSION= 2.0.4	9	PORTVERSION= 2.0.5
10	PORTREVISION= 2
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 21-27 Link Here
21	BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/BSD/Resource.pm:${PORTSDIR}/devel/p5-BSD-Resource	20	BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/BSD/Resource.pm:${PORTSDIR}/devel/p5-BSD-Resource
22	RUN_DEPENDS= ${BUILD_DEPENDS}	21	RUN_DEPENDS= ${BUILD_DEPENDS}
23		22
24	MAKE_JOBS_SAFE= yes	23	MAKE_JOBS_SAFE= yes
25		24
26	SUB_FILES= pkg-message	25	SUB_FILES= pkg-message
27	SUB_LIST= APACHEMODDIR=${APACHEMODDIR}	26	SUB_LIST= APACHEMODDIR=${APACHEMODDIR}
Lines 40-50 Link Here
40	APR::OS.3 APR::PerlIO.3 APR::Pool.3 APR::SockAddr.3 \	39	APR::OS.3 APR::PerlIO.3 APR::Pool.3 APR::SockAddr.3 \
41	APR::Socket.3 APR::Status.3 APR::String.3 APR::Table.3 \	40	APR::Socket.3 APR::Status.3 APR::String.3 APR::Table.3 \
42	APR::ThreadMutex.3 APR::URI.3 APR::UUID.3 APR::Util.3 \	41	APR::ThreadMutex.3 APR::URI.3 APR::UUID.3 APR::Util.3 \
		42	Apache::Reload.3 \
		43	Apache::SizeLimit.3 Apache::SizeLimit::Core.3 \
43	Apache2::Access.3 Apache2::Build.3 Apache2::CmdParms.3 \	44	Apache2::Access.3 Apache2::Build.3 Apache2::CmdParms.3 \
44	Apache2::Command.3 Apache2::Connection.3 Apache2::Const.3 \	45	Apache2::Command.3 Apache2::Connection.3 Apache2::Const.3 \
45	Apache2::Directive.3 Apache2::Filter.3 Apache2::FilterRec.3 \	46	Apache2::Directive.3 Apache2::Filter.3 Apache2::FilterRec.3 \
46	Apache2::HookRun.3 Apache2::Log.3 Apache2::MPM.3 \	47	Apache2::HookRun.3 Apache2::Log.3 Apache2::MPM.3 \
47	Apache2::Module.3 Apache2::PerlSections.3 Apache2::Process.3 \	48	Apache2::Module.3 Apache2::PerlSections.3 Apache2::Process.3 \
		49	Apache2::Reload.3 \
48	Apache2::RequestIO.3 Apache2::RequestRec.3 \	50	Apache2::RequestIO.3 Apache2::RequestRec.3 \
49	Apache2::RequestUtil.3 Apache2::Resource.3 \	51	Apache2::RequestUtil.3 Apache2::Resource.3 \
50	Apache2::Response.3 Apache2::ServerRec.3 \	52	Apache2::Response.3 Apache2::ServerRec.3 \
Lines 89-106 Link Here
89	PLIST_SUB+= THREADRWLOCK="@comment "	91	PLIST_SUB+= THREADRWLOCK="@comment "
90	.endif	92	.endif
91		93
92	pre-fetch:
93	@${ECHO} ""
94	@${ECHO} "Note, Aapche(2)::Reload was mistakenly ommited from ${PORTVERSION}"
95	@${ECHO} "cd ${PORTSDIR}/www/p5-Apache-Reload ; ${MAKE} install"
96	@${ECHO} "After installing mod_perl"
97	@${ECHO} "This will be fixed in the next version...."
98	@${ECHO} ""
99
100	pre-configure:
101	${RM} ${WRKSRC}/lib/ModPerl/BuildMM.pm.orig
102	${RM} ${WRKSRC}/lib/Apache2/Status.pm.orig
103
104	post-install:	94	post-install:
105	${MKDIR} ${PREFIX}/${APACHEINCLUDEDIR}/modules/perl	95	${MKDIR} ${PREFIX}/${APACHEINCLUDEDIR}/modules/perl
106	${INSTALL_DATA} ${WRKSRC}/src/modules/perl/*.h \	96	${INSTALL_DATA} ${WRKSRC}/src/modules/perl/*.h \

Lines 76-81 Link Here

(-)/tmp/milki/ports/mod_perl2/pkg-plist (-3 / +7 lines)
76	%%SITE_PERL%%/%%PERL_ARCH%%/APR/UUID.pm	76	%%SITE_PERL%%/%%PERL_ARCH%%/APR/UUID.pm
77	%%SITE_PERL%%/%%PERL_ARCH%%/APR/Util.pm	77	%%SITE_PERL%%/%%PERL_ARCH%%/APR/Util.pm
78	%%SITE_PERL%%/%%PERL_ARCH%%/APR/XSLoader.pm	78	%%SITE_PERL%%/%%PERL_ARCH%%/APR/XSLoader.pm
		79	%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Reload.pm
		80	%%SITE_PERL%%/%%PERL_ARCH%%/Apache/SizeLimit.pm
		81	%%SITE_PERL%%/%%PERL_ARCH%%/Apache/SizeLimit/Core.pm
79	%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Test.pm	82	%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Test.pm
80	%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Test5005compat.pm	83	%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Test5005compat.pm
81	%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestBuild.pm	84	%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestBuild.pm
Lines 127-132 Link Here
127	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/PerlSections.pm	130	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/PerlSections.pm
128	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/PerlSections/Dump.pm	131	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/PerlSections/Dump.pm
129	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Process.pm	132	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Process.pm
		133	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Reload.pm
130	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/RequestIO.pm	134	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/RequestIO.pm
131	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/RequestRec.pm	135	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/RequestRec.pm
132	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/RequestUtil.pm	136	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/RequestUtil.pm
Lines 334-346 Link Here
334	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Brigade	338	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Brigade
335	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Base64	339	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Base64
336	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR	340	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR
		341	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/SizeLimit
337	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/ModPerl	342	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/ModPerl
338	@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle	343	@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle
339	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/PerlSections	344	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/PerlSections
340	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2	345	@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache2
341	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache	346	@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache
342	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/APR	347	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/APR
343	@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
344	@dirrm %%APACHEINCLUDEDIR%%/modules/perl	348	@dirrm %%APACHEINCLUDEDIR%%/modules/perl
345	@dirrmtry %%APACHEINCLUDEDIR%%/modules	349	@dirrmtry %%APACHEINCLUDEDIR%%/modules
346	@dirrmtry %%APACHEINCLUDEDIR%%	350	@dirrmtry %%APACHEINCLUDEDIR%%