From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Sep 7 17:30:05 2010 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 EA55E1065695 for ; Tue, 7 Sep 2010 17:30:05 +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 AAB068FC17 for ; Tue, 7 Sep 2010 17:30:05 +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 o87HU5ta030740 for ; Tue, 7 Sep 2010 17:30:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o87HU5bl030737; Tue, 7 Sep 2010 17:30:05 GMT (envelope-from gnats) Resent-Date: Tue, 7 Sep 2010 17:30:05 GMT Resent-Message-Id: <201009071730.o87HU5bl030737@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, "Philip M. Gollucci" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 22CFC106566B for ; Tue, 7 Sep 2010 17:23:36 +0000 (UTC) (envelope-from pgollucci@frieza.p6m7g8.net) Received: from frieza.p6m7g8.net (wsip-174-79-184-239.dc.dc.cox.net [174.79.184.239]) by mx1.freebsd.org (Postfix) with ESMTP id BD1708FC18 for ; Tue, 7 Sep 2010 17:23:35 +0000 (UTC) Received: from frieza.p6m7g8.net (localhost [127.0.0.1]) by frieza.p6m7g8.net (8.14.4/8.14.4) with ESMTP id o87HNYjt034921; Tue, 7 Sep 2010 17:23:34 GMT (envelope-from pgollucci@frieza.p6m7g8.net) Received: (from pgollucci@localhost) by frieza.p6m7g8.net (8.14.4/8.14.4/Submit) id o87HNYa2034920; Tue, 7 Sep 2010 17:23:34 GMT (envelope-from pgollucci) Message-Id: <201009071723.o87HNYa2034920@frieza.p6m7g8.net> Date: Tue, 7 Sep 2010 17:23:34 GMT From: "Philip M. Gollucci" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: flo@kasimir.com Subject: ports/150357: [PATCH] www/rt38: Conditionalize on APACHE_VERSION correctly X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Sep 2010 17:30:06 -0000 >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@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 - .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: