From owner-svn-ports-all@FreeBSD.ORG  Thu Mar 20 13:16:45 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 6321880B;
 Thu, 20 Mar 2014 13:16:45 +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 359B2282;
 Thu, 20 Mar 2014 13:16:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2KDGjIp032248;
 Thu, 20 Mar 2014 13:16:45 GMT (envelope-from ehaupt@svn.freebsd.org)
Received: (from ehaupt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2KDGi92032246;
 Thu, 20 Mar 2014 13:16:44 GMT (envelope-from ehaupt@svn.freebsd.org)
Message-Id: <201403201316.s2KDGi92032246@svn.freebsd.org>
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Thu, 20 Mar 2014 13:16:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r348684 - head/ports-mgmt/portaudit-db
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: Thu, 20 Mar 2014 13:16:45 -0000

Author: ehaupt
Date: Thu Mar 20 13:16:44 2014
New Revision: 348684
URL: http://svnweb.freebsd.org/changeset/ports/348684
QAT: https://qat.redports.org/buildarchive/r348684/

Log:
  Support staging

Modified:
  head/ports-mgmt/portaudit-db/Makefile
  head/ports-mgmt/portaudit-db/pkg-plist

Modified: head/ports-mgmt/portaudit-db/Makefile
==============================================================================
--- head/ports-mgmt/portaudit-db/Makefile	Thu Mar 20 13:15:50 2014	(r348683)
+++ head/ports-mgmt/portaudit-db/Makefile	Thu Mar 20 13:16:44 2014	(r348684)
@@ -25,18 +25,20 @@ SED_SCRIPT=	-e 's,%%PREFIX%%,${PREFIX},g
 		-e "s|%%PORTVERSION%%|${PORTVERSION}|g" \
 		-e "s|%%DATABASEDIR%%|${DATABASEDIR}|g"
 
-NO_STAGE=	yes
 do-build:
-	@for f in packaudit.sh packaudit.conf; do \
-		${SED} ${SED_SCRIPT} "${FILESDIR}/$$f" > "${WRKDIR}/$$f"; \
-	done
+.for f in packaudit.sh packaudit.conf
+	@${SED} ${SED_SCRIPT} "${FILESDIR}/$$f" > "${WRKDIR}/${f}"
+.endfor
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKDIR}/packaudit.sh ${PREFIX}/bin/packaudit
-	@${INSTALL_DATA} ${WRKDIR}/packaudit.conf ${PREFIX}/etc/packaudit.conf.sample
-	@${MKDIR} ${DATADIR}
-	@${INSTALL_SCRIPT} ${FILESDIR}/portaudit2vuxml.awk ${DATADIR}
-	@${INSTALL_DATA} ${FILESDIR}/vuxml2html.xslt ${FILESDIR}/vuxml2portaudit.xslt ${DATADIR}
-	@${MKDIR} ${DATABASEDIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/packaudit.sh \
+		${STAGEDIR}${PREFIX}/bin/packaudit
+	${INSTALL_DATA} ${WRKDIR}/packaudit.conf \
+		${STAGEDIR}${PREFIX}/etc/packaudit.conf.sample
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_SCRIPT} ${FILESDIR}/portaudit2vuxml.awk ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${FILESDIR}/vuxml2html.xslt ${FILESDIR}/vuxml2portaudit.xslt \
+		${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATABASEDIR}
 
 .include <bsd.port.mk>

Modified: head/ports-mgmt/portaudit-db/pkg-plist
==============================================================================
--- head/ports-mgmt/portaudit-db/pkg-plist	Thu Mar 20 13:15:50 2014	(r348683)
+++ head/ports-mgmt/portaudit-db/pkg-plist	Thu Mar 20 13:16:44 2014	(r348684)
@@ -5,4 +5,4 @@ etc/packaudit.conf.sample
 %%DATADIR%%/vuxml2portaudit.xslt
 @dirrm %%DATADIR%%
 @exec mkdir -p %%DATABASEDIR%%
-@unexec rmdir %%DATABASEDIR%% 2>/dev/null || true
+@dirrmtry %%DATABASEDIR%%