From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Apr 3 14:40:18 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0C30410657AD for ; Sun, 3 Apr 2011 14:40:18 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 948A98FC0C for ; Sun, 3 Apr 2011 14:40:15 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p33EeFCH081314 for ; Sun, 3 Apr 2011 14:40:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p33EeFJI081313; Sun, 3 Apr 2011 14:40:15 GMT (envelope-from gnats) Resent-Date: Sun, 3 Apr 2011 14:40:15 GMT Resent-Message-Id: <201104031440.p33EeFJI081313@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, olli hauer Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0D645106564A; Sun, 3 Apr 2011 14:39:12 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from u18-124.dslaccess.de (unknown [194.231.39.124]) by mx1.freebsd.org (Postfix) with ESMTP id B060E8FC12; Sun, 3 Apr 2011 14:39:11 +0000 (UTC) Received: by u18-124.dslaccess.de (Postfix, from userid 1100) id 0EBC8207AF; Sun, 3 Apr 2011 16:39:07 +0200 (CEST) Message-Id: <20110403143908.0EBC8207AF@u18-124.dslaccess.de> Date: Sun, 3 Apr 2011 16:39:07 +0200 (CEST) From: olli hauer To: X-Send-Pr-Version: 3.113 Cc: ohauer@FreeBSD.org Subject: ports/156152: [patch] port www/p5-Apache-Peek fix if apache22 is default X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: olli hauer List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Apr 2011 14:40:18 -0000 >Number: 156152 >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:15 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Olli Hauer >Release: >Organization: >Environment: >Description: Now with subject, was lost in previous PR 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@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: