Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 7 Jan 2014 11:16:00 +0000 (UTC)
From:      Dima Panov <fluffy@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r339000 - head/www/lightsquid
Message-ID:  <201401071116.s07BG036070728@svn.freebsd.org>

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



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