Adapt this package to NetBSD and update to version 3.2.

6 files changed, 128 insertions, 83 deletions

diff --git a/www/analog/Makefile b/www/analog/Makefile
index 0de60792d98..7dd903a3786 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -1,37 +1,27 @@
-# New ports collection makefile for: analog
-# http://www.statslab.cam.ac.uk/~sret1/analog/
-# Version required:     3.*
-# Date created:		October 21st 1996
-# Whom:			jfitz
-#
+# $NetBSD: Makefile,v 1.2 1999/05/09 16:41:15 tron Exp $
 # FreeBSD Id: Makefile,v 1.15 1999/03/15 02:01:27 steve Exp
-#
 
-DISTNAME=       analog3.11
-PKGNAME=        analog-3.11
+DISTNAME=       analog3.2
+PKGNAME=        analog-3.2
 CATEGORIES=	www
 MASTER_SITES=   http://www.statslab.cam.ac.uk/~sret1/analog/ \
-		http://brendanr.simplenet.com/analog/ \
-		http://www.magma.ca/~brendanr/analog/ \
-		http://www.monash.edu.au/mirror/analog/ \
-		http://analog.gsp.com/ \
-		http://analog.technomancer.com/ \
-		ftp://ftp.netcasting.net/pub/packages/analog \
-		ftp://download.netvision.net.il/pub/mirrors/analog/ \
-		ftp://mabuse.phil.uni-passau.de/pub/mirrors/analog/
+		http://www.web42.com/analog/ \
+		http://ftp.sunet.se/pub/www/utilities/analog/
+DISTFILES=	${EXTRACT_ONLY} ukdom.tab
 
-MAINTAINER=     ache@freebsd.org
+MAINTAINER=     tron@netbsd.org
+HOMEPAGE=	http://www.statslab.cam.ac.uk/~sret1/analog/
 
-Y2K=		http://www.statslab.cam.ac.uk/~sret1/analog/
-
-MAKE_FLAGS=     -DPREFIX=${PREFIX} -f
+ALL_TARGET=	analog
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+MAKE_ENV+=	PREFIX=${PREFIX}
 
 do-install:
-	install -d -o ${SHAREOWN} -g ${SHAREGRP} -m 555 \
+	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 555 \
 		${PREFIX}/share/doc/analog
-	install -d -o ${BINOWN} -g ${BINGRP} -m 755 \
+	${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 \
 		${PREFIX}/lib/analog/lang
-	install -d -o nobody -g nogroup -m 755 \
+	${INSTALL} -d -o nobody -g nogroup -m 755 \
 		${PREFIX}/www/data/images
 	cd ${WRKSRC}/docs && \
 		${INSTALL_DATA} * ${PREFIX}/share/doc/analog
@@ -42,20 +32,10 @@ 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 ; \
-	    else \
-		${INSTALL_DATA} -m 644 $$file ${PREFIX}/etc/$$file ; \
-	    fi ; \
-	done
+	${INSTALL_DATA} -m 644 ${_DISTDIR}/ukdom.tab \
+	  ${PREFIX}/lib/analog/domains.tab
+	${INSTALL_DATA} -m 644 ${WRKSRC}/analog.cfg ${PREFIX}/etc/analog.cfg
+	${INSTALL_DATA} -m 644 ${WRKSRC}/analog.cfg \
+	  ${PREFIX}/etc/analog.cfg.default
 
-.include <bsd.port.mk>
+.include <../../mk/bsd.pkg.mk>
diff --git a/www/analog/files/md5 b/www/analog/files/md5
index 2af2e9d603e..3a627665c29 100644
--- a/www/analog/files/md5
+++ b/www/analog/files/md5
@@ -1 +1,4 @@
-MD5 (analog3.11.tar.gz) = 7761f7d39f7997eb1ac89a4b3188c559
+$NetBSD: md5,v 1.2 1999/05/09 16:41:15 tron Exp $
+
+MD5 (analog3.2.tar.gz) = 72d8d2d7c19d23f829bafea4e8fa29cb
+MD5 (ukdom.tab) = 1be3b342f615e19d54c4bbffa86a0708
diff --git a/www/analog/patches/patch-aa b/www/analog/patches/patch-aa
index d970227f9d0..bd5fe147301 100644
--- a/www/analog/patches/patch-aa
+++ b/www/analog/patches/patch-aa
@@ -1,25 +1,66 @@
---- Makefile.orig	Sat Nov  7 00:27:05 1998
-+++ Makefile	Tue Jan 19 21:21:20 1999
-@@ -2,10 +2,11 @@
+$NetBSD: patch-aa,v 1.2 1999/05/09 16:41:15 tron Exp $
+
+--- Makefile.orig	Tue May  4 12:02:27 1999
++++ Makefile	Sun May  9 17:40:24 1999
+@@ -2,17 +2,16 @@
  # 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
-+DEFS = -DPREFIX=\"$(PREFIX)\"
- #                    Solaris 2 (SunOS 5) might need DEFS = -DNOSTRCMP
+-#                    HP/UX cc needs -Aa (HP/UX 9) or -Ae (HP/UX 10)
+-#                    Some Linuces might need -I/usr/src/linux/include
+-#                    BS2000/OSD requires -XLLML -XLLMK
+-DEFS =             # any of -DNOPIPES -DNODNS -DNODIRENT -DEBCDIC ...
++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 = -DPREFIX=\"${PREFIX}\"
++                   # any of -DNOPIPES -DNODNS -DNODIRENT -DEBCDIC ...
+ #                    ... -DNEED_STRCMP -DNEED_MEMMOVE -DNEED_STRTOUL ...
+-#                    ... -DNEED_DIFFTIME -DNEED_FLOATINGPONT_H
++#                    ... -DNEED_DIFFTIME -DNEED_FLOATINGPOINT_H
+ #                    Solaris 2 (SunOS 5) might need DEFS = -DNEED_STRCMP
+ #                    SunOS 4 probably needs...
+-#    DEFS = -DNEED_MEMMOVE -DNEED_STRTOUL -DNEED_DIFFTIME -DNEED_FLOATINGPONT_H
+-#                    but even then it may have bugs.
++#   DEFS = -DNEED_MEMMOVE -DNEED_STRTOUL -DNEED_DIFFTIME -DNEED_FLOATINGPOINT_H
  OS = UNIX          # Operating system: UNIX, DOS, WIN32, MAC, OS2, VMS
  #                    RISCOS, BEOS, BS2000
-@@ -27,6 +28,8 @@
+ LIBS =             # extra libraries needed; Solaris 2 (SunOS 5) needs
+@@ -29,29 +28,31 @@
+ 	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)
+ 
  # 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)
