From owner-svn-ports-head@FreeBSD.ORG  Sun Nov 10 23:05:36 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 ESMTP id 40AA226C;
 Sun, 10 Nov 2013 23:05:36 +0000 (UTC)
 (envelope-from ohauer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2CEFB2841;
 Sun, 10 Nov 2013 23:05:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAAN5aQi079730;
 Sun, 10 Nov 2013 23:05:36 GMT (envelope-from ohauer@svn.freebsd.org)
Received: (from ohauer@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAAN5a3S079729;
 Sun, 10 Nov 2013 23:05:36 GMT (envelope-from ohauer@svn.freebsd.org)
Message-Id: <201311102305.rAAN5a3S079729@svn.freebsd.org>
From: Olli Hauer <ohauer@FreeBSD.org>
Date: Sun, 10 Nov 2013 23:05:36 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r333452 - head/Mk
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: Sun, 10 Nov 2013 23:05:36 -0000

Author: ohauer
Date: Sun Nov 10 23:05:35 2013
New Revision: 333452
URL: http://svnweb.freebsd.org/changeset/ports/333452

Log:
  - support STAGE for ports using AP_FAST_BUILD

Modified:
  head/Mk/bsd.apache.mk

Modified: head/Mk/bsd.apache.mk
==============================================================================
--- head/Mk/bsd.apache.mk	Sun Nov 10 22:30:30 2013	(r333451)
+++ head/Mk/bsd.apache.mk	Sun Nov 10 23:05:35 2013	(r333452)
@@ -477,7 +477,12 @@ do-build: ap-gen-plist
 
 .if !target(do-install)
 do-install:
+. if defined(NO_STAGE)
 	@${APXS} -i ${AP_MOD_EN} -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT}
+. else
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
+	@${APXS} -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} -i -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT}
+. endif
 .endif
 .endif          # defined(AP_FAST_BUILD)
 .endif          # defined(AP_PORT_IS_MODULE)