diff options
| author | clement <clement@FreeBSD.org> | 2007-09-19 03:18:09 +0800 |
|---|---|---|
| committer | clement <clement@FreeBSD.org> | 2007-09-19 03:18:09 +0800 |
| commit | 53159b66fa9a1db0291ad766d66aee5fb69d799f (patch) | |
| tree | 69800c7af8839f12596256225c56fed384759bdc /www/apache20 | |
| parent | e421eabf49de81a88865acf1922a0ffd9766d0d3 (diff) | |
| download | freebsd-ports-gnome-53159b66fa9a1db0291ad766d66aee5fb69d799f.tar.gz freebsd-ports-gnome-53159b66fa9a1db0291ad766d66aee5fb69d799f.tar.zst freebsd-ports-gnome-53159b66fa9a1db0291ad766d66aee5fb69d799f.zip | |
- Fix profiles support in startup script [1]
- move envvars support to the beginning of apache2_checkconfig() to be
sure we're using envvars during configtest [2]
PR: ports/116401 [1],
ports/116329 [2]
Submitted by: kevin brintnall <kbrint@rufus.net> [1],
Ruud Althuizen <ruud@il.fontys.nl>
Diffstat (limited to 'www/apache20')
| -rw-r--r-- | www/apache20/Makefile | 1 | ||||
| -rw-r--r-- | www/apache20/files/apache2.sh.in | 11 |
2 files changed, 6 insertions, 6 deletions
diff --git a/www/apache20/Makefile b/www/apache20/Makefile index 450cc1a2861a..f986c7d3d8aa 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -52,6 +52,7 @@ USE_ICONV= yes USE_AUTOTOOLS= autoconf:259 libtool:15 USE_PERL5= yes USE_RC_SUBR= apache2.sh +SUB_LIST+= RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX} USE_APACHE= common20 LIBTOOLFILES= configure USE_LDCONFIG= ${PREFIX}/lib/apache2 diff --git a/www/apache20/files/apache2.sh.in b/www/apache20/files/apache2.sh.in index 65aef9d9d091..9bdda2d30e16 100644 --- a/www/apache20/files/apache2.sh.in +++ b/www/apache20/files/apache2.sh.in @@ -98,6 +98,11 @@ apache2_requirepidfile() apache2_checkconfig() { + if test -f %%PREFIX%%/sbin/envvars + then + . %%PREFIX%%/sbin/envvars + fi + echo "Performing sanity check on apache2 configuration:" eval ${command} ${apache2_flags} -t } @@ -113,18 +118,12 @@ apache2_precmd() { apache2_checkconfig - if test -f %%PREFIX%%/sbin/envvars - then - . %%PREFIX%%/sbin/envvars - fi - if checkyesno apache2limits_enable then eval `/usr/bin/limits ${apache2limits_args}` 2>/dev/null else return 0 fi - } extra_commands="reload graceful configtest" |