upgrade to 3.3

4 files changed, 69 insertions, 55 deletions

diff --git a/www/analog/Makefile b/www/analog/Makefile
index 504ed535331e..bfa2351ff80c 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -4,11 +4,11 @@
 # Date created:		October 21st 1996
 # Whom:			jfitz
 #
-# $Id: Makefile,v 1.14 1999/01/19 18:33:13 ache Exp $
+# $Id: Makefile,v 1.15 1999/03/15 02:01:27 steve Exp $
 #
 
-DISTNAME=       analog3.11
-PKGNAME=        analog-3.11
+DISTNAME=       analog3.3
+PKGNAME=        analog-3.3
 CATEGORIES=	www
 MASTER_SITES=   http://www.statslab.cam.ac.uk/~sret1/analog/ \
 		http://brendanr.simplenet.com/analog/ \
@@ -33,8 +33,6 @@ do-install:
 		${PREFIX}/lib/analog/lang
 	install -d -o nobody -g nogroup -m 755 \
 		${PREFIX}/www/data/images
-	cd ${WRKSRC}/docs && \
-		${INSTALL_DATA} * ${PREFIX}/share/doc/analog
 	cd ${WRKSRC}/images && \
 		${INSTALL_DATA} * ${PREFIX}/www/data/images
 	cd ${WRKSRC}/lang && \
@@ -42,14 +40,6 @@ do-install:
 	cd ${WRKSRC} && \
 		${INSTALL_PROGRAM} analog ${PREFIX}/bin
 	cd ${WRKSRC} && \
-	for file in domains.tab ; do \
-	    if [ -f ${PREFIX}/lib/analog/$$file ] ; then \
-		${INSTALL_DATA} -m 644 $$file ${PREFIX}/lib/analog/$$file-dist ; \
-	    else \
-		${INSTALL_DATA} -m 644 $$file ${PREFIX}/lib/analog/$$file ; \
-	    fi ; \
-	done
-	cd ${WRKSRC} && \
 	for file in analog.cfg ; do \
 	    if [ -f ${PREFIX}/etc/$$file ] ; then \
 		${INSTALL_DATA} -m 644 $$file ${PREFIX}/etc/$$file-dist ; \
@@ -57,5 +47,9 @@ do-install:
 		${INSTALL_DATA} -m 644 $$file ${PREFIX}/etc/$$file ; \
 	    fi ; \
 	done
+.if !defined(NOPORTDOCS)
+	cd ${WRKSRC}/docs && \
+		${INSTALL_DATA} * ${PREFIX}/share/doc/analog
+.endif
 
 .include <bsd.port.mk>
diff --git a/www/analog/distinfo b/www/analog/distinfo
index 2af2e9d603e6..a94f40003de0 100644
--- a/www/analog/distinfo
+++ b/www/analog/distinfo
@@ -1 +1 @@
-MD5 (analog3.11.tar.gz) = 7761f7d39f7997eb1ac89a4b3188c559
+MD5 (analog3.3.tar.gz) = ff1ed8d18c6e41d4edcc8a7fb517bfff
diff --git a/www/analog/files/patch-aa b/www/analog/files/patch-aa
index d970227f9d01..31946897109a 100644
--- a/www/analog/files/patch-aa
+++ b/www/analog/files/patch-aa
@@ -1,20 +1,26 @@
---- Makefile.orig	Sat Nov  7 00:27:05 1998
-+++ Makefile	Tue Jan 19 21:21:20 1999
+--- Makefile.orig	Wed May 19 15:07:25 1999
++++ Makefile	Wed May 19 23:53:39 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 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
+-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 = -DPREFIX=\"$(PREFIX)\"
- #                    Solaris 2 (SunOS 5) might need DEFS = -DNOSTRCMP
- OS = UNIX          # Operating system: UNIX, DOS, WIN32, MAC, OS2, VMS
- #                    RISCOS, BEOS, BS2000
-@@ -27,6 +28,8 @@
+ #                    ... -DNEED_STRCMP -DNEED_MEMMOVE -DNEED_STRTOUL ...
+ #                    ... -DNEED_DIFFTIME -DNEED_FLOATINGPOINT_H
+ #                    Solaris 2 (SunOS 5) might need DEFS = -DNEED_STRCMP
+@@ -25,11 +26,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
+-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
@@ -22,4 +28,4 @@
 +all:	$(PROGRAM)
  
  $(PROGRAM): $(OBJS) $(HEADERS) Makefile
