From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Apr 12 21:00:01 2009 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 5FA721065675 for ; Sun, 12 Apr 2009 21:00:01 +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 3308D8FC26 for ; Sun, 12 Apr 2009 21:00:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n3CL01B3091058 for ; Sun, 12 Apr 2009 21:00:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n3CL01ab091057; Sun, 12 Apr 2009 21:00:01 GMT (envelope-from gnats) Resent-Date: Sun, 12 Apr 2009 21:00:01 GMT Resent-Message-Id: <200904122100.n3CL01ab091057@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 A61A2106564A for ; Sun, 12 Apr 2009 20:52:10 +0000 (UTC) (envelope-from pgollucci@mail.bluecottontech.com) Received: from mail.bluecottontech.com (static-76-161-175-34.dsl.cavtel.net [76.161.175.34]) by mx1.freebsd.org (Postfix) with ESMTP id 4C12B8FC13 for ; Sun, 12 Apr 2009 20:52:09 +0000 (UTC) (envelope-from pgollucci@mail.bluecottontech.com) Received: from mail.bluecottontech.com (localhost [127.0.0.1]) by mail.bluecottontech.com (8.14.3/8.14.3) with ESMTP id n3CKq9jV014473; Sun, 12 Apr 2009 20:52:09 GMT (envelope-from pgollucci@mail.bluecottontech.com) Received: (from pgollucci@localhost) by mail.bluecottontech.com (8.14.3/8.14.3/Submit) id n3CKq32i014472; Sun, 12 Apr 2009 20:52:03 GMT (envelope-from pgollucci) Message-Id: <200904122052.n3CKq32i014472@mail.bluecottontech.com> Date: Sun, 12 Apr 2009 20:52:03 GMT From: "Philip M. Gollucci" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: thierry@FreeBSD.org Subject: ports/133671: [PATCH] french/fr-facturier: apache@ cleanups 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: Sun, 12 Apr 2009 21:00:01 -0000 >Number: 133671 >Category: ports >Synopsis: [PATCH] french/fr-facturier: 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: Sun Apr 12 21:00: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: - USE_APACHE=yes is deprecated - Use APACHEETCDIR - Fix pkg-plist with/ www/apache2* - Bump PORTREVISION Port maintainer (thierry@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- fr-facturier-2.1.2_1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/french/facturier/Makefile,v retrieving revision 1.12 diff -u -u -r1.12 Makefile --- Makefile 19 May 2007 20:05:00 -0000 1.12 +++ Makefile 12 Apr 2009 20:51:03 -0000 @@ -23,17 +23,12 @@ WRKSRC= ${WRKDIR}/${PORTNAME} NO_BUILD= yes -USE_APACHE= yes +USE_APACHE= 1.3+ USE_PERL5_RUN= yes USE_MYSQL= yes -.if defined(WITH_APACHE2) -APACHE_CNFDIR= ${LOCALBASE}/etc/apache2 -.else -APACHE_CNFDIR= ${LOCALBASE}/etc/apache -.endif +APACHE_CONF= ${LOCALBASE}/${APACHEETCDIR}/httpd.conf -APACHE_CONF= ${APACHE_CNFDIR}/httpd.conf PBASE= ${SITE_PERL} DBOWN?= PROP_BD @@ -108,8 +103,8 @@ ${ECHO_CMD} "Include ${FACT_INC}" >> ${APACHE_CONF} ; \ fi) .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} + @${MKDIR} ${DOCSDIR}/ + @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}/ @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." .endif Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/french/facturier/pkg-plist,v retrieving revision 1.4 diff -u -u -r1.4 pkg-plist --- pkg-plist 18 Jun 2005 19:40:51 -0000 1.4 +++ pkg-plist 12 Apr 2009 20:51:03 -0000 @@ -1,4 +1,5 @@ etc/facturier/httpd.conf.facturier +%%APACHEETCDIR%%/httpd.conf.beforeFacturier %%FACT_REP%%/cgi-bin/articlemodif.cgi %%FACT_REP%%/cgi-bin/articles.cgi %%FACT_REP%%/cgi-bin/cherchcontact.cgi --- fr-facturier-2.1.2_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: