Index: head/www/lightsquid/Makefile
===================================================================
--- head/www/lightsquid/Makefile	(revision 237417)
+++ head/www/lightsquid/Makefile	(revision 237418)
@@ -1,89 +1,89 @@
 # New ports collection makefile for:	lightsquid
 # Date created:				24 Nov 2005
 # Whom:					Alexander Logvinov <info@logvinov.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	lightsquid
-PORTVERSION=	1.7.1
-PORTREVISION=	1
+PORTVERSION=	1.8
 CATEGORIES=	www
 MASTER_SITES=	SF
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	A light and fast web based squid proxy traffic analyser
 
 OPTIONS=	GDSUPPORT	"Graphics report support"	on
 
 NO_BUILD=	yes
 USE_PERL5_RUN=	yes
 
 CONFIGS=	lightsquid.cfg realname.cfg skipuser.cfg group.cfg
 REINPLACE_ARGS=	-i ""
 PORTDOCS=	gnugpl.txt install.txt readme.txt thanks.txt graph.txt logformat.txt \
 		templates.txt version.txt
 SUB_FILES=	pkg-message
 .if !defined(NOPORTDOCS)
 SUB_LIST+=	NOTEWORK="Read ${DOCSDIR}/readme.txt."
 .else
 SUB_LIST+=	NOTEWORK=""
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_GDSUPPORT)
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/var/www/html/${PORTNAME}/lang|${DATADIR}/lang|' \
-		-e 's|/var/www/html/${PORTNAME}\"|${PREFIX}/etc/${PORTNAME}\"|' \
-		-e 's|/var/www/html/${PORTNAME}/ip2name|${PREFIX}/libexec/${PORTNAME}|' \
-		-e 's|/var/www/html/${PORTNAME}|${WWWDIR}|' \
+	@${REINPLACE_CMD} -e 's|/var/www/html/${PORTNAME}/lang|${DATADIR}/lang| ; \
+		s|/var/www/html/${PORTNAME}\"|${ETCDIR}\"| ; \
+		s|/var/www/html/${PORTNAME}/ip2name|${PREFIX}/libexec/${PORTNAME}| ; \
+		s|/var/log/squid|${LOCALBASE}/squid/logs| ; \
+		s|/var/www/html/${PORTNAME}|${WWWDIR}|' \
 		${WRKSRC}/lightsquid.cfg
 	@${FIND} -E ${WRKSRC} -maxdepth 1 -regex '.*\.(cgi|pl)' | \
 		${XARGS} ${REINPLACE_CMD} \
-		 -e 's|${PORTNAME}.cfg|${PREFIX}/etc/${PORTNAME}/${PORTNAME}.cfg|g'
+		 -e 's|${PORTNAME}.cfg|${ETCDIR}/${PORTNAME}.cfg|g'
 	@${MV} ${WRKSRC}/group.cfg.src ${WRKSRC}/group.cfg
 
 do-install:
 	${MKDIR} ${DATADIR}/lang
 	cd ${WRKSRC}/lang && \
 	${FIND} . -type f -regex '.*\.lng' -exec \
 		${INSTALL_DATA} "{}" "${DATADIR}/lang/{}" \;
 	${MKDIR} ${PREFIX}/libexec/${PORTNAME}
 	cd ${WRKSRC}/ip2name && \
 	${FIND} . -type f -exec \
 		${INSTALL_DATA} "{}" "${PREFIX}/libexec/${PORTNAME}/{}" \;
