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

- Regular expressions in ALIASes and INCLUDEs are now available on all
  platforms.
- Regular expressions are now Perl-syntax regular expressions. (Thanks to
  Philip Hazel's PCRE library.)
- "Repeated fields" in logfile header lines are now allowed.
- New commands STATUSINCLUDE and STATUSEXCLUDE, and 304ISSUCCESS.
- New output style PLAIN (like ASCII but with accents). New language
  files for this.
- In the computer-readable output, hierarchical reports now have an extra
  column, indicating the depth of the item in the hierarchy.
- All referrers now count as "pages." (See upgrade notes.)
- Configuration commands can be continued across lines with a backslash.
- New token %s in LOGFORMAT, allowing per-line selection of client-name
  and client-IP fields.
- New log format WEBSTAR-EXTENDED to allow for a small bug in WebSTAR's
  implementation of the extended log format.
- Korean language files. Also alternative Swedish translation.

5 files changed, 49 insertions, 33 deletions

diff --git a/www/analog/Makefile b/www/analog/Makefile
index 236ad9ed722..8d8415797f6 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2000/03/21 18:37:52 tron Exp $
+# $NetBSD: Makefile,v 1.15 2000/04/01 10:50:34 tron Exp $
 # FreeBSD Id: Makefile,v 1.15 1999/03/15 02:01:27 steve Exp
 
-DISTNAME=       analog-4.04
+DISTNAME=       analog-4.1
 CATEGORIES=	www
 MASTER_SITES=   ${HOMEPAGE} \
 		http://www.web42.com/analog/ \
diff --git a/www/analog/files/md5 b/www/analog/files/md5
index e1d51e9c289..973ed0f80aa 100644
--- a/www/analog/files/md5
+++ b/www/analog/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.11 2000/03/27 09:46:05 tron Exp $
+$NetBSD: md5,v 1.12 2000/04/01 10:50:34 tron Exp $
 
-MD5 (analog-4.04.tar.gz) = 622dc3687d93be6e6477a558be3e134e
+MD5 (analog-4.1.tar.gz) = d417106fa657f23c40bfff3679d1eab5
diff --git a/www/analog/files/patch-sum b/www/analog/files/patch-sum
index 9f07c983073..864aa5918dd 100644
--- a/www/analog/files/patch-sum
+++ b/www/analog/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.6 2000/03/21 18:37:53 tron Exp $
+$NetBSD: patch-sum,v 1.7 2000/04/01 10:50:34 tron Exp $
 
-MD5 (patch-aa) = a30435376abb745c4d35dd502cdf725a
+MD5 (patch-aa) = beb853b4ef988eb48fce1832ea659695
 MD5 (patch-ab) = f456ceae2e6ae4aa9782fd15fff2169b
diff --git a/www/analog/patches/patch-aa b/www/analog/patches/patch-aa
index 57501212a71..50ee56007c4 100644
--- a/www/analog/patches/patch-aa
+++ b/www/analog/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.8 2000/03/21 18:37:53 tron Exp $
+$NetBSD: patch-aa,v 1.9 2000/04/01 10:50:35 tron Exp $
 
---- 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
+--- Makefile.old	Thu Mar 30 15:59:16 2000
++++ Makefile	Sat Apr  1 12:42:47 2000
+@@ -1,8 +1,8 @@
+ # Makefile for analog 4.1
  # 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
@@ -13,12 +13,6 @@ $NetBSD: patch-aa,v 1.8 2000/03/21 18:37:53 tron Exp $
  #                    HP/UX cc requires CEXTRAFLAGS = -Aa (HP/UX 9) or ...
  #                    -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 =             # 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
 @@ -24,15 +24,26 @@
  #              SVR4 requires LIBS = -lsocket -lnsl
  #              DYNIX/ptx requires LIBS = -L/usr/lib/bsd-socket -lsocket -lnsl
@@ -36,9 +30,9 @@ $NetBSD: patch-aa,v 1.8 2000/03/21 18:37:53 tron Exp $
 +
  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 \
- 	sort.o tree.o utils.o win32.o
- HEADERS = anlghead.h anlghea2.h anlghea3.h anlghea4.h macdir.h
+ 	input.o macinput.o macstuff.o output.o output2.o pcre.o process.o \
+ 	settings.o sort.o tree.o utils.o win32.o
+ HEADERS = anlghead.h anlghea2.h anlghea3.h anlghea4.h macdir.h pcre.h
 -CFLAGS = $(CEXTRAFLAGS) $(DEFS) -D$(OS)
 +CFLAGS += $(DEFS) -D$(OS)
  
diff --git a/www/analog/pkg/PLIST b/www/analog/pkg/PLIST
index 38be1bf2f6e..f3dbdd87964 100644
--- a/www/analog/pkg/PLIST
+++ b/www/analog/pkg/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.11 2000/02/23 18:31:58 tron Exp $
+@comment $NetBSD: PLIST,v 1.12 2000/04/01 10:50:35 tron Exp $
 bin/analog
 etc/analog.cfg.default
 @exec cp -p %F %D/etc/analog.cfg
 @unexec rm -f %D/etc/analog.cfg
+lib/analog/images/analogo.gif
 lib/analog/images/bara1.gif
 lib/analog/images/bara16.gif
 lib/analog/images/bara2.gif
@@ -51,88 +52,110 @@ lib/analog/images/barh2.gif
 lib/analog/images/barh32.gif
 lib/analog/images/barh4.gif
 lib/analog/images/barh8.gif
-lib/analog/images/analogo.gif
 lib/analog/images/html2.gif
 lib/analog/lang/am.lng
 lib/analog/lang/amdom.tab
 lib/analog/lang/ba.lng
+lib/analog/lang/br.lng
 lib/analog/lang/bra.lng
 lib/analog/lang/brh.lng
+lib/analog/lang/cat.lng
 lib/analog/lang/cata.lng
 lib/analog/lang/cath.lng
 lib/analog/lang/cns.lng
 lib/analog/lang/cnt.lng
+lib/analog/lang/cz.lng
 lib/analog/lang/cz1250.lng
 lib/analog/lang/cza.lng
-lib/analog/lang/czh.lng
+lib/analog/lang/de.lng
 lib/analog/lang/dea.lng
 lib/analog/lang/deadom.tab
+lib/analog/lang/dedom.tab
 lib/analog/lang/deform.html
 lib/analog/lang/deh.lng
 lib/analog/lang/dehdom.tab
+lib/analog/lang/dk.lng
 lib/analog/lang/dka.lng
 lib/analog/lang/dkh.lng
+lib/analog/lang/es.lng
 lib/analog/lang/esa.lng
 lib/analog/lang/esadom.tab
+lib/analog/lang/esdom.tab
 lib/analog/lang/esh.lng
 lib/analog/lang/eshdom.tab
+lib/analog/lang/fi.lng
 lib/analog/lang/fia.lng
 lib/analog/lang/fih.lng
+lib/analog/lang/fr.lng
 lib/analog/lang/fra.lng
 lib/analog/lang/fradom.tab
+lib/analog/lang/frdom.tab
 lib/analog/lang/frform.html
 lib/analog/lang/frh.lng
 lib/analog/lang/frhdom.tab
+lib/analog/lang/gr.lng
 lib/analog/lang/gra.lng
-lib/analog/lang/grh.lng
 lib/analog/lang/hua.lng
 lib/analog/lang/huh.lng
 lib/analog/lang/is.lng
 lib/analog/lang/isa.lng
 lib/analog/lang/ish.lng
+lib/analog/lang/it.lng
 lib/analog/lang/ita.lng
 lib/analog/lang/itadom.tab
+lib/analog/lang/itdom.tab
 lib/analog/lang/ith.lng
 lib/analog/lang/ithdom.tab
 lib/analog/lang/jp.lng
 lib/analog/lang/jpform.html
 lib/analog/lang/kr.lng
 lib/analog/lang/lt.lng
+lib/analog/lang/lv.lng
 lib/analog/lang/lva.lng
-lib/analog/lang/lvh.lng
 lib/analog/lang/nl.lng
+lib/analog/lang/nla.lng
+lib/analog/lang/no.lng
+lib/analog/lang/no2.lng
 lib/analog/lang/no2a.lng
 lib/analog/lang/no2h.lng
 lib/analog/lang/noa.lng
 lib/analog/lang/noh.lng
+lib/analog/lang/pl.lng
 lib/analog/lang/pla.lng
 lib/analog/lang/pladom.tab
-lib/analog/lang/plh.lng
-lib/analog/lang/plhdom.tab
+lib/analog/lang/pldom.tab
+lib/analog/lang/pt.lng
 lib/analog/lang/pta.lng
 lib/analog/lang/pth.lng
 lib/analog/lang/ro.lng
+lib/analog/lang/ru.lng
 lib/analog/lang/rua.lng
-lib/analog/lang/ruh.lng
-lib/analog/lang/ruhdom.tab
+lib/analog/lang/rudom.tab
+lib/analog/lang/se.lng
 lib/analog/lang/sea.lng
 lib/analog/lang/seadom.tab
+lib/analog/lang/sealt.lng
+lib/analog/lang/sealta.lng
+lib/analog/lang/sealth.lng
+lib/analog/lang/sedom.tab
 lib/analog/lang/seh.lng
 lib/analog/lang/sehdom.tab
 lib/analog/lang/si.lng
 lib/analog/lang/si1250.lng
+lib/analog/lang/sk.lng
 lib/analog/lang/ska.lng
-lib/analog/lang/skh.lng
+lib/analog/lang/tr.lng
 lib/analog/lang/tra.lng
-lib/analog/lang/trh.lng
 lib/analog/lang/ua.lng
 lib/analog/lang/uk.lng
+lib/analog/lang/uka.lng
 lib/analog/lang/ukdom.tab
 lib/analog/lang/us.lng
+lib/analog/lang/usa.lng
 lib/analog/lang/usform.html
+lib/analog/lang/yu.lng
 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
@@ -175,7 +198,6 @@ 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
 share/doc/analog/startpc.html
 share/doc/analog/startux.html
 share/doc/analog/syntax.html