Updated awstats to 6.96.

New features/improvements:
* Fix security in awredir.pl script by adding a security key required by
  default.
* Enhance security of parameter sanitizing function.
* Add name of config file used to build data files inside data files header.
* Added details of version for Chrome, Opera, Safari and Konqueror browsers.
* Add AdobeAir detection.
* Major update of browsers, robots and search_engines databases (among them,
  the Bing search engine).
* Increase seriously bot detection.
* Add Brezhoneg language.
* Add a better way to detect Safari versions.
* Added subpages for geoip maxmind modules in awstats_buildstaticpages.

Fixes:
* Fix typo in polish language file
* awstats emmits ton of warnings with new geoipfree - ID: 2794728
* Fix: can detect robots with robots.txt url even if file is not root.
* Other minor fixes.

pkgsrc changes:
* Patch XML encoding problem when the AT&T searchbot is encountered.

5 files changed, 49 insertions, 25 deletions

diff --git a/www/awstats/Makefile b/www/awstats/Makefile
index 3da6025c252..5eb438c2bec 100644
--- a/www/awstats/Makefile
+++ b/www/awstats/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2009/09/19 00:05:02 minskim Exp $
+# $NetBSD: Makefile,v 1.42 2010/02/02 11:20:29 fhajny Exp $
 
-DISTNAME=	awstats-6.9
-PKGREVISION=	1
+DISTNAME=	awstats-6.95
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=awstats/}
 
diff --git a/www/awstats/PLIST b/www/awstats/PLIST
index d9fddf30cab..9653563c116 100644
--- a/www/awstats/PLIST
+++ b/www/awstats/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2009/06/14 22:00:18 joerg Exp $
+@comment $NetBSD: PLIST,v 1.16 2010/02/02 11:20:29 fhajny Exp $
 awstats/bin/awstats_buildstaticpages.pl
 awstats/bin/awstats_configure.pl
 awstats/bin/awstats_exportlib.pl
@@ -14,6 +14,7 @@ awstats/cgi-bin/lang/awstats-ba.txt
 awstats/cgi-bin/lang/awstats-be.txt
 awstats/cgi-bin/lang/awstats-bg.txt
 awstats/cgi-bin/lang/awstats-br.txt
+awstats/cgi-bin/lang/awstats-bzg.txt
 awstats/cgi-bin/lang/awstats-ca.txt
 awstats/cgi-bin/lang/awstats-cn.txt
 awstats/cgi-bin/lang/awstats-cy.txt
@@ -60,12 +61,15 @@ awstats/cgi-bin/lang/tooltips_f/awstats-tt-en.txt
 awstats/cgi-bin/lang/tooltips_f/awstats-tt-gr.txt
 awstats/cgi-bin/lang/tooltips_f/awstats-tt-is.txt
 awstats/cgi-bin/lang/tooltips_f/awstats-tt-it.txt
+awstats/cgi-bin/lang/tooltips_f/awstats-tt-ru.txt
 awstats/cgi-bin/lang/tooltips_m/awstats-tt-br.txt
+awstats/cgi-bin/lang/tooltips_m/awstats-tt-cz.txt
 awstats/cgi-bin/lang/tooltips_m/awstats-tt-en.txt
 awstats/cgi-bin/lang/tooltips_m/awstats-tt-fr.txt
 awstats/cgi-bin/lang/tooltips_m/awstats-tt-gr.txt
 awstats/cgi-bin/lang/tooltips_m/awstats-tt-is.txt
 awstats/cgi-bin/lang/tooltips_m/awstats-tt-it.txt
+awstats/cgi-bin/lang/tooltips_m/awstats-tt-ru.txt
 awstats/cgi-bin/lang/tooltips_w/awstats-tt-al.txt
 awstats/cgi-bin/lang/tooltips_w/awstats-tt-ba.txt
 awstats/cgi-bin/lang/tooltips_w/awstats-tt-bg.txt
@@ -141,6 +145,7 @@ awstats/icon/browser/alcatel.png
 awstats/icon/browser/amaya.png
 awstats/icon/browser/amigavoyager.png
 awstats/icon/browser/analogx.png
+awstats/icon/browser/android.png
 awstats/icon/browser/apt.png
 awstats/icon/browser/avant.png
 awstats/icon/browser/aweb.png
@@ -161,6 +166,7 @@ awstats/icon/browser/feeddemon.png
 awstats/icon/browser/feedreader.png
 awstats/icon/browser/firefox.png
 awstats/icon/browser/flashget.png
