ports/133691: [PATCH] www/p5-Maypole: apache@ cleanups

Philip M. Gollucci pgollucci at FreeBSD.org
Mon Apr 13 06:10:01 UTC 2009 

>Number:         133691
>Category:       ports
>Synopsis:       [PATCH] www/p5-Maypole: apache@ cleanups
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 13 06:10:00 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Philip M. Gollucci
>Release:        FreeBSD 7.1-RELEASE-p3 amd64
>Organization:
RideCharge Inc.
>Environment:
System: FreeBSD mail.bluecottontech.com 7.1-RELEASE-p3 FreeBSD 7.1-RELEASE-p3 #1: Tue Mar 10 22:10:18 UTC 2009
>Description:
- WITH_APACHE2 is deprecated
- BUILD_DEPENDS != RUN_DEPENDS
- Don't mix PORTDOCS and PORTEXAMPLES
- Use SUB_FILES for pkg-message
- Add OPTION of MODPERL2
- Bump PORTREVISION
Added file(s):
- files/pkg-message.in

Removed file(s):
- pkg-message

Port maintainer (lth at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- p5-Maypole-2.13_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/www/p5-Maypole/Makefile,v
retrieving revision 1.15
diff -u -u -r1.15 Makefile
--- Makefile	7 Jul 2008 12:07:44 -0000	1.15
+++ Makefile	13 Apr 2009 06:05:25 -0000
@@ -6,6 +6,7 @@
 
 PORTNAME=	Maypole
 PORTVERSION=	2.13
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/T/TE/TEEJAY
@@ -14,7 +15,7 @@
 MAINTAINER=	lth at FreeBSD.org
 COMMENT=	MVC web application framework
 
-RUN_DEPENDS=	p5-CGI-Simple>0:${PORTSDIR}/www/p5-CGI-Simple \
+BUILD_DEPENDS=	p5-CGI-Simple>0:${PORTSDIR}/www/p5-CGI-Simple \
 		p5-CGI-Untaint-date>0:${PORTSDIR}/www/p5-CGI-Untaint-date \
 		p5-CGI-Untaint-email>0:${PORTSDIR}/www/p5-CGI-Untaint-email \
 		p5-CGI-Untaint>=1.26:${PORTSDIR}/www/p5-CGI-Untaint \
@@ -36,27 +37,28 @@
 		p5-UNIVERSAL-require>0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
 		p5-URI>0:${PORTSDIR}/net/p5-URI \
 		p5-libwww>0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
-BUILD_DEPENDS=	${RUN_DEPENDS}
-
-OPTIONS=	MODPERL "mod_perl support" on
+OPTIONS=	MODPERL "mod_perl support" on \
+			MODPERL2 "mod_perl2 support" off
 
 PERL_CONFIGURE=	yes
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_MODPERL)
-.if defined(WITH_APACHE2)
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Apache2/Request.pm:${PORTSDIR}/www/p5-libapreq2
-.else
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq
+BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Apache2/Request.pm:${PORTSDIR}/www/p5-libapreq2
+.endif
+.if defined(WITH_MODPERL2)
+BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq
 .endif
+
+.if defined(WITH_MODPERL) && defined(WITH_MODPERL2)
+IGNORE=	only 1 mod_perl at a time
 .endif
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
-PKGMSG_SUB=	DOCSDIR=${DOCSDIR} \
-		DATADIR=${DATADIR} \
-		EXAMPLESDIR=${EXAMPLESDIR}
+SUB_FILES+=	pkg-message
 
 MAN3=		Apache::MVC.3 \
 		CGI::Maypole.3 \
@@ -103,18 +105,16 @@
 		View.pod \
 		Workflow.pod
 
