upgrade to 4.04

5 files changed, 17 insertions, 24 deletions

diff --git a/www/analog/Makefile b/www/analog/Makefile
index 540c77deea72..071bbfbf4c9c 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for: analog
-# http://www.statslab.cam.ac.uk/~sret1/analog/
+# http://www.analog.cx/
 # Version required:     4.*
 # Date created:		October 21st 1996
 # Whom:			jfitz
@@ -7,10 +7,9 @@
 # $FreeBSD$
 #
 
-DISTNAME=       analog4.03
-PKGNAME=        analog-4.03
+DISTNAME=       analog-4.04
 CATEGORIES=	www
-MASTER_SITES=   http://www.statslab.cam.ac.uk/~sret1/analog/ \
+MASTER_SITES=   http://www.analog.cx/ \
 		http://brendanr.simplenet.com/analog/ \
 		http://www.magma.ca/~brendanr/analog/ \
 		http://www.monash.edu.au/mirror/analog/ \
@@ -22,7 +21,7 @@ MASTER_SITES=   http://www.statslab.cam.ac.uk/~sret1/analog/ \
 
 MAINTAINER=     ache@freebsd.org
 
-Y2K=		http://www.statslab.cam.ac.uk/~sret1/analog/
+Y2K=            http://www.analog.cx/
 
 MAKE_FLAGS=     -DPREFIX=${PREFIX} -f
 ALL_TARGET=     analog
diff --git a/www/analog/distinfo b/www/analog/distinfo
index 57d2fce6f0cf..a51f8c5edcaf 100644
--- a/www/analog/distinfo
+++ b/www/analog/distinfo
@@ -1 +1 @@
-MD5 (analog4.03.tar.gz) = 0cb8a9f053f14f6fab73f3758cc3afce
+MD5 (analog-4.04.tar.gz) = 622dc3687d93be6e6477a558be3e134e
diff --git a/www/analog/files/patch-aa b/www/analog/files/patch-aa
index a9dcc20615ff..689248551786 100644
--- a/www/analog/files/patch-aa
+++ b/www/analog/files/patch-aa
@@ -1,15 +1,9 @@
---- Makefile.orig	Sat Jan 29 19:01:08 2000
-+++ Makefile	Tue Feb 15 22:20:06 2000
-@@ -1,11 +1,15 @@
- # Makefile for analog 4.02
- # 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
- #                    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
+--- Makefile.orig	Tue Mar 21 12:58:01 2000
++++ Makefile	Thu Mar 23 12:25:23 2000
+@@ -7,7 +7,11 @@
+ #                    -Ae (HP/UX 10);       BS2000/OSD requires -XLLML -XLLMK;
+ #                    NeXTSTEP apparently needs...
+ #                    CEXTRAFLAGS = -O2 -pipe -no-precomp 
 -DEFS =             # any of -DNOPIPES -DNODNS -DNODIRENT -DNOOPEN -DNOREGEX ...
 +#DEFS =             # any of -DNOPIPES -DNODNS -DNODIRENT -DNOOPEN -DNOREGEX ...
 +DEFS =  -DANALOGDIR=\"$(PREFIX)/lib/analog/\" \
@@ -19,12 +13,12 @@
  #                    ... -DEBCDIC -DNOGMTIME -DNEED_STRCMP -DNEED_MEMMOVE ...
  #                    ... -DNEED_STRTOUL -DNEED_DIFFTIME -DNEED_FLOATINGPOINT_H
  #                    Solaris 2 (SunOS 5) might need DEFS = -DNEED_STRCMP
-@@ -27,7 +31,7 @@
+@@ -29,7 +33,7 @@
  	input.o macinput.o macstuff.o output.o output2.o process.o settings.o \
  	sort.o tree.o utils.o win32.o
  HEADERS = anlghead.h anlghea2.h anlghea3.h anlghea4.h macdir.h
 -CFLAGS = $(CEXTRAFLAGS) $(DEFS) -D$(OS)
-+CFLAGS += $(CEXTRAFLAGS) $(DEFS) -D$(OS)
++CFLAGS += $(DEFS) -D$(OS)
  
  $(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 198f56c837c8..81a7605e0e7e 100644
--- a/www/analog/files/patch-ac
+++ b/www/analog/files/patch-ac
@@ -1,5 +1,5 @@
---- analog.cfg.orig	Tue Nov 16 14:40:33 1999
-+++ analog.cfg	Thu Dec  9 06:53:56 1999
+--- analog.cfg.orig	Tue Mar 21 12:58:01 2000
++++ analog.cfg	Thu Mar 23 12:27:27 2000
 @@ -7,7 +7,8 @@
  # There is a much more extensive configuration file in examples/big.cfg
  #
@@ -7,6 +7,6 @@
 -# LOGFILE logfile.log
 +LOGFORMAT COMBINED
 +LOGFILE /var/log/httpd-access.log
+ # OUTFILE outfile.html
  # HOSTNAME "[my organisation]"
  # REQINCLUDE pages
- LINKINCLUDE pages
diff --git a/www/analog/pkg-descr b/www/analog/pkg-descr
index 2e3d6b383208..9b3c871f1eea 100644
--- a/www/analog/pkg-descr
+++ b/www/analog/pkg-descr
@@ -5,4 +5,4 @@ logfiles and to produce attractive statistics.
 It was written by Stephen Turner (sret1@cam.ac.uk). For more details,
 see the Readme.html in /usr/local/share/analog or the website.
 
-WWW: http://www.statslab.cam.ac.uk/~sret1/analog/
+WWW: http://www.analog.cx/