Update packages to version 1.5.5. Notable changes are:

 - Update for 64-bit machines.
 - Some memory leak fixes.

7 files changed, 56 insertions, 72 deletions

diff --git a/textproc/dict-server/Makefile b/textproc/dict-server/Makefile
index 7baffa89905..bbec5d5b0e4 100644
--- a/textproc/dict-server/Makefile
+++ b/textproc/dict-server/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/02/25 04:18:16 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2001/10/12 10:51:51 simonb Exp $
 
-DISTNAME=       dictd-1.4.9
-PKGNAME=	dict-server-1.4.9
+DISTNAME=       dictd-1.5.5
+PKGNAME=	dict-server-1.5.5
 CATEGORIES=	textproc
-MASTER_SITES=   ftp://ftp.cs.unc.edu/pub/users/faith/dict/ \
-		ftp://ftp.cs.unc.edu/pub/users/faith/dict/pre/ \
-		ftp://ftp.dict.org/pub/dict/ \
+MASTER_SITES=	ftp://ftp.dict.org/pub/dict/ \
 		ftp://ftp.dict.org/pub/dict/pre/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		dict-gazetteer-1.2-pre.tar.gz \
diff --git a/textproc/dict-server/distinfo b/textproc/dict-server/distinfo
index 5836ef69bbe..d5b4a5caf60 100644
--- a/textproc/dict-server/distinfo
+++ b/textproc/dict-server/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2001/08/16 07:03:21 agc Exp $
+$NetBSD: distinfo,v 1.4 2001/10/12 10:51:51 simonb Exp $
 
-SHA1 (dictd-1.4.9.tar.gz) = 87a268b5725d70073cf02032a9d96f21cb405f5c
-Size (dictd-1.4.9.tar.gz) = 517459 bytes
+SHA1 (dictd-1.5.5.tar.gz) = 542514feaf9a8e0c1050a2faba1ffee3b4150ee0
+Size (dictd-1.5.5.tar.gz) = 531110 bytes
 SHA1 (dict-gazetteer-1.2-pre.tar.gz) = bca7f242a0fac591fd8e271faf0b90e1fe59d106
 Size (dict-gazetteer-1.2-pre.tar.gz) = 2209944 bytes
 SHA1 (dict-misc-1.5-pre.tar.gz) = 169a860058bb6c262f70ca107c77eda5a6001daa
@@ -10,14 +10,14 @@ SHA1 (dict-web1913-1.4-pre.tar.gz) = 2f2a0103d03b91d1df5893339daf86cf3f881709
 Size (dict-web1913-1.4-pre.tar.gz) = 13147422 bytes
 SHA1 (dict-wn-1.5-pre.tar.gz) = 9f8ee64792e4a6a3700f3093ef98f8467c89539d
 Size (dict-wn-1.5-pre.tar.gz) = 8464107 bytes
-SHA1 (patch-aa) = 53ec142b9151b19e2820d5e1bf5093bb53be0b48
-SHA1 (patch-ab) = 2f7cbc15c62a8925d2e662a756372c935a6680a7
-SHA1 (patch-ac) = c3dcc9878875f28764db118460e2fd5fa9273f2f
+SHA1 (patch-aa) = 79bb027b5e0c72dd30e885245c4d9c5a7c11d794
+SHA1 (patch-ab) = eaf3a1899a5ad68461ac32ae4ce0deea494b04c4
+SHA1 (patch-ac) = 997e44984a0e7aa55cc757ae0f9b8a89993b1f1d
 SHA1 (patch-ad) = 75d08ce1778898edcd52b4b94c974aba54f769a7
-SHA1 (patch-ae) = 666be1195f6c11b620f14c9e91be5db377be6022
+SHA1 (patch-ae) = 1b161f8c52a6029f0af2ddb824fc23ee5f867cff
 SHA1 (patch-af) = 9858bfc0cbed9c32d6b4e15ddc468a584e4916e9
 SHA1 (patch-ag) = 4473d472bddc34c5d5be2d6be6a0cee015717a79
