From owner-svn-ports-head@FreeBSD.ORG  Sun Nov 10 20:45:10 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 41232CD7;
 Sun, 10 Nov 2013 20:45:10 +0000 (UTC)
 (envelope-from ohauer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2EA46212C;
 Sun, 10 Nov 2013 20:45:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAAKjAhx031402;
 Sun, 10 Nov 2013 20:45:10 GMT (envelope-from ohauer@svn.freebsd.org)
Received: (from ohauer@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAAKjAT5031401;
 Sun, 10 Nov 2013 20:45:10 GMT (envelope-from ohauer@svn.freebsd.org)
Message-Id: <201311102045.rAAKjAT5031401@svn.freebsd.org>
From: Olli Hauer <ohauer@FreeBSD.org>
Date: Sun, 10 Nov 2013 20:45:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r333447 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 Nov 2013 20:45:10 -0000

Author: ohauer
Date: Sun Nov 10 20:45:09 2013
New Revision: 333447
URL: http://svnweb.freebsd.org/changeset/ports/333447

Log:
  - rewrite part of module enabling

Modified:
  head/Mk/bsd.apache.mk

Modified: head/Mk/bsd.apache.mk
==============================================================================
--- head/Mk/bsd.apache.mk	Sun Nov 10 20:45:06 2013	(r333446)
+++ head/Mk/bsd.apache.mk	Sun Nov 10 20:45:09 2013	(r333447)
@@ -446,6 +446,13 @@ show-modules:
 
 .elif defined(AP_PORT_IS_MODULE)
 
+.if defined(AP_MODENABLE)
+AP_MOD_EN=	-a
+.else
+AP_MOD_EN=	-A
+.endif
+PLIST_SUB+=	AP_MOD_EN="${AP_MOD_EN}"
+
 .if defined(AP_FAST_BUILD)
 .if !target(ap-gen-plist)
 ap-gen-plist:
@@ -455,11 +462,7 @@ ap-gen-plist:
 # apache22
 	@${ECHO} "@unexec ${SED} -i '' -E '/LoadModule[[:blank:]]+%%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf" >> ${PLIST}
 	@${ECHO} "%%APACHEMODDIR%%/%%AP_MODULE%%" >> ${PLIST}
-.if defined(AP_MODENABLE)
-	@${ECHO} "@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F" >> ${PLIST}
-.else
-	@${ECHO} "@exec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F" >> ${PLIST}
-.endif
+	@${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}
 .	endif
 .else
@@ -474,12 +477,8 @@ do-build: ap-gen-plist
 
 .if !target(do-install)
 do-install:
-.if defined(AP_MODENABLE)
-	@${APXS} -i -a -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT}
-.else
-	@${APXS} -i -A -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT}
-.endif
-.endif
-.endif
+	@${APXS} -i ${AP_MOD_EN} -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT}
 .endif
+.endif          # defined(AP_FAST_BUILD)
+.endif          # defined(AP_PORT_IS_MODULE)
 .endif          # defined(_POSTMKINCLUDED) && !defined(Apache_Post_Include)