sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

In the rc.d/localpkg New World Order, the apache.sh startup script may

Browse source 
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)
This commit is contained in:
Peter Pentchev 2004-07-26 15:24:05 +00:00
parent 94517c83f6
commit f554cfdb78
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=114780
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
www/apache13/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= apache PORTNAME= apache
PORTVERSION= 1.3.31 PORTVERSION= 1.3.31
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= www CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
DISTNAME= apache_${PORTVERSION} DISTNAME= apache_${PORTVERSION}

6
www/apache13/files/apache.sh
View file

@ -13,9 +13,9 @@
# #
# DO NOT CHANGE THESE DEFAULT VALUES HERE # DO NOT CHANGE THESE DEFAULT VALUES HERE
# #
apache_enable="NO" apache_enable=${apache_enable-"NO"}
apache_flags="" apache_flags=${apache_flags-""}
apache_pidfile="/var/run/httpd.pid" apache_pidfile=${apache_pidfile-"/var/run/httpd.pid"}
. %%RC_SUBR%% . %%RC_SUBR%%