- Allow staging as a regular user

- Bump portrevision as a directory was not packaged with intended owner

2 files changed, 5 insertions, 9 deletions

diff --git a/dns/bindgraph/Makefile b/dns/bindgraph/Makefile
index a372bd9ae4ef..856330e7dd73 100644
--- a/dns/bindgraph/Makefile
+++ b/dns/bindgraph/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bindgraph
 PORTVERSION=	0.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	dns
 MASTER_SITES=	http://www.linux.it/~md/software/
 
@@ -24,7 +24,9 @@ BINDGRAPH_GROUP?=	${WWWGRP}
 
 USE_RC_SUBR=	${PORTNAME}
 SUB_LIST+=	BINDGRAPH_USER=${BINDGRAPH_USER} BINDGRAPH_GROUP=${BINDGRAPH_GROUP}
-PLIST_SUB=	CGIDIR=${CGIDIR:S,${PREFIX}/,,}
+PLIST_SUB=	CGIDIR=${CGIDIR:S,${PREFIX}/,,} \
+		BINDGRAPH_USER="${BINDGRAPH_USER}" \
+		BINDGRAPH_GROUP="${BINDGRAPH_GROUP}"
 
 DOCS=		README ChangeLog
 PORTDOCS=	${DOCS}
@@ -46,7 +48,6 @@ post-patch:
 do-install:
 	${MKDIR} ${STAGEDIR}${CGIDIR}
 	${MKDIR} ${STAGEDIR}${DATADIR}
-	@${CHOWN} -R ${BINDGRAPH_USER}:${BINDGRAPH_GROUP} ${STAGEDIR}${DATADIR}/
 	@${INSTALL_SCRIPT} ${WRKSRC}/bindgraph.pl ${STAGEDIR}${PREFIX}/sbin/
 	@${INSTALL_SCRIPT} ${WRKSRC}/bindgraph.cgi ${STAGEDIR}${CGIDIR}/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
@@ -54,9 +55,4 @@ do-install:
 	  ${INSTALL_DATA} ${WRKSRC}/$$f ${STAGEDIR}${DOCSDIR}/; \
 	done
 
-post-install:
-	@${ECHO_MSG} ""
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG} ""
-
 .include <bsd.port.mk>
diff --git a/dns/bindgraph/pkg-plist b/dns/bindgraph/pkg-plist
index 4c61ce3ede37..c2579ee2a49c 100644
--- a/dns/bindgraph/pkg-plist
+++ b/dns/bindgraph/pkg-plist
@@ -1,4 +1,4 @@
 %%CGIDIR%%/bindgraph.cgi
 sbin/bindgraph.pl
 @dirrmtry %%CGIDIR%%
-@dirrmtry %%DATADIR%%
+@dirrmtry(%%BINDGRAPH_USER%%,%%BINDGRAPH_GROUP%%,) %%DATADIR%%