Updated to 1.30.04.

Major changes include:

 o Fixed minor bug that would allow incorrect site totals for the
   first day of the month under certain conditions.

 o Added Top Entry and Exit Page tables.

 o Added 'Group' labels.  Allows display of a specified label for
   grouped entries (in 'Top' tables).

 o Added 'Visits' totals.

 o Added Search String analysis.

 o Added native support for ftp logs (xferlog ala wu-ftpd).

 o Added background lines to graphs.

 o Added additonal 'Top' tables for SITES and URL's, sorted by
   KBytes instead of hits.

 o Added additional calculations for max/avg files, pages, visits
   and KBytes in monthly statistics.

 o Updated generated HTML code to fully comply with the HTML 4.0
   Transitional spec.  DOCTYPE header reflects this change as well.

 o Changed code to use 4 digit years in filenames.

 o Language files and documentation updated for new functions.

7 files changed, 48 insertions, 57 deletions

diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index dc5d56bd9c8..20fc6f8b0c5 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.5 1999/05/03 20:25:37 tv Exp $
+# $NetBSD: Makefile,v 1.6 1999/08/26 20:25:43 mjl Exp $
 #
 
-DISTNAME=	webalizer-1.22-03-src
-PKGNAME=	webalizer-1.22.03
+DISTNAME=	webalizer-1.30-04-src
+PKGNAME=	webalizer-1.30.04
 CATEGORIES=	www
-MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/ \
-		ftp://samhain.unix.cslab.tuwien.ac.at/pub/webalizer/
+MASTER_SITES=	ftp://www.mrunix.net/webalizer/ \
+		ftp://webalizer.dexa.org/pub/webalizer/ \
+		http://gd.tuwien.ac.at/infosys/logeval/webalizer/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	mjl@emsi.priv.at
@@ -13,10 +14,14 @@ HOMEPAGE=	http://www.mrunix.net/webalizer/
 
 DEPENDS=	gd-1.3p1:../../graphics/gd
 
-WRKSRC=		${WRKDIR}/webalizer-1.22-03
+WRKSRC=		${WRKDIR}/webalizer-1.30-04
+
+GNU_CONFIGURE=  yes
+CONFIGURE_ARGS= --with-gdlib=${PREFIX}/lib \
+		--with-gd=${PREFIX}/include/gd
 
 post-patch:
-	@for f in webalizer.c webalizer.1; do \
+	@for f in webalizer.1; do \
 	${SED} 's:@@prefix@@:'${PREFIX}':g' ${WRKSRC}/$$f >${WRKSRC}/$$f.new && \
 		 ${MV} ${WRKSRC}/$$f.new ${WRKSRC}/$$f; \
 	done
diff --git a/www/webalizer/files/md5 b/www/webalizer/files/md5
index 4811184d542..c5ad3e8696c 100644
--- a/www/webalizer/files/md5
+++ b/www/webalizer/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1999/04/09 20:19:11 mjl Exp $
+$NetBSD: md5,v 1.4 1999/08/26 20:25:43 mjl Exp $
 
-MD5 (webalizer-1.22-03-src.tgz) = dd5d45a7d68b5786937766dd2876d58d
+MD5 (webalizer-1.30-04-src.tgz) = f151b5e811bcdaa4ba72bca447f5cd44
diff --git a/www/webalizer/files/patch-sum b/www/webalizer/files/patch-sum
index 8c668a21a47..1c2da8397cd 100644
--- a/www/webalizer/files/patch-sum
+++ b/www/webalizer/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:19 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/08/26 20:25:43 mjl Exp $
 
