From owner-svn-ports-head@FreeBSD.ORG  Tue Jan  7 11:16:00 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 A179E597;
 Tue,  7 Jan 2014 11:16:00 +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 7410E1D0C;
 Tue,  7 Jan 2014 11:16:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s07BG0qc070736;
 Tue, 7 Jan 2014 11:16:00 GMT (envelope-from fluffy@svn.freebsd.org)
Received: (from fluffy@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s07BG036070728;
 Tue, 7 Jan 2014 11:16:00 GMT (envelope-from fluffy@svn.freebsd.org)
Message-Id: <201401071116.s07BG036070728@svn.freebsd.org>
From: Dima Panov <fluffy@FreeBSD.org>
Date: Tue, 7 Jan 2014 11:16:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r339000 - head/www/lightsquid
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Jan 2014 11:16:00 -0000

Author: fluffy
Date: Tue Jan  7 11:15:59 2014
New Revision: 339000
URL: http://svnweb.freebsd.org/changeset/ports/339000

Log:
  - Allow packaging as user with staging
  
  Pointyhat to:	myself
  Noticed by:	bapt@

Modified:
  head/www/lightsquid/Makefile
  head/www/lightsquid/pkg-plist   (contents, props changed)

Modified: head/www/lightsquid/Makefile
==============================================================================
--- head/www/lightsquid/Makefile	Tue Jan  7 10:51:51 2014	(r338999)
+++ head/www/lightsquid/Makefile	Tue Jan  7 11:15:59 2014	(r339000)
@@ -18,6 +18,10 @@ USES=		perl5
 USE_PERL5=	run
 NO_BUILD=	yes
 
+PLIST_SUB+=	WWWOWN="${WWWOWN}" \
+		WWWGRP="${WWWGRP}" \
+		CHOWN="${CHOWN}"
+
 .include <bsd.port.options.mk>
 
 CONFIGS=	lightsquid.cfg realname.cfg skipuser.cfg group.cfg
@@ -74,7 +78,7 @@ do-install:
 	${FIND} -E . -maxdepth 1 -regex '.*\.(cgi|pl)' -exec \
 		${INSTALL_SCRIPT} "{}" "${STAGEDIR}/${WWWDIR}/{}" \; && \
 		${INSTALL_DATA} .htaccess ${STAGEDIR}/${WWWDIR}/
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}/${WWWDIR}
+#	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}/${WWWDIR}
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
 .for i in ${PORTDOCS}

Modified: head/www/lightsquid/pkg-plist
==============================================================================
--- head/www/lightsquid/pkg-plist	Tue Jan  7 10:51:51 2014	(r338999)
+++ head/www/lightsquid/pkg-plist	Tue Jan  7 11:15:59 2014	(r339000)
@@ -32,6 +32,8 @@ libexec/lightsquid/ip2name.squidlist2
 %%DATADIR%%/lang/ru.lng
 %%DATADIR%%/lang/sp.lng
 %%DATADIR%%/lang/ua.lng
+@owner %%WWWOWN%%
+@group %%WWWGRP%%
 %%WWWDIR%%/tpl/base/bigfiles.html
 %%WWWDIR%%/tpl/base/day_detail.html
 %%WWWDIR%%/tpl/base/graph.html
@@ -72,13 +74,16 @@ libexec/lightsquid/ip2name.squidlist2
 %%WWWDIR%%/check-setup.pl
 %%WWWDIR%%/common.pl
 %%WWWDIR%%/lightparser.pl
-@dirrmtry %%ETCDIR%%
-@dirrmtry libexec/lightsquid
-@dirrmtry %%DATADIR%%/lang
-@dirrmtry %%DATADIR%%
+@exec %%CHOWN%% -R %%WWWOWN%%:%%WWWGRP%% %%WWWDIR%%
 @dirrmtry %%WWWDIR%%/tpl/base/images
 @dirrmtry %%WWWDIR%%/tpl/base
 @dirrmtry %%WWWDIR%%/tpl/text
 @dirrmtry %%WWWDIR%%/tpl
 @dirrmtry %%WWWDIR%%/report
 @dirrmtry %%WWWDIR%%
+@group
+@owner
+@dirrmtry %%DATADIR%%/lang
+@dirrmtry %%DATADIR%%
+@dirrmtry libexec/lightsquid
+@dirrmtry %%ETCDIR%%