5 files changed, 31 insertions, 30 deletions

diff --git a/www/analog/Makefile b/www/analog/Makefile
index abc993d3438e..d01e7eb9b44e 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for: analog
 # http://www.statslab.cam.ac.uk/~sret1/analog/
-# Version required:     3.*
+# Version required:     4.*
 # Date created:		October 21st 1996
 # Whom:			jfitz
 #
 # $FreeBSD$
 #
 
-DISTNAME=       analog3.32
-PKGNAME=        analog-3.32
+DISTNAME=       analog4.0
+PKGNAME=        analog-4.0
 CATEGORIES=	www
 MASTER_SITES=   http://www.statslab.cam.ac.uk/~sret1/analog/ \
 		http://brendanr.simplenet.com/analog/ \
@@ -25,6 +25,7 @@ MAINTAINER=     ache@freebsd.org
 Y2K=		http://www.statslab.cam.ac.uk/~sret1/analog/
 
 MAKE_FLAGS=     -DPREFIX=${PREFIX} -f
+ALL_TARGET=     analog
 
 do-install:
 	install -d -o ${SHAREOWN} -g ${SHAREGRP} -m 555 \
diff --git a/www/analog/distinfo b/www/analog/distinfo
index 836761973e0b..adc7904ea376 100644
--- a/www/analog/distinfo
+++ b/www/analog/distinfo
@@ -1 +1 @@
-MD5 (analog3.32.tar.gz) = d3e53dd67409dcaccb4cf92d2f458c1a
+MD5 (analog4.0.tar.gz) = 9923d45c2cffbd1efc563be0a0f45dbb
diff --git a/www/analog/files/patch-aa b/www/analog/files/patch-aa
index 241af7985c45..88c825d62027 100644
--- a/www/analog/files/patch-aa
+++ b/www/analog/files/patch-aa
@@ -1,36 +1,30 @@
---- Makefile.orig	Wed Sep  1 17:24:44 1999
-+++ Makefile	Fri Sep 10 01:02:27 1999
+--- Makefile.orig	Sun Nov 14 17:17:21 1999
++++ Makefile	Thu Dec  9 06:48:56 1999
 @@ -1,11 +1,15 @@
- # Makefile for analog 3.32
+ # Makefile for analog 4.0
  # 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
++#CC = gcc           # which compiler to use: eg cc, acc, gcc. NB Different
  #                    compilers need different CFLAGS, e.g., -O instead of -O2.
 -CEXTRAFLAGS = -O2  # options, e.g. for optimisation or ANSI compilation.
 +#CEXTRAFLAGS = -O2  # options, e.g. for optimisation or ANSI compilation.
  #                    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 =             # any of -DNOPIPES -DNODNS -DNODIRENT -DNOOPEN -DEBCDIC ...
+-DEFS =             # any of -DNOPIPES -DNODNS -DNODIRENT -DNOOPEN -DNOREGEX ...
++#DEFS =             # any of -DNOPIPES -DNODNS -DNODIRENT -DNOOPEN -DNOREGEX ...
 +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
+ #                    ... -DEBCDIC -DNEED_STRCMP -DNEED_MEMMOVE ...
+ #                    ... -DNEED_STRTOUL -DNEED_DIFFTIME -DNEED_FLOATINGPOINT_H
  #                    Solaris 2 (SunOS 5) might need DEFS = -DNEED_STRCMP
-@@ -25,11 +29,13 @@
- 	macinput.o macstuff.o output.o output2.o process.o settings.o \
+@@ -25,7 +29,7 @@
+ 	input.o 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
+ HEADERS = anlghead.h anlghea2.h anlghea3.h anlghea4.h macdir.h
 -CFLAGS = $(CEXTRAFLAGS) $(DEFS) -D$(OS)
 +CFLAGS += $(CEXTRAFLAGS) $(DEFS) -D$(OS)
  
- # 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) $(CEXTRAFLAGS) $(OBJS) -o $(PROGRAM) $(LIBS)
diff --git a/www/analog/files/patch-ac b/www/analog/files/patch-ac
index 80f6e25f4015..198f56c837c8 100644
--- a/www/analog/files/patch-ac
+++ b/www/analog/files/patch-ac
@@ -1,12 +1,12 @@
---- 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
+--- analog.cfg.orig	Tue Nov 16 14:40:33 1999
++++ analog.cfg	Thu Dec  9 06:53:56 1999
+@@ -7,7 +7,8 @@
+ # There is a much more extensive configuration file in examples/big.cfg
  #
- # If you have a LOGFORMAT command it must go here, above the LOGFILE command.
--LOGFILE logfile.log
+ # If you need 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]"
+ # HOSTNAME "[my organisation]"
+ # REQINCLUDE pages
  LINKINCLUDE pages
- UNCOMPRESS *.gz,*.Z "gzip -cd"
diff --git a/www/analog/pkg-plist b/www/analog/pkg-plist
index a4f82322e15c..eae06416c97b 100644
--- a/www/analog/pkg-plist
+++ b/www/analog/pkg-plist
@@ -11,6 +11,7 @@ lib/analog/lang/cza.lng
 lib/analog/lang/czh.lng
 lib/analog/lang/dea.lng
 lib/analog/lang/deadom.tab
+lib/analog/lang/deform.html
 lib/analog/lang/deh.lng
 lib/analog/lang/dehdom.tab
 lib/analog/lang/dka.lng
@@ -70,11 +71,15 @@ lib/analog/lang/trh.lng
 lib/analog/lang/uk.lng
 lib/analog/lang/ukdom.tab
 lib/analog/lang/us.lng
-lib/analog/lang/yu.lng
+lib/analog/lang/usform.html
+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
 share/doc/analog/alias.html
+share/doc/analog/args.html
 share/doc/analog/bara8.gif
 share/doc/analog/barb1.gif
 share/doc/analog/barb32.gif
@@ -120,6 +125,7 @@ share/doc/analog/timereps.html
 share/doc/analog/update.html
 share/doc/analog/wasnew1.html
 share/doc/analog/wasnew2.html
+share/doc/analog/wasnew3.html
 share/doc/analog/webworks.html
 share/doc/analog/whatsnew.html
 share/doc/analog/whole.html