From owner-svn-ports-all@freebsd.org  Wed Dec 23 11:39:02 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 3D1F7A4F289;
 Wed, 23 Dec 2015 11:39:02 +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 0DC841EBF;
 Wed, 23 Dec 2015 11:39:01 +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 tBNBd17U008268;
 Wed, 23 Dec 2015 11:39:01 GMT (envelope-from ohauer@FreeBSD.org)
Received: (from ohauer@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBNBd1wl008266;
 Wed, 23 Dec 2015 11:39:01 GMT (envelope-from ohauer@FreeBSD.org)
Message-Id: <201512231139.tBNBd1wl008266@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ohauer set sender to
 ohauer@FreeBSD.org using -f
From: Olli Hauer <ohauer@FreeBSD.org>
Date: Wed, 23 Dec 2015 11:39:01 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r404288 - head/Mk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Dec 2015 11:39:02 -0000

Author: ohauer
Date: Wed Dec 23 11:39:00 2015
New Revision: 404288
URL: https://svnweb.freebsd.org/changeset/ports/404288

Log:
  - adopt new pkg keywords (CHANGES: 20150926)
     - s/exec/postexec/
     - s/unexec/postunexec/
  
  with head apache@

Modified:
  head/Mk/bsd.apache.mk

Modified: head/Mk/bsd.apache.mk
==============================================================================
--- head/Mk/bsd.apache.mk	Wed Dec 23 11:29:22 2015	(r404287)
+++ head/Mk/bsd.apache.mk	Wed Dec 23 11:39:00 2015	(r404288)
@@ -489,10 +489,10 @@ ap-gen-plist:
 .if defined(AP_GENPLIST)
 .	if !exists(${PLIST})
 	@${ECHO} "===>  Generating apache plist"
-	@${ECHO} "@unexec ${SED} -i '' -E '/LoadModule[[:blank:]]+%%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf" >> ${PLIST}
 	@${ECHO} "%%APACHEMODDIR%%/%%AP_MODULE%%" >> ${PLIST}
-	@${ECHO} "@exec %D/sbin/apxs -e ${AP_MOD_EN} -n %%AP_NAME%% %D/%F" >> ${PLIST}
-	@${ECHO} "@unexec echo \"Don't forget to remove all ${MODULENAME}-related directives in your httpd.conf\"">> ${PLIST}
+	@${ECHO} "@postexec %D/sbin/apxs -e ${AP_MOD_EN} -n %%AP_NAME%% %D/%F" >> ${PLIST}
+	@${ECHO} "@postunexec ${SED} -i '' -E '/LoadModule[[:blank:]]+%%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf" >> ${PLIST}
+	@${ECHO} "@postunexec echo \"Don't forget to remove all ${MODULENAME}-related directives in your httpd.conf\"">> ${PLIST}
 .	endif
 .else
 	@${DO_NADA}