From owner-svn-ports-head@freebsd.org Mon Jan 18 19:44:49 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 90D15A879A4; Mon, 18 Jan 2016 19:44:49 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 534301245; Mon, 18 Jan 2016 19:44:49 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0IJimJv080558; Mon, 18 Jan 2016 19:44:48 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0IJimWp080555; Mon, 18 Jan 2016 19:44:48 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201601181944.u0IJimWp080555@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Mon, 18 Jan 2016 19:44:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406607 - in head/www/apache24: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Jan 2016 19:44:49 -0000 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 -@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