+-	$(CC) $(CFLAGS) $(OBJS) -o $(PROGRAM) $(LIBS)
++	$(CC) $(CEXTRAFLAGS) $(OBJS) -o $(PROGRAM) $(LIBS)
+ 	@echo '***'
+ 	@echo '***IMPORTANT: You must read the licence before using analog'
+ 	@echo '***'
+ 
++# Some make's won't pick up this rule but their .c.o rule should be good enough
+ %.o: %.c $(HEADERS) Makefile
+-	$(CC) $(CFLAGS) $(DEFS) -D$(OS) -c $<
++	$(CC) $(CFLAGS) -c $<
+ 
+ $(FORMPROG): $(FORMSRC) Makefile
+-	$(CC) $(CFLAGS) $(FORMSRC) -o $(FORMPROG)
++	$(CC) $(CEXTRAFLAGS) $(FORMSRC) -o $(FORMPROG)
+ 
+ form: $(FORMPROG)
+ 
+ force:
+ 	rm -f $(OBJS)
+-	make $(PROGRAM) 'CFLAGS=$(CFLAGS)' 'LIBS=$(LIBS)' 'DEFS=$(DEFS)' \
+-	CC=$(CC)
++	make $(PROGRAM) 'CEXTRAFLAGS=$(CEXTRAFLAGS)' 'LIBS=$(LIBS)' \
++	'DEFS=$(DEFS)' CC=$(CC)
+ 
+ clean:
+ 	rm -f *.o analog *~
diff --git a/www/analog/patches/patch-ab b/www/analog/patches/patch-ab
index 5597d0e17fc..1dadca9fdda 100644
--- a/www/analog/patches/patch-ab
+++ b/www/analog/patches/patch-ab
@@ -1,3 +1,5 @@
+$NetBSD: patch-ab,v 1.2 1999/05/09 16:41:15 tron Exp $
+
 *** analhead.h.orig	Thu Apr  9 14:59:28 1998
 --- analhead.h	Fri Apr 10 01:34:18 1998
 ***************
diff --git a/www/analog/patches/patch-ac b/www/analog/patches/patch-ac
index 80f6e25f401..99468f20a99 100644
--- a/www/analog/patches/patch-ac
+++ b/www/analog/patches/patch-ac
@@ -1,3 +1,5 @@
+$NetBSD: patch-ac,v 1.2 1999/05/09 16:41:15 tron Exp $
+
 --- analog.cfg.orig	Wed Nov 25 22:49:33 1998
 +++ analog.cfg	Tue Jan 19 21:24:09 1999
 @@ -8,7 +8,8 @@
diff --git a/www/analog/pkg/PLIST b/www/analog/pkg/PLIST
index 205c38fb1eb..dcbeb40f8f6 100644
--- a/www/analog/pkg/PLIST
+++ b/www/analog/pkg/PLIST
@@ -1,59 +1,73 @@
+@comment $NetBSD: PLIST,v 1.2 1999/05/09 16:41:15 tron Exp $
 bin/analog
-etc/analog.cfg
+etc/analog.cfg.default
+@exec cp -p %F %D/etc/analog.cfg
+@unexec rm -f %D/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/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/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 +83,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
@@ -104,3 +120,4 @@ www/data/images/html2.gif
 @dirrm lib/analog
 @dirrm share/doc/analog
 @dirrm www/data/images
+@dirrm www/data