-	${MKDIR} ${PREFIX}/etc/${PORTNAME}
+	${MKDIR} ${ETCDIR}
 .for i in ${CONFIGS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/etc/${PORTNAME}/${i}.dist
-.if !exists(${PREFIX}/etc/${PORTNAME}/${i})
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/etc/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${i} ${ETCDIR}/${i}.dist
+.if !exists(${ETCDIR}/${i})
+	${INSTALL_DATA} ${WRKSRC}/${i} ${ETCDIR}
 .endif
 .endfor
 	${MKDIR} ${WWWDIR}/report
 	${MKDIR} ${WWWDIR}/tpl
 	cd ${WRKSRC}/tpl && \
 	${FIND} . -type d ! -empty -exec \
 		${MKDIR} "${WWWDIR}/tpl/{}" \; && \
 	${FIND} . -type f -exec \
 		${INSTALL_DATA} "{}" "${WWWDIR}/tpl/{}" \;
 	cd ${WRKSRC} && \
 	${FIND} -E . -maxdepth 1 -regex '.*\.(cgi|pl)' -exec \
 		${INSTALL_SCRIPT} "{}" "${WWWDIR}/{}" \; && \
 		${INSTALL_DATA} .htaccess ${WWWDIR}/
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
 .endfor
 .endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/www/lightsquid/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.8
\ No newline at end of property
+1.9
\ No newline at end of property
Index: head/www/lightsquid/distinfo
===================================================================
--- head/www/lightsquid/distinfo	(revision 237417)
+++ head/www/lightsquid/distinfo	(revision 237418)
@@ -1,3 +1,3 @@
-MD5 (lightsquid-1.7.1.tgz) = 16e02500a947402e78fa789946116fc5
-SHA256 (lightsquid-1.7.1.tgz) = c6f669a7f8e0b25b38fb969f84f25e456d922be67eee8bb5686c3c804c2d0192
-SIZE (lightsquid-1.7.1.tgz) = 53979
+MD5 (lightsquid-1.8.tgz) = 310a7e16017290232183753d73f3559d
+SHA256 (lightsquid-1.8.tgz) = 691ec0167f1d12f9a9038f734921c30b4578b57e5e627ce61e7d4107154be073
+SIZE (lightsquid-1.8.tgz) = 60868

Property changes on: head/www/lightsquid/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/www/lightsquid/files/pkg-message.in
===================================================================
--- head/www/lightsquid/files/pkg-message.in	(revision 237417)
+++ head/www/lightsquid/files/pkg-message.in	(revision 237418)
@@ -1,4 +1,4 @@
 ****************************************************************************
 %%NOTEWORK%%
-Edit %%PREFIX%%/etc/lightsquid/lightsquid.cfg to suit your needs.
+Edit %%ETCDIR%%/lightsquid.cfg to suit your needs.
 ****************************************************************************

Property changes on: head/www/lightsquid/files/pkg-message.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/www/lightsquid/pkg-plist
===================================================================
--- head/www/lightsquid/pkg-plist	(revision 237417)
+++ head/www/lightsquid/pkg-plist	(revision 237418)
@@ -1,85 +1,84 @@
-@unexec if cmp -s %D/etc/lightsquid/group.cfg %D/etc/lightsquid/group.cfg.dist; then rm -f %D/etc/lightsquid/group.cfg; fi
-@unexec if cmp -s %D/etc/lightsquid/realname.cfg %D/etc/lightsquid/realname.cfg.dist; then rm -f %D/etc/lightsquid/realname.cfg; fi
-@unexec if cmp -s %D/etc/lightsquid/skipuser.cfg %D/etc/lightsquid/skipuser.cfg.dist; then rm -f %D/etc/lightsquid/skipuser.cfg; fi
-@unexec if cmp -s %D/etc/lightsquid/lightsquid.cfg %D/etc/lightsquid/lightsquid.cfg.dist; then rm -f %D/etc/lightsquid/lightsquid.cfg; fi
-etc/lightsquid/group.cfg.dist
+@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
-etc/lightsquid/lightsquid.cfg.dist
+%%ETCDIR%%/lightsquid.cfg.dist
 @exec [ -f %B/lightsquid.cfg ] || cp %B/%f %B/lightsquid.cfg
-etc/lightsquid/realname.cfg.dist
+%%ETCDIR%%/realname.cfg.dist
 @exec [ -f %B/realname.cfg ] || cp %B/%f %B/realname.cfg
-etc/lightsquid/skipuser.cfg.dist
+%%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
 libexec/lightsquid/ip2name.dns
 libexec/lightsquid/ip2name.ip
 libexec/lightsquid/ip2name.list
 libexec/lightsquid/ip2name.simple
 libexec/lightsquid/ip2name.smb
 libexec/lightsquid/ip2name.squidauth
 libexec/lightsquid/ip2name.squidlist
 libexec/lightsquid/ip2name.squidlist2
 %%DATADIR%%/lang/bg.lng
 %%DATADIR%%/lang/cz.lng
 %%DATADIR%%/lang/eng.lng
 %%DATADIR%%/lang/fr.lng
 %%DATADIR%%/lang/hu.lng
 %%DATADIR%%/lang/it.lng
 %%DATADIR%%/lang/pt_br.lng
 %%DATADIR%%/lang/ru-koi8.lng
 %%DATADIR%%/lang/ru.lng
 %%DATADIR%%/lang/sp.lng
 %%DATADIR%%/lang/ua.lng
 %%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/index.html
 %%WWWDIR%%/tpl/base/month_detail.html
 %%WWWDIR%%/tpl/base/topsites.html
 %%WWWDIR%%/tpl/base/user_detail.html
 %%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/group_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%%/fixreport.pl
 %%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
-@dirrmtry etc/lightsquid
+@dirrmtry %%ETCDIR%%
 @dirrmtry libexec/lightsquid
 @dirrmtry %%DATADIR%%/lang
 @dirrmtry %%DATADIR%%
 @dirrmtry %%WWWDIR%%/tpl/base/images
 @dirrmtry %%WWWDIR%%/tpl/base
 @dirrmtry %%WWWDIR%%/tpl/text
 @dirrmtry %%WWWDIR%%/tpl
 @dirrmtry %%WWWDIR%%/report
 @dirrmtry %%WWWDIR%%

Property changes on: head/www/lightsquid/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property