Update to 3.4.00

Changelog:

Version 3.4.00
==============

 - The english.5 manual page has been dropped from the distribution;
   the english.aff file provides superior documentation (and in any
   case, most people will use munchlist to apply affixes).

 - Ispell now supports systems (BSD) that foolish discarded backwards
   compatibility and insist on using termios.

 - A function (getline) has been renamed in correct.c to solve
   compilation problems on some systems.

 - The manual page now correctly identifies the ispell version that it
   describes.

 - It is now possible to insert the ispell version information into
   shell scripts via the Makefile.

 - An error has been corrected in the English affix files that caused
   certain words ending in "th" to be pluralized incorrectly.  The
   dictionaries have been updated to ensure that no incorrect plurals
   have crept in.

 - The personal dictionary is now written in a stable order when there
   are multiple variant capitalizations of a word.

 - The security of temporary files has been improved on systems that
   don't have the "mktemp" command.

 - The deformatters makefile has been changed to be compatible with
   older versions of make.

 - A bug in TeX deformatting has been corrected.  Previously, two
   adjacent math-mode environments introduced with dollar signs, such
   as $a=b$$c=d$, would cause ispell to lose track of whether it was
   in math mode.

 - The Makefile now supports a DESTDIR installation prefix (patch from
   Petter Reinholdtsen)

 - The American and British Makefiles have been simplified to ensure
   that dictionaries are always built with the lastest information.

3 files changed, 19 insertions, 236 deletions

diff --git a/textproc/ispell/patches/patch-ab b/textproc/ispell/patches/patch-ab
index b01ad8daec4..0d11cb9b055 100644
--- a/textproc/ispell/patches/patch-ab
+++ b/textproc/ispell/patches/patch-ab
@@ -1,50 +1,32 @@
-$NetBSD: patch-ab,v 1.9 2014/05/14 02:28:13 rodent Exp $
+$NetBSD: patch-ab,v 1.10 2015/03/14 07:55:32 ryoon Exp $
 
---- Makefile.orig	Wed May 25 13:57:02 2005
+--- Makefile.orig	2015-02-08 09:10:54.000000000 +0000
 +++ Makefile
-@@ -373,13 +373,10 @@ install-dictbuild:
+@@ -397,13 +397,10 @@ install-dictbuild:
  	    rm -f fixispell-a$$MAN1EXT
  	@. ./config.sh; \
  	  set -x; \
--	  $$INSTALL sq.1 $$MAN1DIR/sq$$MAN1EXT; \
+-	  $$INSTALL sq.1 $(DESTDIR)$$MAN1DIR/sq$$MAN1EXT; \
  	  for m in buildhash munchlist findaffix tryaffix; do \
  	    echo ".so `basename $$MAN1DIR`/ispell$$MAN1EXT" \
- 	      > $$MAN1DIR/$$m$$MAN1EXT; \
+ 	      > $(DESTDIR)$$MAN1DIR/$$m$$MAN1EXT; \
 -	  done; \
 -	  echo ".so `basename $$MAN1DIR`/sq$$MAN1EXT" \
--	    > $$MAN1DIR/unsq$$MAN1EXT 
+-	    > $(DESTDIR)$$MAN1DIR/unsq$$MAN1EXT 
 +	  done
  	@. ./config.sh; \
  	  set -x; \
- 	  cd $$MAN1DIR; \
-@@ -506,10 +503,10 @@ defhash.h:  config.X local.h Makefile
+ 	  cd $(DESTDIR)$$MAN1DIR; \
+@@ -421,7 +418,7 @@ install-languages:
+ 	  cd $(DESTDIR)$$LIBDIR; \
+ 	  if [ $$MASTERHASH != $$DEFHASH ]; then \
+ 	    rm -f $$DEFHASH; \
+-	    $$LINK -s $(DESTDIR)$$MASTERHASH $$DEFHASH; \
++	    $$LINK -s $$MASTERHASH $$DEFHASH; \
+ 	  fi
  
- 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 Makefile
- 	      | 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:
+ munchable:	findaffix tryaffix munchlist buildhash ispell icombine
+@@ -666,7 +663,7 @@ local.h:
  	set +e; \
  	  [ -r local.h ]  ||  (cp local.h.generic local.h; chmod u+w local.h)
  
@@ -53,13 +35,13 @@ $NetBSD: patch-ab,v 1.9 2014/05/14 02:28:13 rodent Exp $
  	@. ./config.sh; \
  	  set $(SHELLDEBUG); \
  	  set +e; \
-@@ -650,7 +653,8 @@ msgs.h:	config.sh FRC
+@@ -680,7 +677,8 @@ msgs.h:	config.sh FRC
  	  else \
  	    set -x; \
- 	    rm -f msgs.h; $$LINK $$msgs msgs.h  ||  cp $$msgs msgs.h; \
+ 	    rm -f msgs.h; $$LINK -s $$msgs msgs.h  ||  cp $$msgs msgs.h; \
 -	  fi
 +	  fi; \
-+	touch msgs.h
++	  touch msgs.h
  
  FRC:
  
diff --git a/textproc/ispell/patches/patch-ak b/textproc/ispell/patches/patch-ak
deleted file mode 100644
index 1bf3a07ac85..00000000000
--- a/textproc/ispell/patches/patch-ak
+++ /dev/null
@@ -1,147 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2014/05/14 02:28:13 rodent Exp $
-
---- term.c.orig	Thu Apr 14 23:11:36 2005
-+++ 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(__FreeBSD__) || defined(linux) || defined(__sgi) || defined(__INTERIX) || defined(__OpenBSD__)
-+#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-as b/textproc/ispell/patches/patch-as
deleted file mode 100644
index 949aa4c25ab..00000000000
--- a/textproc/ispell/patches/patch-as
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-as,v 1.2 2014/05/14 02:28:13 rodent Exp $
-
-Avoid conflit with system getline.
-Fixes PR pkg/41746, thanks to Tom Stejskal.
-
---- correct.c.orig	Thu Apr 28 14:46:51 2005
-+++ correct.c
-@@ -245,7 +245,7 @@ static void	save_root_cap P ((ichar_t * word, ichar_t 
- 		  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 @@ checkagain:
- 
- 		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 @@ checkagain:
- 		    (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 @@ checkagain:
- 		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 @@ static void save_root_cap (word, pattern, prestrip, pr
-     return;
-     }
- 
--static char * getline (s, len)
-+static char * get_line (s, len)
-     register char *	s;
-     register int	len;
-     {