View | Details | Raw Unified | Return to bug 191471 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-6 / +29 lines)
Lines 3-24 Link Here
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-34 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: $PATCHREV
36
PATCHREV=	1618150
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
46
# Provider is build iff apache24 is in use
47
.if ${APACHE_VERSION:M22}
48
PLIST_SUB+=	AP22="@comment "
49
.else
50
PLIST_SUB+=	AP22=""
51
.endif
52
32
# Using apxs in this way is problematic if apache2 is installed under a
53
# Using apxs in this way is problematic if apache2 is installed under a
33
# different PREFIX than mod_perl2, because the mod_perl2 installation will
54
# different PREFIX than mod_perl2, because the mod_perl2 installation will
34
# use paths returned by apxs to install some components. Fixes welcome.
55
# use paths returned by apxs to install some components. Fixes welcome.
Lines 57-73 Link Here
57
	${REINPLACE_CMD} -e 's/APR_INLINE//g' \
78
	${REINPLACE_CMD} -e 's/APR_INLINE//g' \
58
		${PATCH_WRKSRC}/src/modules/perl/modperl_common_util.h
79
		${PATCH_WRKSRC}/src/modules/perl/modperl_common_util.h
59
	${REINPLACE_CMD} -e "s|/usr/local/apache/bin/apxs|${APXS}|" \
80
	${REINPLACE_CMD} -e "s|/usr/local/apache/bin/apxs|${APXS}|" \
60
			-e "s|'bin', 'apxs'|'sbin', 'apxs'|" \
81
		-e "s|'bin', 'apxs'|'sbin', 'apxs'|" \
61
			${WRKSRC}/lib/Apache2/Build.pm
82
		${WRKSRC}/lib/Apache2/Build.pm
62
83
63
pre-configure:
84
pre-configure:
64
	@${FIND} ${WRKSRC} -type f \( -name \*.bak -o -name \*.orig \) -delete
85
	${FIND} ${WRKSRC} -type f \( -name \*.bak -o -name \*.orig \) -delete
65
86
66
post-configure:
87
post-configure:
67
	${REINPLACE_CMD} -e 's/-pthread -Wl,-E//g' \
88
	${REINPLACE_CMD} -e 's/-pthread -Wl,-E//g' \
68
		${PATCH_WRKSRC}/xs/APR/APR/Makefile
89
		${PATCH_WRKSRC}/xs/APR/APR/Makefile
69
90
70
post-install:
91
post-install:
92
# adjust pkg-message
93
	${REINPLACE_CMD} -e ${PMSED} ${WRKDIR}/pkg-message
71
	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR}/modules/perl
94
	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR}/modules/perl
72
	${INSTALL_DATA} ${WRKSRC}/src/modules/perl/*.h \
95
	${INSTALL_DATA} ${WRKSRC}/src/modules/perl/*.h \
73
		${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR}/modules/perl
96
		${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR}/modules/perl
(-)distinfo (+2 lines)
Lines 1-2 Link Here
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-r1618150.diff.gz) = 7ce5f40a72f8779e09465aba7328947c3490976a6269783d4d6cf95830d2b350
4
SIZE (mod_perl-2.0.8-r1618150.diff.gz) = 142858
(-)files/pkg-message.in (-3 / +6 lines)
Lines 1-5 Link Here
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
===================================================================
(-)pkg-plist (+18 lines)
Lines 142-147 Link Here
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
%%AP22%%%%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
%%AP22%%%%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
%%AP22%%%%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

Return to bug 191471