Date: Sat, 9 Aug 2014 18:21:59 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364455 - head/Mk Message-ID: <53e666c7.2ad5.2e545f38@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Sat Aug 9 18:21:59 2014 New Revision: 364455 URL: http://svnweb.freebsd.org/changeset/ports/364455 QAT: https://qat.redports.org/buildarchive/r364455/ Log: - add some additional SUB_LIST hints MFH: 2014Q3 Modified: head/Mk/bsd.apache.mk Modified: head/Mk/bsd.apache.mk ============================================================================== --- head/Mk/bsd.apache.mk Sat Aug 9 16:55:00 2014 (r364454) +++ head/Mk/bsd.apache.mk Sat Aug 9 18:21:59 2014 (r364455) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53e666c7.2ad5.2e545f38>