- Update to 1.8

Approved by:	tabthorpe (mentor)

4 files changed, 24 insertions, 25 deletions

diff --git a/www/lightsquid/Makefile b/www/lightsquid/Makefile
index 125fc3f14997..ea9f70ec1de8 100644
--- a/www/lightsquid/Makefile
+++ b/www/lightsquid/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	lightsquid
-PORTVERSION=	1.7.1
-PORTREVISION=	1
+PORTVERSION=	1.8
 CATEGORIES=	www
 MASTER_SITES=	SF
 EXTRACT_SUFX=	.tgz
@@ -38,14 +37,15 @@ 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:
@@ -57,11 +57,11 @@ do-install:
 	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
diff --git a/www/lightsquid/distinfo b/www/lightsquid/distinfo
index 288ef1278616..c4f4a677b0d2 100644
--- a/www/lightsquid/distinfo
+++ b/www/lightsquid/distinfo
@@ -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
diff --git a/www/lightsquid/files/pkg-message.in b/www/lightsquid/files/pkg-message.in
index 7061cc047b87..f58aa558a34f 100644
--- a/www/lightsquid/files/pkg-message.in
+++ b/www/lightsquid/files/pkg-message.in
@@ -1,4 +1,4 @@
 ****************************************************************************
 %%NOTEWORK%%
-Edit %%PREFIX%%/etc/lightsquid/lightsquid.cfg to suit your needs.
+Edit %%ETCDIR%%/lightsquid.cfg to suit your needs.
 ****************************************************************************
diff --git a/www/lightsquid/pkg-plist b/www/lightsquid/pkg-plist
index 460386c878a9..aa1fe49844a7 100644
--- a/www/lightsquid/pkg-plist
+++ b/www/lightsquid/pkg-plist
@@ -1,14 +1,14 @@
-@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
@@ -58,7 +58,6 @@ libexec/lightsquid/ip2name.squidlist2
 %%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
@@ -73,7 +72,7 @@ libexec/lightsquid/ip2name.squidlist2
 %%WWWDIR%%/check-setup.pl
 %%WWWDIR%%/common.pl
 %%WWWDIR%%/lightparser.pl
-@dirrmtry etc/lightsquid
+@dirrmtry %%ETCDIR%%
 @dirrmtry libexec/lightsquid
 @dirrmtry %%DATADIR%%/lang
 @dirrmtry %%DATADIR%%