- USE_APACHE=yes is deprecated

- Use APACHEETCDIR
- Fix pkg-plist with/ www/apache2*
- Bump PORTREVISION

PR:		ports/133671
Submitted by:	pgollucci

2 files changed, 5 insertions, 9 deletions

diff --git a/french/facturier/Makefile b/french/facturier/Makefile
index 46caa88d82a8..60222717f9fd 100644
--- a/french/facturier/Makefile
+++ b/french/facturier/Makefile
@@ -23,17 +23,12 @@ RUN_DEPENDS=	${LOCALBASE}/bin/htmldoc:${PORTSDIR}/textproc/htmldoc			\
 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 @@ do-install:
 		${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
 
diff --git a/french/facturier/pkg-plist b/french/facturier/pkg-plist
index 44e75ab96f4f..439d926debb7 100644
--- a/french/facturier/pkg-plist
+++ b/french/facturier/pkg-plist
@@ -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