- 	$(CC) $(CFLAGS) $(OBJS) -o $(PROGRAM) $(LIBS)
+ 	$(CC) $(CEXTRAFLAGS) $(OBJS) -o $(PROGRAM) $(LIBS)
diff --git a/www/analog/pkg-plist b/www/analog/pkg-plist
index 205c38fb1eb5..73e3a10a4b90 100644
--- a/www/analog/pkg-plist
+++ b/www/analog/pkg-plist
@@ -1,59 +1,71 @@
 bin/analog
 etc/analog.cfg
-lib/analog/domains.tab
 lib/analog/lang/bra.lng
 lib/analog/lang/brh.lng
+lib/analog/lang/cata.lng
+lib/analog/lang/cath.lng
+lib/analog/lang/cn.lng
 lib/analog/lang/cz1250.lng
 lib/analog/lang/cza.lng
 lib/analog/lang/czh.lng
 lib/analog/lang/dea.lng
+lib/analog/lang/deadom.tab
 lib/analog/lang/deh.lng
+lib/analog/lang/dehdom.tab
 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/domesa.tab
-lib/analog/lang/domesh.tab
-lib/analog/lang/dompla.tab
-lib/analog/lang/domplh.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/cn.lng
 lib/analog/lang/esa.lng
+lib/analog/lang/esadom.tab
 lib/analog/lang/esh.lng
+lib/analog/lang/eshdom.tab
 lib/analog/lang/fia.lng
 lib/analog/lang/fih.lng
+lib/analog/lang/fra.lng
+lib/analog/lang/fradom.tab
+lib/analog/lang/frform.html
+lib/analog/lang/frh.lng
+lib/analog/lang/frhdom.tab
 lib/analog/lang/gra.lng
 lib/analog/lang/grh.lng
+lib/analog/lang/hua.lng
+lib/analog/lang/huh.lng
+lib/analog/lang/is.lng
+lib/analog/lang/isa.lng
+lib/analog/lang/ish.lng
+lib/analog/lang/ita.lng
+lib/analog/lang/ith.lng
+lib/analog/lang/jp.lng
+lib/analog/lang/jpform.html
+lib/analog/lang/kr.lng
+lib/analog/lang/lt.lng
+lib/analog/lang/lva.lng
+lib/analog/lang/lvh.lng
 lib/analog/lang/nl.lng
 lib/analog/lang/no2a.lng
 lib/analog/lang/no2h.lng
 lib/analog/lang/noa.lng
 lib/analog/lang/noh.lng
 lib/analog/lang/pla.lng
+lib/analog/lang/pladom.tab
 lib/analog/lang/plh.lng
+lib/analog/lang/plhdom.tab
+lib/analog/lang/pta.lng
+lib/analog/lang/pth.lng
+lib/analog/lang/ro.lng
 lib/analog/lang/rua.lng
 lib/analog/lang/ruh.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/tra.lng
 lib/analog/lang/trh.lng
+lib/analog/lang/uk.lng
+lib/analog/lang/ukdom.tab
+lib/analog/lang/us.lng
 share/doc/analog/Licence.txt
 share/doc/analog/Readme.html
 share/doc/analog/acknow.html
@@ -69,10 +81,12 @@ share/doc/analog/domfile.html
 share/doc/analog/errors.html
 share/doc/analog/faq.html
 share/doc/analog/form.html
+share/doc/analog/helpers.html
 share/doc/analog/hierreps.html
 share/doc/analog/include.html
 share/doc/analog/indx.html
 share/doc/analog/logfile.html
+share/doc/analog/logfmt.html
 share/doc/analog/lowmem.html
 share/doc/analog/mailing.html
 share/doc/analog/map.html