Update "analog" package to version 6.0. Changes since version 5.32:

- Added Palm OS and Symbian OS to the Operating System Report.
- ISO 8601 extended date format available in language files.
- Another style sheet from James Reeves added to the examples directory.
- Analog is now distributed under the GNU General Public License.
- Fix problems building unzip.c on some platforms.
- Fix invalid XHTML output in non-European languages.
- The DNSTIMEOUT command is now off by default, because it breaks DNS lookups
  on many platforms.
- Recognises Firebird and Firefox as browsers.
- msnbot recognised as a robot in the default configuration.
- Patches for Mac.
- New Makefiles for Windows and RISC OS.
- Corrections to Finnish and Japanese language files.
- Reads zip and bzip2 logfiles without the need for an UNCOMPRESS command.
- Automatically strips ;params section from URLs (for example, jsessionid's).
- Recognises Windows Server 2003 in the Operating System Report.
- First user-contributed style sheets added to examples/css directory.
- Computer-readable output style now forces English output.
- More corrections to XML output style.
- Patches for OpenVMS and RISC OS.
- Basque language files.
- Country code .cs, formerly Czechoslovakia, is now Serbia and Montenegro.
  (Changed in English, French and German domains files, and removed from other
  domains files).
- Corrections to Swedish and Ukrainian language files, and to German domains
  files.
- Internal Search reports now work properly on case-insensitive file systems.
- Various bug fixes and improvements to XHTML and XML output styles.
- New command CSSPREFIX to add a prefix to the CSS class names used in the
  XHTML output.
- XML DTD distributed with the program.
- Language files for Simplified Chinese.
- This is the first beta test for version 6.
- Output code completely rewritten, to permit more output formats.
- New output formats XHTML and XML. (Thanks to Per Jessen for XML, and to
  Jeremy Wadsack for help with XHTML).
- XHTML is now the default output style.
- The barcharts are now made from png's not gif's by default.
- New command LOGOURL.

4 files changed, 21 insertions, 17 deletions

diff --git a/www/analog/Makefile b/www/analog/Makefile
index 4d58ed39abe..23e1f908c31 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.45 2004/12/03 15:15:12 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2004/12/19 22:00:10 tron Exp $
 
-DISTNAME=       analog-5.32
+DISTNAME=       analog-6.0
 CATEGORIES=	www
-PKGREVISION=	1
 MASTER_SITES=   ${HOMEPAGE} \
 		http://www.web42.com/analog/ \
-		http://www.statslab.cam.ac.uk/~sret1/analog/ \
-		http://www.gekko.de/analog/
+		http://analog.org/loganalysis/ \
+		http://www.gekko.de/analog/ /
 
 MAINTAINER=     tron@NetBSD.org
 HOMEPAGE=	http://www.analog.cx/
diff --git a/www/analog/PLIST b/www/analog/PLIST
index 8c857bfa26c..be9605b1e24 100644
--- a/www/analog/PLIST
+++ b/www/analog/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2002/12/02 12:08:43 tron Exp $
+@comment $NetBSD: PLIST,v 1.9 2004/12/19 22:00:10 tron Exp $
 bin/analog
 share/examples/analog.cfg
 @exec test -f %D/etc/analog.cfg || cp -p %D/%F %D/etc/analog.cfg
@@ -141,6 +141,7 @@ lib/analog/lang/README.txt
 lib/analog/lang/am.lng
 lib/analog/lang/amdom.tab
 lib/analog/lang/ba.lng
+lib/analog/lang/baq.lng
 lib/analog/lang/bg.lng
 lib/analog/lang/bgdesc.txt
 lib/analog/lang/bgdom.tab
@@ -158,6 +159,8 @@ lib/analog/lang/cata.lng
 lib/analog/lang/catadom.tab
 lib/analog/lang/catdom.tab
 lib/analog/lang/cn.lng
+lib/analog/lang/cndesc.txt
+lib/analog/lang/cndom.tab
 lib/analog/lang/cz.lng
 lib/analog/lang/cz1.lng
 lib/analog/lang/cz1a.lng
@@ -302,11 +305,12 @@ lib/analog/lang/yua.lng
 lib/analog/lang/yudom.tab
 man/man1/analog.1
 share/doc/analog/LicBSD.txt
-share/doc/analog/Licapach.txt
+share/doc/analog/Licbzip2.txt
 share/doc/analog/Licence.txt
 share/doc/analog/Licgd.txt
 share/doc/analog/Licpcre.txt
 share/doc/analog/Licpng.txt
+share/doc/analog/Licunzip.txt
 share/doc/analog/Liczlib.txt
 share/doc/analog/Readme.html
 share/doc/analog/acknow.html
@@ -363,6 +367,7 @@ share/doc/analog/wasnew1.html
 share/doc/analog/wasnew2.html
 share/doc/analog/wasnew3.html
 share/doc/analog/wasnew4.html
+share/doc/analog/wasnew5.html
 share/doc/analog/webworks.html
 share/doc/analog/whatsnew.html
 @dirrm share/doc/analog
diff --git a/www/analog/distinfo b/www/analog/distinfo
index 12b0d2b3eb7..c6117ea6d4f 100644
--- a/www/analog/distinfo
+++ b/www/analog/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.18 2004/08/04 10:51:38 tron Exp $
+$NetBSD: distinfo,v 1.19 2004/12/19 22:00:10 tron Exp $
 
-SHA1 (analog-5.32.tar.gz) = 81cd8c018663f905ce8c11175ca826f019765b4d
-Size (analog-5.32.tar.gz) = 1428349 bytes
-SHA1 (patch-aa) = 736bd5c425ec88b62d5d3873367bd3ee134b030c
+SHA1 (analog-6.0.tar.gz) = 17ad601f84e73c940883fb9b9e805879aac37493
+Size (analog-6.0.tar.gz) = 1553316 bytes
+SHA1 (patch-aa) = c057985dafcb1ae4bae41b0cc0ddb645c5b6916d
 SHA1 (patch-ab) = e59f91bedf08f4ece6b36ee06bc8d7d7742948c4
diff --git a/www/analog/patches/patch-aa b/www/analog/patches/patch-aa
index 9669c094070..d982b573d6f 100644
--- a/www/analog/patches/patch-aa
+++ b/www/analog/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.23 2002/12/02 12:08:43 tron Exp $
+$NetBSD: patch-aa,v 1.24 2004/12/19 22:00:10 tron Exp $
 
---- Makefile.orig	Sat Nov 30 16:36:10 2002
-+++ Makefile	Mon Dec  2 12:43:07 2002
-@@ -2,15 +2,20 @@
+--- Makefile.orig	2004-12-19 13:51:30.000000000 +0000
++++ Makefile	2004-12-19 21:45:24.000000000 +0000
+@@ -2,16 +2,20 @@
  # Please read docs/Readme.html, or http://www.analog.cx/
  # This is a general Unix-like Makefile: Makefiles for other OS's can be found
  #   in the "build" directory.
@@ -13,6 +13,7 @@ $NetBSD: patch-aa,v 1.23 2002/12/02 12:08:43 tron Exp $
 -CFLAGS = -O2    # options, e.g. for optimisation or ANSI compilation.
 +#MAKE = make        # which "make" to use
 +#CFLAGS = -O2    # options, e.g. for optimisation or ANSI compilation.
+ #                 Some OS's need -D_FILE_OFFSET_BITS=64 to support files > 2MB.
  #                 HP/UX cc needs CFLAGS = -Aa (HP/UX 9) or -Ae (HP/UX 10)
  #                 BeOS needs CFLAGS = -O2 -Wl,-L/boot/home/config/lib
  #                 BS2000/OSD needs CFLAGS = -XLLML -XLLMK
@@ -23,7 +24,6 @@ $NetBSD: patch-aa,v 1.23 2002/12/02 12:08:43 tron Exp $
 +	-DIMAGEDIR=\"/images/\" \
 +	-DLANGDIR=\"${PREFIX}/lib/analog/lang/\" \
 +	-DLOGFILE=\"/var/log/httpd-access.log\"
-+#		any combination of -DNOPIPES -DNODNS -DNODIRENT -DNOGLOB ...
  #                 ... -DNOOPEN -DNOFOLLOW -DNOALARM -DNOGRAPHICS -DNOGMTIME ...
  #                 ... -DEBCDIC -DUSE_PLAIN_SETJMP ...
- #                 ... -DHAVE_GD -DHAVE_ZLIB -DHAVE_PCRE ...
+ #                 ... -DHAVE_GD -DHAVE_ZLIB -DHAVE_BZLIB -DHAVE_PCRE ...