upgrade to 3.32

2 files changed, 9 insertions, 80 deletions

diff --git a/www/analog/files/patch-aa b/www/analog/files/patch-aa
index cdc9817ebd60..241af7985c45 100644
--- a/www/analog/files/patch-aa
+++ b/www/analog/files/patch-aa
@@ -1,7 +1,7 @@
---- Makefile.orig	Wed May 19 04:07:25 1999
-+++ Makefile	Thu Jun  3 13:35:15 1999
-@@ -1,11 +1,12 @@
- # Makefile for analog 3.3
+--- Makefile.orig	Wed Sep  1 17:24:44 1999
++++ Makefile	Fri Sep 10 01:02:27 1999
+@@ -1,11 +1,15 @@
+ # Makefile for analog 3.32
  # 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
 +CC ?= gcc           # which compiler to use: eg cc, acc, gcc. NB Different
@@ -12,11 +12,14 @@
  #                    -Ae (HP/UX 10);       BS2000/OSD requires -XLLML -XLLMK
 -DEFS =             # any of -DNOPIPES -DNODNS -DNODIRENT -DNOOPEN -DEBCDIC ...
 +#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,11 +26,13 @@
+@@ -25,11 +29,13 @@
  	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/files/patch-ab b/www/analog/files/patch-ab
deleted file mode 100644
index 5597d0e17fc8..000000000000
--- a/www/analog/files/patch-ab
+++ /dev/null
@@ -1,74 +0,0 @@
-*** 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. */
-