[pkgsrc/trunk]: pkgsrc/textproc/ispell-base Update ispell-base to 3.3.02

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5b033cd83382
branches:  trunk
changeset: 496654:5b033cd83382
user:      markd <markd%pkgsrc.org@localhost>
date:      Thu Jul 07 12:42:20 2005 +0000

description:
Update ispell-base to 3.3.02

Ispell 3.3 offers improved support for international languages, improved
deformatting, and better support for compilation on Windows systems. All
known security holes have been closed. A number of small bugs are also
fixed.

diffstat:

 textproc/ispell-base/Makefile         |  12 ++++---
 textproc/ispell-base/PLIST            |  10 +++---
 textproc/ispell-base/distinfo         |  24 ++++++---------
 textproc/ispell-base/patches/patch-ab |  27 +++++++++++++---
 textproc/ispell-base/patches/patch-ac |  10 +++---
 textproc/ispell-base/patches/patch-ad |  14 ++++----
 textproc/ispell-base/patches/patch-ae |  26 +++++++++-------
 textproc/ispell-base/patches/patch-ak |  54 +++++++++++++++++-----------------
 textproc/ispell-base/patches/patch-al |  16 +++++-----
 textproc/ispell-base/patches/patch-am |  13 --------
 textproc/ispell-base/patches/patch-ao |  13 --------
 textproc/ispell-base/patches/patch-ap |  13 --------
 textproc/ispell-base/patches/patch-aq |  13 --------
 13 files changed, 104 insertions(+), 141 deletions(-)

diffs (truncated from 466 to 300 lines):

diff -r d74fefeb5cb7 -r 5b033cd83382 textproc/ispell-base/Makefile
--- a/textproc/ispell-base/Makefile     Thu Jul 07 11:46:55 2005 +0000
+++ b/textproc/ispell-base/Makefile     Thu Jul 07 12:42:20 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:47:36 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/07/07 12:42:20 markd Exp $
 #
 
-DISTNAME=      ispell-3.2.06
-PKGNAME=       ispell-base-3.2.06
+DISTNAME=      ispell-3.3.02
+PKGNAME=       ispell-base-3.3.02
 CATEGORIES=    textproc
 MASTER_SITES=  http://fmg-www.cs.ucla.edu/geoff/tars/
 
@@ -12,6 +12,9 @@
 
 CONFLICTS+=    ispell-[0-9]*
 
+USE_TOOLS+=    mktemp
+TOOLS_DEPMETHOD.mktemp=        DEPENDS
+
 MAKE_FLAGS+=   TMPDIR="${WRKDIR}"
 
 .include "../../mk/bsd.prefs.mk"
@@ -33,8 +36,7 @@
 
 do-configure:
        cd ${WRKSRC};                                                   \
-       ${SED} -e 's|/usr/local|${PREFIX}|g' <local.h.samp >local.h;    \
-       ${ECHO} "#undef NO8BIT" >> local.h ;                            \
+       ${SED} -e 's|/usr/local|${PREFIX}|g' <local.h.bsd >local.h;     \
        ${ECHO} "#define LANGUAGES \"{american,MASTERDICTS=american.med+,HASHFILES=americanmed+.hash,EXTRADICT=${EXTRADICT}}\""  >>local.h; \
        ${ECHO} "#define MASTERHASH \"americanmed+.hash\"" >>local.h;   \
        ${ECHO} "#define MASKBITS 64" >>local.h;                        \
diff -r d74fefeb5cb7 -r 5b033cd83382 textproc/ispell-base/PLIST
--- a/textproc/ispell-base/PLIST        Thu Jul 07 11:46:55 2005 +0000
+++ b/textproc/ispell-base/PLIST        Thu Jul 07 12:42:20 2005 +0000
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2004/12/01 12:18:21 markd Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/07/07 12:42:20 markd Exp $
 bin/buildhash
-bin/deformat-c
-bin/deformat-sh
+bin/defmt-c
+bin/defmt-sh
 bin/findaffix
 bin/icombine
 bin/ijoin
