summaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authordinoex <dinoex@FreeBSD.org>2004-12-16 16:28:57 +0000
committerdinoex <dinoex@FreeBSD.org>2004-12-16 16:28:57 +0000
commitf751a95c7f399e99bf0ffaaf3a02c0c4bbed28f4 (patch)
tree0b84c86b336206677bbb38695355f77b220bb95b /www
parent00a81f09b1ba8ebd39fadd3ef4654730cf9de75d (diff)
downloadFreeBSD-ports-f751a95c7f399e99bf0ffaaf3a02c0c4bbed28f4.zip
FreeBSD-ports-f751a95c7f399e99bf0ffaaf3a02c0c4bbed28f4.tar.gz
- fix package when WITHOUT_RC_SUBR=YES
and old rc files are installed. Submitted by: Dave Ryan
Diffstat (limited to 'www')
-rw-r--r--www/apache13-modssl/Makefile12
1 files changed, 7 insertions, 5 deletions
diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index 85f7a7a..7bd710c 100644
--- a/www/apache13-modssl/Makefile
+++ b/www/apache13-modssl/Makefile
@@ -71,12 +71,14 @@ check-depends::
@${FALSE}
.endif
-.if exists(${PREFIX}/etc/rc.d/apache.sh)
-PLIST_FILES+= etc/rc.d/apache.sh.sample
+.if exists(${PREFIX}/etc/rc.d/apache.sh) || !defined(USE_RC_SUBR)
+APACHE_SH?= etc/rc.d/apache.sh.sample
.else
-PLIST_FILES+= etc/rc.d/apache.sh
+APACHE_SH?= etc/rc.d/apache.sh
.endif
+PLIST_FILES+= ${APACHE_SH}
+
.if defined(WITH_APACHE_SUEXEC) && ${WITH_APACHE_SUEXEC} == yes
APACHE_SUEXEC_CALLER?=www
@@ -390,9 +392,9 @@ pre-install:
post-install:
.if defined(USE_RC_SUBR)
- ${INSTALL_SCRIPT} ${WRKSRC}/rcng.sh ${PREFIX}/etc/rc.d/apache.sh
+ ${INSTALL_SCRIPT} ${WRKSRC}/rcng.sh ${PREFIX}/${APACHE_SH}
.else
- ${INSTALL_SCRIPT} ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/apache.sh.sample
+ ${INSTALL_SCRIPT} ${WRKSRC}/apache.sh ${PREFIX}/${APACHE_SH}
.endif
.if defined(WITH_APACHE_MODSNMP) || defined(APACHE_WITH_MODSNMP)
@${MKDIR} ${DATADIR}/buckets
OpenPOWER on IntegriCloud