diff options
| author | Peter Pentchev <roam@FreeBSD.org> | 2004-07-26 15:24:05 +0000 |
|---|---|---|
| committer | Peter Pentchev <roam@FreeBSD.org> | 2004-07-26 15:24:05 +0000 |
| commit | f554cfdb78c9ed47d66ee4ab93bea12efa45027e (patch) | |
| tree | 36505391afb590775a6cee0a3d42e1cfca87a616 | |
| parent | Update to 0.941 [0.94.1] (diff) | |
In the rc.d/localpkg New World Order, the apache.sh startup script may
be executed when the apache_enable and other config variables have
already been set, e.g. via /etc/rc.conf. In that case, load_rc_config
will not do anything at all, and the "defaults" set in the script will
override the user's settings. Fix this by honoring any previously-set
config variables.
Carte blanche by: ache (maintainer)
Notes
Notes:
svn path=/head/; revision=114780
| -rw-r--r-- | www/apache13/Makefile | 2 | ||||
| -rw-r--r-- | www/apache13/files/apache.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/www/apache13/Makefile b/www/apache13/Makefile index 67497e5d18bb..be4927de7cac 100644 --- a/www/apache13/Makefile +++ b/www/apache13/Makefile @@ -7,7 +7,7 @@ PORTNAME= apache PORTVERSION= 1.3.31 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} DISTNAME= apache_${PORTVERSION} diff --git a/www/apache13/files/apache.sh b/www/apache13/files/apache.sh index 03e31dd16321..3e3cdff59aba 100644 --- a/www/apache13/files/apache.sh +++ b/www/apache13/files/apache.sh @@ -13,9 +13,9 @@ # # DO NOT CHANGE THESE DEFAULT VALUES HERE # -apache_enable="NO" -apache_flags="" -apache_pidfile="/var/run/httpd.pid" +apache_enable=${apache_enable-"NO"} +apache_flags=${apache_flags-""} +apache_pidfile=${apache_pidfile-"/var/run/httpd.pid"} . %%RC_SUBR%% |