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.diff -r1.6 -r1.7 pkgsrc/www/squidanalyzer/Makefile
(adam)
@@ -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 | |||
3 | DISTNAME= squidanalyzer-6.1 | 3 | DISTNAME= squidanalyzer-6.2-1 | |
4 | PKGNAME= squidanalyzer-6.2.1 | |||
4 | CATEGORIES= www | 5 | CATEGORIES= www | |
5 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=squid-report/} | 6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=squid-report/} | |
6 | 7 | |||
7 | MAINTAINER= adam@NetBSD.org | 8 | MAINTAINER= adam@NetBSD.org | |
8 | HOMEPAGE= http://squidanalyzer.darold.net/ | 9 | HOMEPAGE= http://squidanalyzer.darold.net/ | |
9 | COMMENT= Squid proxy native log analyser and reports generator | 10 | COMMENT= Squid proxy native log analyser and reports generator | |
10 | LICENSE= gnu-gpl-v3 | 11 | LICENSE= gnu-gpl-v3 | |
11 | 12 | |||
12 | DEPENDS+= p5-GD-Graph3d>=0.63:../../graphics/p5-GD-Graph3d | 13 | DEPENDS+= p5-GD-Graph3d>=0.63:../../graphics/p5-GD-Graph3d | |
13 | 14 | |||
15 | WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:R} | |||
16 | ||||
14 | USE_LANGUAGES= # empty | 17 | USE_LANGUAGES= # empty | |
15 | USE_TOOLS+= perl:run | 18 | USE_TOOLS+= perl:run | |
16 | REPLACE_PERL+= squid-analyzer | 19 | REPLACE_PERL+= squid-analyzer | |
17 | 20 | |||
18 | BUILD_DEFS+= VARBASE | 21 | BUILD_DEFS+= VARBASE | |
19 | PERL5_PACKLIST= auto/SquidAnalyzer/.packlist | 22 | PERL5_PACKLIST= auto/SquidAnalyzer/.packlist | |
20 | MAKE_PARAMS+= BINDIR=${PREFIX}/bin | 23 | MAKE_PARAMS+= BINDIR=${PREFIX}/bin | |
21 | MAKE_PARAMS+= CONFDIR=${EGDIR} | 24 | MAKE_PARAMS+= CONFDIR=${EGDIR} | |
22 | MAKE_PARAMS+= DESTDIR=${DESTDIR} | 25 | MAKE_PARAMS+= DESTDIR=${DESTDIR} | |
23 | MAKE_PARAMS+= ETCDIR=${PKG_SYSCONFDIR} | 26 | MAKE_PARAMS+= ETCDIR=${PKG_SYSCONFDIR} | |
24 | MAKE_PARAMS+= HTMLDIR=${PREFIX}/share/squidanalyzer | 27 | MAKE_PARAMS+= HTMLDIR=${PREFIX}/share/squidanalyzer | |
25 | MAKE_PARAMS+= LOGFILE=${VARBASE}/squid/access.log | 28 | MAKE_PARAMS+= LOGFILE=${VARBASE}/squid/access.log | |
26 | MAKE_PARAMS+= MANDIR=${PREFIX}/${PKGMANDIR}/man3 | 29 | MAKE_PARAMS+= MANDIR=${PREFIX}/${PKGMANDIR}/man3 |
@@ -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 $ | |
2 | bin/squid-analyzer | 2 | bin/squid-analyzer | |
3 | man/man3/squid-analyzer.3 | |||
3 | share/examples/squidanalyzer/excluded | 4 | share/examples/squidanalyzer/excluded | |
4 | share/examples/squidanalyzer/included | 5 | share/examples/squidanalyzer/included | |
5 | share/examples/squidanalyzer/lang/cs_CZ.txt | 6 | share/examples/squidanalyzer/lang/cs_CZ.txt | |
6 | share/examples/squidanalyzer/lang/de_DE.txt | 7 | share/examples/squidanalyzer/lang/de_DE.txt | |
7 | share/examples/squidanalyzer/lang/en_US.txt | 8 | share/examples/squidanalyzer/lang/en_US.txt | |
8 | share/examples/squidanalyzer/lang/es_ES.txt | 9 | share/examples/squidanalyzer/lang/es_ES.txt | |
9 | share/examples/squidanalyzer/lang/fr_FR.txt | 10 | share/examples/squidanalyzer/lang/fr_FR.txt | |
11 | share/examples/squidanalyzer/lang/it_IT.txt | |||
10 | share/examples/squidanalyzer/lang/pl_PL.txt | 12 | share/examples/squidanalyzer/lang/pl_PL.txt | |
11 | share/examples/squidanalyzer/lang/pt_BR.txt | 13 | share/examples/squidanalyzer/lang/pt_BR.txt | |
12 | share/examples/squidanalyzer/lang/ru_RU.txt | 14 | share/examples/squidanalyzer/lang/ru_RU.txt | |
13 | share/examples/squidanalyzer/lang/uk_UA.txt | 15 | share/examples/squidanalyzer/lang/uk_UA.txt | |
14 | share/examples/squidanalyzer/network-aliases | 16 | share/examples/squidanalyzer/network-aliases | |
15 | share/examples/squidanalyzer/squidanalyzer.conf | 17 | share/examples/squidanalyzer/squidanalyzer.conf | |
16 | share/examples/squidanalyzer/user-aliases | 18 | share/examples/squidanalyzer/user-aliases | |
17 | share/squidanalyzer/flotr2.js | 19 | share/squidanalyzer/flotr2.js | |
18 | share/squidanalyzer/images/back-arrow.png | 20 | share/squidanalyzer/images/back-arrow.png | |
19 | share/squidanalyzer/images/cursor.png | 21 | share/squidanalyzer/images/cursor.png | |
20 | share/squidanalyzer/images/domain.png | 22 | share/squidanalyzer/images/domain.png | |
21 | share/squidanalyzer/images/info.png | 23 | share/squidanalyzer/images/info.png | |
22 | share/squidanalyzer/images/logo-squidanalyzer.png | 24 | share/squidanalyzer/images/logo-squidanalyzer.png |
@@ -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 | |||
3 | SHA1 (squidanalyzer-6.1.tar.gz) = 0334c2209845b2346cf057487cfd5ebfe1718083 | 3 | SHA1 (squidanalyzer-6.2-1.tar.gz) = 05ae554b0e695b9cffaf36fb1416286a4dee45c0 | |
4 | RMD160 (squidanalyzer-6.1.tar.gz) = cea53b4c394d967221dade97f901c6d0c152108d | 4 | RMD160 (squidanalyzer-6.2-1.tar.gz) = f0c5dc14d1138d26e425e72aaf61cf6eccb24f53 | |
5 | Size (squidanalyzer-6.1.tar.gz) = 144400 bytes | 5 | Size (squidanalyzer-6.2-1.tar.gz) = 147794 bytes | |
6 | SHA1 (patch-Makefile.PL) = c9c916c929d8349c6d4aa0d904ec8783c54995d0 |
$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
};