Initial import of new format of ispell package, the interactive

spelling checker.  The new format allows multiple language
dictionaries to be installed at the same time, and uses pkgsrc
dependencies, rather then overloading the base package.

This is the base package (which also installs the default American
English directories).

15 files changed, 319 insertions, 0 deletions

diff --git a/textproc/ispell-base/Makefile b/textproc/ispell-base/Makefile
new file mode 100644
index 00000000000..8efebc0f9cd
--- /dev/null
+++ b/textproc/ispell-base/Makefile
@@ -0,0 +1,35 @@
+# $NetBSD: Makefile,v 1.1.1.1 2001/03/14 12:10:22 agc Exp $
+#
+
+DISTNAME=	ispell-3.1.20
+PKGNAME=	ispell-base-3.1.20
+CATEGORIES=	textproc
+MASTER_SITES=	ftp://ftp.cs.ucla.edu/pub/ispell-3.1/
+
+MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://www.gnu.org/software/ispell/ispell.html
+COMMENT=	Interactive spelling checker
+
+CONFLICTS+=	ispell-[0-9]*
+
+WRKSRC=		${WRKDIR}/ispell-3.1
+
+USE_GTEXINFO=	yes
+INFO_FILES=	ispell.info
+
+.if exists(/usr/include/inttypes.h)
+CFLAGS+=	-DHAVE_INTTYPES_H
+.endif
+
+do-configure:
+	cd ${WRKSRC};							\
+	${SED} -e 's|/usr/local|${PREFIX}|g' <local.h.samp >local.h;	\
+	${ECHO} "#undef NO8BIT" >> local.h ;				\
+	${ECHO} "#define LANGUAGES \"{american,MASTERDICTS=american.med+,HASHFILES=americanmed+.hash,EXTRADICT=/usr/share/dict/words}\""  >>local.h; \
+	${ECHO} "#undef WORDS"  >> local.h ;				\
+	${ECHO} '#define WORDS   "/usr/share/dict/words"'  >> local.h ;	\
+	${ECHO} '#undef ELISPDIR'  >> local.h;				\
+	${ECHO} "#define ELISPDIR \"${PREFIX}/share/emacs/site-lisp\"" >> local.h; \
+	${ECHO} "#define CFLAGS \"${CFLAGS}\"" >> local.h
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ispell-base/files/md5 b/textproc/ispell-base/files/md5
new file mode 100644
index 00000000000..634e492b84b
--- /dev/null
+++ b/textproc/ispell-base/files/md5
@@ -0,0 +1,3 @@
+$NetBSD: md5,v 1.1.1.1 2001/03/14 12:10:22 agc Exp $
+
+SHA1 (ispell-3.1.20.tar.gz) = f8f849a3868ef3d88c1ba6fe5b49505f75de786e
diff --git a/textproc/ispell-base/files/patch-sum b/textproc/ispell-base/files/patch-sum
new file mode 100644
index 00000000000..dc627587069
--- /dev/null
+++ b/textproc/ispell-base/files/patch-sum
@@ -0,0 +1,12 @@
+$NetBSD: patch-sum,v 1.1.1.1 2001/03/14 12:10:22 agc Exp $
+
+SHA1 (patch-aa) = cf8e0863e62103526d75ba5f0f25c760d4ee8e32
+SHA1 (patch-ab) = 6cad60fd5b86f6691702eb69d59cd650a9eb27a2
+SHA1 (patch-ac) = 05b7f88754819faf2e282221ce1c2fcc446f0b36
+SHA1 (patch-ad) = 72769350706c17ecf30afe99d7487edd4ad9551c
+SHA1 (patch-ae) = e7e2b99d9055e5beeaaf68b9a4379f630241d0bd
+SHA1 (patch-af) = 9145f44bc1d5f2375796e5b8308059b6c2189458
+SHA1 (patch-ag) = 49790fdbd7602c199fafe8a4c5f372286c4b2a88
+SHA1 (patch-ah) = 2a5da425a5a6c97907218b96515f2a9718d1e9ca
+SHA1 (patch-ai) = 210d80ca55fc1d4fb5aa308205d8630a7f4bfb67
+SHA1 (patch-aj) = 645d9c15fe6148e4ced398729aab6ffc9662c1d8
diff --git a/textproc/ispell-base/patches/patch-aa b/textproc/ispell-base/patches/patch-aa
new file mode 100644
index 00000000000..626160a0f30
--- /dev/null
+++ b/textproc/ispell-base/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.1.1.1 2001/03/14 12:10:22 agc Exp $
+
+--- languages/english/english.2-orig	Mon Jan 23 19:28:44 1995
++++ languages/english/english.2	Thu Apr 16 14:34:21 1998
+@@ -1867,7 +1867,6 @@
+ auxotroph
+ auxotrophic
+ auxotrophy
+-avaliable
+ avast
+ avatar
+ avaunt
diff --git a/textproc/ispell-base/patches/patch-ab b/textproc/ispell-base/patches/patch-ab
new file mode 100644
index 00000000000..fa90b951858
--- /dev/null
+++ b/textproc/ispell-base/patches/patch-ab
@@ -0,0 +1,67 @@
+$NetBSD: patch-ab,v 1.1.1.1 2001/03/14 12:10:22 agc Exp $
+
+--- Makefile.orig	Sat Jan  1 20:32:31 2000
++++ Makefile	Sat Jan  1 20:38:02 2000
+@@ -240,31 +240,15 @@
+ 	  set $(SHELLDEBUG); \
+ 	  if [ -d $$TEXINFODIR -a -r ispell.info ]; then \
+ 	    set -ex; \
+-	    rm -f $$TEXINFODIR/ispell; \
+-	    $$INSTALL ispell.info $$TEXINFODIR/ispell; \
+-	    chmod 644 $$TEXINFODIR/ispell; \
++	    rm -f $$TEXINFODIR/ispell.info; \
++	    $$INSTALL ispell.info $$TEXINFODIR/ispell.info; \
++	    chmod 644 $$TEXINFODIR/ispell.info; \
+ 	  else \
+ 	    : ; \
+ 	  fi
+ 	@set +e; \
+ 	  . ./config.sh; \
+ 	  set $(SHELLDEBUG); \
+-	  if [ -d $$ELISPDIR ]; then \
+-	    set -ex; \
+-	    rm -f $$ELISPDIR/ispell.el; \
+-	    $$INSTALL ispell.el $$ELISPDIR; \
+-	    if sh iwhich $$EMACS >/dev/null; then \
+-		echo '(byte-compile-file "'"$$ELISPDIR/ispell.el"'")' \
+-		  > /tmp/emi$$$$; \
+-		$$EMACS -batch -l /tmp/emi$$$$; \
+-		rm -f /tmp/emi$$$$; \
+-		chmod 644 $$ELISPDIR/ispell.el $$ELISPDIR/ispell.elc; \
+-	    else \
+-		chmod 644 $$ELISPDIR/ispell.el; \
+-	    fi; \
+-	  else \
+-	    : ; \
+-	  fi
+ 
+ install-dictbuild:
+ 	@. ./config.sh; \
+@@ -324,7 +308,7 @@
+ 	  set $(SHELLDEBUG); \
+ 	  if [ -d $$TEXINFODIR ]; then \
+ 	    if sh iwhich makeinfo >/dev/null \
+-	      &&  makeinfo ispell.texinfo 2>/dev/null; then \
++	      && makeinfo --no-split --force ispell.texinfo 2>/dev/null; true; then \
+ 		:; \
+ 	    elif sh iwhich $$EMACS >/dev/null; then \
+ 		set -e; \
+@@ -508,7 +492,7 @@
+ local.h:
+ 	set +e; [ -r local.h ]  ||  cp local.h.samp local.h
+ 
+-msgs.h:	config.sh FRC
++msgs.h:	config.sh 
+ 	@. ./config.sh; \
+ 	  set $(SHELLDEBUG); \
+ 	  set +e; \
+@@ -522,7 +506,8 @@
+ 	  else \
+ 	    set -x; \
+ 	    rm -f msgs.h; ln $$msgs msgs.h  ||  cp $$msgs msgs.h; \
+-	  fi
++	  fi; \
++	touch msgs.h
+ 
+ FRC:
+ 
diff --git a/textproc/ispell-base/patches/patch-ac b/textproc/ispell-base/patches/patch-ac
new file mode 100644
index 00000000000..a0f3dcc071f
--- /dev/null
+++ b/textproc/ispell-base/patches/patch-ac
@@ -0,0 +1,31 @@
+$NetBSD: patch-ac,v 1.1.1.1 2001/03/14 12:10:22 agc Exp $
+--- ispell.h.orig	Mon Oct 26 23:13:30 1998
++++ ispell.h	Mon Oct 26 23:16:48 1998
+@@ -90,6 +90,16 @@
+ 
+ #include <stdio.h>
+ 
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#define PTRSIZE intptr_t
++#else
++#define PTRSIZE int
++#endif
++#if !defined(HAVE_INTTYPES_H) && defined(__alpha) && defined(__NetBSD__)
++#define PTRSIZE long
++#endif /* hack for 1.3 */
++
+ #ifdef __STDC__
+ #define P(x)	x
+ #define VOID	void
+@@ -336,8 +346,8 @@
+     short maxstringcharlen;			/* Max strchr len supported */
+     short compoundmin;				/* Min lth of compound parts */
+     short compoundbit;				/* Flag 4 compounding roots */
+-    int stringsize;				/* Size of string table */
+-    int lstringsize;				/* Size of lang. str tbl */
++    PTRSIZE stringsize;				/* Size of string table */
++    PTRSIZE lstringsize;			/* Size of lang. str tbl */
+     int tblsize;				/* No. entries in hash tbl */
+     int stblsize;				/* No. entries in sfx tbl */
+     int ptblsize;				/* No. entries in pfx tbl */
diff --git a/textproc/ispell-base/patches/patch-ad b/textproc/ispell-base/patches/patch-ad
new file mode 100644
index 00000000000..39d44a490a8
--- /dev/null
+++ b/textproc/ispell-base/patches/patch-ad
@@ -0,0 +1,21 @@
+$NetBSD: patch-ad,v 1.1.1.1 2001/03/14 12:10:22 agc Exp $
+--- buildhash.c.orig	Mon Jan 23 11:28:24 1995
++++ buildhash.c	Mon Oct 26 23:20:42 1998
+@@ -211,7 +211,7 @@
+     {
+     register FILE *		houtfile;
+     register struct dent *	dp;
+-    int				strptr;
++    PTRSIZE				strptr;
+     int				n;
+     int				i;
+     int				maxplen;
+@@ -336,7 +336,7 @@
+ 	{
+ 	if (dp->next != 0)
+ 	    {
+-	    int		x;
++	    PTRSIZE		x;
+ 	    x = dp->next - hashtbl;
+ 	    dp->next = (struct dent *)x;
+ 	    }
diff --git a/textproc/ispell-base/patches/patch-ae b/textproc/ispell-base/patches/patch-ae
new file mode 100644
index 00000000000..4a7c544a151
--- /dev/null
+++ b/textproc/ispell-base/patches/patch-ae
@@ -0,0 +1,30 @@
+$NetBSD: patch-ae,v 1.1.1.1 2001/03/14 12:10:22 agc Exp $
+--- lookup.c.orig	Mon Oct 26 23:24:20 1998
++++ lookup.c	Mon Oct 26 23:25:41 1998
+@@ -212,22 +212,22 @@
+ 	    if (dp->word == (char *) -1)
+ 		dp->word = NULL;
+ 	    else
+-		dp->word = &hashstrings [ (int)(dp->word) ];
++		dp->word = &hashstrings [ (PTRSIZE)(dp->word) ];
+ 	    if (dp->next == (struct dent *) -1)
+ 		dp->next = NULL;
+ 	    else
+-		dp->next = &hashtbl [ (int)(dp->next) ];
++		dp->next = &hashtbl [ (PTRSIZE)(dp->next) ];
+ 	    }
+ 	}
+ 
+     for (i = numsflags + numpflags, entry = sflaglist; --i >= 0; entry++)
+ 	{
+ 	if (entry->stripl)
+-	    entry->strip = (ichar_t *) &hashstrings[(int) entry->strip];
++	    entry->strip = (ichar_t *) &hashstrings[(PTRSIZE) entry->strip];
+ 	else
+ 	    entry->strip = NULL;
+ 	if (entry->affl)
+-	    entry->affix = (ichar_t *) &hashstrings[(int) entry->affix];
++	    entry->affix = (ichar_t *) &hashstrings[(PTRSIZE) entry->affix];
+ 	else
+ 	    entry->affix = NULL;
+ 	}
diff --git a/textproc/ispell-base/patches/patch-af b/textproc/ispell-base/patches/patch-af
new file mode 100644
index 00000000000..4b963da5077
--- /dev/null
+++ b/textproc/ispell-base/patches/patch-af
@@ -0,0 +1,20 @@
+$NetBSD: patch-af,v 1.1.1.1 2001/03/14 12:10:22 agc Exp $
+--- fields.c.orig	Mon Oct 26 23:27:45 1998
++++ fields.c	Mon Oct 26 23:31:02 1998
+@@ -32,6 +32,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include "config.h"
+ #include "fields.h"
+ 
+@@ -62,7 +63,7 @@
+ extern char *	malloc ();
+ extern char *	realloc ();
+ extern char *	strchr ();
+-extern int	strlen ();
++/* extern int	strlen ();*/
+ 
+ /*
+  * Read one line of the given file into a buffer, break it up into
diff --git a/textproc/ispell-base/patches/patch-ag b/textproc/ispell-base/patches/patch-ag
new file mode 100644
index 00000000000..72170f461e8
--- /dev/null
+++ b/textproc/ispell-base/patches/patch-ag
@@ -0,0 +1,11 @@
+$NetBSD: patch-ag,v 1.1.1.1 2001/03/14 12:10:22 agc Exp $
+--- sq.c.orig	Mon Oct 26 23:28:32 1998
++++ sq.c	Mon Oct 26 23:28:58 1998
+@@ -49,6 +49,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <string.h>
+ 
+ #ifdef __STDC__
+ #define P(x)	x
diff --git a/textproc/ispell-base/patches/patch-ah b/textproc/ispell-base/patches/patch-ah
new file mode 100644
index 00000000000..29c240f8509
--- /dev/null
+++ b/textproc/ispell-base/patches/patch-ah
@@ -0,0 +1,11 @@
+$NetBSD: patch-ah,v 1.1.1.1 2001/03/14 12:10:22 agc Exp $
+--- unsq.c.orig	Mon Oct 26 23:28:34 1998
++++ unsq.c	Mon Oct 26 23:29:08 1998
+@@ -49,6 +49,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include "msgs.h"
+ 
+ #ifdef __STDC__
diff --git a/textproc/ispell-base/patches/patch-ai b/textproc/ispell-base/patches/patch-ai
new file mode 100644
index 00000000000..6e13f1149c4
--- /dev/null
+++ b/textproc/ispell-base/patches/patch-ai
@@ -0,0 +1,19 @@
+$NetBSD: patch-ai,v 1.1.1.1 2001/03/14 12:10:22 agc Exp $
+--- languages/english/english.3.orig	Tue Oct 27 22:26:48 1998
++++ languages/english/english.3	Tue Oct 27 22:27:35 1998
+@@ -5202,6 +5202,7 @@
+ dirndl
+ disaccredit
+ disafforest
++disappear
+ disbranch
+ disbud
+ discalced
+@@ -5236,7 +5237,6 @@
+ dispersoid
+ displayable
+ disproven
+-dissappear
+ disseminule
+ dissentious
+ dissepiment
diff --git a/textproc/ispell-base/patches/patch-aj b/textproc/ispell-base/patches/patch-aj
new file mode 100644
index 00000000000..413d41f4f09
--- /dev/null
+++ b/textproc/ispell-base/patches/patch-aj
@@ -0,0 +1,16 @@
+$NetBSD: patch-aj,v 1.1.1.1 2001/03/14 12:10:22 agc Exp $
+
+--- ispell.texinfo-orig	Wed Nov  2 19:44:23 1994
++++ ispell.texinfo	Sun Dec 20 23:22:20 1998
+@@ -4,6 +4,11 @@
+ @settitle ISPELL V3.1
+ @comment %**end of header (This is for running Texinfo on a region.)
+ 
++@dircategory Miscellaneous
++@direntry
++* ISPELL: (ispell).             An interactive spelling corrector.
++@end direntry
++
+ @iftex
+ @finalout
+ @end iftex
diff --git a/textproc/ispell-base/pkg/DESCR b/textproc/ispell-base/pkg/DESCR
new file mode 100644
index 00000000000..9ede40c46b7
--- /dev/null
+++ b/textproc/ispell-base/pkg/DESCR
@@ -0,0 +1,5 @@
+Ispell is a fast screen-oriented spelling checker that shows you your
+errors in the context of the original file, and suggests possible
+corrections when it can figure them out.  Compared to UNIX spell, it
+is faster and much easier to use.  Ispell can also handle languages
+other than English.
diff --git a/textproc/ispell-base/pkg/PLIST b/textproc/ispell-base/pkg/PLIST
new file mode 100644
index 00000000000..e323ae9a6c5
--- /dev/null
+++ b/textproc/ispell-base/pkg/PLIST
@@ -0,0 +1,26 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2001/03/14 12:10:22 agc Exp $
+bin/buildhash
+bin/findaffix
+bin/icombine
+bin/ijoin
+bin/ispell
+bin/munchlist
+bin/sq
+bin/tryaffix
+bin/unsq
+@unexec install-info --delete %D/info/ispell.info %D/info/dir
+info/ispell.info
+@exec install-info %D/info/ispell.info %D/info/dir
+lib/american.hash
+lib/americanmed+.hash
+lib/english.aff
+lib/english.hash
+man/man1/buildhash.1.gz
+man/man1/findaffix.1.gz
+man/man1/ispell.1.gz
+man/man1/munchlist.1.gz
+man/man1/sq.1.gz
+man/man1/tryaffix.1.gz
+man/man1/unsq.1.gz
+man/man4/ispell.4.gz
+man/man4/english.4.gz