Attachment #145304 for bug #191471





PORTNAME=	mod_perl
PORTVERSION=	2.0.8
PORTREVISION=	2
PORTEPOCH=	3
CATEGORIES=	www perl5
MASTER_SITES=	APACHE/perl
PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
PKGNAMESUFFIX=	2

PATCH_SITES=	${MASTER_SITE_LOCAL}
PATCH_SITE_SUBDIR=	ohauer

MAINTAINER=	apache@FreeBSD.org
COMMENT=	Embeds a Perl interpreter in the Apache2 server

LICENSE=	APACHE20

BUILD_DEPENDS=	p5-BSD-Resource>=0:${PORTSDIR}/devel/p5-BSD-Resource
RUN_DEPENDS:=	${BUILD_DEPENDS}

SUB_FILES=	pkg-message
SUB_LIST=	APACHEMODDIR=${APACHEMODDIR}
USE_APACHE=	22+
USES=		gmake perl5
USE_PERL5=	configure
USE_CSTD=	gnu89

.include <bsd.port.pre.mk>

.if ${APACHE_VERSION} > 22
# patch shaped against upstream mod_perl
# Last Changed Rev: 1602105
PATCHREV=	1602105
PATCHFILES+= 	${PORTNAME}-${PORTVERSION}-r${PATCHREV}.diff.gz
PLIST_SUB+=	AP24=""
PMSED=		's/%AP24%//'
NO_PACKAGE=	yes
.else
PLIST_SUB+=	AP24="@comment "
PMSED=		'/%AP24%/d'
.endif

# Using apxs in this way is problematic if apache2 is installed under a

	${REINPLACE_CMD} -e 's/-pthread -Wl,-E//g' \
		${PATCH_WRKSRC}/xs/APR/APR/Makefile