@@ -17,5 +17,5 @@
 man/man1/ispell.1
 man/man1/munchlist.1
 man/man1/tryaffix.1
-man/man4/ispell.4
-man/man4/english.4
+man/man5/english.5
+man/man5/ispell.5
diff -r d74fefeb5cb7 -r 5b033cd83382 textproc/ispell-base/distinfo
--- a/textproc/ispell-base/distinfo     Thu Jul 07 11:46:55 2005 +0000
+++ b/textproc/ispell-base/distinfo     Thu Jul 07 12:42:20 2005 +0000
@@ -1,18 +1,14 @@
-$NetBSD: distinfo,v 1.10 2005/03/24 17:08:02 tv Exp $
+$NetBSD: distinfo,v 1.11 2005/07/07 12:42:20 markd Exp $
 
-SHA1 (ispell-3.2.06.tar.gz) = 35f496322cda172d56610417e4e1c7b962f734d7
-RMD160 (ispell-3.2.06.tar.gz) = 3f6a3840540ebc753146c427da8ce2d54317b46e
-Size (ispell-3.2.06.tar.gz) = 580742 bytes
+SHA1 (ispell-3.3.02.tar.gz) = c0d98e1af3afb8e0b642717c03439ff8881e3d60
+RMD160 (ispell-3.3.02.tar.gz) = 12edc94ebb7c1f4040bd8f5b0dbb8f40326aa781
+Size (ispell-3.3.02.tar.gz) = 619813 bytes
 SHA1 (patch-aa) = cf8e0863e62103526d75ba5f0f25c760d4ee8e32
-SHA1 (patch-ab) = 8be9baccc9bc75027b2e2a1fb8be14e5d9cd5b05
-SHA1 (patch-ac) = 5d72462faf73b0205cce77d2b8b5769626294732
-SHA1 (patch-ad) = fb49b658513f43ecc07f17cdde0eeebc0b59a9b9
-SHA1 (patch-ae) = 4ebef741c4e092e3d25ec49ff8a45f3fbd8d1d20
+SHA1 (patch-ab) = 8c59901c7ddfc918ebdcc6235b1a72a8a2e1ba07
+SHA1 (patch-ac) = 02b94c918164c19ec7cba5c9b88b7168a6f37925
+SHA1 (patch-ad) = 86bcb4c4b34a970b5f3eba6d406a8b8204fccf39
+SHA1 (patch-ae) = 0b19b5f4f2a0faf74ce130b7414bdf85b7588954
 SHA1 (patch-ai) = 210d80ca55fc1d4fb5aa308205d8630a7f4bfb67
-SHA1 (patch-ak) = cfc487ffb4d4d0c96a004f04f98404015f71ae4d
-SHA1 (patch-al) = 8e75a7b529e76ed7137510e5e18f7b87084c62a8
-SHA1 (patch-am) = 15d74f643f88f67a08923a491018cc341bdac44b
-SHA1 (patch-ao) = 6ddf8412689f17cff7632a90ea443513da9d8448
-SHA1 (patch-ap) = 47411640b343a5d60b9d9e8d28574bd0397dde45
-SHA1 (patch-aq) = b37bfe33f3b710bef1141afabb2dae3d9b1776cd
+SHA1 (patch-ak) = aed34699d30d05a61bc2bd4d2ebf88e170ccd65c
+SHA1 (patch-al) = 27d87b52dc5507e9dbab73bb9643fa490920216d
 SHA1 (patch-ar) = 872cfc47e3652716afab9561fcf4a1bda2cee61a
diff -r d74fefeb5cb7 -r 5b033cd83382 textproc/ispell-base/patches/patch-ab
--- a/textproc/ispell-base/patches/patch-ab     Thu Jul 07 11:46:55 2005 +0000
+++ b/textproc/ispell-base/patches/patch-ab     Thu Jul 07 12:42:20 2005 +0000
@@ -1,20 +1,35 @@
-$NetBSD: patch-ab,v 1.3 2004/12/01 12:18:21 markd Exp $
+$NetBSD: patch-ab,v 1.4 2005/07/07 12:42:20 markd Exp $
 