+awstats/icon/browser/flock.png
 awstats/icon/browser/fpexpress.png
 awstats/icon/browser/fresco.png
 awstats/icon/browser/freshdownload.png
@@ -174,6 +180,8 @@ awstats/icon/browser/hotjava.png
 awstats/icon/browser/httrack.png
 awstats/icon/browser/ibrowse.png
 awstats/icon/browser/icab.png
+awstats/icon/browser/icecat.png
+awstats/icon/browser/iceweasel.png
 awstats/icon/browser/java.png
 awstats/icon/browser/jetbrains_omea.png
 awstats/icon/browser/kmeleon.png
@@ -219,6 +227,7 @@ awstats/icon/browser/rssxpress.png
 awstats/icon/browser/safari.png
 awstats/icon/browser/sagem.png
 awstats/icon/browser/samsung.png
+awstats/icon/browser/seamonkey.png
 awstats/icon/browser/sharp.png
 awstats/icon/browser/sharpreader.png
 awstats/icon/browser/shrook.png
@@ -443,6 +452,7 @@ awstats/icon/flags/nl.png
 awstats/icon/flags/nn.png
 awstats/icon/flags/no.png
 awstats/icon/flags/np.png
+awstats/icon/flags/nr.png
 awstats/icon/flags/nt.png
 awstats/icon/flags/nu.png
 awstats/icon/flags/nz.png
@@ -529,6 +539,7 @@ awstats/icon/mime/flash.png
 awstats/icon/mime/glasses.png
 awstats/icon/mime/html.png
 awstats/icon/mime/image.png
+awstats/icon/mime/jnlp.png
 awstats/icon/mime/jscript.png
 awstats/icon/mime/lit.png
 awstats/icon/mime/notavailable.png
@@ -554,8 +565,11 @@ awstats/icon/os/amigaos.png
 awstats/icon/os/apple.png
 awstats/icon/os/atari.png
 awstats/icon/os/beos.png
+awstats/icon/os/blackberry.png
 awstats/icon/os/bsd.png
+awstats/icon/os/bsddflybsd.png
 awstats/icon/os/bsdfreebsd.png
+awstats/icon/os/bsdkfreebsd.png
 awstats/icon/os/bsdi.png
 awstats/icon/os/bsdnetbsd.png
 awstats/icon/os/bsdopenbsd.png
@@ -570,18 +584,25 @@ awstats/icon/os/gnu.png
 awstats/icon/os/hpux.png
 awstats/icon/os/ibm.png
 awstats/icon/os/imode.png
+awstats/icon/os/inferno.png
 awstats/icon/os/irix.png
+awstats/icon/os/j2me.png
 awstats/icon/os/java.png
 awstats/icon/os/kfreebsd.png
 awstats/icon/os/linux.png
+awstats/icon/os/linuxandroid.png
+awstats/icon/os/linuxasplinux.png
 awstats/icon/os/linuxcentos.png
 awstats/icon/os/linuxdebian.png
 awstats/icon/os/linuxfedora.png
 awstats/icon/os/linuxgentoo.png
 awstats/icon/os/linuxmandr.png
+awstats/icon/os/linuxpclinuxos.png
 awstats/icon/os/linuxredhat.png
 awstats/icon/os/linuxsuse.png
 awstats/icon/os/linuxubuntu.png
+awstats/icon/os/linuxvine.png
+awstats/icon/os/linuxzenwalk.png
 awstats/icon/os/mac.png
 awstats/icon/os/macintosh.png
 awstats/icon/os/macosx.png
@@ -591,20 +612,24 @@ awstats/icon/os/next.png
 awstats/icon/os/openbsd.png
 awstats/icon/os/os2.png
 awstats/icon/os/osf.png
+awstats/icon/os/palmos.png
 awstats/icon/os/psp.png
 awstats/icon/os/qnx.png
 awstats/icon/os/riscos.png
 awstats/icon/os/sco.png
 awstats/icon/os/sunos.png
+awstats/icon/os/syllable.png
 awstats/icon/os/symbian.png
 awstats/icon/os/unix.png
 awstats/icon/os/unknown.png
 awstats/icon/os/vms.png
 awstats/icon/os/webtv.png
+awstats/icon/os/wii.png
 awstats/icon/os/win.png
 awstats/icon/os/win16.png
 awstats/icon/os/win2000.png
 awstats/icon/os/win2003.png
