Attachment #156927 for bug #199629

Lines 3-9 Link Here

(-)/usr/ports/www/lightsquid/Makefile (-6 / +8 lines)
3		3
4	PORTNAME= lightsquid	4	PORTNAME= lightsquid
5	PORTVERSION= 1.8	5	PORTVERSION= 1.8
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= www	7	CATEGORIES= www
8	MASTER_SITES= SF	8	MASTER_SITES= SF
9		9
Lines 13-20 Link Here
13	OPTIONS_DEFINE= GD DOCS	13	OPTIONS_DEFINE= GD DOCS
14	OPTIONS_DEFAULT= GD	14	OPTIONS_DEFAULT= GD
15		15
16	USES= perl5 tar:tgz	16	USES= perl5 tar:tgz shebangfix
17	USE_PERL5= run	17	USE_PERL5= run
		18	SHEBANG_FILES= bigfiles.cgi check-setup.pl common.pl day_detail.cgi get.cgi graph.cgi \
		19	group_detail.cgi index.cgi lang/check_lng.pl lang/check_tpl_lng.pl \
		20	lightparser.pl lightsquid.cfg month_detail.cgi tools/fixreport.pl \
		21	tools/SiteAggregator/ReportExplorer.pl tools/SiteAggregator/SiteAgregator.pl \
		22	topsites.cgi user_detail.cgi user_month.cgi user_time.cgi whousesite.cgi
18	NO_BUILD= yes	23	NO_BUILD= yes
19		24
20	PLIST_SUB+= WWWOWN="${WWWOWN}" \	25	PLIST_SUB+= WWWOWN="${WWWOWN}" \
Lines 61-70 Link Here
61	${INSTALL_DATA} "{}" "${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/{}" \;	66	${INSTALL_DATA} "{}" "${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/{}" \;
62	${MKDIR} ${STAGEDIR}/${ETCDIR}	67	${MKDIR} ${STAGEDIR}/${ETCDIR}
63	.for i in ${CONFIGS}	68	.for i in ${CONFIGS}
64	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}/${ETCDIR}/${i}.dist	69	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}/${ETCDIR}/${i}.sample
65	.if !exists(${ETCDIR}/${i})
66	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}/${ETCDIR}
67	.endif
68	.endfor	70	.endfor
69	${MKDIR} ${STAGEDIR}/${WWWDIR}/report	71	${MKDIR} ${STAGEDIR}/${WWWDIR}/report
70	${MKDIR} ${STAGEDIR}/${WWWDIR}/tpl	72	${MKDIR} ${STAGEDIR}/${WWWDIR}/tpl




@sample %%ETCDIR%%/group.cfg.sample
@sample %%ETCDIR%%/lightsquid.cfg.sample
@sample %%ETCDIR%%/realname.cfg.sample
@sample %%ETCDIR%%/skipuser.cfg.sample
%%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
libexec/lightsquid/ip2name.abils
libexec/lightsquid/ip2name.demo
libexec/lightsquid/ip2name.dhcp

%%WWWDIR%%/common.pl
%%WWWDIR%%/lightparser.pl
@exec %%CHOWN%% -R %%WWWOWN%%:%%WWWGRP%% %%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%%

Return to bug 199629

Lines 1-15 Link Here

(-)/usr/ports/www/lightsquid/pkg-plist (-22 / +10 lines)
1	@unexec if cmp -s %D/%%ETCDIR%%/group.cfg %D/%%ETCDIR%%/group.cfg.dist; then rm -f %D/%%ETCDIR%%/group.cfg; fi	1	@sample %%ETCDIR%%/group.cfg.sample
2	@unexec if cmp -s %D/%%ETCDIR%%/realname.cfg %D/%%ETCDIR%%/realname.cfg.dist; then rm -f %D/%%ETCDIR%%/realname.cfg; fi	2	@sample %%ETCDIR%%/lightsquid.cfg.sample
3	@unexec if cmp -s %D/%%ETCDIR%%/skipuser.cfg %D/%%ETCDIR%%/skipuser.cfg.dist; then rm -f %D/%%ETCDIR%%/skipuser.cfg; fi	3	@sample %%ETCDIR%%/realname.cfg.sample
4	@unexec if cmp -s %D/%%ETCDIR%%/lightsquid.cfg %D/%%ETCDIR%%/lightsquid.cfg.dist; then rm -f %D/%%ETCDIR%%/lightsquid.cfg; fi	4	@sample %%ETCDIR%%/skipuser.cfg.sample
5	%%ETCDIR%%/group.cfg.dist
6	@exec [ -f %B/group.cfg ] \|\| cp %B/%f %B/group.cfg
7	%%ETCDIR%%/lightsquid.cfg.dist
8	@exec [ -f %B/lightsquid.cfg ] \|\| cp %B/%f %B/lightsquid.cfg
9	%%ETCDIR%%/realname.cfg.dist
10	@exec [ -f %B/realname.cfg ] \|\| cp %B/%f %B/realname.cfg
11	%%ETCDIR%%/skipuser.cfg.dist
12	@exec [ -f %B/skipuser.cfg ] \|\| cp %B/%f %B/skipuser.cfg
13	libexec/lightsquid/ip2name.abils	5	libexec/lightsquid/ip2name.abils
14	libexec/lightsquid/ip2name.demo	6	libexec/lightsquid/ip2name.demo
15	libexec/lightsquid/ip2name.dhcp	7	libexec/lightsquid/ip2name.dhcp
Lines 75-89 Link Here
75	%%WWWDIR%%/common.pl	67	%%WWWDIR%%/common.pl
76	%%WWWDIR%%/lightparser.pl	68	%%WWWDIR%%/lightparser.pl
77	@exec %%CHOWN%% -R %%WWWOWN%%:%%WWWGRP%% %%WWWDIR%%	69	@exec %%CHOWN%% -R %%WWWOWN%%:%%WWWGRP%% %%WWWDIR%%
78	@dirrmtry %%WWWDIR%%/tpl/base/images	70	@dir %%WWWDIR%%/tpl/base/images
79	@dirrmtry %%WWWDIR%%/tpl/base	71	@dir %%WWWDIR%%/tpl/base
80	@dirrmtry %%WWWDIR%%/tpl/text	72	@dir %%WWWDIR%%/tpl/text
81	@dirrmtry %%WWWDIR%%/tpl	73	@dir %%WWWDIR%%/tpl
82	@dirrmtry %%WWWDIR%%/report	74	@dir %%WWWDIR%%/report
83	@dirrmtry %%WWWDIR%%	75	@dir %%WWWDIR%%
84	@group	76	@group
85	@owner	77	@owner
86	@dirrmtry %%DATADIR%%/lang
87	@dirrmtry %%DATADIR%%
88	@dirrmtry libexec/lightsquid
89	@dirrmtry %%ETCDIR%%