---- Makefile.orig      2001-07-26 09:51:45.000000000 +1200
+--- Makefile.orig      2005-05-26 01:57:02.000000000 +1200
 +++ Makefile
-@@ -486,7 +486,7 @@ local.h:
+@@ -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; \
+@@ -636,7 +633,7 @@ local.h:
        set +e; \
-         [ -r local.h ]  ||  (cp local.h.samp local.h; chmod u+w local.h)
+         [ -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; \
-@@ -500,7 +500,8 @@ msgs.h:    config.sh FRC
+@@ -650,7 +647,8 @@ msgs.h:    config.sh FRC
          else \
            set -x; \
-           rm -f msgs.h; ln $$msgs msgs.h  ||  cp $$msgs msgs.h; \
+           rm -f msgs.h; $$LINK $$msgs msgs.h  ||  cp $$msgs msgs.h; \
 -        fi
 +        fi; \
 +      touch msgs.h
diff -r d74fefeb5cb7 -r 5b033cd83382 textproc/ispell-base/patches/patch-ac
--- a/textproc/ispell-base/patches/patch-ac     Thu Jul 07 11:46:55 2005 +0000
+++ b/textproc/ispell-base/patches/patch-ac     Thu Jul 07 12:42:20 2005 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.2 2004/12/01 12:18:21 markd Exp $
+$NetBSD: patch-ac,v 1.3 2005/07/07 12:42:20 markd Exp $
 
---- ispell.h.orig      2001-07-26 09:51:46.000000000 +1200
+--- ispell.h.orig      2005-04-29 02:46:51.000000000 +1200
 +++ ispell.h
-@@ -136,6 +136,16 @@
- 
+@@ -144,6 +144,16 @@
+ #include "config.h"
  #include <stdio.h>
  
 +#ifdef HAVE_INTTYPES_H
@@ -19,7 +19,7 @@
  #ifdef __STDC__
  #define P(x)  x
  #define VOID  void
-@@ -372,8 +382,8 @@ struct hashheader
+@@ -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 */
diff -r d74fefeb5cb7 -r 5b033cd83382 textproc/ispell-base/patches/patch-ad
--- a/textproc/ispell-base/patches/patch-ad     Thu Jul 07 11:46:55 2005 +0000
+++ b/textproc/ispell-base/patches/patch-ad     Thu Jul 07 12:42:20 2005 +0000
@@ -1,22 +1,22 @@
-$NetBSD: patch-ad,v 1.2 2004/12/01 12:18:21 markd Exp $
+$NetBSD: patch-ad,v 1.3 2005/07/07 12:42:20 markd Exp $
 
---- buildhash.c.orig   2001-07-26 09:51:45.000000000 +1200
+--- buildhash.c.orig   2005-04-28 12:26:06.000000000 +1200
 +++ buildhash.c
-@@ -237,7 +237,7 @@ static void output ()
+@@ -248,7 +248,7 @@ static void output ()
      {
      register FILE *           houtfile;
      register struct dent *    dp;
--    int                               strptr;
+-    unsigned long             strptr;
 +    PTRSIZE                   strptr;
      int                               n;
      unsigned int              i;
      int                               maxplen;
-@@ -362,7 +362,7 @@ static void output ()
+@@ -375,7 +375,7 @@ static void output ()
        {
        if (dp->next != 0)
            {
--          int         x;
-+          PTRSIZE             x;
+-          unsigned long       x;
++          PTRSIZE     x;
            x = dp->next - hashtbl;
            dp->next = (struct dent *)x;
            }
diff -r d74fefeb5cb7 -r 5b033cd83382 textproc/ispell-base/patches/patch-ae
--- a/textproc/ispell-base/patches/patch-ae     Thu Jul 07 11:46:55 2005 +0000
+++ b/textproc/ispell-base/patches/patch-ae     Thu Jul 07 12:42:20 2005 +0000
@@ -1,31 +1,33 @@
-$NetBSD: patch-ae,v 1.2 2004/12/01 12:18:21 markd Exp $
+$NetBSD: patch-ae,v 1.3 2005/07/07 12:42:20 markd Exp $
 
---- lookup.c.orig      2001-07-26 09:51:46.000000000 +1200
+--- lookup.c.orig      2005-04-15 09:25:52.000000000 +1200
 +++ lookup.c
-@@ -243,22 +243,22 @@ int linit ()
+@@ -247,11 +247,11 @@ int linit ()
            if (dp->word == (unsigned char *) -1)
                dp->word = NULL;
            else
--              dp->word = &hashstrings [ (int)(dp->word) ];
-+              dp->word = &hashstrings [ (PTRSIZE)(dp->word) ];
+-              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 [ (int)(dp->next) ];
-+              dp->next = &hashtbl [ (PTRSIZE)(dp->next) ];
+-              dp->next = &hashtbl[(unsigned long) dp->next];
++              dp->next = &hashtbl[(PTRSIZE) dp->next];
            }
        }
  
-     for (i = numsflags + numpflags, entry = sflaglist; --i >= 0; entry++)
+@@ -259,12 +259,12 @@ int linit ()
        {
        if (entry->stripl)
--          entry->strip = (ichar_t *) &hashstrings[(int) entry->strip];
-+          entry->strip = (ichar_t *) &hashstrings[(PTRSIZE) entry->strip];
+           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[(int) entry->affix];
-+          entry->affix = (ichar_t *) &hashstrings[(PTRSIZE) entry->affix];
+           entry->affix =
+-            (ichar_t *) &hashstrings[(unsigned long) entry->affix];
++            (ichar_t *) &hashstrings[(PTRSIZE) entry->affix];
        else
            entry->affix = NULL;
        }
diff -r d74fefeb5cb7 -r 5b033cd83382 textproc/ispell-base/patches/patch-ak
--- a/textproc/ispell-base/patches/patch-ak     Thu Jul 07 11:46:55 2005 +0000
+++ b/textproc/ispell-base/patches/patch-ak     Thu Jul 07 12:42:20 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.4 2005/03/24 17:08:02 tv Exp $
+$NetBSD: patch-ak,v 1.5 2005/07/07 12:42:20 markd Exp $
 
---- term.c.orig        2001-07-25 17:51:46.000000000 -0400
+--- term.c.orig        2005-04-15 11:11:36.000000000 +1200
 +++ term.c
-@@ -80,7 +80,10 @@ static char Rcs_Id[] =
+@@ -86,7 +86,10 @@ static char Rcs_Id[] =
  #include "ispell.h"
  #include "proto.h"
  #include "msgs.h"
@@ -13,8 +13,8 @@
 +#elif defined(USG)
  #include <termio.h>
  #else
- #include <sgtty.h>
-@@ -151,7 +154,10 @@ static int putch (c)
+ #ifndef __DJGPP__
+@@ -165,7 +168,10 @@ static int iputch (c)
      return putchar (c);
      }
  
@@ -26,7 +26,7 @@
  static struct termio  sbuf;
  static struct termio  osbuf;
  #else
-@@ -279,8 +285,31 @@ retry:
+@@ -292,8 +298,31 @@ retry:
  
  #endif
  
@@ -59,7 +59,7 @@
      (void) sigsetmask (1<<(SIGTSTP-1) | 1<<(SIGTTIN-1) | 1<<(SIGTTOU-1));
  #endif
  #endif
-@@ -306,7 +335,7 @@ retry:
+@@ -319,7 +348,7 @@ retry:
  #endif
  #endif
  
@@ -68,10 +68,10 @@
      (void) ioctl (0, TIOCGETP, (char *) &osbuf);
  #ifdef TIOCGLTC
      (void) ioctl (0, TIOCGLTC, (char *) &oltc);
-@@ -359,7 +388,9 @@ SIGNAL_TYPE done (signo)
+@@ -372,7 +401,9 @@ SIGNAL_TYPE done (signo)
        {
        if (te)
-           tputs (te, 1, putch);
+           tputs (te, 1, iputch);
 -#ifdef USG
 +#ifdef USE_TERMIOS
 +      tcsetattr(0, TCSANOW, &osbuf);
@@ -79,29 +79,29 @@