-SHA1 (patch-ah) = 7952316967e8612d340a6a2b73e88d2a9035d6d7
+SHA1 (patch-ah) = d3453553e15858054bce4943a0316d485938806a
 SHA1 (patch-ai) = 21b2c9ace814e005139c64c4b6890e8b7e249f29
 SHA1 (patch-aj) = 76527be1d4ff89aeec72606d9575a99e6a8e2d3b
 SHA1 (patch-ak) = 4167c9007ed7b31ff9a29b368d82154bc95893cf
diff --git a/textproc/dict-server/patches/patch-aa b/textproc/dict-server/patches/patch-aa
index 941d66355d3..f5ddfdc8f9b 100644
--- a/textproc/dict-server/patches/patch-aa
+++ b/textproc/dict-server/patches/patch-aa
@@ -1,28 +1,12 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/07/28 16:17:20 tron Exp $
+$NetBSD: patch-aa,v 1.2 2001/10/12 10:51:51 simonb Exp $
 
---- configure.orig	Mon Jul  6 03:38:03 1998
-+++ configure	Wed Jul 28 17:57:42 1999
-@@ -46,11 +46,13 @@
- # dashes changed to underlines.
- build=NONE
- cache_file=./config.cache
-+etcdir=/etc
- exec_prefix=NONE
- host=NONE
- no_create=
- nonopt=NONE
- no_recursion=
-+piddir=/var/run
- prefix=NONE
- program_prefix=NONE
- program_suffix=NONE
-@@ -549,9 +551,6 @@
- 
- 
- 
--prefix=/usr
--etcdir=/etc
--piddir=/var/run
- 
- echo Configuring for dict
- echo .
+--- configure.orig	Fri Jan 12 20:24:53 2001
++++ configure	Wed Oct 10 14:54:02 2001
+@@ -1416,7 +1416,6 @@
+     fi
+ fi
+ 
+-local_zlib=1
+ if test "$local_zlib" = 0; then
+     echo $ac_n "checking for zlibVersion in -lz""... $ac_c" 1>&6
+ echo "configure:1423: checking for zlibVersion in -lz" >&5
diff --git a/textproc/dict-server/patches/patch-ab b/textproc/dict-server/patches/patch-ab
index 8a9b200ac2c..5bef1da232a 100644
--- a/textproc/dict-server/patches/patch-ab
+++ b/textproc/dict-server/patches/patch-ab
@@ -1,25 +1,26 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/07/28 16:17:20 tron Exp $
+$NetBSD: patch-ab,v 1.2 2001/10/12 10:51:51 simonb Exp $
 
---- Makefile.in.orig	Mon Jul  6 00:09:59 1998
-+++ Makefile.in	Wed Jul 28 17:57:42 1999
-@@ -141,16 +141,16 @@
- 	$(CC) -c $(XTRACFLAGS) $(CFLAGS) -Wno-implicit $<
+--- Makefile.in.orig	Fri Jan 12 20:24:29 2001
++++ Makefile.in	Wed Oct 10 14:57:51 2001
+@@ -141,17 +141,16 @@
+ 	$(CC) -c $(XTRACFLAGS) $(CFLAGS) $(SCFLAGS) $<
  
  install.dict: dict
 -	install dict $(bindir)
--	install -m 644 dict.1 $(man1_prefix)
+-	install -m 644 dict.1 $(man1_prefix)/dict.1
 +	${INSTALL_PROGRAM} dict $(bindir)
 +	${BSD_INSTALL_MAN} dict.1 $(man1_prefix)
  
  install.dictzip: dictzip
 -	install dictzip $(bindir)
--	install -m 644 dictzip.1 $(man1_prefix)
+-	install -m 644 dictzip.1 $(man1_prefix)/dictzip.1
 +	${INSTALL_PROGRAM} dictzip $(bindir)
 +	${BSD_INSTALL_MAN} dictzip.1 $(man1_prefix)
  
  install.dictd: dictd
 -	install dictd $(sbindir)
--	install -m 644 dictd.8 $(man8_prefix)
+-	if test ! -d $(man8_prefix); then install -d 755 $(man8_prefix); fi
+-	install -m 644 dictd.8 $(man8_prefix)/dictd.8
 +	${INSTALL_PROGRAM} dictd $(sbindir)
 +	${BSD_INSTALL_MAN} dictd.8 $(man8_prefix)
  
