Date: Sun, 7 Jun 2015 20:01:42 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r388742 - head/www/lightsquid Message-ID: <201506072001.t57K1gCA069588@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Sun Jun 7 20:01:41 2015 New Revision: 388742 URL: https://svnweb.freebsd.org/changeset/ports/388742 Log: - Fix shebangs - Modernize plist, drop @dirrm* - Use @sample for config file handling PR: 199629 Submitted by: amdmi3 Approved by: maintainer timeout (fluffy, 2 weeks) MFH: 2015Q2 Modified: head/www/lightsquid/Makefile head/www/lightsquid/pkg-plist Modified: head/www/lightsquid/Makefile ============================================================================== --- head/www/lightsquid/Makefile Sun Jun 7 19:57:48 2015 (r388741) +++ head/www/lightsquid/Makefile Sun Jun 7 20:01:41 2015 (r388742) @@ -3,7 +3,7 @@ PORTNAME= lightsquid PORTVERSION= 1.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= SF @@ -13,7 +13,9 @@ COMMENT= Light and fast web based squid OPTIONS_DEFINE= GD DOCS OPTIONS_DEFAULT= GD -USES= perl5 tar:tgz +USES= perl5 tar:tgz shebangfix +SHEBANG_FILES= *.cgi *.pl tools/SiteAggregator/*.pl lang/*.pl tools/*.pl \ + lightsquid.cfg USE_PERL5= run NO_BUILD= yes @@ -61,10 +63,7 @@ do-install: ${INSTALL_DATA} "{}" "${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/{}" \; ${MKDIR} ${STAGEDIR}/${ETCDIR} .for i in ${CONFIGS} - ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}/${ETCDIR}/${i}.dist -.if !exists(${ETCDIR}/${i}) - ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}/${ETCDIR} -.endif + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}/${ETCDIR}/${i}.sample .endfor ${MKDIR} ${STAGEDIR}/${WWWDIR}/report ${MKDIR} ${STAGEDIR}/${WWWDIR}/tpl Modified: head/www/lightsquid/pkg-plist ============================================================================== --- head/www/lightsquid/pkg-plist Sun Jun 7 19:57:48 2015 (r388741) +++ head/www/lightsquid/pkg-plist Sun Jun 7 20:01:41 2015 (r388742) @@ -1,15 +1,7 @@ -@unexec if cmp -s %D/%%ETCDIR%%/group.cfg %D/%%ETCDIR%%/group.cfg.dist; then rm -f %D/%%ETCDIR%%/group.cfg; fi -@unexec if cmp -s %D/%%ETCDIR%%/realname.cfg %D/%%ETCDIR%%/realname.cfg.dist; then rm -f %D/%%ETCDIR%%/realname.cfg; fi -@unexec if cmp -s %D/%%ETCDIR%%/skipuser.cfg %D/%%ETCDIR%%/skipuser.cfg.dist; then rm -f %D/%%ETCDIR%%/skipuser.cfg; fi -@unexec if cmp -s %D/%%ETCDIR%%/lightsquid.cfg %D/%%ETCDIR%%/lightsquid.cfg.dist; then rm -f %D/%%ETCDIR%%/lightsquid.cfg; fi -%%ETCDIR%%/group.cfg.dist -@exec [ -f %B/group.cfg ] || cp %B/%f %B/group.cfg -%%ETCDIR%%/lightsquid.cfg.dist -@exec [ -f %B/lightsquid.cfg ] || cp %B/%f %B/lightsquid.cfg -%%ETCDIR%%/realname.cfg.dist -@exec [ -f %B/realname.cfg ] || cp %B/%f %B/realname.cfg -%%ETCDIR%%/skipuser.cfg.dist -@exec [ -f %B/skipuser.cfg ] || cp %B/%f %B/skipuser.cfg +@sample %%ETCDIR%%/group.cfg.sample +@sample %%ETCDIR%%/lightsquid.cfg.sample +@sample %%ETCDIR%%/realname.cfg.sample +@sample %%ETCDIR%%/skipuser.cfg.sample libexec/lightsquid/ip2name.abils libexec/lightsquid/ip2name.demo libexec/lightsquid/ip2name.dhcp @@ -34,10 +26,26 @@ libexec/lightsquid/ip2name.squidlist2 %%DATADIR%%/lang/ua.lng @owner %%WWWOWN%% @group %%WWWGRP%% +%%WWWDIR%%/.htaccess +%%WWWDIR%%/bigfiles.cgi +%%WWWDIR%%/check-setup.pl +%%WWWDIR%%/common.pl +%%WWWDIR%%/day_detail.cgi +%%WWWDIR%%/get.cgi +%%WWWDIR%%/graph.cgi +%%WWWDIR%%/group_detail.cgi +%%WWWDIR%%/index.cgi +%%WWWDIR%%/lightparser.pl +%%WWWDIR%%/month_detail.cgi +%%WWWDIR%%/topsites.cgi %%WWWDIR%%/tpl/base/bigfiles.html %%WWWDIR%%/tpl/base/day_detail.html %%WWWDIR%%/tpl/base/graph.html %%WWWDIR%%/tpl/base/group_detail.html +%%WWWDIR%%/tpl/base/images/datetime.png +%%WWWDIR%%/tpl/base/images/flag_red.png +%%WWWDIR%%/tpl/base/images/graph.png +%%WWWDIR%%/tpl/base/images/printer.png %%WWWDIR%%/tpl/base/index.html %%WWWDIR%%/tpl/base/month_detail.html %%WWWDIR%%/tpl/base/topsites.html @@ -45,45 +53,24 @@ libexec/lightsquid/ip2name.squidlist2 %%WWWDIR%%/tpl/base/user_month.html %%WWWDIR%%/tpl/base/user_time.html %%WWWDIR%%/tpl/base/whousesite.html -%%WWWDIR%%/tpl/base/images/datetime.png -%%WWWDIR%%/tpl/base/images/flag_red.png -%%WWWDIR%%/tpl/base/images/graph.png -%%WWWDIR%%/tpl/base/images/printer.png %%WWWDIR%%/tpl/text/bigfiles.html -%%WWWDIR%%/tpl/text/user_detail.html -%%WWWDIR%%/tpl/text/index.html +%%WWWDIR%%/tpl/text/day_detail.html %%WWWDIR%%/tpl/text/group_detail.html +%%WWWDIR%%/tpl/text/index.html +%%WWWDIR%%/tpl/text/month_detail.html +%%WWWDIR%%/tpl/text/topsites.html +%%WWWDIR%%/tpl/text/user_detail.html %%WWWDIR%%/tpl/text/user_month.html %%WWWDIR%%/tpl/text/whousesite.html -%%WWWDIR%%/tpl/text/topsites.html -%%WWWDIR%%/tpl/text/month_detail.html -%%WWWDIR%%/tpl/text/day_detail.html -%%WWWDIR%%/bigfiles.cgi -%%WWWDIR%%/day_detail.cgi -%%WWWDIR%%/get.cgi -%%WWWDIR%%/graph.cgi -%%WWWDIR%%/group_detail.cgi -%%WWWDIR%%/index.cgi -%%WWWDIR%%/month_detail.cgi -%%WWWDIR%%/topsites.cgi %%WWWDIR%%/user_detail.cgi %%WWWDIR%%/user_month.cgi %%WWWDIR%%/user_time.cgi %%WWWDIR%%/whousesite.cgi -%%WWWDIR%%/.htaccess -%%WWWDIR%%/check-setup.pl -%%WWWDIR%%/common.pl -%%WWWDIR%%/lightparser.pl -@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%% +@dir %%WWWDIR%%/tpl/base/images +@dir %%WWWDIR%%/tpl/base +@dir %%WWWDIR%%/tpl/text +@dir %%WWWDIR%%/tpl +@dir %%WWWDIR%%/report +@dir %%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?201506072001.t57K1gCA069588>