svn commit: r406607 - in head/www/apache24: . files
Olli Hauer
ohauer at FreeBSD.org
Mon Jan 18 19:44:49 UTC 2016
Author: ohauer
Date: Mon Jan 18 19:44:47 2016
New Revision: 406607
URL: https://svnweb.freebsd.org/changeset/ports/406607
Log:
- use new $opt-target
- improve kldstat check
- use new defined postexec, preunexec in pkg-plist
with hat apache@
Modified:
head/www/apache24/Makefile
head/www/apache24/files/apache24.in
head/www/apache24/pkg-plist
Modified: head/www/apache24/Makefile
==============================================================================
--- head/www/apache24/Makefile Mon Jan 18 19:36:57 2016 (r406606)
+++ head/www/apache24/Makefile Mon Jan 18 19:44:47 2016 (r406607)
@@ -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
Modified: head/www/apache24/files/apache24.in
==============================================================================
--- head/www/apache24/files/apache24.in Mon Jan 18 19:36:57 2016 (r406606)
+++ head/www/apache24/files/apache24.in Mon Jan 18 19:44:47 2016 (r406607)
@@ -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
Modified: head/www/apache24/pkg-plist
==============================================================================
--- head/www/apache24/pkg-plist Mon Jan 18 19:36:57 2016 (r406606)
+++ head/www/apache24/pkg-plist Mon Jan 18 19:44:47 2016 (r406607)
@@ -243,9 +243,9 @@ sbin/split-logfile
%%DATADIR%%/build/program.mk
%%DATADIR%%/build/rules.mk
%%DATADIR%%/build/special.mk
- at unexec if cmp -s %D/%%WWWDIR%%/data/index.html %D/%%DATADIR%%/misc/index.html; then rm -f %D/%%WWWDIR%%/data/index.html; fi
+ at 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
- at exec [ -f %D/%%WWWDIR%%/data/index.html ] || cp %D/%%DATADIR%%/misc/index.html %D/%%WWWDIR%%/data/index.html
+ at 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
- at unexec rm -f %D/%%ETCDIR%%/httpd.conf.bak 2> /dev/null || true
+ at preunexec rm -f %D/%%ETCDIR%%/httpd.conf.bak 2> /dev/null || true
@dir %%ETCDIR%%/envvars.d
@dir %%WWWDIR%%/data
More information about the svn-ports-all
mailing list