svn commit: r313288 - in head: Mk www/apache22-itk-mpm

[Olli Hauer]

Author: ohauer
Date: Sat Mar  2 19:46:37 2013
New Revision: 313288
URL: http://svnweb.freebsd.org/changeset/ports/313288

Log:
  - allow to install apache modules activated by defining
    AP_MODENABLE in make.conf
  
    Requested on the mailing lists
  
  - fix patch location in help text
  
  with head apache@

Modified:
  head/Mk/bsd.apache.mk
  head/www/apache22-itk-mpm/Makefile

Modified: head/Mk/bsd.apache.mk
==============================================================================
--- head/Mk/bsd.apache.mk	Sat Mar  2 19:31:49 2013	(r313287)
+++ head/Mk/bsd.apache.mk	Sat Mar  2 19:46:37 2013	(r313288)
@@ -455,7 +455,11 @@ 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} "@unexec echo \"Don't forget to remove all ${MODULENAME}-related directives in your httpd.conf\"">> ${PLIST}
 .	endif
 .else
@@ -470,7 +474,11 @@ 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
 .endif

Modified: head/www/apache22-itk-mpm/Makefile
==============================================================================
--- head/www/apache22-itk-mpm/Makefile	Sat Mar  2 19:31:49 2013	(r313287)
+++ head/www/apache22-itk-mpm/Makefile	Sat Mar  2 19:46:37 2013	(r313288)
@@ -10,7 +10,7 @@
 # It's not possible to use both patches together
 #
 # For a quick description take a look into the mpm-itk* patches
-# in the apache22/files directory
+# in the files directory
 
 MASTERDIR=		${.CURDIR}/../apache22