From owner-svn-ports-all@FreeBSD.ORG  Sun Mar  9 17:42:57 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 30E91917;
 Sun,  9 Mar 2014 17:42:57 +0000 (UTC)
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 0331E217;
 Sun,  9 Mar 2014 17:42:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s29HguUR071616;
 Sun, 9 Mar 2014 17:42:56 GMT (envelope-from ohauer@svn.freebsd.org)
Received: (from ohauer@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s29HguwN071614;
 Sun, 9 Mar 2014 17:42:56 GMT (envelope-from ohauer@svn.freebsd.org)
Message-Id: <201403091742.s29HguwN071614@svn.freebsd.org>
From: Olli Hauer <ohauer@FreeBSD.org>
Date: Sun, 9 Mar 2014 17:42:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r347673 - in head/www/mod_layout22: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Mar 2014 17:42:57 -0000

Author: ohauer
Date: Sun Mar  9 17:42:56 2014
New Revision: 347673
URL: http://svnweb.freebsd.org/changeset/ports/347673
QAT: https://qat.redports.org/buildarchive/r347673/

Log:
  add stage support

Modified:
  head/www/mod_layout22/Makefile
  head/www/mod_layout22/files/patch-Makefile

Modified: head/www/mod_layout22/Makefile
==============================================================================
--- head/www/mod_layout22/Makefile	Sun Mar  9 17:21:48 2014	(r347672)
+++ head/www/mod_layout22/Makefile	Sun Mar  9 17:42:56 2014	(r347673)
@@ -11,7 +11,6 @@ PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache2.2 module to wrap served pages with a header and/or footer
 
-
 CONFLICTS=	mod_layout-3.* mod_layout-4.*
 
 PORTSCOUT=	limit:^5
@@ -21,11 +20,15 @@ LATEST_LINK=	mod_layout22
 
 MAKE_ARGS+=	builddir=${WRKSRC}
 
-NO_STAGE=	yes
+post-patch:
+	${REINPLACE_CMD} -e 's|@APXS_STAGE@|-S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR}|' \
+		${WRKSRC}/Makefile
+
+pre-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
+
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/README
 
 .include <bsd.port.mk>

Modified: head/www/mod_layout22/files/patch-Makefile
==============================================================================
--- head/www/mod_layout22/files/patch-Makefile	Sun Mar  9 17:21:48 2014	(r347672)
+++ head/www/mod_layout22/files/patch-Makefile	Sun Mar  9 17:42:56 2014	(r347673)
@@ -1,6 +1,6 @@
---- Makefile.orig	2007-02-21 22:29:07.000000000 +0100
-+++ Makefile	2008-08-31 21:53:05.000000000 +0200
-@@ -1,10 +1,10 @@
+--- ./Makefile.orig	2008-01-07 07:44:50.000000000 +0100
++++ ./Makefile	2014-03-09 18:38:09.000000000 +0100
+@@ -1,10 +1,11 @@
  ##
  ##  Makefile -- Build procedure for mod_layout Apache module
  ##
@@ -10,6 +10,18 @@
  #   the used tools
 -APXS=apxs
 +APXS=${LOCALBASE}/sbin/apxs
++APXS_STAGE=	@APXS_STAGE@
  APACHECTL=apachectl
  CC=`$(APXS) -q CC`
  INC=-I`$(APXS) -q INCLUDEDIR` `$(APXS) -q CFLAGS`  #-DLAYOUT_FILEOWNER_NAME
+@@ -57,8 +58,8 @@
+ header.o : header.c
+ 	$(APXS) -c header.c
+ #   install the shared object file into Apache 
+-install: 
+-	$(APXS) -iac $(INCLUDES) $(LIBS) $(SRC)
++install: mod_layout.so
++	$(APXS) $(APXS_STAGE) -i -n layout mod_layout.la
+ 	@echo "+--------------------------------------------------------+"; \
+ 	echo "| All done.                                              |"; \
+ 	echo "|                                                        |"; \