Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Mar 2014 13:16:44 +0000 (UTC)
From:      Emanuel Haupt <ehaupt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r348684 - head/ports-mgmt/portaudit-db
Message-ID:  <201403201316.s2KDGi92032246@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403201316.s2KDGi92032246>