Update "analog" package to version 3.31.

5 files changed, 70 insertions, 95 deletions

diff --git a/www/analog/Makefile b/www/analog/Makefile
index 59ee2afdd7f..3955acd1440 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 1999/05/29 10:31:06 tron Exp $
+# $NetBSD: Makefile,v 1.7 1999/06/20 10:46:15 tron Exp $
 # FreeBSD Id: Makefile,v 1.15 1999/03/15 02:01:27 steve Exp
 
-DISTNAME=       analog3.3
-PKGNAME=        analog-3.3
+DISTNAME=       analog3.31
+PKGNAME=        analog-3.31
 CATEGORIES=	www
 MASTER_SITES=   http://www.statslab.cam.ac.uk/~sret1/analog/ \
 		http://www.web42.com/analog/ \
diff --git a/www/analog/files/md5 b/www/analog/files/md5
index bea9a1e1c0b..41a2f3edeac 100644
--- a/www/analog/files/md5
+++ b/www/analog/files/md5
@@ -1,3 +1 @@
-$NetBSD: md5,v 1.4 1999/05/29 10:31:07 tron Exp $
-
-MD5 (analog3.3.tar.gz) = ff1ed8d18c6e41d4edcc8a7fb517bfff
+MD5 (analog3.31.tar.gz) = 30d93a68cf2a4702f6c2568e8a5095c3
diff --git a/www/analog/patches/patch-aa b/www/analog/patches/patch-aa
index 76da720d540..c05fd3b6dc6 100644
--- a/www/analog/patches/patch-aa
+++ b/www/analog/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 1999/05/29 10:31:07 tron Exp $
+$NetBSD: patch-aa,v 1.4 1999/06/20 10:46:16 tron Exp $
 
---- Makefile.orig	Wed May 19 13:07:25 1999
-+++ Makefile	Sat May 29 12:19:53 1999
-@@ -2,10 +2,10 @@
+--- Makefile.orig	Sat Jun 19 13:19:18 1999
++++ Makefile	Sun Jun 20 12:34:52 1999
+@@ -2,10 +2,13 @@
  # 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.
@@ -11,11 +11,14 @@ $NetBSD: patch-aa,v 1.3 1999/05/29 10:31:07 tron Exp $
  #                    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 = -DPREFIX=\"${PREFIX}\"
++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
  #                    Solaris 2 (SunOS 5) might need DEFS = -DNEED_STRCMP
-@@ -25,14 +25,14 @@
+@@ -25,14 +28,14 @@
  	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
