Attachment 155881 Details for Bug 199629 – Patch

[patch] Patch

lightsquid.patch (text/plain), 2.36 KB, created by Dmitry Marakasov on 2015-04-22 23:27:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2015-04-22 23:27:02 UTC

Size: 2.36 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 383387)
>+++ Makefile	(working copy)
>@@ -61,10 +61,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
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 383387)
>+++ pkg-plist	(working copy)
>@@ -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