From owner-svn-ports-all@FreeBSD.ORG  Wed Jun  4 11:14: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 24DAEDFB;
 Wed,  4 Jun 2014 11:14: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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id EC5312510;
 Wed,  4 Jun 2014 11:14:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s54BEucf040989;
 Wed, 4 Jun 2014 11:14:56 GMT (envelope-from rodrigo@svn.freebsd.org)
Received: (from rodrigo@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s54BEu7g040987;
 Wed, 4 Jun 2014 11:14:56 GMT (envelope-from rodrigo@svn.freebsd.org)
Message-Id: <201406041114.s54BEu7g040987@svn.freebsd.org>
From: Rodrigo Osorio <rodrigo@FreeBSD.org>
Date: Wed, 4 Jun 2014 11:14:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r356465 - head/irc/cgiirc
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.18
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: Wed, 04 Jun 2014 11:14:57 -0000

Author: rodrigo
Date: Wed Jun  4 11:14:56 2014
New Revision: 356465
URL: http://svnweb.freebsd.org/changeset/ports/356465
QAT: https://qat.redports.org/buildarchive/r356465/

Log:
  - support staging
  - changes in per-install & do-install commands
  
  Submitted by:	rodrigo@ (maintainer)
  Reviewed by:	bapt (mentor)

Modified:
  head/irc/cgiirc/Makefile
  head/irc/cgiirc/pkg-plist

Modified: head/irc/cgiirc/Makefile
==============================================================================
--- head/irc/cgiirc/Makefile	Wed Jun  4 11:09:26 2014	(r356464)
+++ head/irc/cgiirc/Makefile	Wed Jun  4 11:14:56 2014	(r356465)
@@ -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>

Modified: head/irc/cgiirc/pkg-plist
==============================================================================
--- head/irc/cgiirc/pkg-plist	Wed Jun  4 11:09:26 2014	(r356464)
+++ head/irc/cgiirc/pkg-plist	Wed Jun  4 11:14:56 2014	(r356465)
@@ -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