From a197a3dc2ed22063d886afc4dfb2842953f24e13 Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 7 Apr 2008 07:21:00 +0000 Subject: Changes 6.7: New features/improvements: - Full support for -day option. To build different report for each day - Added virtualenamequot tag - Added option NotPageList - Addes .jobs and .mobi domains Fixes: - Minor bug in awstats_configure.pl Other/Documentation: - Updated some language files. - Updated browsers database. --- www/awstats/Makefile | 39 +++++++++++++++++++-------------------- www/awstats/PLIST | 5 +---- www/awstats/distinfo | 12 ++++++------ www/awstats/patches/patch-aa | 6 +++--- www/awstats/patches/patch-ab | 24 +++++++++++------------- 5 files changed, 40 insertions(+), 46 deletions(-) (limited to 'www') diff --git a/www/awstats/Makefile b/www/awstats/Makefile index f8465c839e5..1884c233765 100644 --- a/www/awstats/Makefile +++ b/www/awstats/Makefile @@ -1,25 +1,20 @@ -# $NetBSD: Makefile,v 1.34 2008/01/03 12:37:06 adrianp Exp $ -# +# $NetBSD: Makefile,v 1.35 2008/04/07 07:21:00 adam Exp $ -DISTNAME= awstats-6.6 -PKGREVISION= 4 +DISTNAME= awstats-6.7 CATEGORIES= www -MASTER_SITES= http://awstats.sourceforge.net/files/ -# awstats are in the habit of updating the tarball but not incrementing -# the version or name of the tarball. DIST_SUBDIR must be set like this -# to avoid checksum errors. -# -DIST_SUBDIR= ${PKGNAME} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=awstats/} MAINTAINER= minskim@NetBSD.org HOMEPAGE= http://awstats.sourceforge.net/ COMMENT= Free real-time logfile analyzer to get advanced web statistics -NO_BUILD= YES +NO_BUILD= yes -USE_TOOLS+= perl:run -REPLACE_PERL+= tools/*.pl \ - wwwroot/cgi-bin/*.pl +USE_TOOLS+= perl:run +REPLACE_PERL+= tools/*.pl +REPLACE_PERL+= wwwroot/cgi-bin/*.pl +REPLACE_PERL+= wwwroot/cgi-bin/plugins/*.pm +REPLACE_PERL+= wwwroot/classes/src/*.pl .include "../../mk/bsd.prefs.mk" .include "options.mk" @@ -53,13 +48,17 @@ SUBST_MESSAGE.conf= Fixing configuration files and scripts. CONF_FILES+= ${PREFIX}/share/examples/awstats/awstats.conf \ ${PKG_SYSCONFDIR}/awstats.model.conf +INSTALLATION_DIRS+= awstats +INSTALLATION_DIRS+= awstats/bin +INSTALLATION_DIRS+= awstats/cgi-bin +INSTALLATION_DIRS+= awstats/cgi-bin/plugins +INSTALLATION_DIRS+= share/doc/awstats +INSTALLATION_DIRS+= share/examples/awstats + +post-extract: + find ${WRKSRC} -name .cvsignore -exec rm {} \; + do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/awstats - ${INSTALL_SCRIPT_DIR} ${PREFIX}/awstats/bin - ${INSTALL_SCRIPT_DIR} ${PREFIX}/awstats/cgi-bin - ${INSTALL_DATA_DIR} ${PREFIX}/awstats/cgi-bin/plugins - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/awstats - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/awstats ${INSTALL_SCRIPT} ${WRKSRC}/tools/*.pl ${PREFIX}/awstats/bin ${INSTALL_SCRIPT} ${WRKSRC}/wwwroot/cgi-bin/*.pl \ ${PREFIX}/awstats/cgi-bin diff --git a/www/awstats/PLIST b/www/awstats/PLIST index cfd2901d98f..47f7df575b0 100644 --- a/www/awstats/PLIST +++ b/www/awstats/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2007/02/20 18:29:49 minskim Exp $ +@comment $NetBSD: PLIST,v 1.12 2008/04/07 07:21:00 adam Exp $ awstats/bin/awstats_buildstaticpages.pl awstats/bin/awstats_configure.pl awstats/bin/awstats_exportlib.pl @@ -512,7 +512,6 @@ awstats/icon/flags/za.png awstats/icon/flags/ze.png awstats/icon/flags/zm.png awstats/icon/flags/zw.png -awstats/icon/mime/.cvsignore awstats/icon/mime/ai.png awstats/icon/mime/archive.png awstats/icon/mime/audio.png @@ -541,7 +540,6 @@ awstats/icon/mime/unknown.png awstats/icon/mime/video.png awstats/icon/mime/wmv.png awstats/icon/mime/xls.png -awstats/icon/os/.cvsignore awstats/icon/os/aix.png awstats/icon/os/amigaos.png awstats/icon/os/apple.png @@ -649,7 +647,6 @@ share/doc/awstats/awstats_tools.html share/doc/awstats/awstats_upgrade.html share/doc/awstats/awstats_webmin.html share/doc/awstats/awstats_what.html -share/doc/awstats/images/.cvsignore share/doc/awstats/images/awstats.gif share/doc/awstats/images/awstats.ico share/doc/awstats/images/awstats.png diff --git a/www/awstats/distinfo b/www/awstats/distinfo index c2ddea7ed43..af48d10fbbc 100644 --- a/www/awstats/distinfo +++ b/www/awstats/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.19 2007/02/20 18:29:49 minskim Exp $ +$NetBSD: distinfo,v 1.20 2008/04/07 07:21:00 adam Exp $ -SHA1 (awstats-6.6nb4/awstats-6.6.tar.gz) = d5ad39ced9787c4b2453719906659f085ac77a34 -RMD160 (awstats-6.6nb4/awstats-6.6.tar.gz) = 5588e667948b6f739ff5f2d61b26a45c2d39e0da -Size (awstats-6.6nb4/awstats-6.6.tar.gz) = 1084101 bytes -SHA1 (patch-aa) = 46f1ee8be589cf0ff9d5dad90e9b014ae3954dcc -SHA1 (patch-ab) = e740af99580d2cb5d68e99ca4f8e08e71a46d9d9 +SHA1 (awstats-6.7.tar.gz) = 7dab4208441bce494bf1b3937242794a2328ace1 +RMD160 (awstats-6.7.tar.gz) = 5a84327871b65cad5cb6dbaded5c223660806953 +Size (awstats-6.7.tar.gz) = 1089638 bytes +SHA1 (patch-aa) = 78b3a3100d687f07e0bed7b677abc52b767b8598 +SHA1 (patch-ab) = df8961949160d172ab40569a414b52eb4a8b1f06 diff --git a/www/awstats/patches/patch-aa b/www/awstats/patches/patch-aa index efa29cc3b64..ea9674a42ca 100644 --- a/www/awstats/patches/patch-aa +++ b/www/awstats/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.7 2006/06/05 18:04:26 minskim Exp $ +$NetBSD: patch-aa,v 1.8 2008/04/07 07:21:00 adam Exp $ ---- wwwroot/cgi-bin/awstats.pl.orig 2006-06-05 00:22:30.000000000 -0700 +--- wwwroot/cgi-bin/awstats.pl.orig 2007-07-07 13:00:06.000000000 +0200 +++ wwwroot/cgi-bin/awstats.pl -@@ -1131,7 +1131,7 @@ sub Read_Config { +@@ -1141,7 +1141,7 @@ sub Read_Config { my $configdir=shift; my @PossibleConfigDir=(); diff --git a/www/awstats/patches/patch-ab b/www/awstats/patches/patch-ab index e1e6e31207e..2c83bf2758b 100644 --- a/www/awstats/patches/patch-ab +++ b/www/awstats/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.4 2006/05/16 18:13:55 minskim Exp $ +$NetBSD: patch-ab,v 1.5 2008/04/07 07:21:00 adam Exp $ ---- tools/awstats_configure.pl.orig 2006-02-08 13:26:14.000000000 -0800 +--- tools/awstats_configure.pl.orig 2007-04-02 20:30:52.000000000 +0200 +++ tools/awstats_configure.pl @@ -29,12 +29,12 @@ $AWSTATS_MODEL_CONFIG $AWSTATS_DIRDATA_PATH @@ -21,17 +21,15 @@ $NetBSD: patch-ab,v 1.4 2006/05/16 18:13:55 minskim Exp $ -@@ -62,7 +62,8 @@ use vars qw/ - 'C:/Program Files/Apache Group/Apache/conf/httpd.conf', +@@ -64,6 +64,7 @@ use vars qw/ '/etc/httpd/httpd.conf', '/usr/local/apache/conf/httpd.conf', --'/usr/local/apache2/conf/httpd.conf' -+'/usr/local/apache2/conf/httpd.conf', + '/usr/local/apache2/conf/httpd.conf', +'@PREFIX@/etc/httpd/httpd.conf', ); use vars qw/ -@@ -308,13 +309,13 @@ if ($OS eq 'linux') { +@@ -309,13 +310,13 @@ if ($OS eq 'linux') { $AWSTATS_PATH=`pwd`; $AWSTATS_PATH =~ s/[\r\n]//; $AWSTATS_PATH=~s/tools[\\\/]?$//; $AWSTATS_PATH=~s/[\\\/]$//; @@ -48,7 +46,7 @@ $NetBSD: patch-ab,v 1.4 2006/05/16 18:13:55 minskim Exp $ print "And then, run configure.pl from this location.\n"; print "Do you want to continue setup from this NON standard directory [yN] ? "; my $bidon=''; -@@ -323,23 +324,23 @@ if ($OS eq 'linux') { +@@ -324,23 +325,23 @@ if ($OS eq 'linux') { print "configure.pl aborted.\n"; exit 1; } @@ -79,7 +77,7 @@ $NetBSD: patch-ab,v 1.4 2006/05/16 18:13:55 minskim Exp $ print "And then, run configure.pl from this location.\n"; print "Do you want to continue setup from this NON standard directory [yN] ? "; my $bidon=''; -@@ -348,10 +349,10 @@ elsif ($OS eq 'macosx') { +@@ -349,10 +350,10 @@ elsif ($OS eq 'macosx') { print "configure.pl aborted.\n"; exit 1; } @@ -94,7 +92,7 @@ $NetBSD: patch-ab,v 1.4 2006/05/16 18:13:55 minskim Exp $ } } elsif ($OS eq 'windows') { -@@ -420,6 +421,7 @@ if (! scalar keys %ApacheConfPath) { +@@ -421,6 +422,7 @@ if (! scalar keys %ApacheConfPath) { print "\n".($bidon?"Now, enter":"Enter")." full config file path of your Web server.\n"; print "Example: /etc/httpd/httpd.conf\n"; print "Example: /usr/local/apache2/conf/httpd.conf\n"; @@ -102,7 +100,7 @@ $NetBSD: patch-ab,v 1.4 2006/05/16 18:13:55 minskim Exp $ print "Example: c:\\Program files\\apache group\\apache\\conf\\httpd.conf\n"; $bidon=''; while ($bidon ne 'none' && ! -f "$bidon") { -@@ -542,8 +544,8 @@ EOF +@@ -545,8 +547,8 @@ EOF # ----------------------------- my $modelfile=''; if ($OS eq 'linux') { @@ -113,7 +111,7 @@ $NetBSD: patch-ab,v 1.4 2006/05/16 18:13:55 minskim Exp $ } else { $modelfile="$AWSTATS_MODEL_CONFIG"; -@@ -551,7 +553,7 @@ if ($OS eq 'linux') { +@@ -554,7 +556,7 @@ if ($OS eq 'linux') { } } elsif ($OS eq "macosx") { @@ -122,7 +120,7 @@ $NetBSD: patch-ab,v 1.4 2006/05/16 18:13:55 minskim Exp $ } elsif ($OS eq 'windows') { $modelfile="$AWSTATS_PATH\\wwwroot\\cgi-bin\\awstats.model.conf"; } else { $modelfile="$AWSTATS_PATH\\wwwroot\\cgi-bin\\awstats.model.conf"; } -@@ -604,11 +606,11 @@ if ($bidon =~ /^y/i) { +@@ -607,11 +609,11 @@ if ($bidon =~ /^y/i) { if ($OS eq 'linux') { print "\n-----> Define config file path\n"; print "In which directory do you plan to store your config file(s) ?\n"; -- cgit v1.2.3