diff --git a/www/analog/patches/patch-ab b/www/analog/patches/patch-ab
deleted file mode 100644
index 1dadca9fdda..00000000000
--- a/www/analog/patches/patch-ab
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-ab,v 1.2 1999/05/09 16:41:15 tron Exp $
-
-*** analhead.h.orig	Thu Apr  9 14:59:28 1998
---- analhead.h	Fri Apr 10 01:34:18 1998
-***************
-*** 5,10 ****
---- 5,13 ----
-  
-  #ifndef ANALHEAD
-  #define ANALHEAD
-+ #ifndef PREFIX
-+ #define PREFIX "/usr/local"
-+ #endif
-  
-  /*** The first few options -- up to LOGO -- are ones that you may want to
-       change before compiling the program for the first time. However, all of
-***************
-*** 18,25 ****
-  /* the URL of your host's home page, for linking to at the top of the
-     output; use "none" for no linking. */
-  
-! #define HTTPDIR "/usr/local/etc/httpd/"
-! #define ANALOGDIR HTTPDIR"analog/"
-  /* The directories where your HTTP stuff lives and where your analog stuff
-     lives. You don't really need these; they are just used in this file to
-     build up other filenames. Note how you can stick together names by
---- 21,27 ----
-  /* the URL of your host's home page, for linking to at the top of the
-     output; use "none" for no linking. */
-  
-! #define ANALOGDIR PREFIX"/lib/analog/"
-  /* The directories where your HTTP stuff lives and where your analog stuff
-     lives. You don't really need these; they are just used in this file to
-     build up other filenames. Note how you can stick together names by
-***************
-*** 29,39 ****
-  #define DOMAINSFILE ANALOGDIR"domains.tab"
-  /* the file where the domain definitions live; see docs/domfile.html */
-  
-! #define LOGFILE HTTPDIR"logs/access_log"
-  /* The name of the default logfile. Can be a list, separated by commas
-     (but no spaces), and can include wild cards. */
-  
-! #define IMAGEDIR "images/"
-  /* URL of the directory where the images for the graphical reports live.
-     The URL can be absolute, or relative to the output page: e.g., just the
-     empty string "" for the same directory as the output page. */
---- 31,41 ----
-  #define DOMAINSFILE ANALOGDIR"domains.tab"
-  /* the file where the domain definitions live; see docs/domfile.html */
-  
-! #define LOGFILE "/var/log/httpd-access.log"
-  /* The name of the default logfile. Can be a list, separated by commas
-     (but no spaces), and can include wild cards. */
-  
-! #define IMAGEDIR "/images/"
-  /* URL of the directory where the images for the graphical reports live.
-     The URL can be absolute, or relative to the output page: e.g., just the
-     empty string "" for the same directory as the output page. */
-***************
-*** 41,47 ****
-  #define LANGDIR ANALOGDIR"lang/"
-  /* Directory where the language files live. */
-  
-! #define DEFAULTCONFIGFILE ANALOGDIR"analog.cfg"
-  /* the name of the default configuration file; see README.html for a
-     description of this file. Use "none" for no configuration file. */
-  
---- 43,49 ----
-  #define LANGDIR ANALOGDIR"lang/"
-  /* Directory where the language files live. */
-  
-! #define DEFAULTCONFIGFILE PREFIX"/etc/analog.cfg"
-  /* the name of the default configuration file; see README.html for a
-     description of this file. Use "none" for no configuration file. */
-  
diff --git a/www/analog/pkg/PLIST b/www/analog/pkg/PLIST
index 20b8da03c00..6431f8e8217 100644
--- a/www/analog/pkg/PLIST
+++ b/www/analog/pkg/PLIST
@@ -1,15 +1,57 @@
-@comment $NetBSD: PLIST,v 1.6 1999/05/29 10:31:08 tron Exp $
+@comment $NetBSD: PLIST,v 1.7 1999/06/20 10:46:17 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/bara1.gif
+lib/analog/images/bara16.gif
+lib/analog/images/bara2.gif
+lib/analog/images/bara32.gif
+lib/analog/images/bara4.gif
+lib/analog/images/bara8.gif
+lib/analog/images/barb1.gif
+lib/analog/images/barb16.gif
+lib/analog/images/barb2.gif
+lib/analog/images/barb32.gif
+lib/analog/images/barb4.gif
+lib/analog/images/barb8.gif
+lib/analog/images/barc1.gif
+lib/analog/images/barc16.gif
+lib/analog/images/barc2.gif
+lib/analog/images/barc32.gif
+lib/analog/images/barc4.gif
+lib/analog/images/barc8.gif
+lib/analog/images/bard1.gif
+lib/analog/images/bard16.gif
+lib/analog/images/bard2.gif
+lib/analog/images/bard32.gif
+lib/analog/images/bard4.gif
+lib/analog/images/bard8.gif
+lib/analog/images/bare1.gif
+lib/analog/images/bare16.gif
+lib/analog/images/bare2.gif
+lib/analog/images/bare32.gif
+lib/analog/images/bare4.gif
+lib/analog/images/bare8.gif
+lib/analog/images/barf1.gif
+lib/analog/images/barf16.gif
+lib/analog/images/barf2.gif
+lib/analog/images/barf32.gif
+lib/analog/images/barf4.gif
+lib/analog/images/barf8.gif
+lib/analog/images/barg1.gif
+lib/analog/images/barg16.gif
+lib/analog/images/barg2.gif
+lib/analog/images/barg32.gif
+lib/analog/images/barg4.gif
+lib/analog/images/barg8.gif
+lib/analog/images/barh1.gif
+lib/analog/images/barh16.gif
+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/bar1.gif
-lib/analog/images/bar16.gif
-lib/analog/images/bar2.gif
-lib/analog/images/bar32.gif
-lib/analog/images/bar4.gif
-lib/analog/images/bar8.gif
 lib/analog/images/html2.gif
 lib/analog/lang/bra.lng
 lib/analog/lang/brh.lng
@@ -82,6 +124,14 @@ share/doc/analog/Readme.html
 share/doc/analog/acknow.html
 share/doc/analog/alias.html
 share/doc/analog/basiccmd.html
+share/doc/analog/bara8.gif
+share/doc/analog/barb8.gif
+share/doc/analog/barc8.gif
+share/doc/analog/bard8.gif
+share/doc/analog/bare8.gif
+share/doc/analog/barf8.gif
+share/doc/analog/barg8.gif
+share/doc/analog/barh8.gif
 share/doc/analog/cache.html
 share/doc/analog/compout.html
 share/doc/analog/custom.html