upgrade to 3.11

4 files changed, 23 insertions, 30 deletions

diff --git a/www/analog/Makefile b/www/analog/Makefile
index da40c23cc763..a3c763da5bde 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -1,13 +1,14 @@
 # New ports collection makefile for: analog
-# Version required:     2.90beta4
+# http://www.statslab.cam.ac.uk/~sret1/analog/
+# Version required:     3.*
 # Date created:		October 21st 1996
 # Whom:			jfitz
 #
-# $Id: Makefile,v 1.12 1998/08/18 21:12:12 stb Exp $
+# $Id: Makefile,v 1.13 1999/01/13 04:00:06 scrappy Exp $
 #
 
-DISTNAME=       analog3.0
-PKGNAME=        analog-3.0
+DISTNAME=       analog3.11
+PKGNAME=        analog-3.11
 CATEGORIES=	www
 MASTER_SITES=   http://www.statslab.cam.ac.uk/~sret1/analog/ \
 		http://www.lightside.net/analog/ \
diff --git a/www/analog/distinfo b/www/analog/distinfo
index f9375140243e..2af2e9d603e6 100644
--- a/www/analog/distinfo
+++ b/www/analog/distinfo
@@ -1 +1 @@
-MD5 (analog3.0.tar.gz) = 871fce16c7029ffac42c77b645bb489c
+MD5 (analog3.11.tar.gz) = 7761f7d39f7997eb1ac89a4b3188c559
diff --git a/www/analog/files/patch-aa b/www/analog/files/patch-aa
index 83a92ed71e38..d970227f9d01 100644
--- a/www/analog/files/patch-aa
+++ b/www/analog/files/patch-aa
@@ -1,20 +1,20 @@
---- Makefile.orig	Mon Jun 15 19:57:00 1998
-+++ Makefile	Tue Aug 18 21:00:37 1998
+--- Makefile.orig	Sat Nov  7 00:27:05 1998
++++ Makefile	Tue Jan 19 21:21:20 1999
 @@ -2,10 +2,11 @@
  # 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.
 -CFLAGS = -O2       # options, e.g. for optimisation or ANSI compilation.
 +#CFLAGS = -O2       # options, e.g. for optimisation or ANSI compilation.
- #                    HP/UX cc needs -Aa
+ #                    HP/UX cc needs -Aa (HP/UX 9) or -Ae (HP/UX 10)
  #                    Some Linuces might need -I/usr/src/linux/include
 -DEFS =             # any of -DNOPIPES -DNODNS -DNODIRENT -DNOSTRCMP -DEBCDIC
 +#DEFS =             # any of -DNOPIPES -DNODNS -DNODIRENT -DNOSTRCMP -DEBCDIC
 +DEFS = -DPREFIX=\"$(PREFIX)\"
+ #                    Solaris 2 (SunOS 5) might need DEFS = -DNOSTRCMP
  OS = UNIX          # Operating system: UNIX, DOS, WIN32, MAC, OS2, VMS
  #                    RISCOS, BEOS, BS2000
- LIBS =             # extra libraries needed; Solaris 2 (SunOS 5) needs
-@@ -26,6 +27,8 @@
+@@ -27,6 +28,8 @@
  # Form interface options:
  FORMPROG = anlgform.cgi     # The program that processes the data from the form
  FORMSRC = anlgform.c        # The source code for that program
diff --git a/www/analog/files/patch-ac b/www/analog/files/patch-ac
index 1bfbbd0df206..80f6e25f4015 100644
--- a/www/analog/files/patch-ac
+++ b/www/analog/files/patch-ac
@@ -1,20 +1,12 @@
-*** analog.cfg.orig	Wed Apr  8 17:38:41 1998
---- analog.cfg	Wed Apr  8 22:57:45 1998
-***************
-*** 6,12 ****
-  #
-  #
-  # REQINCLUDE pages
-! LOGFILE logfile.log
-  HOSTNAME "[my organisation]"
-  LINKINCLUDE pages
-  UNCOMPRESS *.gz,*.Z "gzip -cd"
---- 6,13 ----
-  #
-  #
-  # REQINCLUDE pages
-! LOGFORMAT COMBINED
-! LOGFILE /var/log/httpd-access.log
-  HOSTNAME "[my organisation]"
-  LINKINCLUDE pages
-  UNCOMPRESS *.gz,*.Z "gzip -cd"
+--- analog.cfg.orig	Wed Nov 25 22:49:33 1998
++++ analog.cfg	Tue Jan 19 21:24:09 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
+ UNCOMPRESS *.gz,*.Z "gzip -cd"