Merge changes in the main trunk into the buildlink2 branch for thosebuildlink2

packages that have been converted to USE_BUILDLINK2.

13 files changed, 94 insertions, 42 deletions

diff --git a/textproc/ispell-base/Makefile b/textproc/ispell-base/Makefile
index 377e80c7700..6577c40c0b1 100644
--- a/textproc/ispell-base/Makefile
+++ b/textproc/ispell-base/Makefile
@@ -1,12 +1,15 @@
-# $NetBSD: Makefile,v 1.6.2.1 2002/06/30 06:24:18 jlam Exp $
+# $NetBSD: Makefile,v 1.6.2.2 2002/08/25 21:21:40 jlam Exp $
 #
 
 DISTNAME=	ispell-3.1.20
 PKGNAME=	ispell-base-3.1.20
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.cs.ucla.edu/pub/ispell-3.1/
 
+PATCH_SITES=	ftp://kdstevens.com/pub/stevens/
+PATCHFILES=    ispell-patch1.gz
+
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/ispell/ispell.html
 COMMENT=	Interactive spelling checker
diff --git a/textproc/ispell-base/distinfo b/textproc/ispell-base/distinfo
index 6c2a25ff498..8bb0485dd05 100644
--- a/textproc/ispell-base/distinfo
+++ b/textproc/ispell-base/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.3 2002/02/18 15:14:43 seb Exp $
+$NetBSD: distinfo,v 1.3.2.1 2002/08/25 21:21:41 jlam Exp $
 
 SHA1 (ispell-3.1.20.tar.gz) = f8f849a3868ef3d88c1ba6fe5b49505f75de786e
 Size (ispell-3.1.20.tar.gz) = 677987 bytes
+SHA1 (ispell-patch1.gz) = 61d7237cdbb8af1f2cb1f673e1c06aea0669089b
+Size (ispell-patch1.gz) = 1110 bytes
 SHA1 (patch-aa) = cf8e0863e62103526d75ba5f0f25c760d4ee8e32
 SHA1 (patch-ab) = f67725f76e3fe9136381e55e3aab37ef8b729cf7
 SHA1 (patch-ac) = 05b7f88754819faf2e282221ce1c2fcc446f0b36
@@ -13,3 +15,9 @@ SHA1 (patch-ah) = 2a5da425a5a6c97907218b96515f2a9718d1e9ca
 SHA1 (patch-ai) = 210d80ca55fc1d4fb5aa308205d8630a7f4bfb67
 SHA1 (patch-aj) = 645d9c15fe6148e4ced398729aab6ffc9662c1d8
 SHA1 (patch-ak) = a60cbdead54b450457a1313107513c61747c4c1f
