Date: Sun, 10 Nov 2013 20:45:10 +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: r333447 - head/Mk Message-ID: <201311102045.rAAKjAT5031401@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311102045.rAAKjAT5031401>