ports/150357: [PATCH] www/rt38: Conditionalize on APACHE_VERSION correctly

Philip M. Gollucci pgollucci at p6m7g8.com
Tue Sep 7 17:30:06 UTC 2010


>Number:         150357
>Category:       ports
>Synopsis:       [PATCH] www/rt38: Conditionalize on APACHE_VERSION correctly
>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:   Tue Sep 07 17:30:04 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Philip M. Gollucci
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
RideCharge Inc / TaxiMagic
>Environment:
System: FreeBSD frieza.p6m7g8.net 9.0-CURRENT FreeBSD 9.0-CURRENT #1: Tue Aug 24 18:32:38 UTC 2010
>Description:
- Does not affect default package
- Brings port into apache@ guidelines for multiple www/apache* version use
- Removes soon to be obsolete MODPERL2 option

Port maintainer (flo at kasimir.com) is cc'd.

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

--- rt-3.8.8.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/rt38/Makefile,v
retrieving revision 1.27
diff -u -u -r1.27 Makefile
--- Makefile	3 Sep 2010 17:32:31 -0000	1.27
+++ Makefile	7 Sep 2010 17:20:39 -0000
@@ -35,7 +35,6 @@
 		SQLITE		"Enable SQLite backend" 	off \
 		DEV 		"Configure for Developers"	off \
 		STANDALONE	"Enable standalone server"	off \
-		MODPERL2	"Enable mod_perl2 support"	off  \
 		FASTCGI		"Enable FastCGI support" 	off \
 		GRAPHVIZ	"Enable GraphViz charts"	on
 
@@ -57,7 +56,6 @@
 USE_AUTOTOOLS=	autoconf:262
 
 .include <bsd.port.pre.mk>
-
 .if defined(WITH_DEV)
 BUILD_DEPENDS+=	${DEV_DEPS}
 RUN_DEPENDS+=	${DEV_DEPS}
@@ -68,7 +66,7 @@
 RUN_DEPENDS+=	${STANDALONE_DEPS}
 .endif
 
-.if defined(WITH_APACHE) || defined(WITH_FASTCGI)
+.if defined(WITH_APACHE) || defined(WITH_FASTCGI) || defined(WITH_MODPERL)
 USE_APACHE=	1.3+
 .endif
 
@@ -82,18 +80,22 @@
 RUN_DEPENDS+=	${GRAPVIZ_DEPS}
 .endif
 
-.if defined(WITH_MODPERL2)
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Apache2/Request.pm:${PORTSDIR}/www/p5-libapreq2 \
-	${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI-mp2
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Apache2/Request.pm:${PORTSDIR}/www/p5-libapreq2 \
-	${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI-mp2
-.endif
+.if defined(WITH_MODPERL)
+WITH_APACHE=	yes
 
-.if defined(WITH_MODPERL) && !defined(WITH_MODPERL2)
+.include "${.CURDIR}/../../Mk/bsd.apache.mk"
+
+.	if ${APACHE_VERSION} == 13
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq \
 	${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI-mp1
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq \
 	${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI-mp1
+.	else
+BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Apache2/Request.pm:${PORTSDIR}/www/p5-libapreq2 \
+	${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI-mp2
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Apache2/Request.pm:${PORTSDIR}/www/p5-libapreq2 \
+	${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI-mp2
+.	endif
 .endif
 
 .if !defined(WITHOUT_MYSQL)
--- rt-3.8.8.patch ends here ---

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



More information about the freebsd-ports-bugs mailing list