Update "analog" package to version 4.0. Changes since version 3.32:

- Five new reports: Organisation Report, Operating System Report,
  Search Word Report, Search Query Report, Processing Time Report.
- Browser Summary improved (will change results).
- Form interface completely rewritten, and considerably simplified.
- Multiple *'s now allowed on left-hand side of ALIASes.
- Regular expressions allowed in INCLUDEs & EXCLUDEs, and ALIASes.
- The output INCLUDEs and EXCLUDEs now apply to the lower levels of a
  hierarchical report as well as the top level.
- New commands: CGI, STYLESHEET and ERRLINELENGTH.
- New column N in most reports.
- DEBUG C now reports which part of a corrupt logfile line is corrupt.
- Non-exact bytes are now displayed as, e.g., 47.68 Mbytes instead of
  48,832 kbytes. This should be less confusing.
- Timestamps added to PROGRESSFREQ reports.
- The DNS file has a new time encoding.
- Header files split up to make anlghead.h simpler.
- Form interfaces in German and U.S. English included.
- New documentation about search arguments.
- New examples directory.
- New licence. (Nearly the same, just clarified, and slightly loosened).

6 files changed, 33 insertions, 45 deletions

diff --git a/www/analog/Makefile b/www/analog/Makefile
index 84c7d43df71..4795813b6db 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 1999/10/07 17:41:59 tron Exp $
+# $NetBSD: Makefile,v 1.11 1999/11/16 21:27:40 tron Exp $
 # FreeBSD Id: Makefile,v 1.15 1999/03/15 02:01:27 steve Exp
 
-DISTNAME=       analog3.32
-PKGNAME=        analog-3.32
+DISTNAME=       analog4.0
+PKGNAME=        analog-4.0
 CATEGORIES=	www
-MASTER_SITES=   http://www.statslab.cam.ac.uk/~sret1/analog/ \
+MASTER_SITES=   ${HOMEPAGE} \
 		http://www.web42.com/analog/ \
 		http://ftp.sunet.se/pub/www/utilities/analog/
 
diff --git a/www/analog/files/md5 b/www/analog/files/md5
index cb36ba39a4a..81eaa92045d 100644
--- a/www/analog/files/md5
+++ b/www/analog/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.6 1999/09/02 20:16:47 tron Exp $
+$NetBSD: md5,v 1.7 1999/11/16 21:27:42 tron Exp $
 
-MD5 (analog3.32.tar.gz) = d3e53dd67409dcaccb4cf92d2f458c1a
+MD5 (analog4.0.tar.gz) = 9923d45c2cffbd1efc563be0a0f45dbb
diff --git a/www/analog/files/patch-sum b/www/analog/files/patch-sum
index 23837310139..63b1ccb13f5 100644
--- a/www/analog/files/patch-sum
+++ b/www/analog/files/patch-sum
@@ -1,4 +1,3 @@
-$NetBSD: patch-sum,v 1.2 1999/11/12 16:27:39 rh Exp $
+$NetBSD: patch-sum,v 1.3 1999/11/16 21:27:42 tron Exp $
 
-MD5 (patch-aa) = 52df033a9244f39dab6c69c8c53ee62b
-MD5 (patch-ac) = c846d6194e1bf92b84487fcd876504ca
+MD5 (patch-aa) = d28f2513c0156d616ad887e45eef3510
diff --git a/www/analog/patches/patch-aa b/www/analog/patches/patch-aa
index c05fd3b6dc6..c929227607e 100644
--- a/www/analog/patches/patch-aa
+++ b/www/analog/patches/patch-aa
@@ -1,34 +1,31 @@
-$NetBSD: patch-aa,v 1.4 1999/06/20 10:46:16 tron Exp $
+$NetBSD: patch-aa,v 1.5 1999/11/16 21:27:42 tron Exp $
 
---- Makefile.orig	Sat Jun 19 13:19:18 1999
-+++ Makefile	Sun Jun 20 12:34:52 1999
-@@ -2,10 +2,13 @@
+--- Makefile.orig	Tue Nov 16 19:50:24 1999
++++ Makefile	Tue Nov 16 19:53:03 1999
+@@ -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
  #                    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.
++#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
--DEFS =             # any of -DNOPIPES -DNODNS -DNODIRENT -DNOOPEN -DEBCDIC ...
-+DEFS =	-DANALOGDIR=\"${PREFIX}/lib/analog/\" \
-+	-DLOGFILE=\"/var/log/httpd-access.log\" \
-+	-DIMAGEDIR=\"/images/\" \
-+	-DDEFAULTCONFIGFILE=\"${PREFIX}/etc/analog.cfg\"
- #                    ... -DNEED_STRCMP -DNEED_MEMMOVE -DNEED_STRTOUL ...
- #                    ... -DNEED_DIFFTIME -DNEED_FLOATINGPOINT_H
+-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 ...
+ #                    ... -DEBCDIC -DNEED_STRCMP -DNEED_MEMMOVE ...
+ #                    ... -DNEED_STRTOUL -DNEED_DIFFTIME -DNEED_FLOATINGPOINT_H
  #                    Solaris 2 (SunOS 5) might need DEFS = -DNEED_STRCMP