+awstats/icon/os/win2008.png
 awstats/icon/os/win95.png
 awstats/icon/os/win98.png
 awstats/icon/os/wince.png
@@ -612,6 +637,7 @@ awstats/icon/os/winlong.png
 awstats/icon/os/winme.png
 awstats/icon/os/winnt.png
 awstats/icon/os/winunknown.png
+awstats/icon/os/winvista.png
 awstats/icon/os/winxbox.png
 awstats/icon/os/winxp.png
 awstats/icon/other/awstats_logo1.png
diff --git a/www/awstats/distinfo b/www/awstats/distinfo
index c709fa8a3b4..7f5c14b48c5 100644
--- a/www/awstats/distinfo
+++ b/www/awstats/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.24 2009/09/19 00:05:02 minskim Exp $
+$NetBSD: distinfo,v 1.25 2010/02/02 11:20:29 fhajny Exp $
 
-SHA1 (awstats-6.9.tar.gz) = 5ad8485eab04147b20adf5e8a7bdd5b6d3e2468b
-RMD160 (awstats-6.9.tar.gz) = 339af2df9c44713d632b4d1ae3d733132f7b0bab
-Size (awstats-6.9.tar.gz) = 1125906 bytes
+SHA1 (awstats-6.95.tar.gz) = 0eba9c3f834b05dbfc3392ce443140008fa12525
+RMD160 (awstats-6.95.tar.gz) = 62394005828e49d714200f907adf44fbe5cb8834
+Size (awstats-6.95.tar.gz) = 1138306 bytes
 SHA1 (patch-aa) = 1897d739b38b9c830f9af2211aa9fcb5e15a6795
 SHA1 (patch-ab) = 9ae474058a1803c1132b36448c1a6987c58e8823
-SHA1 (patch-ac) = 88879e7bf0b69ebb65be698fbdc687a5b16ebe07
+SHA1 (patch-ad) = 9c08fff3fcc3871a08c73c9509fbeb5baca06c09
diff --git a/www/awstats/patches/patch-ac b/www/awstats/patches/patch-ac
deleted file mode 100644
index c2d225d376b..00000000000
--- a/www/awstats/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2009/09/19 00:05:03 minskim Exp $
-
-CVS Revision 1.13
-Fix: awstats emits ton of warnings with new geoipfree - ID: 2794728
-
---- wwwroot/cgi-bin/plugins/geoipfree.pm.orig	2008-11-15 08:03:42.000000000 -0800
-+++ wwwroot/cgi-bin/plugins/geoipfree.pm
-@@ -51,7 +51,7 @@ sub Init_geoipfree {
- 	# ENTER HERE CODE TO DO INIT PLUGIN ACTIONS
- 	debug(" Plugin geoipfree: InitParams=$InitParams",1);
- 	%TmpDomainLookup=();
--	$gi = Geo::IPfree::new();
-+	$gi = Geo::IPfree->new();
- #	$gi->Faster; 	# Do not enable Faster as the Memoize module is rarely available
- 	# ----->
- 
diff --git a/www/awstats/patches/patch-ad b/www/awstats/patches/patch-ad
new file mode 100644
index 00000000000..f192a117937
--- /dev/null
+++ b/www/awstats/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1 2010/02/02 11:20:29 fhajny Exp $
+
+Fix ampersand encoding that breaks XHTML output, ID 1824230.
+
+--- wwwroot/cgi-bin/lib/search_engines.pm.orig	2008-11-15 14:58:02.000000000 +0000
++++ wwwroot/cgi-bin/lib/search_engines.pm
+@@ -904,7 +904,7 @@
+ 'excite','<a href="http://www.excite.com/" title="Search Engine Home Page [new window]" target="_blank">Excite</a>',
+ # Minor international search engines
+ 'google4counter','<a href="http://www.4-counter.com/" title="Search Engine Home Page [new window]" target="_blank">4-counter (Google)</a>',
+-'att','<a href="http://www.att.net/" title="Search Engine Home Page [new window]" target="_blank">AT&T search (powered by Google)</a>',
++'att','<a href="http://www.att.net/" title="Search Engine Home Page [new window]" target="_blank">AT&amp;T search (powered by Google)</a>',
+ 'bungeebonesdotcom','<a href="http://BungeeBones.com/search.php/" title="Search Engine Home Page [new window]" target="_blank">BungeeBones</a>',
+ 'go','Go.com',
+ 'askde','<a href="http://de.ask.com/" title="Search Engine Home Page [new window]" target="_blank">Ask Deutschland</a>',