diff options
| author | Thierry Thomas <thierry@FreeBSD.org> | 2004-04-16 10:59:29 +0000 |
|---|---|---|
| committer | Thierry Thomas <thierry@FreeBSD.org> | 2004-04-16 10:59:29 +0000 |
| commit | c86ae035558890222a469226e8af9de157cb204d (patch) | |
| tree | 282f3e28d5eaeb78a3742ab73d03760575d796f3 /french/facturier/Makefile | |
| parent | b6adcb2390d1f928b21dd97df57305fdd8740a9e (diff) | |
| download | ports-c86ae035558890222a469226e8af9de157cb204d.tar.gz ports-c86ae035558890222a469226e8af9de157cb204d.zip | |
Fix a deinstallation problem noted on dosirak
+ utilize USE_APACHE and let it run smoothly with Apache2
+ utilize PORTDOCS
+ display a clean PKGMESSAGE when installing a package.
Approved by: mat (mentor).
Notes
Notes:
svn path=/head/; revision=107213
Diffstat (limited to 'french/facturier/Makefile')
| -rw-r--r-- | french/facturier/Makefile | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/french/facturier/Makefile b/french/facturier/Makefile index 83dcd82c7a79..7ad124b47160 100644 --- a/french/facturier/Makefile +++ b/french/facturier/Makefile @@ -14,20 +14,23 @@ EXTRACT_SUFX= .tgz MAINTAINER= thierry@pompo.net COMMENT= Logiciel de facturation pour P.M.I. & P.M.E. -BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/${APACHE_PORT} -RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/${APACHE_PORT} \ - ${LOCALBASE}/bin/htmldoc:${PORTSDIR}/textproc/htmldoc \ +RUN_DEPENDS= ${LOCALBASE}/bin/htmldoc:${PORTSDIR}/textproc/htmldoc \ ${PBASE}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql \ ${PBASE}/Tie/IxHash.pm:${PORTSDIR}/devel/p5-Tie-IxHash WRKSRC= ${WRKDIR}/${PORTNAME} NO_BUILD= yes +USE_APACHE= yes USE_PERL5_RUN= yes USE_REINPLACE= yes -APACHE_PORT?= www/apache13 -APACHE_CNFDIR?= ${LOCALBASE}/etc/apache +.if defined(WITH_APACHE2) +APACHE_CNFDIR= ${LOCALBASE}/etc/apache2 +.else +APACHE_CNFDIR= ${LOCALBASE}/etc/apache +.endif + APACHE_CONF= ${APACHE_CNFDIR}/httpd.conf PBASE= ${SITE_PERL} @@ -45,7 +48,9 @@ PLIST_SUB= FACT_REP=${LFACT_REP} SS_REPS= cgi-bin html lib log sql REINPLACE_ARGS= -i.beforeFacturier -DOCS= COPYING README.txt todo.txt +PORTDOCS= COPYING README.txt todo.txt + +PKGMESSAGE= ${WRKDIR}/pkg-message pre-everything:: @${ECHO_MSG} "" @@ -96,21 +101,23 @@ do-install: ${ECHO_CMD} "# Le Facturier's cgi-bin directory" >> ${APACHE_CONF} ; \ ${ECHO_CMD} "Include ${FACT_INC}" >> ${APACHE_CONF} ; \ fi) + .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} -.for FILE in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} +.for doc in ${PORTDOCS} + @${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR} .endfor @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." .endif post-install: @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} | \ - ${SED} -e "s:/usr/local/www/facturier:${FACT_REP}:" \ + @${SED} -e "s:/usr/local/www/facturier:${FACT_REP}:" \ -e "s:/usr/local/share/doc/facturier:${DOCSDIR}:" \ -e "s:%%DBOWN%%:${DBOWN}:;s:%%DBPWD%%:${DBPWD}:" \ - -e "s:%%DBSERV%%:${DBSERV}:" + -e "s:%%DBSERV%%:${DBSERV}:" \ + ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} + @${CAT} ${PKGMESSAGE} @${ECHO_MSG} .include <bsd.port.mk> |