- support staging

- changes in per-install & do-install commands

Submitted by:	rodrigo@ (maintainer)
Reviewed by:	bapt (mentor)

2 files changed, 15 insertions, 10 deletions

diff --git a/irc/cgiirc/Makefile b/irc/cgiirc/Makefile
index c2fce5bc8bfe..9bce7ee228de 100644
--- a/irc/cgiirc/Makefile
+++ b/irc/cgiirc/Makefile
@@ -12,18 +12,19 @@ COMMENT=	IRC web gateway written in Perl
 
 LICENSE=	GPLv2
 
-USES=		perl5
+USES=		perl5  shebangfix
 NO_BUILD=	yes
+SHEBANG_FILES=	docs/identd.pl \
+		irc.cgi \
+		client-perl.cgi \
+		nph-irc.cgi
+PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
-NO_STAGE=	yes
 pre-install:
-	@${MV} ${WRKSRC}/cgiirc.config ${WRKSRC}/cgiirc.config.sample 2>/dev/null || true
+	@${MV} ${WRKSRC}/cgiirc.config ${WRKSRC}/cgiirc.config.sample
 
 do-install:
-	${MKDIR} ${PREFIX}/www/cgiirc
-	${CP} -rp ${WRKSRC}/* ${PREFIX}/www/cgiirc
-	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/www/cgiirc
-	@[ -f ${PREFIX}/www/cgiirc/cgiirc.config ] || \
-	${CP} ${WRKSRC}/cgiirc.config.sample ${PREFIX}/www/cgiirc/cgiirc.config
+	${MKDIR} ${STAGEDIR}${PREFIX}/www/cgiirc
+	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/cgiirc
 
 .include <bsd.port.mk>
diff --git a/irc/cgiirc/pkg-plist b/irc/cgiirc/pkg-plist
index 67c49743e191..fcda5aa4edf7 100644
--- a/irc/cgiirc/pkg-plist
+++ b/irc/cgiirc/pkg-plist
@@ -1,7 +1,9 @@
-@unexec if cmp -s %D/www/cgiirc/cgiirc.config %D/www/cgiirc/cgiirc.config.sample; then rm -f %D/www/cgiirc/cgiirc.config; fi
+@owner %%WWWOWN%%
+@group %%WWWGRP%%
+@sample www/cgiirc/cgiirc.config.sample
+www/cgiirc/.htaccess
 www/cgiirc/README
 www/cgiirc/cgiirc.config.full
-www/cgiirc/cgiirc.config.sample
 www/cgiirc/client-perl.cgi
 www/cgiirc/client.c
 www/cgiirc/docs/CHANGES
@@ -129,3 +131,5 @@ www/cgiirc/nph-irc.cgi
 @dirrm www/cgiirc/formats
 @dirrm www/cgiirc/docs
 @dirrmtry www/cgiirc
+@owner root
+@group wheel