Wed Feb 25 11:43:54 2015 UTC ()
Changes 6.2.1:
This release adds support to common or combined squid log format and a new
Italian translation file. There's also a new configuration directive UserReport
to be able to remove any user related reports, statistics about URL and domains
will remain. The second new directive is ExcludedCodes to be able to exclude
some log entries following the TCP code returned.


(adam)
diff -r1.6 -r1.7 pkgsrc/www/squidanalyzer/Makefile
diff -r1.3 -r1.4 pkgsrc/www/squidanalyzer/PLIST
diff -r1.5 -r1.6 pkgsrc/www/squidanalyzer/distinfo
diff -r0 -r1.3 pkgsrc/www/squidanalyzer/patches/patch-Makefile.PL

cvs diff -r1.6 -r1.7 pkgsrc/www/squidanalyzer/Makefile (expand / switch to unified diff)

--- pkgsrc/www/squidanalyzer/Makefile 2014/10/29 09:31:24 1.6
+++ pkgsrc/www/squidanalyzer/Makefile 2015/02/25 11:43:54 1.7
@@ -1,26 +1,29 @@ @@ -1,26 +1,29 @@
1# $NetBSD: Makefile,v 1.6 2014/10/29 09:31:24 adam Exp $ 1# $NetBSD: Makefile,v 1.7 2015/02/25 11:43:54 adam Exp $
2 2
3DISTNAME= squidanalyzer-6.1 3DISTNAME= squidanalyzer-6.2-1
 4PKGNAME= squidanalyzer-6.2.1
4CATEGORIES= www 5CATEGORIES= www
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=squid-report/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=squid-report/}
6 7
7MAINTAINER= adam@NetBSD.org 8MAINTAINER= adam@NetBSD.org
8HOMEPAGE= http://squidanalyzer.darold.net/ 9HOMEPAGE= http://squidanalyzer.darold.net/
9COMMENT= Squid proxy native log analyser and reports generator 10COMMENT= Squid proxy native log analyser and reports generator
10LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
11 12
12DEPENDS+= p5-GD-Graph3d>=0.63:../../graphics/p5-GD-Graph3d 13DEPENDS+= p5-GD-Graph3d>=0.63:../../graphics/p5-GD-Graph3d
13 14
 15WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:R}
 16
14USE_LANGUAGES= # empty 17USE_LANGUAGES= # empty
15USE_TOOLS+= perl:run 18USE_TOOLS+= perl:run
16REPLACE_PERL+= squid-analyzer 19REPLACE_PERL+= squid-analyzer
17 20
18BUILD_DEFS+= VARBASE 21BUILD_DEFS+= VARBASE
19PERL5_PACKLIST= auto/SquidAnalyzer/.packlist 22PERL5_PACKLIST= auto/SquidAnalyzer/.packlist
20MAKE_PARAMS+= BINDIR=${PREFIX}/bin 23MAKE_PARAMS+= BINDIR=${PREFIX}/bin
21MAKE_PARAMS+= CONFDIR=${EGDIR} 24MAKE_PARAMS+= CONFDIR=${EGDIR}
22MAKE_PARAMS+= DESTDIR=${DESTDIR} 25MAKE_PARAMS+= DESTDIR=${DESTDIR}
23MAKE_PARAMS+= ETCDIR=${PKG_SYSCONFDIR} 26MAKE_PARAMS+= ETCDIR=${PKG_SYSCONFDIR}
24MAKE_PARAMS+= HTMLDIR=${PREFIX}/share/squidanalyzer 27MAKE_PARAMS+= HTMLDIR=${PREFIX}/share/squidanalyzer
25MAKE_PARAMS+= LOGFILE=${VARBASE}/squid/access.log 28MAKE_PARAMS+= LOGFILE=${VARBASE}/squid/access.log
26MAKE_PARAMS+= MANDIR=${PREFIX}/${PKGMANDIR}/man3 29MAKE_PARAMS+= MANDIR=${PREFIX}/${PKGMANDIR}/man3

cvs diff -r1.3 -r1.4 pkgsrc/www/squidanalyzer/PLIST (expand / switch to unified diff)

--- pkgsrc/www/squidanalyzer/PLIST 2014/09/12 10:21:42 1.3
+++ pkgsrc/www/squidanalyzer/PLIST 2015/02/25 11:43:54 1.4
@@ -1,22 +1,24 @@ @@ -1,22 +1,24 @@
1@comment $NetBSD: PLIST,v 1.3 2014/09/12 10:21:42 adam Exp $ 1@comment $NetBSD: PLIST,v 1.4 2015/02/25 11:43:54 adam Exp $
2bin/squid-analyzer 2bin/squid-analyzer
 3man/man3/squid-analyzer.3
3share/examples/squidanalyzer/excluded 4share/examples/squidanalyzer/excluded
4share/examples/squidanalyzer/included 5share/examples/squidanalyzer/included
5share/examples/squidanalyzer/lang/cs_CZ.txt 6share/examples/squidanalyzer/lang/cs_CZ.txt
6share/examples/squidanalyzer/lang/de_DE.txt 7share/examples/squidanalyzer/lang/de_DE.txt
7share/examples/squidanalyzer/lang/en_US.txt 8share/examples/squidanalyzer/lang/en_US.txt
8share/examples/squidanalyzer/lang/es_ES.txt 9share/examples/squidanalyzer/lang/es_ES.txt
9share/examples/squidanalyzer/lang/fr_FR.txt 10share/examples/squidanalyzer/lang/fr_FR.txt
 11share/examples/squidanalyzer/lang/it_IT.txt
