Moving ispell-* packages as discussed on tech-pkg@. Reasons being:

1) Shorter package name;
2) Be consistent with kde3-l18n-*, kde4-l10n-*, hunspell-*, aspell-*,
lang-* PKG_OPTIONS;
3) Simplify modifications to PKGNAME in some Makefiles;
4) Accordance with international language naming standards;

and rename the ispell-base package to ispell, to be consistent with aspell
and hunspell. Bump PKGREVISION where necessary.

10 files changed, 408 insertions, 0 deletions

diff --git a/textproc/ispell/patches/patch-aa b/textproc/ispell/patches/patch-aa
new file mode 100644
index 00000000000..9400e998cf3
--- /dev/null
+++ b/textproc/ispell/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.4 2013/04/24 02:20:36 rodent 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/patches/patch-ab b/textproc/ispell/patches/patch-ab
new file mode 100644
index 00000000000..fdaac685a92
--- /dev/null
+++ b/textproc/ispell/patches/patch-ab
@@ -0,0 +1,65 @@
+$NetBSD: patch-ab,v 1.8 2013/04/24 02:20:36 rodent Exp $
+
+--- Makefile.orig	2005-05-25 15:57:02.000000000 +0200
++++ Makefile
+@@ -373,13 +373,10 @@ install-dictbuild:
+ 	    rm -f fixispell-a$$MAN1EXT
+ 	@. ./config.sh; \
+ 	  set -x; \
+-	  $$INSTALL sq.1 $$MAN1DIR/sq$$MAN1EXT; \
+ 	  for m in buildhash munchlist findaffix tryaffix; do \
+ 	    echo ".so `basename $$MAN1DIR`/ispell$$MAN1EXT" \
+ 	      > $$MAN1DIR/$$m$$MAN1EXT; \
+-	  done; \
+-	  echo ".so `basename $$MAN1DIR`/sq$$MAN1EXT" \
+-	    > $$MAN1DIR/unsq$$MAN1EXT 
++	  done
+ 	@. ./config.sh; \
+ 	  set -x; \
+ 	  cd $$MAN1DIR; \
+@@ -506,10 +503,10 @@ defhash.h:  config.X local.h Makefile
+ 
+ config.sh:  config.X defhash.h local.h Makefile
+ 	set $(SHELLDEBUG); \
+-	for var in BAKEXT BINDIR CC CFLAGS COUNTSUFFIX DEFDICT DEFHASH \
++	for var in BAKEXT CC CFLAGS COUNTSUFFIX DEFDICT DEFHASH \
+ 	  DEFLANG EXEEXT HASHSUFFIX INSTALL \
+-	  LANGUAGES LIBDIR LIBES LINK LINT LINTFLAGS LOOK_XREF \
+-	  MAKE_SORTTMP MAN1DIR MAN1EXT MAN45DIR MAN45EXT MAN45SECT MASTERHASH \
++	  LANGUAGES LIBES LINK LINT LINTFLAGS LOOK_XREF \
++	  MAKE_SORTTMP MAN1EXT MAN45EXT MAN45SECT MASTERHASH \
+ 	  MSGLANG POUNDBANG REGLIB STATSUFFIX \
+ 	  SPELL_XREF TERMLIB TIB_XREF WORDS YACC \
+ 	  ; do \
+@@ -518,6 +515,12 @@ config.sh:  config.X defhash.h local.h M
+ 	      | sed -e 's/"[^"]*$$/'"'/" -e "s/=/='/" -e 's/\\"/"/g' \
+ 	      | sed -n -e '$$p'; \
+ 	  done > config.sh; \
++	for var in BINDIR LIBDIR MAN1DIR MAN45DIR; do \
++	    cat config.X defhash.h local.h \
++	      | sed -n -e "s/^#define[ 	]*$$var[ 	]*"'"'"/$$var=/p" \
++	      | sed -e 's/"[^"]*$$/'"'/" -e "s/=/=\$${DESTDIR}'/" -e 's/\\"/"/g' \
++	      | sed -n -e '$$p'; \
++	  done >> config.sh; \
+ 	echo 'case "$$MAKE_SORTTMP" in "") \
+ 	  SORTTMP="-e /!!SORTTMP!!/s/=.*$$/=/";; *) SORTTMP=;; esac' \
+ 	  >> config.sh
+@@ -636,7 +639,7 @@ local.h:
+ 	set +e; \
+ 	  [ -r local.h ]  ||  (cp local.h.generic local.h; chmod u+w local.h)
+ 
+-msgs.h:	config.sh FRC
++msgs.h:	config.sh
+ 	@. ./config.sh; \
+ 	  set $(SHELLDEBUG); \
+ 	  set +e; \
+@@ -650,7 +653,8 @@ msgs.h:	config.sh FRC
+ 	  else \
+ 	    set -x; \
+ 	    rm -f msgs.h; $$LINK $$msgs msgs.h  ||  cp $$msgs msgs.h; \
+-	  fi
++	  fi; \
++	touch msgs.h
+ 
+ FRC:
+ 
diff --git a/textproc/ispell/patches/patch-ac b/textproc/ispell/patches/patch-ac
new file mode 100644
index 00000000000..e930cd2094e
--- /dev/null
+++ b/textproc/ispell/patches/patch-ac
@@ -0,0 +1,32 @@
+$NetBSD: patch-ac,v 1.3 2013/04/24 02:20:36 rodent Exp $
+
+--- ispell.h.orig	2005-04-29 02:46:51.000000000 +1200
++++ ispell.h
+@@ -144,6 +144,16 @@
+ #include "config.h"
+ #include <stdio.h>
+ 
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#define PTRSIZE intptr_t
++#else
++#define PTRSIZE unsigned int
++#endif
++#if !defined(HAVE_INTTYPES_H) && defined(__alpha) && defined(__NetBSD__)
++#define PTRSIZE unsigned long
++#endif /* hack for 1.3 */
++
+ #ifdef __STDC__
+ #define P(x)	x
+ #define VOID	void
+@@ -380,8 +390,8 @@ struct hashheader
+     unsigned short maxstringcharlen;		/* Max strchr len supported */
+     unsigned short compoundmin;			/* Min lth of compound parts */
+     short compoundbit;				/* Flag 4 compounding roots */
+-    unsigned int stringsize;			/* Size of string table */
+-    unsigned int lstringsize;			/* Size of lang. str tbl */
++    PTRSIZE stringsize;				/* Size of string table */
++    PTRSIZE lstringsize;			/* Size of lang. str tbl */
+     unsigned int tblsize;			/* No. entries in hash tbl */
+     unsigned int stblsize;			/* No. entries in sfx tbl */
+     unsigned int ptblsize;			/* No. entries in pfx tbl */
diff --git a/textproc/ispell/patches/patch-ad b/textproc/ispell/patches/patch-ad
new file mode 100644
index 00000000000..2ae6ef107a8
--- /dev/null
+++ b/textproc/ispell/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.3 2013/04/24 02:20:36 rodent Exp $
+
+--- buildhash.c.orig	2005-04-28 12:26:06.000000000 +1200
++++ buildhash.c
+@@ -248,7 +248,7 @@ static void output ()
+     {
+     register FILE *		houtfile;
+     register struct dent *	dp;
+-    unsigned long		strptr;
++    PTRSIZE			strptr;
+     int				n;
+     unsigned int		i;
+     int				maxplen;
+@@ -375,7 +375,7 @@ static void output ()
+ 	{
+ 	if (dp->next != 0)
+ 	    {
+-	    unsigned long	x;
++	    PTRSIZE	x;
+ 	    x = dp->next - hashtbl;
+ 	    dp->next = (struct dent *)x;
+ 	    }
diff --git a/textproc/ispell/patches/patch-ae b/textproc/ispell/patches/patch-ae
new file mode 100644
index 00000000000..9a952c6f70b
--- /dev/null
+++ b/textproc/ispell/patches/patch-ae
@@ -0,0 +1,33 @@
+$NetBSD: patch-ae,v 1.3 2013/04/24 02:20:36 rodent Exp $
+
+--- lookup.c.orig	2005-04-15 09:25:52.000000000 +1200
++++ lookup.c
+@@ -247,11 +247,11 @@ int linit ()
+ 	    if (dp->word == (unsigned char *) -1)
+ 		dp->word = NULL;
+ 	    else
+-		dp->word = &hashstrings[(unsigned long) dp->word];
++		dp->word = &hashstrings[(PTRSIZE) dp->word];
+ 	    if (dp->next == (struct dent *) -1)
+ 		dp->next = NULL;
+ 	    else
+-		dp->next = &hashtbl[(unsigned long) dp->next];
++		dp->next = &hashtbl[(PTRSIZE) dp->next];
+ 	    }
+ 	}
+ 
+@@ -259,12 +259,12 @@ int linit ()
+ 	{
+ 	if (entry->stripl)
+ 	    entry->strip =
+-	      (ichar_t *) &hashstrings[(unsigned long) entry->strip];
++	      (ichar_t *) &hashstrings[(PTRSIZE) entry->strip];
+ 	else
+ 	    entry->strip = NULL;
+ 	if (entry->affl)
+ 	    entry->affix =
+-	      (ichar_t *) &hashstrings[(unsigned long) entry->affix];
++	      (ichar_t *) &hashstrings[(PTRSIZE) entry->affix];
+ 	else
+ 	    entry->affix = NULL;
+ 	}
diff --git a/textproc/ispell/patches/patch-ai b/textproc/ispell/patches/patch-ai
new file mode 100644
index 00000000000..418a4ae18d7
--- /dev/null
+++ b/textproc/ispell/patches/patch-ai
@@ -0,0 +1,19 @@
+$NetBSD: patch-ai,v 1.3 2013/04/24 02:20:36 rodent 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/patches/patch-ak b/textproc/ispell/patches/patch-ak
new file mode 100644
index 00000000000..23986765c9f
--- /dev/null
+++ b/textproc/ispell/patches/patch-ak
@@ -0,0 +1,147 @@
+$NetBSD: patch-ak,v 1.1 2013/04/24 02:20:36 rodent Exp $
+
+--- term.c.orig	2005-04-15 11:11:36.000000000 +1200
++++ term.c
+@@ -86,7 +86,10 @@ static char Rcs_Id[] =
+ #include "ispell.h"
+ #include "proto.h"
+ #include "msgs.h"
+-#ifdef USG
++#if defined(__NetBSD__) || defined(linux) || defined(__sgi) || defined(__INTERIX)
++#define USE_TERMIOS
++#include <termios.h>
++#elif defined(USG)
+ #include <termio.h>
+ #else
+ #ifndef __DJGPP__
+@@ -165,7 +168,10 @@ static int iputch (c)
+     return putchar (c);
+     }
+ 
+-#ifdef USG
++#ifdef USE_TERMIOS
++static struct termios	sbuf;
++static struct termios	osbuf;
++#elif defined(USG)
+ static struct termio	sbuf;
+ static struct termio	osbuf;
+ #else
+@@ -292,8 +298,31 @@ retry:
+ 
+ #endif
+ 
++#ifdef USE_TERMIOS
++    if (!isatty (0))
++	{
++	(void) fprintf (stderr, TERM_C_NO_BATCH);
++	exit (1);
++	}
++    tcgetattr(0, &osbuf);
++    termchanged = 1;
++
++    sbuf = osbuf;
++    sbuf.c_lflag &= ~(ECHO | ECHOK | ECHONL | ICANON);
++    sbuf.c_oflag &= ~(OPOST);
++    sbuf.c_iflag &= ~(INLCR | IGNCR | ICRNL);
++    sbuf.c_lflag |= ISIG;
++    sbuf.c_cc[VMIN] = 1;
++    sbuf.c_cc[VTIME] = 0;
++    tcsetattr(0, TCSANOW, &sbuf);
++
++    uerasechar = osbuf.c_cc[VERASE];
++    ukillchar = osbuf.c_cc[VKILL];
++
++#endif
++
+ #ifdef SIGTSTP
+-#ifndef USG
++#if !(defined(USG) || defined(USE_TERMIOS))
+     (void) sigsetmask (1<<(SIGTSTP-1) | 1<<(SIGTTIN-1) | 1<<(SIGTTOU-1));
+ #endif
+ #endif
+@@ -319,7 +348,7 @@ retry:
+ #endif
+ #endif
+ 
+-#ifndef USG
++#if !(defined(USG) || defined(USE_TERMIOS))
+     (void) ioctl (0, TIOCGETP, (char *) &osbuf);
+ #ifdef TIOCGLTC
+     (void) ioctl (0, TIOCGLTC, (char *) &oltc);
+@@ -372,7 +401,9 @@ SIGNAL_TYPE done (signo)
+ 	{
+ 	if (te)
+ 	    tputs (te, 1, iputch);
+-#ifdef USG
++#ifdef USE_TERMIOS
++	tcsetattr(0, TCSANOW, &osbuf);
++#elif defined(USG)
+ 	(void) ioctl (0, TCSETAW, (char *) &osbuf);
+ #else
+ 	(void) ioctl (0, TIOCSETP, (char *) &osbuf);
+@@ -393,7 +424,9 @@ static SIGNAL_TYPE onstop (signo)
+ 	imove (li - 1, 0);
+ 	if (te)
+ 	    tputs (te, 1, iputch);
+-#ifdef USG
++#ifdef USE_TERMIOS
++	tcsetattr(0, TCSANOW, &osbuf);
++#elif defined(USG)
+ 	(void) ioctl (0, TCSETAW, (char *) &osbuf);
+ #else
+ 	(void) ioctl (0, TIOCSETP, (char *) &osbuf);
+@@ -412,7 +445,9 @@ static SIGNAL_TYPE onstop (signo)
+     (void) signal (signo, onstop);
+     if (termchanged)
+ 	{
+-#ifdef USG
++#ifdef USE_TERMIOS
++	  tcsetattr(0, TCSANOW, &sbuf);
++#elif defined(USG)
+ 	(void) ioctl (0, TCSETAW, (char *) &sbuf);
+ #else
+ 	(void) ioctl (0, TIOCSETP, (char *) &sbuf);
+@@ -480,7 +515,9 @@ int shellescape	(buf)
+ 	}
+     argv[i] = NULL;
+ 
+-#ifdef USG
++#ifdef USE_TERMIOS
++    tcsetattr(0, TCSANOW, &osbuf);
++#elif defined(USG)
+     (void) ioctl (0, TCSETAW, (char *) &osbuf);
+ #else
+     (void) ioctl (0, TIOCSETP, (char *) &osbuf);
+@@ -526,7 +563,9 @@ int shellescape	(buf)
+ 	(void) signal (SIGTSTP, onstop);
+ #endif
+ 
+-#ifdef USG
++#ifdef USE_TERMIOS
++    tcsetattr(0, TCSANOW, &sbuf);
++#elif defined(USG)
+     (void) ioctl (0, TCSETAW, (char *) &sbuf);
+ #else
+     (void) ioctl (0, TIOCSETP, (char *) &sbuf);
+@@ -562,7 +601,9 @@ void shescape (buf)
+     char	curdir[MAXPATHLEN];
+ #endif
+ 
+-#ifdef USG
++#ifdef USE_TERMIOS
++    tcsetattr(0, TCSANOW, &osbuf);
++#elif defined(USG)
+     (void) ioctl (0, TCSETAW, (char *) &osbuf);
+ #else
+     (void) ioctl (0, TIOCSETP, (char *) &osbuf);
+@@ -610,7 +651,9 @@ void shescape (buf)
+     chdir (curdir);
+ #endif
+ 
+-#ifdef USG
++#ifdef USE_TERMIOS
++    tcsetattr(0, TCSANOW, &sbuf);
++#elif defined(USG)
+     (void) ioctl (0, TCSETAW, (char *) &sbuf);
+ #else
+     (void) ioctl (0, TIOCSETP, (char *) &sbuf);
diff --git a/textproc/ispell/patches/patch-al b/textproc/ispell/patches/patch-al
new file mode 100644
index 00000000000..83411fb67ce
--- /dev/null
+++ b/textproc/ispell/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2013/04/24 02:20:36 rodent Exp $
+
+--- config.X.orig	2005-05-26 02:13:53.000000000 +1200
++++ config.X
+@@ -274,7 +274,7 @@
+ ** -lcurses, or -lncurses on most systems.
+ */
+ #ifndef TERMLIB
+-#define TERMLIB	"-lncurses"
++#define TERMLIB	"-ltermcap"
+ #endif
+ 
+ /*
diff --git a/textproc/ispell/patches/patch-ar b/textproc/ispell/patches/patch-ar
new file mode 100644
index 00000000000..b2b1d650d77
--- /dev/null
+++ b/textproc/ispell/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1 2013/04/24 02:20:37 rodent Exp $
+
+--- ijoin.c.orig	Fri Mar 19 15:00:19 2004
++++ ijoin.c	Fri Mar 19 15:01:51 2004
+@@ -133,8 +133,6 @@
+ static int		unpairable1 = 0; /* NZ if -a1 */
+ static int		unpairable2 = 0; /* NZ if -a2 */
+ 
+-extern int	strcmp ();
+-
+ int main (argc, argv)			/* Join files */
+     int			argc;		/* Argument count */
+     char *		argv[];		/* Argument vector */
diff --git a/textproc/ispell/patches/patch-as b/textproc/ispell/patches/patch-as
new file mode 100644
index 00000000000..95245e3bc14
--- /dev/null
+++ b/textproc/ispell/patches/patch-as
@@ -0,0 +1,52 @@
+$NetBSD: patch-as,v 1.1 2013/04/24 02:20:37 rodent Exp $
+
+Avoid conflit with system getline.
+Fixes PR pkg/41746, thanks to Tom Stejskal.
+
+--- correct.c.orig	2009-07-17 09:14:29.000000000 +0100
++++ correct.c	2009-07-17 09:14:46.000000000 +0100
+@@ -245,7 +245,7 @@
+ 		  struct flagent * sufent,
+ 		  ichar_t savearea[MAX_CAPS][INPUTWORDLEN + MAXAFFIXLEN],
+ 		  int * nsaved));
+-static char *	getline P ((char * buf, int bufsize));
++static char *	get_line P ((char * buf, int bufsize));
+ void		askmode P ((void));
+ void		copyout P ((unsigned char ** cc, int cnt));
+ static void	lookharder P ((unsigned char * string));
+@@ -571,7 +571,7 @@
+ 
+ 		imove (li - 1, 0);
+ 		(void) putchar ('!');
+-		if (getline ((char *) buf, sizeof buf) == NULL)
++		if (get_line ((char *) buf, sizeof buf) == NULL)
+ 		    {
+ 		    (void) putchar (7);
+ 		    ierase ();
+@@ -596,7 +596,7 @@
+ 		    (void) printf ("%s ", CORR_C_READONLY);
+ 		    }
+ 		(void) printf (CORR_C_REPLACE_WITH);
+-		if (getline ((char *) ctok, ctokl) == NULL)
++		if (get_line ((char *) ctok, ctokl) == NULL)
+ 		    {
+ 		    (void) putchar (7);
+ 		    /* Put it back */
+@@ -664,7 +664,7 @@
+ 		unsigned char	buf[100];
+ 		imove (li - 1, 0);
+ 		(void) printf (CORR_C_LOOKUP_PROMPT);
+-		if (getline ((char *) buf, sizeof buf) == NULL)
++		if (get_line ((char *) buf, sizeof buf) == NULL)
+ 		    {
+ 		    (void) putchar (7);
+ 		    ierase ();
+@@ -1583,7 +1583,7 @@
+     return;
+     }
+ 
+-static char * getline (s, len)
++static char * get_line (s, len)
+     register char *	s;
+     register int	len;
+     {