-@@ -25,14 +28,14 @@
- 	macinput.o macstuff.o output.o output2.o process.o settings.o \
+@@ -25,10 +29,10 @@
+ 	input.o macinput.o macstuff.o output.o output2.o process.o settings.o \
  	sort.o tree.o utils.o win32.o
- HEADERS = analhead.h analhea2.h macdir.h
+ HEADERS = anlghead.h anlghea2.h anlghea3.h anlghea4.h macdir.h
 -CFLAGS = $(CEXTRAFLAGS) $(DEFS) -D$(OS)
 +CFLAGS += $(DEFS) -D$(OS)
  
- # Form interface options:
- FORMPROG = anlgform.cgi     # The program that processes the data from the form
- FORMSRC = anlgform.c        # The source code for that program
- 
  $(PROGRAM): $(OBJS) $(HEADERS) Makefile
 -	$(CC) $(CEXTRAFLAGS) $(OBJS) -o $(PROGRAM) $(LIBS)
 +	$(CC) $(OBJS) -o $(PROGRAM) $(LIBS)
diff --git a/www/analog/patches/patch-ac b/www/analog/patches/patch-ac
deleted file mode 100644
index d0e8664a669..00000000000
--- a/www/analog/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.3 1999/11/12 16:27:39 rh Exp $
-
---- analog.cfg.orig	Fri Nov 12 17:24:29 1999
-+++ analog.cfg	Fri Nov 12 17:24:29 1999
-@@ -8,7 +8,8 @@
- # REQINCLUDE pages
- #
- # If you have a LOGFORMAT command it must go here, above the LOGFILE command.
--LOGFILE logfile.log
-+LOGFORMAT COMBINED
-+LOGFILE /var/log/httpd-access.log
- HOSTNAME "[my organisation]"
- LINKINCLUDE pages
- REFLINKINCLUDE pages
diff --git a/www/analog/pkg/PLIST b/www/analog/pkg/PLIST
index 84acd71df0f..3e87c9df4ea 100644
--- a/www/analog/pkg/PLIST
+++ b/www/analog/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 1999/09/02 20:16:47 tron Exp $
+@comment $NetBSD: PLIST,v 1.9 1999/11/16 21:27:43 tron Exp $
 bin/analog
 etc/analog.cfg.default
 @exec cp -p %F %D/etc/analog.cfg
@@ -53,7 +53,6 @@ lib/analog/images/barh4.gif
 lib/analog/images/barh8.gif
 lib/analog/images/analogo.gif
 lib/analog/images/html2.gif
-lib/analog/lang/yu.lng
 lib/analog/lang/bra.lng
 lib/analog/lang/brh.lng
 lib/analog/lang/cata.lng
@@ -64,6 +63,7 @@ lib/analog/lang/cza.lng
 lib/analog/lang/czh.lng
 lib/analog/lang/dea.lng
 lib/analog/lang/deadom.tab
+lib/analog/lang/deform.html
 lib/analog/lang/deh.lng
 lib/analog/lang/dehdom.tab
 lib/analog/lang/dka.lng
@@ -123,11 +123,15 @@ lib/analog/lang/trh.lng
 lib/analog/lang/uk.lng
 lib/analog/lang/ukdom.tab
 lib/analog/lang/us.lng
-share/doc/analog/reports.html
+lib/analog/lang/usform.html
+lib/analog/lang/yua.lng
+lib/analog/lang/yudom.tab
+lib/analog/lang/yuh.lng
 share/doc/analog/Licence.txt
 share/doc/analog/Readme.html
 share/doc/analog/acknow.html
 share/doc/analog/alias.html
+share/doc/analog/args.html
 share/doc/analog/basiccmd.html
 share/doc/analog/bara8.gif
 share/doc/analog/barb1.gif
@@ -162,6 +166,7 @@ share/doc/analog/meaning.html
 share/doc/analog/othreps.html
 share/doc/analog/output.html
 share/doc/analog/quickref.html
+share/doc/analog/reports.html
 share/doc/analog/start.html
 share/doc/analog/startmac.html
 share/doc/analog/startos2.html
@@ -172,6 +177,7 @@ share/doc/analog/timereps.html
 share/doc/analog/update.html
 share/doc/analog/wasnew1.html
 share/doc/analog/wasnew2.html
+share/doc/analog/wasnew3.html
 share/doc/analog/webworks.html
 share/doc/analog/whatsnew.html
 share/doc/analog/whole.html