10share/examples/squidanalyzer/lang/pl_PL.txt 12share/examples/squidanalyzer/lang/pl_PL.txt
11share/examples/squidanalyzer/lang/pt_BR.txt 13share/examples/squidanalyzer/lang/pt_BR.txt
12share/examples/squidanalyzer/lang/ru_RU.txt 14share/examples/squidanalyzer/lang/ru_RU.txt
13share/examples/squidanalyzer/lang/uk_UA.txt 15share/examples/squidanalyzer/lang/uk_UA.txt
14share/examples/squidanalyzer/network-aliases 16share/examples/squidanalyzer/network-aliases
15share/examples/squidanalyzer/squidanalyzer.conf 17share/examples/squidanalyzer/squidanalyzer.conf
16share/examples/squidanalyzer/user-aliases 18share/examples/squidanalyzer/user-aliases
17share/squidanalyzer/flotr2.js 19share/squidanalyzer/flotr2.js
18share/squidanalyzer/images/back-arrow.png 20share/squidanalyzer/images/back-arrow.png
19share/squidanalyzer/images/cursor.png 21share/squidanalyzer/images/cursor.png
20share/squidanalyzer/images/domain.png 22share/squidanalyzer/images/domain.png
21share/squidanalyzer/images/info.png 23share/squidanalyzer/images/info.png
22share/squidanalyzer/images/logo-squidanalyzer.png 24share/squidanalyzer/images/logo-squidanalyzer.png

cvs diff -r1.5 -r1.6 pkgsrc/www/squidanalyzer/distinfo (expand / switch to unified diff)

--- pkgsrc/www/squidanalyzer/distinfo 2014/10/29 09:31:24 1.5
+++ pkgsrc/www/squidanalyzer/distinfo 2015/02/25 11:43:54 1.6
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.5 2014/10/29 09:31:24 adam Exp $ 1$NetBSD: distinfo,v 1.6 2015/02/25 11:43:54 adam Exp $
2 2
3SHA1 (squidanalyzer-6.1.tar.gz) = 0334c2209845b2346cf057487cfd5ebfe1718083 3SHA1 (squidanalyzer-6.2-1.tar.gz) = 05ae554b0e695b9cffaf36fb1416286a4dee45c0
4RMD160 (squidanalyzer-6.1.tar.gz) = cea53b4c394d967221dade97f901c6d0c152108d 4RMD160 (squidanalyzer-6.2-1.tar.gz) = f0c5dc14d1138d26e425e72aaf61cf6eccb24f53
5Size (squidanalyzer-6.1.tar.gz) = 144400 bytes 5Size (squidanalyzer-6.2-1.tar.gz) = 147794 bytes
 6SHA1 (patch-Makefile.PL) = c9c916c929d8349c6d4aa0d904ec8783c54995d0

File Added: pkgsrc/www/squidanalyzer/patches/patch-Makefile.PL
$NetBSD: patch-Makefile.PL,v 1.3 2015/02/25 11:43:54 adam Exp $

Use CONFDIR (not ETCDIR) to install default configuration files.

--- Makefile.PL.orig	2015-02-25 11:27:53.000000000 +0000
+++ Makefile.PL
@@ -39,8 +39,8 @@ unless(open(INST, ">install_all.sh")) {
 }
 print INST qq{#!/bin/sh
 test ! -d "$DESTDIR$BINDIR" && mkdir -p $DESTDIR$BINDIR
-test ! -d "$DESTDIR$ETCDIR" && mkdir -p $DESTDIR$ETCDIR
-test ! -d "$DESTDIR$ETCDIR/lang" && mkdir -p $DESTDIR$ETCDIR/lang
+test ! -d "$DESTDIR$CONFDIR" && mkdir -p $DESTDIR$CONFDIR
+test ! -d "$DESTDIR$CONFDIR/lang" && mkdir -p $DESTDIR$CONFDIR/lang
 test ! -d "$DESTDIR$HTMLDIR" && mkdir -p $DESTDIR$HTMLDIR
 test ! -d "$DESTDIR$HTMLDIR/images" && mkdir -p $DESTDIR$HTMLDIR/images
 };
@@ -56,10 +56,10 @@ test ! -d "$DESTDIR$MANDIR" && mkdir -p 
 
 # Copy files that must not be overriden 
 for file in squidanalyzer.conf network-aliases user-aliases excluded included; do
-if [ -r $DESTDIR$ETCDIR/\$file ]; then
-	install -m 644 etc/\$file $DESTDIR$ETCDIR/\$file.sample
+if [ -r $DESTDIR$CONFDIR/\$file ]; then
+	install -m 644 etc/\$file $DESTDIR$CONFDIR/\$file.sample
 else
-	install -m 644 etc/\$file $DESTDIR$ETCDIR/\$file
+	install -m 644 etc/\$file $DESTDIR$CONFDIR/\$file
 fi
 done
 install -m 755 squid-analyzer $DESTDIR$BINDIR/
@@ -73,7 +73,7 @@ install -m 644 resources/images/back-arr
 install -m 644 resources/images/info.png $DESTDIR$HTMLDIR/images/
 install -m 644 resources/images/network.png $DESTDIR$HTMLDIR/images/
 install -m 644 resources/images/user.png $DESTDIR$HTMLDIR/images/
-install -m 644 lang/* $DESTDIR$ETCDIR/lang/
+install -m 644 lang/* $DESTDIR$CONFDIR/lang/
 pod2text doc/SquidAnalyzer.pod README
 pod2man doc/SquidAnalyzer.pod squid-analyzer.3
 };