Apply fixes from Julio Merino (jmmv@hispabsd.org) in PR 17653 - make ispell

use /tmp rather than /usr/tmp by default.

8 files changed, 87 insertions, 3 deletions

diff --git a/textproc/ispell-base/Makefile b/textproc/ispell-base/Makefile
index c2b91f2f671..ea0b8436596 100644
--- a/textproc/ispell-base/Makefile
+++ b/textproc/ispell-base/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2002/06/29 23:51:30 jschauma Exp $
+# $NetBSD: Makefile,v 1.8 2002/07/22 10:31:30 agc 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/
 
diff --git a/textproc/ispell-base/distinfo b/textproc/ispell-base/distinfo
index 3aa5fc60d7e..0477a63da93 100644
--- a/textproc/ispell-base/distinfo
+++ b/textproc/ispell-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/06/29 23:51:30 jschauma Exp $
+$NetBSD: distinfo,v 1.5 2002/07/22 10:31:30 agc Exp $
 
 SHA1 (ispell-3.1.20.tar.gz) = f8f849a3868ef3d88c1ba6fe5b49505f75de786e
 Size (ispell-3.1.20.tar.gz) = 677987 bytes
@@ -15,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..a43db6a201f
--- /dev/null
+++ b/textproc/ispell-base/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2002/07/22 10:31:30 agc 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..3949623df07
--- /dev/null
+++ b/textproc/ispell-base/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2002/07/22 10:31:30 agc 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..eb30943b7d1
--- /dev/null
+++ b/textproc/ispell-base/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2002/07/22 10:31:31 agc 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..f78b24c0b5b
--- /dev/null
+++ b/textproc/ispell-base/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2002/07/22 10:31:31 agc 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..f7170f46df2
--- /dev/null
+++ b/textproc/ispell-base/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1 2002/07/22 10:31:31 agc 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..2c609ae8b84
--- /dev/null
+++ b/textproc/ispell-base/patches/patch-aq
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.1 2002/07/22 10:31:31 agc 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 ..."