ports/133671: [PATCH] french/fr-facturier: apache@ cleanups

[Philip M. Gollucci]

>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 at 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: