Updated to 2.01.06. Changes include:

 o Fixed possible segfault condition in MangleAgent code on
   some malformed user agent names.
 o Fixed DNS to prevent hangs on blank and malformed hostnames.
 o Fixed problem calculating visits.
 o Fixed hostname lowercase problem (wasn't) when using DNS lookups.
 o Fixed problem with incremental datafile which could cause a read
   error under certain circumstances
 o Fixed problem with hash table node creation
 o Fixed problem where country graph could be produced incorrectly
 o Found and fixed a problem with a possible 32-bit wrap around

 o Added DailyGraph and DailyStats configuration options
 o Improved visit calculation logic to reduce 'false' counts
 o Added reverse DNS lookup capability.
 o Added ability to dump Sites, URL's, Referrers, User Agents,
   Usernames and Search Strings to tab delimited files
 o Added username analysis, based on usernames found in the log,
 o Added the ability to display ALL sites, URL's, Referrers,
   User Agents and Search Strings on a seperate HTML page
 o Added support for squid proxy logs
 o Completely modified the way the various TOP tables are handled
   and sorted
 o Added the ability to group domains automatically
 o Added user configurable search engine specification
 o Changed code to use the latest version of GD which supports PNG
 o Added ability to override log file to STDIN by use of '-'
 o Added gzipped logfile support.
 o Minor changes to search string code to increase accuracy.
 o Minor changes to URL parse code to allow additional characters.
 o Major changes to hash table node format for reduced memory usage.

8 files changed, 44 insertions, 100 deletions

diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index c64cdd3776a..6ab86b31b10 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -1,20 +1,20 @@
-# $NetBSD: Makefile,v 1.10 2000/04/26 03:21:35 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 2000/10/18 16:41:23 mjl Exp $
 #
 
-DISTNAME=	webalizer-1.30-04-src
-PKGNAME=	webalizer-1.30.04
+DISTNAME=	webalizer-2.01-06-src
+PKGNAME=	webalizer-2.01.06
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.mrunix.net/webalizer/ \
 		ftp://webalizer.dexa.org/pub/webalizer/ \
 		http://gd.tuwien.ac.at/infosys/logeval/webalizer/
-EXTRACT_SUFX=	.tgz
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	mjl@emsi.priv.at
+MAINTAINER=	mjl@netbsd.org
 HOMEPAGE=	http://www.mrunix.net/webalizer/
 
 DEPENDS+=	gd-1.*:../../graphics/gd
 
-WRKSRC=		${WRKDIR}/webalizer-1.30-04
+WRKSRC=		${WRKDIR}/webalizer-2.01-06
 
 USE_X11=	yes
 GNU_CONFIGURE=  yes
diff --git a/www/webalizer/files/md5 b/www/webalizer/files/md5
index c5ad3e8696c..f6d663a4584 100644
--- a/www/webalizer/files/md5
+++ b/www/webalizer/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 1999/08/26 20:25:43 mjl Exp $
+$NetBSD: md5,v 1.5 2000/10/18 16:41:25 mjl Exp $
 
-MD5 (webalizer-1.30-04-src.tgz) = f151b5e811bcdaa4ba72bca447f5cd44
+MD5 (webalizer-2.01-06-src.tar.bz2) = 9e52cd91de25c87e29b105e5b23dcdfc
diff --git a/www/webalizer/files/patch-sum b/www/webalizer/files/patch-sum
index 9b1b772b184..67e05340391 100644
--- a/www/webalizer/files/patch-sum
+++ b/www/webalizer/files/patch-sum
@@ -1,6 +1,5 @@
-$NetBSD: patch-sum,v 1.5 2000/04/26 03:21:36 hubertf Exp $
+$NetBSD: patch-sum,v 1.6 2000/10/18 16:41:26 mjl Exp $
 
-MD5 (patch-ab) = a540e90570b7c36969beca2d8f83591c
-MD5 (patch-ac) = fe80afca67e860607c72fdc415bb6db4
-MD5 (patch-ad) = 28c34ef333f3860a711ae5fe96c75a84
-MD5 (patch-ae) = 0d9a905175e38ec3d0e519b6093c7cfb
+MD5 (patch-ab) = 83e4d4d05275cb9b0e6074f86359c184
+MD5 (patch-ac) = 64084432ba18b9310a2492a0fbda523e
+MD5 (patch-ad) = 983c2afe39cd3373ec1a490d4d83f3a5
diff --git a/www/webalizer/patches/patch-ab b/www/webalizer/patches/patch-ab
index 51ac3178d80..b68897b755f 100644
--- a/www/webalizer/patches/patch-ab
+++ b/www/webalizer/patches/patch-ab
@@ -1,15 +1,13 @@
-$NetBSD: patch-ab,v 1.3 1999/08/26 20:25:43 mjl Exp $
+$NetBSD: patch-ab,v 1.4 2000/10/18 16:41:26 mjl Exp $
 
---- webalizer.c.orig	Thu Aug 26 21:34:36 1999
-+++ webalizer.c	Thu Aug 26 21:35:27 1999
-@@ -248,8 +248,8 @@
+--- webalizer.c.orig	Tue Oct 17 06:15:53 2000
++++ webalizer.c	Wed Oct 18 18:12:27 2000
+@@ -267,6 +267,8 @@
     /* check for default config file */
     if (!access("webalizer.conf",F_OK))
        get_config("webalizer.conf");
--   else if (!access("/etc/webalizer.conf",F_OK))
--      get_config("/etc/webalizer.conf");
-+   else if (!access(PREFIX "/etc/webalizer.conf",F_OK))
++   else if (!access(PREFIX "/etc/webalizer.conf", F_OK))
 +      get_config(PREFIX "/etc/webalizer.conf");
+    else if (!access(tmp_buf,F_OK))
+       get_config(tmp_buf);
  
-    /* get command line options */
-    opterr = 0;     /* disable parser errors */
diff --git a/www/webalizer/patches/patch-ac b/www/webalizer/patches/patch-ac
index 02509253118..a200787c31c 100644
--- a/www/webalizer/patches/patch-ac
+++ b/www/webalizer/patches/patch-ac
@@ -1,22 +1,16 @@
-$NetBSD: patch-ac,v 1.3 1999/08/26 20:25:44 mjl Exp $
+$NetBSD: patch-ac,v 1.4 2000/10/18 16:41:26 mjl Exp $
 
---- webalizer.1.orig	Thu Aug 26 21:34:42 1999
-+++ webalizer.1	Thu Aug 26 21:35:04 1999
-@@ -27,7 +27,7 @@
+--- webalizer.1.orig	Wed Oct 18 18:13:37 2000
++++ webalizer.1	Wed Oct 18 18:14:46 2000
+@@ -45,8 +45,9 @@
  A default configuration file is scanned for.  A file named
  \fIwebalizer.conf\fP is searched for in the current directory, and if
  found, it's configuration data is parsed.  If the file is not
 -present in the current directory,  the file \fI/etc/webalizer.conf\fP
-+present in the current directory,  the file \fI@@prefix@@/etc/webalizer.conf\fP
- is searched for and, if found, is used instead.
+-is searched for and, if found, is used instead.
++present in the current directory,  the files \fI@@prefix@@/etc/webalizer.conf\fP
++and then \fI/etc/webalizer.conf\fP
++are searched for and, if found, are used instead.
  .TP 8
  .B o
-@@ -515,7 +515,7 @@
- .TP 20
- .I webalizer.conf
- Default configuration file.  Is searched for in the current directory
--and if not found, in the \fI/etc/\fP directory.
-+and if not found, in the \fI@@prefix@@/etc/\fP directory.
- .TP 20
- .I webalizer.hist
- Monthly history file for previous 12 months.  (can be changed)
+ Any command line arguments given to the program are parsed.  This
diff --git a/www/webalizer/patches/patch-ad b/www/webalizer/patches/patch-ad
index 651bf556f10..ac3e6dc532a 100644
--- a/www/webalizer/patches/patch-ad
+++ b/www/webalizer/patches/patch-ad
@@ -1,30 +1,24 @@
-$NetBSD: patch-ad,v 1.5 2000/09/03 13:43:49 wiz Exp $
---- Makefile.in.orig	Mon Jun 28 22:12:40 1999
-+++ Makefile.in	Tue Apr 25 21:16:37 2000
-@@ -23,7 +23,7 @@
+$NetBSD: patch-ad,v 1.6 2000/10/18 16:41:26 mjl Exp $
+
+--- Makefile.in.orig	Wed Oct 18 18:15:54 2000
++++ Makefile.in	Wed Oct 18 18:18:05 2000
+@@ -23,8 +23,8 @@
  MANDIR = @mandir@/man1
+ ETCDIR = @ETCDIR@
  CC     = @CC@
- CFLAGS = @CFLAGS@
+-CFLAGS = @CFLAGS@
 -LIBS   = @LIBS@
++CFLAGS = @CFLAGS@ -DPREFIX=\"${PREFIX}\"
 +LIBS   = @LIBS@ -lpng -ljpeg -lz -lttf -lintl -lXpm -lX11
- DEFS   = @DEFS@
+ DEFS   = -DETCDIR=\"@ETCDIR@\" @DEFS@ @OPTS@
  LDFLAGS= @LDFLAGS@
  INSTALL= @INSTALL@
-@@ -41,7 +41,7 @@
- 	$(CC) ${LDFLAGS} -o webalizer webalizer.o graphs.o ${LIBS}
- 
- webalizer.o: webalizer.c webalizer.h webalizer_lang.h ctry.h
--	$(CC) ${CFLAGS} ${DEFS} -c webalizer.c
-+	$(CC) -DPREFIX=\"@prefix@\" ${CFLAGS} ${DEFS} -c webalizer.c
- 
- graphs.o: graphs.c graphs.h webalizer_lang.h
- 	$(CC) ${CFLAGS} ${DEFS} -I${GDLIB} -c graphs.c
-@@ -58,7 +58,7 @@
+@@ -86,7 +86,7 @@
  install: all
  	$(INSTALL_PROGRAM) webalizer ${BINDIR}/webalizer
  	$(INSTALL_DATA) webalizer.1 ${MANDIR}/webalizer.1
--	$(INSTALL_DATA) sample.conf /etc/webalizer.conf.sample
-+	$(INSTALL_DATA) sample.conf @prefix@/etc/webalizer.conf.sample
+-	$(INSTALL_DATA) sample.conf ${ETCDIR}/webalizer.conf.sample
++	$(INSTALL_DATA) sample.conf ${PREFIX}/etc/webalizer.conf.sample
+ 	rm -f ${BINDIR}/webazolver
+ 	@LN_S@ ${BINDIR}/webalizer ${BINDIR}/webazolver
  
- uninstall:
- 	rm -f ${MANDIR}/webalizer.1
diff --git a/www/webalizer/patches/patch-ae b/www/webalizer/patches/patch-ae
deleted file mode 100644
index 995ebe57275..00000000000
--- a/www/webalizer/patches/patch-ae
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ae,v 1.1 1999/08/27 09:07:48 agc Exp $
-
-Use the correct gd calls - use PNG, not GIF
-
---- graphs.c	1999/08/27 08:45:49	1.1
-+++ graphs.c	1999/08/27 08:47:58
-@@ -285,7 +285,7 @@
-    /* save gif image */
-    if ((out = fopen(fname, "wb")) != NULL)
-    {
--      gdImageGif(im, out);
-+      gdImagePng(im, out);
-       fclose(out);
-    }
-    /* deallocate memory */
-@@ -501,7 +501,7 @@
-    /* open file for writing */
-    if ((out = fopen(fname, "wb")) != NULL)
-    {
--      gdImageGif(im, out);
-+      gdImagePng(im, out);
-       fclose(out);
-    }
-    /* deallocate memory */
-@@ -614,7 +614,7 @@
-    /* save as gif file */
-    if ( (out = fopen(fname, "wb")) != NULL)
-    {
--      gdImageGif(im, out);
-+      gdImagePng(im, out);
-       fclose(out);
-    }
-    /* deallocate memory */
-@@ -700,7 +700,7 @@
-    /* save gif image */
-    if ((out = fopen(fname, "wb")) != NULL)
-    {
--      gdImageGif(im, out);
-+      gdImagePng(im, out);
-       fclose(out);
-    }
-    /* deallocate memory */
diff --git a/www/webalizer/pkg/PLIST b/www/webalizer/pkg/PLIST
index 43612603c34..47d232d6da1 100644
--- a/www/webalizer/pkg/PLIST
+++ b/www/webalizer/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 1999/03/23 21:16:06 mjl Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/10/18 16:41:26 mjl Exp $
 bin/webalizer
+bin/webazolver
 man/man1/webalizer.1
 etc/webalizer.conf.sample