post-install:
# adjust pkg-message
	${REINPLACE_CMD} -e ${PMSED} ${WRKDIR}/pkg-message
	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR}/modules/perl
	${INSTALL_DATA} ${WRKSRC}/src/modules/perl/*.h \
		${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR}/modules/perl

Lines 1-2 Link Here

(-)mod_perl2/distinfo (+2 lines)
1	SHA256 (mod_perl-2.0.8.tar.gz) = 35dc1b7a40a90a395ce88bba2df84f22289975f34d1757de6d715560c20a20e6	1	SHA256 (mod_perl-2.0.8.tar.gz) = 35dc1b7a40a90a395ce88bba2df84f22289975f34d1757de6d715560c20a20e6
2	SIZE (mod_perl-2.0.8.tar.gz) = 3790026	2	SIZE (mod_perl-2.0.8.tar.gz) = 3790026
		3	SHA256 (mod_perl-2.0.8-r1602105.diff.gz) = 1984335c57fefd153d0fe396cdef59cf6e08ed644a60ea1ee7a2b6cbc55711cb
		4	SIZE (mod_perl-2.0.8-r1602105.diff.gz) = 145754

Lines 1-5 Link Here

(-)mod_perl2/files/pkg-message.in (-3 / +6 lines)
1	#########################################################	1	===================================================================
2
3	Simple config:	2	Simple config:
4		3
5	LoadModule perl_module %%APACHEMODDIR%%/mod_perl.so	4	LoadModule perl_module %%APACHEMODDIR%%/mod_perl.so
Lines 14-17 Link Here
14		13
15	http://perl.apache.org/docs/2.0/user/intro/start_fast.html	14	http://perl.apache.org/docs/2.0/user/intro/start_fast.html
16		15
17	#########################################################	16	%AP24% !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
		17	%AP24% Use this mod_perl2 version at own risk, it is a current
		18	%AP24% development snapshot and not marked production ready!
		19	%AP24% !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
		20	===================================================================

Return to bug 191471

Lines 3-24 Link Here

(-)mod_perl2/Makefile (-3 / +20 lines)
3		3
4	PORTNAME= mod_perl	4	PORTNAME= mod_perl
5	PORTVERSION= 2.0.8	5	PORTVERSION= 2.0.8
6	PORTREVISION= 1	6	PORTREVISION= 2
7	PORTEPOCH= 3	7	PORTEPOCH= 3
8	CATEGORIES= www perl5	8	CATEGORIES= www perl5
9	MASTER_SITES= APACHE/perl	9	MASTER_SITES= APACHE/perl
10	PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX}	10	PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX}
11	PKGNAMESUFFIX= 2	11	PKGNAMESUFFIX= 2
12		12
		13	PATCH_SITES= ${MASTER_SITE_LOCAL}
		14	PATCH_SITE_SUBDIR= ohauer
		15
13	MAINTAINER= apache@FreeBSD.org	16	MAINTAINER= apache@FreeBSD.org
14	COMMENT= Embeds a Perl interpreter in the Apache2 server	17	COMMENT= Embeds a Perl interpreter in the Apache2 server
15		18
		19	LICENSE= APACHE20
		20
16	BUILD_DEPENDS= p5-BSD-Resource>=0:${PORTSDIR}/devel/p5-BSD-Resource	21	BUILD_DEPENDS= p5-BSD-Resource>=0:${PORTSDIR}/devel/p5-BSD-Resource
17	RUN_DEPENDS:= ${BUILD_DEPENDS}	22	RUN_DEPENDS:= ${BUILD_DEPENDS}
18		23
19	SUB_FILES= pkg-message	24	SUB_FILES= pkg-message
20	SUB_LIST= APACHEMODDIR=${APACHEMODDIR}	25	SUB_LIST= APACHEMODDIR=${APACHEMODDIR}
21	USE_APACHE= 22	26	USE_APACHE= 22+
22	USES= gmake perl5	27	USES= gmake perl5
23	USE_PERL5= configure	28	USE_PERL5= configure
24	USE_CSTD= gnu89	29	USE_CSTD= gnu89
Lines 26-32 Link Here
26	.include <bsd.port.pre.mk>	31	.include <bsd.port.pre.mk>
27		32
28	.if ${APACHE_VERSION} > 22	33	.if ${APACHE_VERSION} > 22
29	BROKEN= Does not build with apache24	34	# patch shaped against upstream mod_perl
		35	# Last Changed Rev: 1602105
		36	PATCHREV= 1602105
		37	PATCHFILES+= ${PORTNAME}-${PORTVERSION}-r${PATCHREV}.diff.gz
		38	PLIST_SUB+= AP24=""
		39	PMSED= 's/%AP24%//'
		40	NO_PACKAGE= yes
		41	.else
		42	PLIST_SUB+= AP24="@comment "
		43	PMSED= '/%AP24%/d'
30	.endif	44	.endif
31		45
32	# Using apxs in this way is problematic if apache2 is installed under a	46	# Using apxs in this way is problematic if apache2 is installed under a
Lines 67-73 Link Here
67	${REINPLACE_CMD} -e 's/-pthread -Wl,-E//g' \	81	${REINPLACE_CMD} -e 's/-pthread -Wl,-E//g' \
68	${PATCH_WRKSRC}/xs/APR/APR/Makefile	82	${PATCH_WRKSRC}/xs/APR/APR/Makefile
69		83
		84
70	post-install:	85	post-install:
		86	# adjust pkg-message
		87	${REINPLACE_CMD} -e ${PMSED} ${WRKDIR}/pkg-message
71	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR}/modules/perl	88	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR}/modules/perl
72	${INSTALL_DATA} ${WRKSRC}/src/modules/perl/*.h \	89	${INSTALL_DATA} ${WRKSRC}/src/modules/perl/*.h \
73	${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR}/modules/perl	90	${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR}/modules/perl

Lines 142-147 Link Here

(-)mod_perl2/pkg-plist (+18 lines)
142	%%PERL5_MAN3%%/ModPerl::RegistryLoader.3.gz	142	%%PERL5_MAN3%%/ModPerl::RegistryLoader.3.gz
143	%%PERL5_MAN3%%/ModPerl::RegistryPrefork.3.gz	143	%%PERL5_MAN3%%/ModPerl::RegistryPrefork.3.gz
144	%%PERL5_MAN3%%/ModPerl::Util.3.gz	144	%%PERL5_MAN3%%/ModPerl::Util.3.gz
		145	%%AP24%%%%PERL5_MAN3%%/MyTest::Util.3.gz
145	%%PERL5_MAN3%%/mod_perl2.3.gz	146	%%PERL5_MAN3%%/mod_perl2.3.gz
146	%%SITE_PERL%%/%%PERL_ARCH%%/APR.pm	147	%%SITE_PERL%%/%%PERL_ARCH%%/APR.pm
147	%%SITE_PERL%%/%%PERL_ARCH%%/APR/Base64.pm	148	%%SITE_PERL%%/%%PERL_ARCH%%/APR/Base64.pm
Lines 222-227 Link Here
222	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/PerlSections.pm	223	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/PerlSections.pm
223	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/PerlSections/Dump.pm	224	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/PerlSections/Dump.pm
224	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Process.pm	225	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Process.pm
		226	%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Provider.pm
225	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Reload.pm	227	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Reload.pm
226	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/RequestIO.pm	228	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/RequestIO.pm
227	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/RequestRec.pm	229	%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/RequestRec.pm
Lines 250-255 Link Here
250	%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/Const.pm	252	%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/Const.pm
251	%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/FunctionMap.pm	253	%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/FunctionMap.pm
252	%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/Global.pm	254	%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/Global.pm
		255	%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/InterpPool.pm
		256	%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/Interpreter.pm
253	%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/MM.pm	257	%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/MM.pm
254	%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/Manifest.pm	258	%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/Manifest.pm
255	%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/MapUtil.pm	259	%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/MapUtil.pm
Lines 265-273 Link Here
265	%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/StructureMap.pm	269	%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/StructureMap.pm
266	%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/TestReport.pm	270	%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/TestReport.pm
267	%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/TestRun.pm	271	%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/TestRun.pm
		272	%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/TiPool.pm
		273	%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/TiPoolConfig.pm
268	%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/TypeMap.pm	274	%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/TypeMap.pm
269	%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/Util.pm	275	%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/Util.pm
270	%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/WrapXS.pm	276	%%SITE_PERL%%/%%PERL_ARCH%%/ModPerl/WrapXS.pm
		277	%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/MyTest/Util.pm
271	%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/APR.so	278	%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/APR.so
272	%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Base64/Base64.so	279	%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Base64/Base64.so
273	%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Brigade/Brigade.so	280	%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Brigade/Brigade.so
Lines 307-312 Link Here
307	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/MPM/MPM.so	314	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/MPM/MPM.so
308	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Module/Module.so	315	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Module/Module.so
309	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Process/Process.so	316	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Process/Process.so
		317	%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Provider/Provider.so
310	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/RequestIO/RequestIO.so	318	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/RequestIO/RequestIO.so
311	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/RequestRec/RequestRec.so	319	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/RequestRec/RequestRec.so
312	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/RequestUtil/RequestUtil.so	320	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/RequestUtil/RequestUtil.so
Lines 320-325 Link Here
320	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/typemap	328	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/typemap
321	%%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Const/Const.so	329	%%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Const/Const.so
322	%%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Global/Global.so	330	%%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Global/Global.so
		331	%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/InterpPool/InterpPool.so
		332	%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Interpreter/Interpreter.so
		333	%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/TiPool/TiPool.so
		334	%%AP24%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/TiPoolConfig/TiPoolConfig.so
323	%%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Util/Util.so	335	%%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Util/Util.so
324	%%SITE_PERL%%/%%PERL_ARCH%%/auto/mod_perl2/.packlist	336	%%SITE_PERL%%/%%PERL_ARCH%%/auto/mod_perl2/.packlist
325	%%SITE_PERL%%/%%PERL_ARCH%%/mod_perl2.pm	337	%%SITE_PERL%%/%%PERL_ARCH%%/mod_perl2.pm
Lines 336-341 Link Here
336	@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache2	348	@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache2
337	@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle	349	@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle
338	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/ModPerl	350	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/ModPerl
		351	%%AP24%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/MyTest
339	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Base64	352	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Base64
340	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Brigade	353	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Brigade
341	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Bucket	354	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Bucket
Lines 375-380 Link Here
375	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/MPM	388	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/MPM
376	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Module	389	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Module
377	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Process	390	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Process
		391	%%AP24%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Provider
378	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/RequestIO	392	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/RequestIO
379	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/RequestRec	393	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/RequestRec
380	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/RequestUtil	394	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/RequestUtil
Lines 388-393 Link Here
388	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2	402	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2
389	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Const	403	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Const
390	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Global	404	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Global
		405	%%AP24%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/InterpPool
		406	%%AP24%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Interpreter
		407	%%AP24%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/TiPool
		408	%%AP24%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/TiPoolConfig
391	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Util	409	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Util
392	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl	410	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl
393	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/mod_perl2	411	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/mod_perl2