Update "analog" package to version 4.04. Changes since version 4.03:

- The analog home page has moved to www.analog.cx
- New column d in non-time reports.
- The RUNTIME command now turns off the "Program started at" line as well as
  the "Running Time" line.
- Non-alphanumeric characters are now allowed in the REPORTORDER as separators.
- Correctly parses more APACHELOGFORMATs.
- Better detection of Windows 2000 in Operating System Report.
- Better warning messages when the erroneous command contained a space.
- Code for NeXTSTEP operating system.
- Better treatment of multibyte character sets.
- Icelandic language files. Corrections to Bosnian, French, Italian, Japanese &
  Swedish.

4 files changed, 24 insertions, 20 deletions

diff --git a/www/analog/Makefile b/www/analog/Makefile
index be94589b0ee..236ad9ed722 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2000/02/23 18:31:56 tron Exp $
+# $NetBSD: Makefile,v 1.14 2000/03/21 18:37:52 tron Exp $
 # FreeBSD Id: Makefile,v 1.15 1999/03/15 02:01:27 steve Exp
 
-DISTNAME=       analog4.03
-PKGNAME=        analog-4.03
+DISTNAME=       analog-4.04
 CATEGORIES=	www
 MASTER_SITES=   ${HOMEPAGE} \
 		http://www.web42.com/analog/ \
diff --git a/www/analog/files/md5 b/www/analog/files/md5
index 6e03226969f..9b5e4003b89 100644
--- a/www/analog/files/md5
+++ b/www/analog/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.9 2000/02/23 18:31:57 tron Exp $
+$NetBSD: md5,v 1.10 2000/03/21 18:37:53 tron Exp $
 
-MD5 (analog4.03.tar.gz) = 0cb8a9f053f14f6fab73f3758cc3afce
+MD5 (analog-4.04.tar.gz) = 54c28d84f68e4ad85c3e6251c609a94e
diff --git a/www/analog/files/patch-sum b/www/analog/files/patch-sum
index 8a6414605a9..9f07c983073 100644
--- a/www/analog/files/patch-sum
+++ b/www/analog/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.5 2000/02/23 18:31:57 tron Exp $
+$NetBSD: patch-sum,v 1.6 2000/03/21 18:37:53 tron Exp $
 
-MD5 (patch-aa) = 5f8c0606a050513f3bf74d0f49ff0dcb
+MD5 (patch-aa) = a30435376abb745c4d35dd502cdf725a
 MD5 (patch-ab) = f456ceae2e6ae4aa9782fd15fff2169b
diff --git a/www/analog/patches/patch-aa b/www/analog/patches/patch-aa
index a8c82b5250f..57501212a71 100644
--- a/www/analog/patches/patch-aa
+++ b/www/analog/patches/patch-aa
@@ -1,25 +1,25 @@
-$NetBSD: patch-aa,v 1.7 2000/02/23 18:31:58 tron Exp $
+$NetBSD: patch-aa,v 1.8 2000/03/21 18:37:53 tron Exp $
 
---- Makefile.orig	Sat Feb 12 19:18:08 2000
-+++ Makefile	Wed Feb 23 19:20:12 2000
-@@ -2,10 +2,14 @@
- # Please read docs/Readme.html, or http://www.statslab.cam.ac.uk/~sret1/analog/
- CC = gcc           # which compiler to use: eg cc, acc, gcc. NB Different
+--- Makefile.orig	Tue Mar 21 10:58:01 2000
++++ Makefile	Tue Mar 21 19:31:39 2000
+@@ -1,13 +1,13 @@
+ # Makefile for analog 4.04
+ # Please read docs/Readme.html, or http://www.analog.cx/
+-CC = gcc           # which compiler to use: eg cc, acc, gcc. NB Different
++#CC = gcc           # which compiler to use: eg cc, acc, gcc. NB Different
  #                    compilers need different CFLAGS, e.g., -O instead of -O2.
 -CEXTRAFLAGS = -O2  # options, e.g. for optimisation or ANSI compilation.
 +#CEXTRAFLAGS = -O2  # options, e.g. for optimisation or ANSI compilation.
  #                    HP/UX cc requires CEXTRAFLAGS = -Aa (HP/UX 9) or ...
- #                    -Ae (HP/UX 10);       BS2000/OSD requires -XLLML -XLLMK
+ #                    -Ae (HP/UX 10);       BS2000/OSD requires -XLLML -XLLMK;
+ #                    NeXTSTEP apparently needs...
+ #                    CEXTRAFLAGS = -O2 -pipe -no-precomp 
 -DEFS =             # any of -DNOPIPES -DNODNS -DNODIRENT -DNOOPEN -DNOREGEX ...
-+DEFS =	-DANALOGDIR=\"${PREFIX}/lib/analog/\" \
-+	-DLOGFILE=\"/var/log/httpd-access.log\" \
-+	-DIMAGEDIR=\"/images/\" \
-+	-DDEFAULTCONFIGFILE=\"${PREFIX}/etc/analog.cfg\"
-+             # any of -DNOPIPES -DNODNS -DNODIRENT -DNOOPEN -DNOREGEX ...
++#DEFS =             # any of -DNOPIPES -DNODNS -DNODIRENT -DNOOPEN -DNOREGEX ...
  #                    ... -DEBCDIC -DNOGMTIME -DNEED_STRCMP -DNEED_MEMMOVE ...
  #                    ... -DNEED_STRTOUL -DNEED_DIFFTIME -DNEED_FLOATINGPOINT_H
  #                    Solaris 2 (SunOS 5) might need DEFS = -DNEED_STRCMP
-@@ -22,15 +26,21 @@
+@@ -24,15 +24,26 @@
  #              SVR4 requires LIBS = -lsocket -lnsl
  #              DYNIX/ptx requires LIBS = -L/usr/lib/bsd-socket -lsocket -lnsl
  
@@ -29,6 +29,11 @@ $NetBSD: patch-aa,v 1.7 2000/02/23 18:31:58 tron Exp $
 +LIBS+= -lsocket -lnsl
 +.endif
 +
++DEFS =	-DANALOGDIR=\"${PREFIX}/lib/analog/\" \
++	-DLOGFILE=\"/var/log/httpd-access.log\" \
++	-DIMAGEDIR=\"/images/\" \
++	-DDEFAULTCONFIGFILE=\"${PREFIX}/etc/analog.cfg\"
++
  PROGRAM = analog
  OBJS = alias.o analog.o cache.o dates.o globals.o hash.o init.o init2.o \
  	input.o macinput.o macstuff.o output.o output2.o process.o settings.o \