Attachment 156927 Details for Bug 199629 – patch timp

[patch] patch timp

lightsquid.patch (text/plain), 3.23 KB, created by Pavel Timofeev on 2015-05-19 07:36:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Timofeev

Created: 2015-05-19 07:36:32 UTC

Size: 3.23 KB

patch

obsolete

>diff -ruN /home/timp/lightsquid.orig/Makefile /usr/ports/www/lightsquid/Makefile
>--- /home/timp/lightsquid.orig/Makefile	2015-05-19 10:11:13.192238000 +0300
>+++ /usr/ports/www/lightsquid/Makefile	2015-05-19 10:25:30.949081000 +0300
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	lightsquid
> PORTVERSION=	1.8
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	www
> MASTER_SITES=	SF
> 
>@@ -13,8 +13,13 @@
> OPTIONS_DEFINE=		GD DOCS
> OPTIONS_DEFAULT=	GD
> 
>-USES=		perl5 tar:tgz
>+USES=		perl5 tar:tgz shebangfix
> USE_PERL5=	run
>+SHEBANG_FILES=	bigfiles.cgi check-setup.pl common.pl day_detail.cgi get.cgi graph.cgi \
>+		group_detail.cgi index.cgi lang/check_lng.pl lang/check_tpl_lng.pl \
>+		lightparser.pl lightsquid.cfg month_detail.cgi tools/fixreport.pl \
>+		tools/SiteAggregator/ReportExplorer.pl tools/SiteAggregator/SiteAgregator.pl \
>+		topsites.cgi user_detail.cgi user_month.cgi user_time.cgi whousesite.cgi
> NO_BUILD=	yes
> 
> PLIST_SUB+=	WWWOWN="${WWWOWN}" \
>@@ -61,10 +66,7 @@
> 		${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
>diff -ruN /home/timp/lightsquid.orig/pkg-plist /usr/ports/www/lightsquid/pkg-plist
>--- /home/timp/lightsquid.orig/pkg-plist	2015-05-19 10:11:13.979609000 +0300
>+++ /usr/ports/www/lightsquid/pkg-plist	2015-05-19 10:19:49.356786000 +0300
>@@ -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
>@@ -75,15 +67,11 @@
> %%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%%

Actions: View | Diff

Attachments on bug 199629: 155881 | 156927