-MD5 (patch-aa) = 689ef29e407ccd4dd25f369eefc6136d
-MD5 (patch-ab) = 9dab7ad0d81dfafbf1fc5be18c0a7c03
-MD5 (patch-ac) = 98420abaf3d22bc5033ca0f7ba70d580
+MD5 (patch-ab) = a540e90570b7c36969beca2d8f83591c
+MD5 (patch-ac) = fe80afca67e860607c72fdc415bb6db4
+MD5 (patch-ad) = bfe4091806bc07ba732c54752de72a64
diff --git a/www/webalizer/patches/patch-aa b/www/webalizer/patches/patch-aa
deleted file mode 100644
index 9f190d49618..00000000000
--- a/www/webalizer/patches/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-aa,v 1.3 1999/05/08 01:08:53 tv Exp $
-
---- Makefile.orig	Tue Mar  2 08:37:06 1999
-+++ Makefile	Tue Mar 23 21:49:01 1999
-@@ -17,14 +17,14 @@
- #LIBS   = -lgd -lm
- 
- # These for Linux (most GCC based systems)
--BINDIR = /usr/local/bin
--MANDIR = /usr/local/man/man1
-+BINDIR = ${PREFIX}/bin
-+MANDIR = ${PREFIX}/man/man1
- CC     = gcc
--CFLAGS = -O2 -Wall -fsigned-char
--LIBS   = -lgd -lm
-+CFLAGS = -O2 -Wall -fsigned-char -DPREFIX=\"${PREFIX}\"
-+LIBS   = -L${PREFIX}/lib -lgd -lm ${LDFLAGS}
- 
- # where are the GD header files?
--GDLIB  = /usr/local/include/gd
-+GDLIB  = ${PREFIX}/include/gd
- 
- # Shouldn't have to touch below here!
- 
-@@ -51,9 +51,9 @@
- install: all
- 	cp webalizer.1 ${MANDIR}/webalizer.1
- 	cp webalizer   ${BINDIR}/webalizer
--	cp sample.conf /etc/webalizer.conf.sample
-+	cp sample.conf ${PREFIX}/etc/webalizer.conf.sample
- 
- uninstall:
- 	rm -f ${MANDIR}/webalizer.1
- 	rm -f ${BINDIR}/webalizer
--	rm -f /etc/webalizer.conf.sample
-+	rm -f ${PREFIX}/etc/webalizer.conf.sample
diff --git a/www/webalizer/patches/patch-ab b/www/webalizer/patches/patch-ab
index 9b36cb706a6..51ac3178d80 100644
--- a/www/webalizer/patches/patch-ab
+++ b/www/webalizer/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 1999/03/23 21:16:06 mjl Exp $
+$NetBSD: patch-ab,v 1.3 1999/08/26 20:25:43 mjl Exp $
 
---- webalizer.c.orig	Tue Mar 23 21:50:47 1999
-+++ webalizer.c	Tue Mar 23 21:51:26 1999
-@@ -201,8 +201,8 @@
+--- webalizer.c.orig	Thu Aug 26 21:34:36 1999
++++ webalizer.c	Thu Aug 26 21:35:27 1999
+@@ -248,8 +248,8 @@
     /* check for default config file */
     if (!access("webalizer.conf",F_OK))
        get_config("webalizer.conf");
diff --git a/www/webalizer/patches/patch-ac b/www/webalizer/patches/patch-ac
index 9946c50dd55..02509253118 100644
--- a/www/webalizer/patches/patch-ac
+++ b/www/webalizer/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.2 1999/03/23 21:16:06 mjl Exp $
+$NetBSD: patch-ac,v 1.3 1999/08/26 20:25:44 mjl Exp $
 
---- webalizer.1.orig	Tue Mar 23 21:52:56 1999
-+++ webalizer.1	Tue Mar 23 21:53:35 1999
+--- webalizer.1.orig	Thu Aug 26 21:34:42 1999
++++ webalizer.1	Thu Aug 26 21:35:04 1999
 @@ -27,7 +27,7 @@
  A default configuration file is scanned for.  A file named
  \fIwebalizer.conf\fP is searched for in the current directory, and if
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.2 1999/03/23 21:16:06 mjl Exp $
  is searched for and, if found, is used instead.
  .TP 8
  .B o
-@@ -431,7 +431,7 @@
+@@ -515,7 +515,7 @@
  .TP 20
  .I webalizer.conf
  Default configuration file.  Is searched for in the current directory
diff --git a/www/webalizer/patches/patch-ad b/www/webalizer/patches/patch-ad
new file mode 100644
index 00000000000..af5b38cf0d7
--- /dev/null
+++ b/www/webalizer/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1 1999/08/26 20:25:44 mjl Exp $
+
+--- Makefile.in.orig	Tue Jun 29 07:12:40 1999
++++ Makefile.in	Thu Aug 26 22:16:11 1999
+@@ -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 @@
+ 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
+ 
+ uninstall:
+ 	rm -f ${MANDIR}/webalizer.1