Updated to version 3.0

4 files changed, 59 insertions, 42 deletions

diff --git a/www/analog/Makefile b/www/analog/Makefile
index a14f8af74e1a..2f40535a9a16 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -3,11 +3,11 @@
 # Date created:		October 21st 1996
 # Whom:			jfitz
 #
-# $Id: Makefile,v 1.9 1997/05/07 19:51:22 ache Exp $
+# $Id: Makefile,v 1.11 1998/04/09 12:49:01 ache Exp $
 #
 
-DISTNAME=       analog2.90beta4
-PKGNAME=        analog-2.90b4
+DISTNAME=       analog3.0
+PKGNAME=        analog-3.0
 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 42e8425bc567..f9375140243e 100644
--- a/www/analog/distinfo
+++ b/www/analog/distinfo
@@ -1 +1 @@
-MD5 (analog2.90beta4.tar.gz) = 7ac7483f27071b7abde48219258f0db7
+MD5 (analog3.0.tar.gz) = 871fce16c7029ffac42c77b645bb489c
diff --git a/www/analog/files/patch-aa b/www/analog/files/patch-aa
index 2b47d09ef369..83a92ed71e38 100644
--- a/www/analog/files/patch-aa
+++ b/www/analog/files/patch-aa
@@ -1,37 +1,25 @@
-*** Makefile.orig	Wed Apr  8 17:37:54 1998
---- Makefile	Wed Apr  8 19:42:19 1998
-***************
-*** 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.
-  #                    HP/UX cc needs -Aa
-  #                    Some Linuces might need -I/usr/src/linux/include
-! DEFS =             # any of -DNOPIPES -DNODNS -DNODIRENT
-  OS = UNIX          # Operating system: UNIX, DOS, WIN32, MAC or VMS
-  LIBS =             # extra libraries needed; Solaris 2 (SunOS 5) needs
-  #                    LIBS = -lnsl and SCO Unix needs LIBS = -lsocket
---- 2,12 ----
-  # 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.
-  #                    HP/UX cc needs -Aa
-  #                    Some Linuces might need -I/usr/src/linux/include
-! #DEFS =             # any of -DNOPIPES -DNODNS -DNODIRENT
-! DEFS = -DPREFIX=\"$(PREFIX)\"
-  OS = UNIX          # Operating system: UNIX, DOS, WIN32, MAC or VMS
-  LIBS =             # extra libraries needed; Solaris 2 (SunOS 5) needs
-  #                    LIBS = -lnsl and SCO Unix needs LIBS = -lsocket
-***************
-*** 26,31 ****
---- 27,34 ----
-  FORMSRC = analform.c        # The source code for that program
-  FORMHTML = analogform.html  # Where the form itself will go
-  FORMOPTS =                  # Extra analog options when constructing the form
-+ 
-+ all: $(PROGRAM)
-  
-  $(PROGRAM): $(OBJS) $(HEADERS) Makefile
-  	$(CC) $(CFLAGS) $(OBJS) -o $(PROGRAM) $(LIBS)
+--- Makefile.orig	Mon Jun 15 19:57:00 1998
++++ Makefile	Tue Aug 18 21:00:37 1998
+@@ -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
+ #                    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)\"
+ 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 @@
+ # Form interface options:
+ FORMPROG = anlgform.cgi     # The program that processes the data from the form
+ FORMSRC = anlgform.c        # The source code for that program
++
++all:	$(PROGRAM)
+ 
+ $(PROGRAM): $(OBJS) $(HEADERS) Makefile
+ 	$(CC) $(CFLAGS) $(OBJS) -o $(PROGRAM) $(LIBS)
diff --git a/www/analog/pkg-plist b/www/analog/pkg-plist
index 474e64dae168..734dc9073ff8 100644
--- a/www/analog/pkg-plist
+++ b/www/analog/pkg-plist
@@ -1,10 +1,37 @@
 bin/analog
 etc/analog.cfg
 lib/analog/domains.tab
+lib/analog/lang/bra.lng
+lib/analog/lang/brh.lng
+lib/analog/lang/cz1250.lng
+lib/analog/lang/cza.lng
+lib/analog/lang/czh.lng
+lib/analog/lang/dea.lng
+lib/analog/lang/deh.lng
+lib/analog/lang/dka.lng
+lib/analog/lang/dkh.lng
+lib/analog/lang/domdea.tab
+lib/analog/lang/domdeh.tab
+lib/analog/lang/domfra.tab
+lib/analog/lang/domfrh.tab
+lib/analog/lang/fra.lng
+lib/analog/lang/frh.lng
 lib/analog/lang/ita.lng
+lib/analog/lang/us.lng
+lib/analog/lang/hua.lng
+lib/analog/lang/huh.lng
+lib/analog/lang/pta.lng
+lib/analog/lang/pth.lng
+lib/analog/lang/ro.lng
+lib/analog/lang/sea.lng
+lib/analog/lang/seh.lng
+lib/analog/lang/si1250.lng
+lib/analog/lang/sia.lng
+lib/analog/lang/sih.lng
+lib/analog/lang/ska.lng
+lib/analog/lang/skh.lng
 lib/analog/lang/ith.lng
 lib/analog/lang/uk.lng
-lib/analog/lang/us.lng
 share/doc/analog/Licence.txt
 share/doc/analog/Readme.html
 share/doc/analog/acknow.html
@@ -33,6 +60,7 @@ share/doc/analog/othreps.html
 share/doc/analog/output.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
@@ -42,6 +70,7 @@ share/doc/analog/wasnew1.html
 share/doc/analog/wasnew2.html
 share/doc/analog/webworks.html
 share/doc/analog/whatsnew.html
+share/doc/analog/whole.html
 www/data/images/analogo.gif
 www/data/images/bar1.gif
 www/data/images/bar16.gif