From owner-svn-ports-branches@FreeBSD.ORG  Sat Aug  9 19:06:55 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@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 ESMTPS id EE5DE67A
 for <svn-ports-branches@freebsd.org>; Sat,  9 Aug 2014 19:06:55 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C42332C8C
 for <svn-ports-branches@freebsd.org>; Sat,  9 Aug 2014 19:06:55 +0000 (UTC)
Received: from ohauer (uid 1234) (envelope-from ohauer@FreeBSD.org) id 2ca4
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Sat, 09 Aug 2014 19:06:55 +0000
From: Olli Hauer <ohauer@FreeBSD.org>
Date: Sat, 9 Aug 2014 19:06:55 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r364467 - branches/2014Q3/Mk
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e6714f.2ca4.1252856@svn.freebsd.org>
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Aug 2014 19:06:56 -0000

Author: ohauer
Date: Sat Aug  9 19:06:55 2014
New Revision: 364467
URL: http://svnweb.freebsd.org/changeset/ports/364467
QAT: https://qat.redports.org/buildarchive/r364467/

Log:
  MFH: r364455
  
  - add some additional SUB_LIST hints
  
  Approved by:	portmgr (erwin@)

Modified:
  branches/2014Q3/Mk/bsd.apache.mk
Directory Properties:
  branches/2014Q3/   (props changed)

Modified: branches/2014Q3/Mk/bsd.apache.mk
==============================================================================
--- branches/2014Q3/Mk/bsd.apache.mk	Sat Aug  9 18:59:41 2014	(r364466)
+++ branches/2014Q3/Mk/bsd.apache.mk	Sat Aug  9 19:06:55 2014	(r364467)
@@ -348,9 +348,15 @@ APACHE_PORT?=	www/apache${APACHE_VERSION
 
 PLIST_SUB+=	APACHEMODDIR="${APACHEMODDIR}" \
 		APACHEINCLUDEDIR="${APACHEINCLUDEDIR}" \
-		APACHEETCDIR="${APACHEETCDIR}"
+		APACHEETCDIR="${APACHEETCDIR}" \
+		APACHE_VERSION="${APACHE_VERSION}"
+
+SUB_LIST+=	APACHEMODDIR="${APACHEMODDIR}" \
+		APACHEETCDIR="${APACHEETCDIR}" \
+		APACHE_VERSION="${APACHE_VERSION}"
 
 APACHE_PKGNAMEPREFIX=	ap${APACHE_VERSION}-
+
 .if defined(AP_FAST_BUILD)
 PKGNAMEPREFIX?=	${APACHE_PKGNAMEPREFIX}
 .endif
@@ -462,7 +468,6 @@ ap-gen-plist:
 .if defined(AP_GENPLIST)
 .	if !exists(${PLIST})
 	@${ECHO} "===>  Generating apache plist"
-# apache22
 	@${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}
@@ -493,6 +498,7 @@ do-install:
 .	endif
 . endif
 .endif
+
 .endif          # defined(AP_FAST_BUILD)
-.endif          # defined(AP_PORT_IS_MODULE)
+.endif          # defined(AP_PORT_IS_SERVER / AP_PORT_IS_MODULE)
 .endif          # defined(_POSTMKINCLUDED) && !defined(Apache_Post_Include)