-pre-patch:
-	@ ${SED} ${PKGMSG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${PKGDIR}/pkg-message > ${PKGMESSAGE}
-
 post-install:
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${DOCSDIR}
+	@ ${MKDIR} ${DOCSDIR}/
 .for FILE in ${DOC_FILES}
-	@ ${INSTALL_DATA} ${WRKSRC}/lib/Maypole/Manual/${FILE} ${DOCSDIR}
+	@ ${INSTALL_DATA} ${WRKSRC}/lib/Maypole/Manual/${FILE} ${DOCSDIR}/
 .endfor
-	@ ${MKDIR} ${EXAMPLESDIR}
-	@ ${CP} -R ${WRKSRC}/examples/ ${EXAMPLESDIR}
+.endif
+.if !defined(NOPORTEXAMPLES)
+	@ ${MKDIR} ${EXAMPLESDIR}/
+	@ ${CP} -R ${WRKSRC}/examples/ ${EXAMPLESDIR}/
 .endif
 	@ ${CAT} ${PKGMESSAGE}
 
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message	7 Jul 2008 12:07:44 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-========================================================================
-
-Maypole has now been installed.
-
-Documentation:	%%DOCSDIR%%/
-Examples:	%%EXAMPLESDIR%%/
-
-Enjoy!
-
-========================================================================
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/www/p5-Maypole/pkg-plist,v
retrieving revision 1.8
diff -u -u -r1.8 pkg-plist
--- pkg-plist	7 Jul 2008 12:07:44 -0000	1.8
+++ pkg-plist	13 Apr 2009 06:05:25 -0000
@@ -59,30 +59,30 @@
 %%PORTDOCS%%%%DOCSDIR%%/View.pod
 %%PORTDOCS%%%%DOCSDIR%%/Workflow.pod
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%%%EXAMPLESDIR%%/BeerDB.pm
-%%PORTDOCS%%%%EXAMPLESDIR%%/BeerDB/Base.pm
-%%PORTDOCS%%%%EXAMPLESDIR%%/BeerDB/Beer.pm
-%%PORTDOCS%%%%EXAMPLESDIR%%/beerdb.sql
-%%PORTDOCS%%%%EXAMPLESDIR%%/fancy_example/BeerDB.pm
-%%PORTDOCS%%%%EXAMPLESDIR%%/fancy_example/BeerDB/Base.pm
-%%PORTDOCS%%%%EXAMPLESDIR%%/fancy_example/BeerDB/Beer.pm
-%%PORTDOCS%%%%EXAMPLESDIR%%/fancy_example/BeerDB/Brewery.pm
-%%PORTDOCS%%%%EXAMPLESDIR%%/fancy_example/BeerDB/Drinker.pm
-%%PORTDOCS%%%%EXAMPLESDIR%%/fancy_example/beerdb.sql
-%%PORTDOCS%%%%EXAMPLESDIR%%/fancy_example/templates/custom/addnew
-%%PORTDOCS%%%%EXAMPLESDIR%%/fancy_example/templates/custom/display_inputs
-%%PORTDOCS%%%%EXAMPLESDIR%%/fancy_example/templates/custom/display_search_inputs
-%%PORTDOCS%%%%EXAMPLESDIR%%/fancy_example/templates/custom/edit
-%%PORTDOCS%%%%EXAMPLESDIR%%/fancy_example/templates/custom/header
-%%PORTDOCS%%%%EXAMPLESDIR%%/fancy_example/templates/custom/maypole.css
-%%PORTDOCS%%%%EXAMPLESDIR%%/fancy_example/templates/custom/metadata
-%%PORTDOCS%%%%EXAMPLESDIR%%/fancy_example/templates/custom/search_form
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/fancy_example/templates/custom
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/fancy_example/templates
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/fancy_example/BeerDB
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/fancy_example
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/BeerDB
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/BeerDB.pm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/BeerDB/Base.pm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/BeerDB/Beer.pm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beerdb.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fancy_example/BeerDB.pm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fancy_example/BeerDB/Base.pm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fancy_example/BeerDB/Beer.pm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fancy_example/BeerDB/Brewery.pm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fancy_example/BeerDB/Drinker.pm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fancy_example/beerdb.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fancy_example/templates/custom/addnew
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fancy_example/templates/custom/display_inputs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fancy_example/templates/custom/display_search_inputs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fancy_example/templates/custom/edit
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fancy_example/templates/custom/header
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fancy_example/templates/custom/maypole.css
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fancy_example/templates/custom/metadata
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fancy_example/templates/custom/search_form
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/fancy_example/templates/custom
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/fancy_example/templates
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/fancy_example/BeerDB
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/fancy_example
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/BeerDB
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole
 @dirrmtry %%SITE_PERL%%/Maypole/templates/factory
 @dirrmtry %%SITE_PERL%%/Maypole/templates/beer
Index: files/pkg-message.in
===================================================================
RCS file: files/pkg-message.in
diff -N files/pkg-message.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/pkg-message.in	13 Apr 2009 06:05:25 -0000
@@ -0,0 +1,10 @@
+========================================================================
+
+Maypole has now been installed.
+
+Documentation:	%%DOCSDIR%%/
+Examples:	%%EXAMPLESDIR%%/
+
+Enjoy!
+
+========================================================================
--- p5-Maypole-2.13_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list