+SHA1 (patch-al) = 8e75a7b529e76ed7137510e5e18f7b87084c62a8
+SHA1 (patch-am) = d42829fe0c22bc4f42bc60f403576f80dde7e66a
+SHA1 (patch-an) = b1f17843e68a1ff6d6ddb4814c8fcf070add2f8e
+SHA1 (patch-ao) = 6ddf8412689f17cff7632a90ea443513da9d8448
+SHA1 (patch-ap) = 47411640b343a5d60b9d9e8d28574bd0397dde45
+SHA1 (patch-aq) = b37bfe33f3b710bef1141afabb2dae3d9b1776cd
diff --git a/textproc/ispell-base/patches/patch-al b/textproc/ispell-base/patches/patch-al
new file mode 100644
index 00000000000..61ccd8d9862
--- /dev/null
+++ b/textproc/ispell-base/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1.2.2 2002/08/25 21:21:43 jlam Exp $
+
+--- config.X.orig	Fri Jul 19 21:47:10 2002
++++ config.X	Fri Jul 19 21:48:05 2002
+@@ -315,7 +315,7 @@
+ ** space.  Otherwise make it the null string.
+ */
+ #ifndef MAKE_SORTTMP
+-#define MAKE_SORTTMP "-T ${TMPDIR-/usr/tmp}"
++#define MAKE_SORTTMP "-T ${TMPDIR-/tmp}"
+ #endif
+ 
+ /*
diff --git a/textproc/ispell-base/patches/patch-am b/textproc/ispell-base/patches/patch-am
new file mode 100644
index 00000000000..102dd35f9fb
--- /dev/null
+++ b/textproc/ispell-base/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1.2.2 2002/08/25 21:21:44 jlam Exp $
+
+--- munchlist.X.orig	Fri Jul 19 21:47:10 2002
++++ munchlist.X	Fri Jul 19 21:48:24 2002
+@@ -128,7 +128,7 @@
+     set -vx
+ fi
+ LIBDIR=!!LIBDIR!!
+-TDIR=${TMPDIR-/usr/tmp}
++TDIR=${TMPDIR-/tmp}
+ TMP=${TDIR}/munch$$
+ SORTTMP="-T ${TDIR}"			# !!SORTTMP!!
+ if [ -r ./icombine ]
diff --git a/textproc/ispell-base/patches/patch-an b/textproc/ispell-base/patches/patch-an
new file mode 100644
index 00000000000..99cc7e541f8
--- /dev/null
+++ b/textproc/ispell-base/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1.2.2 2002/08/25 21:21:45 jlam Exp $
+
+--- splitdict.orig	Fri Jul 19 21:49:28 2002
++++ splitdict	Fri Jul 19 21:48:33 2002
+@@ -51,7 +51,7 @@
+ # Get rid of all old RCS log lines in preparation for the 3.1 release.
+ #
+ #
+-TMP=${TMPDIR:-/usr/tmp}/sd$$
++TMP=${TMPDIR:-/tmp}/sd$$
+ 
+ case "$#" in
+     3)
diff --git a/textproc/ispell-base/patches/patch-ao b/textproc/ispell-base/patches/patch-ao
new file mode 100644
index 00000000000..d689a688892
--- /dev/null
+++ b/textproc/ispell-base/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1.2.2 2002/08/25 21:21:45 jlam Exp $
+
+--- subset.X.orig	Fri Jul 19 21:47:10 2002
++++ subset.X	Fri Jul 19 21:48:52 2002
+@@ -77,7 +77,7 @@
+ #
+ #
+ LIBDIR=!!LIBDIR!!
+-TDIR=${TMPDIR-/usr/tmp}
++TDIR=${TMPDIR-/tmp}
+ TMP=${TDIR}/sset$$.
+ SORTTMP="-T ${TDIR}"			# !!SORTTMP!!
+ USAGE="Usage:  subset [-b base] [-l langfile] dict-0 dict-1 ..."
diff --git a/textproc/ispell-base/patches/patch-ap b/textproc/ispell-base/patches/patch-ap
new file mode 100644
index 00000000000..ff387da7ec5
--- /dev/null
+++ b/textproc/ispell-base/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1.2.2 2002/08/25 21:21:46 jlam Exp $
+
+--- tryaffix.X.orig	Fri Jul 19 21:47:10 2002
++++ tryaffix.X	Fri Jul 19 21:49:02 2002
+@@ -73,7 +73,7 @@
+ # Get rid of all old RCS log lines in preparation for the 3.1 release.
+ #
+ #
+-SORTTMP="-T ${TMPDIR-/usr/tmp}"		# !!SORTTMP!!
++SORTTMP="-T ${TMPDIR-/tmp}"		# !!SORTTMP!!
+ USAGE='tryaffix [-p | -s] [-c] dict-file affix[+addition] ...'
+ counts=no
+ pre=
diff --git a/textproc/ispell-base/patches/patch-aq b/textproc/ispell-base/patches/patch-aq
new file mode 100644
index 00000000000..f60886c48e1
--- /dev/null
+++ b/textproc/ispell-base/patches/patch-aq
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.1.2.2 2002/08/25 21:21:47 jlam Exp $
+
+--- zapdups.X.orig	Fri Jul 19 21:47:10 2002
++++ zapdups.X	Fri Jul 19 21:49:09 2002
+@@ -68,7 +68,7 @@
+ #
+ #
+ LIBDIR=!!LIBDIR!!
+-TDIR=${TMPDIR-/usr/tmp}
++TDIR=${TMPDIR-/tmp}
+ TMP=${TDIR}/zd$$
+ SORTTMP="-T ${TDIR}"			# !!SORTTMP!!
+ USAGE="zapdups [-d [-n]] [-l langfile] dict-0 dict-1 ..."
diff --git a/textproc/t1utils/DESCR b/textproc/t1utils/DESCR
deleted file mode 100644
index 9680c8027ee..00000000000
--- a/textproc/t1utils/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Utilities for working with Postscript Type 1 font files.  In
-particular, this package includes programs for changing font files
-between ASCII and binary formats, and a "human readable" format,
-and it also includes a program for extracting the useful information
-from the "resource fork" of MacOS files.
diff --git a/textproc/t1utils/Makefile b/textproc/t1utils/Makefile
deleted file mode 100644
index a14b97a05c9..00000000000
--- a/textproc/t1utils/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.6.2.1 2002/06/30 06:24:21 jlam Exp $
-#
-
-DISTNAME=	t1utils-1.23
-CATEGORIES=	textproc converters
-MASTER_SITES=	http://www.lcdf.org/~eddietwo/type/
-
-MAINTAINER=	jonb@netbsd.org
-HOMEPAGE=	http://www.lcdf.org/~eddietwo/type/
-COMMENT=	Utility programs for dealing with Postscript Type 1 font files
-
-GNU_CONFIGURE=	YES
-USE_BUILDLINK2=	YES
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/t1utils/PLIST b/textproc/t1utils/PLIST
deleted file mode 100644
index 8d3eda2b603..00000000000
--- a/textproc/t1utils/PLIST
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:58:56 zuntum Exp $
-bin/t1ascii
-bin/t1asm
-bin/t1binary
-bin/t1disasm
-bin/t1mac
-bin/t1unmac
-man/man1/t1ascii.1
-man/man1/t1asm.1
-man/man1/t1binary.1
-man/man1/t1disasm.1
-man/man1/t1mac.1
-man/man1/t1unmac.1
diff --git a/textproc/t1utils/distinfo b/textproc/t1utils/distinfo
deleted file mode 100644
index 88eaf885af2..00000000000
--- a/textproc/t1utils/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.3 2001/07/26 22:46:03 dillo Exp $
-
-SHA1 (t1utils-1.23.tar.gz) = b9b44b6b76494c6b7444af0341d338f1bc6eaa7f
-Size (t1utils-1.23.tar.gz) = 72306 bytes
diff --git a/textproc/texi2html/Makefile b/textproc/texi2html/Makefile
index 7bb24c90bd2..2d430e17304 100644
--- a/textproc/texi2html/Makefile
+++ b/textproc/texi2html/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.11.2.1 2002/06/30 06:24:22 jlam Exp $
+# $NetBSD: Makefile,v 1.11.2.2 2002/08/25 21:21:49 jlam Exp $
 #
 
 DISTNAME=		texi2html-1.64
 CATEGORIES=		textproc
 MASTER_SITES=		http://www.mathematik.uni-kl.de/~obachman/Texi2html/Distrib/
 
-MAINTAINER=		tv@netbsd.org
+MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.mathematik.uni-kl.de/~obachman/Texi2html/
 COMMENT=		Texinfo-to-HTML direct translator