From owner-svn-ports-head@FreeBSD.ORG  Sat Mar  2 19:46:38 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id D850E4E9;
 Sat,  2 Mar 2013 19:46:38 +0000 (UTC)
 (envelope-from ohauer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C0DB5F5B;
 Sat,  2 Mar 2013 19:46:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r22JkcNc017633;
 Sat, 2 Mar 2013 19:46:38 GMT (envelope-from ohauer@svn.freebsd.org)
Received: (from ohauer@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r22Jkcos017631;
 Sat, 2 Mar 2013 19:46:38 GMT (envelope-from ohauer@svn.freebsd.org)
Message-Id: <201303021946.r22Jkcos017631@svn.freebsd.org>
From: Olli Hauer <ohauer@FreeBSD.org>
Date: Sat, 2 Mar 2013 19:46:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r313288 - in head: Mk www/apache22-itk-mpm
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: Sat, 02 Mar 2013 19:46:38 -0000

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