ports/156151: [patch] port www/p5-Apache-Peek fix if apache22 is default

[olli hauer]

>Number:         156151
>Category:       ports
>Synopsis:       [patch] port www/p5-Apache-Peek fix if apache22 is default
>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:   Sun Apr 03 14:40:14 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Olli Hauer
>Release:        
>Organization:
>Environment:


>Description:
If the port is build on a fresh system where apache22 is the default 
the BROKEN message is does not trigger, instead the port tries to
add apache13 to the mix and this triggers then the conflict message
from apache.

The ports should check against apache not only mod_perl

Note: Apache22 will be the default in near time.

>How-To-Repeat:
Build the port against apache22 without mod_perl installed.


>Fix:

--- p5-Apache-Peek.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/www/p5-Apache-Peek/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile	17 Apr 2008 14:29:34 -0000	1.14
+++ Makefile	3 Apr 2011 14:05:04 -0000
@@ -9,21 +9,13 @@
 PORTVERSION=	1.02
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../../authors/id/S/ST/STAS
+MASTER_SITE_SUBDIR=	CPAN:STAS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv at FreeBSD.org
 COMMENT=	A data debugging tool for the XS programmer (under mod_perl)
 
-.if defined(WITH_MODPERL2)
-BROKEN=		Broken due the new mod_perl2 API
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Apache2/mod_perl.pm:${PORTSDIR}/www/mod_perl2
-MOD_PERL=	2
-.else
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
-		${SITE_PERL}/${PERL_ARCH}/Apache/Test.pm:${PORTSDIR}/www/p5-Apache-Test
-MOD_PERL=	1
-.endif
+USE_APACHE=	13+
 
 PERL_CONFIGURE=	YES
 
@@ -35,6 +27,16 @@
 
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+.if defined(WITH_MODPERL2) || ${APACHE_VERSION} > 13
+BROKEN=		Broken due the new mod_perl2 API
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Apache2/mod_perl.pm:${PORTSDIR}/www/mod_perl2
+MOD_PERL=	2
+.else
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
+		${SITE_PERL}/${PERL_ARCH}/Apache/Test.pm:${PORTSDIR}/www/p5-Apache-Test
+MOD_PERL=	1
+.endif
+
 post-patch:
 	@${PERL} -pi -e '$$_="" if /^test_configure\(/;' ${WRKSRC}/Makefile.PL
 
--- p5-Apache-Peek.diff ends here ---

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