diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2002-04-19 17:45:25 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2002-04-19 17:45:25 +0000 |
| commit | 4b4f4ae757eaf71068db696a5a165f3bfef7638e (patch) | |
| tree | c2ff9cc3c74d81637115725f79e240931df973c3 /www | |
| parent | 5cbe079c2fb618b7c7648c664f39b510e12f5b08 (diff) | |
| download | freebsd-ports-4b4f4ae757eaf71068db696a5a165f3bfef7638e.zip | |
Make startscript apache.sh PREFIX aware at install time,
so it can be called within an path or dir.
e.g. in: /usr/local/etc/rc.local/apache.sh
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache13-modssl/Makefile | 6 | ||||
| -rw-r--r-- | www/apache13-modssl/files/apache.sh | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile index 257c3e2c7098..d39c61eab371 100644 --- a/www/apache13-modssl/Makefile +++ b/www/apache13-modssl/Makefile @@ -93,6 +93,10 @@ TYPE= test CRT= KEY= +post-extract: + @${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/apache.sh \ + > ${WRKSRC}/apache.sh + pre-patch: @cd ${WRKDIR}/mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE} \ && ${ECHO_MSG} "===> Applying mod_ssl-${VERSION_MODSSL} extension" \ @@ -121,7 +125,7 @@ pre-install: post-install: @if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \ ${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \ - ${INSTALL_SCRIPT} -m 751 ${FILESDIR}/apache.sh ${PREFIX}/etc/rc.d/apache.sh; \ + ${INSTALL_SCRIPT} -m 751 ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/apache.sh; \ fi .include <bsd.port.post.mk> diff --git a/www/apache13-modssl/files/apache.sh b/www/apache13-modssl/files/apache.sh index 8e6e38810fa8..34eb4cd3c31c 100644 --- a/www/apache13-modssl/files/apache.sh +++ b/www/apache13-modssl/files/apache.sh @@ -1,16 +1,11 @@ #!/bin/sh -if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then - echo "$0: Cannot determine the PREFIX" >&2 - exit 1 -fi - case "$1" in start) - [ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl startssl > /dev/null && echo -n ' apache' + [ -x %%PREFIX%%/sbin/apachectl ] && %%PREFIX%%/sbin/apachectl startssl > /dev/null && echo -n ' apache' ;; stop) - [ -r /var/run/httpd.pid ] && ${PREFIX}/sbin/apachectl stop > /dev/null && echo -n ' apache' + [ -r /var/run/httpd.pid ] && %%PREFIX%%/sbin/apachectl stop > /dev/null && echo -n ' apache' ;; *) echo "Usage: `basename $0` {start|stop}" >&2 |