Attachment #53672 for bug #81192

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




#

PORTNAME=	mod_perl
PORTVERSION=	2.0.0r6
PORTEPOCH=	1
CATEGORIES=	www perl5
MASTER_SITES=	http://perl.apache.org/dist/ \

		APR::BucketAlloc.3 APR::BucketType.3 APR::Const.3 \
		APR::Date.3 APR::Error.3 APR::Finfo.3 APR::IpSubnet.3 \
		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 \
		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::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 \


pre-everything::
	@${ECHO} "************************************************************"
	@${ECHO} "NOTE: Version RC5 and higher of ${PORTNAME} significantly"
	@${ECHO} "      change the API - old code *will* break!"
	@${ECHO} "      See http://perl.apache.org/docs/2.0/rename.html"
	@${ECHO} ""
	@${ECHO} "Hit Ctrl-C to abort now, if this is of concern."
	@${ECHO} "************************************************************"
	@sleep 10

.include <bsd.port.pre.mk>


	${MKDIR} ${PREFIX}/include/apache2/modules/perl
	${INSTALL_DATA} ${WRKSRC}/src/modules/perl/*.h \
		${PREFIX}/include/apache2/modules/perl
	${INSTALL_DATA} ${WRKSRC}/xs/*.h ${PREFIX}/include/apache2
	${INSTALL_DATA} ${WRKSRC}/xs/APR/PerlIO/*.h ${PREFIX}/include/apache2
	${MKDIR} ${PREFIX}/libexec/apache2
	${INSTALL_PROGRAM} ${WRKSRC}/src/modules/perl/mod_perl.so \
		${PREFIX}/libexec/apache2/mod_perl.so

Lines 1-2 Link Here

(-)/usr/ports/www/mod_perl2/distinfo (-2 / +2 lines)
1	MD5 (mod_perl-2.0.0-RC5.tar.gz) = a523a60b5a9758a88a0f1bdcd09eb425	1	MD5 (mod_perl-2.0.0-RC6.tar.gz) = 3e7f7aefb19c772a998802990ced15c0
2	SIZE (mod_perl-2.0.0-RC5.tar.gz) = 1431194	2	SIZE (mod_perl-2.0.0-RC6.tar.gz) = 1435432




--- m	Wed May 18 11:55:48 2005
+++ Makefile.PL	Wed May 18 11:56:07 2005
@@ -668,11 +668,11 @@
 	cd "$(MODPERL_SRC)" && $(MAKE)
 
 modperl_lib_install:
-	cd "$(MODPERL_SRC)" && $(MAKE) DESTDIR=$(DESTDIR) install
+#	cd "$(MODPERL_SRC)" && $(MAKE) DESTDIR=$(DESTDIR) install
 
 modperl_xs_h_install:
-	@$(MKPATH) $(DESTDIR)$(MODPERL_AP_INCLUDEDIR)
-	$(CP) $(MODPERL_XS_H_FILES) $(DESTDIR)$(MODPERL_AP_INCLUDEDIR)
+#	@$(MKPATH) $(DESTDIR)$(MODPERL_AP_INCLUDEDIR)
+#	$(CP) $(MODPERL_XS_H_FILES) $(DESTDIR)$(MODPERL_AP_INCLUDEDIR)
 
 modperl_src_clean:
 	cd "$(MODPERL_SRC)" && $(MAKE) clean

Return to bug 81192

Lines 6-12 Link Here

(-)/usr/ports/www/mod_perl2/Makefile (-14 / +17 lines)
6	#	6	#
7		7
8	PORTNAME= mod_perl	8	PORTNAME= mod_perl
9	PORTVERSION= 2.0.0r5	9	PORTVERSION= 2.0.0r6
10	PORTEPOCH= 1	10	PORTEPOCH= 1
11	CATEGORIES= www perl5	11	CATEGORIES= www perl5
12	MASTER_SITES= http://perl.apache.org/dist/ \	12	MASTER_SITES= http://perl.apache.org/dist/ \
Lines 31-45 Link Here
31	APR::BucketAlloc.3 APR::BucketType.3 APR::Const.3 \	31	APR::BucketAlloc.3 APR::BucketType.3 APR::Const.3 \
32	APR::Date.3 APR::Error.3 APR::Finfo.3 APR::IpSubnet.3 \	32	APR::Date.3 APR::Error.3 APR::Finfo.3 APR::IpSubnet.3 \
33	APR::OS.3 APR::PerlIO.3 APR::Pool.3 APR::SockAddr.3 \	33	APR::OS.3 APR::PerlIO.3 APR::Pool.3 APR::SockAddr.3 \
34	APR::Socket.3 APR::String.3 APR::Table.3 APR::ThreadMutex.3 \	34	APR::Socket.3 APR::Status.3 APR::String.3 APR::Table.3 \
35	APR::URI.3 APR::UUID.3 APR::Util.3 Apache2::Access.3 \	35	APR::ThreadMutex.3 APR::URI.3 APR::UUID.3 APR::Util.3 \
36	Apache2::Build.3 Apache2::CmdParms.3 Apache2::Command.3 \	36	Apache2::Access.3 Apache2::Build.3 Apache2::CmdParms.3 \
37	Apache2::Connection.3 Apache2::Const.3 Apache2::Directive.3 \	37	Apache2::Command.3 Apache2::Connection.3 Apache2::Const.3 \
38	Apache2::Filter.3 Apache2::FilterRec.3 Apache2::HookRun.3 \	38	Apache2::Directive.3 Apache2::Filter.3 Apache2::FilterRec.3 \
39	Apache2::Log.3 Apache2::Module.3 Apache2::PerlSections.3 \	39	Apache2::HookRun.3 Apache2::Log.3 Apache2::Module.3 \
40	Apache2::Process.3 Apache2::Reload.3 Apache2::RequestIO.3 \	40	Apache2::PerlSections.3 Apache2::Process.3 Apache2::Reload.3 \
41	Apache2::RequestRec.3 Apache2::RequestUtil.3 \	41	Apache2::RequestIO.3 Apache2::RequestRec.3 \
42	Apache2::Resource.3 Apache2::Response.3 Apache2::ServerRec.3 \	42	Apache2::RequestUtil.3 Apache2::Resource.3 \
		43	Apache2::Response.3 Apache2::ServerRec.3 \
43	Apache2::ServerUtil.3 Apache2::SizeLimit.3 Apache2::Status.3 \	44	Apache2::ServerUtil.3 Apache2::SizeLimit.3 Apache2::Status.3 \
44	Apache2::SubProcess.3 Apache2::SubRequest.3 Apache2::URI.3 \	45	Apache2::SubProcess.3 Apache2::SubRequest.3 Apache2::URI.3 \
45	Apache2::Util.3 Apache2::compat.3 Apache2::porting.3 \	46	Apache2::Util.3 Apache2::compat.3 Apache2::porting.3 \
Lines 57-69 Link Here
57		58
58	pre-everything::	59	pre-everything::
59	@${ECHO} "************************************************************"	60	@${ECHO} "************************************************************"
60	@${ECHO} "NOTE: This version of ${PORTNAME} significantly"	61	@${ECHO} "NOTE: Version RC5 and higher of ${PORTNAME} significantly"
61	@${ECHO} " changes the API - old code will break!"	62	@${ECHO} " change the API - old code will break!"
62	@${ECHO} " See http://perl.apache.org/docs/2.0/rename.html"	63	@${ECHO} " See http://perl.apache.org/docs/2.0/rename.html"
63	@${ECHO} ""	64	@${ECHO} ""
64	@${ECHO} "Hit Ctrl-C now to abort, if this is of concern."	65	@${ECHO} "Hit Ctrl-C to abort now, if this is of concern."
65	@${ECHO} "************************************************************"	66	@${ECHO} "************************************************************"
66	@sleep 5	67	@sleep 10
67		68
68	.include <bsd.port.pre.mk>	69	.include <bsd.port.pre.mk>
69		70
Lines 76-81 Link Here
76	${MKDIR} ${PREFIX}/include/apache2/modules/perl	77	${MKDIR} ${PREFIX}/include/apache2/modules/perl
77	${INSTALL_DATA} ${WRKSRC}/src/modules/perl/*.h \	78	${INSTALL_DATA} ${WRKSRC}/src/modules/perl/*.h \
78	${PREFIX}/include/apache2/modules/perl	79	${PREFIX}/include/apache2/modules/perl
		80	${INSTALL_DATA} ${WRKSRC}/xs/*.h ${PREFIX}/include/apache2
		81	${INSTALL_DATA} ${WRKSRC}/xs/APR/PerlIO/*.h ${PREFIX}/include/apache2
79	${MKDIR} ${PREFIX}/libexec/apache2	82	${MKDIR} ${PREFIX}/libexec/apache2
80	${INSTALL_PROGRAM} ${WRKSRC}/src/modules/perl/mod_perl.so \	83	${INSTALL_PROGRAM} ${WRKSRC}/src/modules/perl/mod_perl.so \
81	${PREFIX}/libexec/apache2/mod_perl.so	84	${PREFIX}/libexec/apache2/mod_perl.so

Lines 1-11 Link Here

(-)/usr/ports/www/mod_perl2/files/patch-aa (-6 / +12 lines)
1	--- m Wed Dec 1 11:10:30 2004	1	--- m Wed May 18 11:55:48 2005
2	+++ Makefile.PL Wed Dec 1 11:10:41 2004	2	+++ Makefile.PL Wed May 18 11:56:07 2005
3	@@ -588,7 +588,7 @@	3	@@ -668,11 +668,11 @@
4	cd "$(MODPERL_SRC)" && $(MAKE)	4	cd "$(MODPERL_SRC)" && $(MAKE)
5		5
6	modperl_lib_install:	6	modperl_lib_install:
7	- cd "$(MODPERL_SRC)" && $(MAKE) install	7	- cd "$(MODPERL_SRC)" && $(MAKE) DESTDIR=$(DESTDIR) install
8	+# cd "$(MODPERL_SRC)" && $(MAKE) install	8	+# cd "$(MODPERL_SRC)" && $(MAKE) DESTDIR=$(DESTDIR) install
9		9
10	modperl_xs_h_install:	10	modperl_xs_h_install:
11	@$(MKPATH) $(MODPERL_AP_INCLUDEDIR)	11	- @$(MKPATH) $(DESTDIR)$(MODPERL_AP_INCLUDEDIR)
		12	- $(CP) $(MODPERL_XS_H_FILES) $(DESTDIR)$(MODPERL_AP_INCLUDEDIR)
		13	+# @$(MKPATH) $(DESTDIR)$(MODPERL_AP_INCLUDEDIR)
		14	+# $(CP) $(MODPERL_XS_H_FILES) $(DESTDIR)$(MODPERL_AP_INCLUDEDIR)
		15
		16	modperl_src_clean:
		17	cd "$(MODPERL_SRC)" && $(MAKE) clean

Lines 1-8 Link Here

(-)/usr/ports/www/mod_perl2/pkg-plist (-2 / +6 lines)
1	bin/mp2bug	1	bin/mp2bug
2	include/apache2/modperl_apr_perlio.h	2	include/apache2/modperl_apr_perlio.h
3	include/apache2/modperl_xs_util.h
4	include/apache2/modperl_xs_typedefs.h
5	include/apache2/modperl_xs_sv_convert.h	3	include/apache2/modperl_xs_sv_convert.h
		4	include/apache2/modperl_xs_typedefs.h
		5	include/apache2/modperl_xs_util.h
6	include/apache2/modules/perl/mod_perl.h	6	include/apache2/modules/perl/mod_perl.h
7	include/apache2/modules/perl/modperl_apache_compat.h	7	include/apache2/modules/perl/modperl_apache_compat.h
8	include/apache2/modules/perl/modperl_apache_includes.h	8	include/apache2/modules/perl/modperl_apache_includes.h
Lines 67-72 Link Here
67	%%SITE_PERL%%/%%PERL_ARCH%%/APR/Pool.pm	67	%%SITE_PERL%%/%%PERL_ARCH%%/APR/Pool.pm
68	%%SITE_PERL%%/%%PERL_ARCH%%/APR/SockAddr.pm	68	%%SITE_PERL%%/%%PERL_ARCH%%/APR/SockAddr.pm
69	%%SITE_PERL%%/%%PERL_ARCH%%/APR/Socket.pm	69	%%SITE_PERL%%/%%PERL_ARCH%%/APR/Socket.pm
		70	%%SITE_PERL%%/%%PERL_ARCH%%/APR/Status.pm
70	%%SITE_PERL%%/%%PERL_ARCH%%/APR/String.pm	71	%%SITE_PERL%%/%%PERL_ARCH%%/APR/String.pm
71	%%SITE_PERL%%/%%PERL_ARCH%%/APR/Table.pm	72	%%SITE_PERL%%/%%PERL_ARCH%%/APR/Table.pm
72	%%SITE_PERL%%/%%PERL_ARCH%%/APR/URI.pm	73	%%SITE_PERL%%/%%PERL_ARCH%%/APR/URI.pm
Lines 197-202 Link Here
197	%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/SockAddr/SockAddr.so	198	%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/SockAddr/SockAddr.so
198	%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Socket/Socket.bs	199	%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Socket/Socket.bs
199	%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Socket/Socket.so	200	%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Socket/Socket.so
		201	%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Status/Status.bs
		202	%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Status/Status.so
200	%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/String/String.bs	203	%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/String/String.bs
201	%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/String/String.so	204	%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/String/String.so
202	%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Table/Table.bs	205	%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Table/Table.bs
Lines 299-304 Link Here
299	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/URI	302	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/URI
300	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Table	303	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Table
301	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/String	304	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/String
		305	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Status
302	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Socket	306	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Socket
303	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/SockAddr	307	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/SockAddr
304	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Pool	308	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Pool