diff --git a/textproc/dict-server/patches/patch-ac b/textproc/dict-server/patches/patch-ac
index 57cbb235a3e..15c4aabb8c0 100644
--- a/textproc/dict-server/patches/patch-ac
+++ b/textproc/dict-server/patches/patch-ac
@@ -1,16 +1,13 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/07/28 16:17:20 tron Exp $
+$NetBSD: patch-ac,v 1.2 2001/10/12 10:51:52 simonb Exp $
 
---- libmaa/maaP.h.orig	Sun Feb 22 14:41:19 1998
-+++ libmaa/maaP.h	Wed Jul 28 17:57:42 1999
-@@ -103,9 +103,11 @@
+--- libmaa/maaP.h.orig	Fri Dec 24 00:30:12 1999
++++ libmaa/maaP.h	Wed Oct 10 14:59:11 2001
+@@ -102,7 +102,7 @@
+ # include <getopt.h>
  #else
  #if !defined(__FreeBSD__) && !defined(__DGUX__) && !defined(__hpux__)
- #if !defined(__bsdi__) && !(defined(__sparc) && defined(__svr4__))
-+#if !defined(__NetBSD__)
+-#if !defined(__bsdi__) && !defined(__OpenBSD__)
++#if !defined(__bsdi__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+ #if !(defined(__sparc) && defined(__svr4__))
  extern int  getopt( int, char **, char * );
  extern int  optind;
- extern char *optarg;
-+#endif
- #endif
- #endif
- #endif
diff --git a/textproc/dict-server/patches/patch-ae b/textproc/dict-server/patches/patch-ae
index 99d571199e5..8645958ab9d 100644
--- a/textproc/dict-server/patches/patch-ae
+++ b/textproc/dict-server/patches/patch-ae
@@ -1,11 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2000/06/26 21:02:05 dmcmahill Exp $
+$NetBSD: patch-ae,v 1.2 2001/10/12 10:51:52 simonb Exp $
 
---- decl.h.orig	Thu Jan 15 22:51:55 1998
-+++ decl.h	Mon Jun 26 16:20:25 2000
-@@ -29,5 +29,5 @@
+--- decl.h.orig	Mon Jan  1 08:14:18 2001
++++ decl.h	Wed Oct 10 15:45:31 2001
+@@ -28,7 +28,7 @@
+ declarations for standard library calls.  We provide them here for
  situations that we know about. */
  
--#if defined(__sparc__)
-+#if defined(__sparc__) && !defined(__NetBSD__)
+-#if defined(__sparc__) && !defined(__linux__)
++#if defined(__sparc__) && !defined(__linux__) && !defined(__NetBSD__)
  				/* Both SunOS and Solaris */
  extern int    getrusage( int who, struct rusage * );
+ extern void   bcopy( const void *, void *, int );
diff --git a/textproc/dict-server/patches/patch-ah b/textproc/dict-server/patches/patch-ah
index 8b9a0f166ac..0e1ee0c3ad0 100644
--- a/textproc/dict-server/patches/patch-ah
+++ b/textproc/dict-server/patches/patch-ah
@@ -1,11 +1,13 @@
-$NetBSD: patch-ah,v 1.1 2000/06/26 21:02:07 dmcmahill Exp $
+$NetBSD: patch-ah,v 1.2 2001/10/12 10:51:52 simonb Exp $
 
---- libmaa/decl.h.orig	Thu Jan 15 22:51:48 1998
-+++ libmaa/decl.h	Mon Jun 26 16:27:02 2000
-@@ -29,5 +29,5 @@
+--- libmaa/decl.h.orig	Mon Jan  1 08:14:19 2001
++++ libmaa/decl.h	Wed Oct 10 15:46:45 2001
+@@ -28,7 +28,7 @@
+ declarations for standard library calls.  We provide them here for
  situations that we know about. */
  
--#if defined(__sparc__)
-+#if defined(__sparc__) && !defined(__NetBSD__)
+-#if defined(__sparc__) && !defined(linux)
++#if defined(__sparc__) && !defined(linux) && !defined(__NetBSD__)
  #include <sys/resource.h>
  				/* Both SunOS and Solaris */
+ extern int    getrusage( int who, struct rusage * );