diff options
| author | Olli Hauer <ohauer@FreeBSD.org> | 2016-01-18 19:44:47 +0000 |
|---|---|---|
| committer | Olli Hauer <ohauer@FreeBSD.org> | 2016-01-18 19:44:47 +0000 |
| commit | dffb271b7165395f4118d5a01391be51c354a655 (patch) | |
| tree | 030eab0d448ec069a1922251193e43714536fb28 /www/apache24 | |
| parent | 5b8022a608051eab51c611084ffd2b8ba33cb8c7 (diff) | |
Notes
Diffstat (limited to 'www/apache24')
| -rw-r--r-- | www/apache24/Makefile | 3 | ||||
| -rw-r--r-- | www/apache24/files/apache24.in | 4 | ||||
| -rw-r--r-- | www/apache24/pkg-plist | 6 |
3 files changed, 6 insertions, 7 deletions
diff --git a/www/apache24/Makefile b/www/apache24/Makefile index 4f463989d454..9ab36b65264f 100644 --- a/www/apache24/Makefile +++ b/www/apache24/Makefile @@ -177,9 +177,8 @@ post-install: -${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* -${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/apache24/mod_*.so -.if ${PORT_OPTIONS:MLOG_FORENSIC} +post-install-LOG_FORENSIC-on: ${INSTALL_SCRIPT} ${WRKSRC}/support/check_forensic ${STAGEDIR}${PREFIX}/sbin -.endif # maintainer only, check for new modules modlist: extract diff --git a/www/apache24/files/apache24.in b/www/apache24/files/apache24.in index 768e5cdc8218..1f585050db3c 100644 --- a/www/apache24/files/apache24.in +++ b/www/apache24/files/apache24.in @@ -52,8 +52,8 @@ envvars="%%PREFIX%%/sbin/envvars" apache24_accf() { if checkyesno apache24_http_accept_enable; then - /sbin/kldstat -v | grep accf_http > /dev/null 2>&1 || /sbin/kldload accf_http || return ${?} - /sbin/kldstat -v | grep accf_data > /dev/null 2>&1 || /sbin/kldload accf_data || return ${?} + /sbin/kldstat -qm accf_http || /sbin/kldload accf_http || return ${?} + /sbin/kldstat -qm accf_data || /sbin/kldload accf_data || return ${?} else apache24_flags="${apache24_flags} -DNOHTTPACCEPT" fi diff --git a/www/apache24/pkg-plist b/www/apache24/pkg-plist index dc71035fcb71..d2ef5a017722 100644 --- a/www/apache24/pkg-plist +++ b/www/apache24/pkg-plist @@ -243,9 +243,9 @@ sbin/split-logfile %%DATADIR%%/build/program.mk %%DATADIR%%/build/rules.mk %%DATADIR%%/build/special.mk -@unexec if cmp -s %D/%%WWWDIR%%/data/index.html %D/%%DATADIR%%/misc/index.html; then rm -f %D/%%WWWDIR%%/data/index.html; fi +@preunexec if cmp -s %D/%%WWWDIR%%/data/index.html %D/%%DATADIR%%/misc/index.html; then rm -f %D/%%WWWDIR%%/data/index.html; fi %%DATADIR%%/misc/index.html -@exec [ -f %D/%%WWWDIR%%/data/index.html ] || cp %D/%%DATADIR%%/misc/index.html %D/%%WWWDIR%%/data/index.html +@postexec [ -f %D/%%WWWDIR%%/data/index.html ] || cp %D/%%DATADIR%%/misc/index.html %D/%%WWWDIR%%/data/index.html @(,,0400) %%WWWDIR%%/cgi-bin/printenv @(,,0400) %%WWWDIR%%/cgi-bin/test-cgi %%WWWDIR%%/error/HTTP_BAD_GATEWAY.html.var @@ -510,6 +510,6 @@ sbin/split-logfile %%WWWDIR%%/icons/world2.gif %%WWWDIR%%/icons/world2.png %%WWWDIR%%/icons/xml.png -@unexec rm -f %D/%%ETCDIR%%/httpd.conf.bak 2> /dev/null || true +@preunexec rm -f %D/%%ETCDIR%%/httpd.conf.bak 2> /dev/null || true @dir %%ETCDIR%%/envvars.d @dir %%WWWDIR%%/data |