diff options
-rw-r--r-- | textproc/ispell-base/Makefile | 27 | ||||
-rw-r--r-- | textproc/ispell-base/PLIST | 22 | ||||
-rw-r--r-- | textproc/ispell-base/distinfo | 25 | ||||
-rw-r--r-- | textproc/ispell-base/patches/patch-ab | 60 | ||||
-rw-r--r-- | textproc/ispell-base/patches/patch-ac | 29 | ||||
-rw-r--r-- | textproc/ispell-base/patches/patch-ad | 15 | ||||
-rw-r--r-- | textproc/ispell-base/patches/patch-ae | 11 | ||||
-rw-r--r-- | textproc/ispell-base/patches/patch-af | 20 | ||||
-rw-r--r-- | textproc/ispell-base/patches/patch-ag | 11 | ||||
-rw-r--r-- | textproc/ispell-base/patches/patch-ah | 11 | ||||
-rw-r--r-- | textproc/ispell-base/patches/patch-aj | 16 | ||||
-rw-r--r-- | textproc/ispell-base/patches/patch-ak | 4 | ||||
-rw-r--r-- | textproc/ispell-base/patches/patch-am | 10 | ||||
-rw-r--r-- | textproc/ispell-base/patches/patch-an | 13 |
14 files changed, 73 insertions, 201 deletions
diff --git a/textproc/ispell-base/Makefile b/textproc/ispell-base/Makefile index efbb2d0e109..a581d9a8f83 100644 --- a/textproc/ispell-base/Makefile +++ b/textproc/ispell-base/Makefile @@ -1,14 +1,10 @@ -# $NetBSD: Makefile,v 1.20 2004/11/19 17:28:59 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2004/12/01 12:18:21 markd Exp $ # -DISTNAME= ispell-3.1.20 -PKGNAME= ispell-base-3.1.20 -PKGREVISION= 2 +DISTNAME= ispell-3.2.06 +PKGNAME= ispell-base-3.2.06 CATEGORIES= textproc -MASTER_SITES= ftp://ftp.cs.ucla.edu/pub/ispell-3.1/ - -PATCH_SITES= ftp://kdstevens.com/pub/stevens/ -PATCHFILES= ispell-patch1.gz +MASTER_SITES= http://fmg-www.cs.ucla.edu/geoff/tars/ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://ficus-www.cs.ucla.edu/geoff/ispell.html @@ -16,36 +12,35 @@ COMMENT= Interactive spelling checker CONFLICTS+= ispell-[0-9]* -WRKSRC= ${WRKDIR}/ispell-3.1 MAKE_FLAGS+= TMPDIR="${WRKDIR}" -USE_MAKEINFO= YES -INFO_FILES= ispell.info +.include "../../mk/bsd.prefs.mk" -.if exists(/usr/include/inttypes.h) +.if exists(/usr/include/inttypes.h) && ${LOWER_OPSYS} != "irix5.3" CFLAGS+= -DHAVE_INTTYPES_H .endif USE_BUILDLINK3= yes -.include "../../mk/bsd.prefs.mk" - .if ${OPSYS} == "SunOS" EXTRADICT=/usr/dict/words .else EXTRADICT=/usr/share/dict/words .endif +.if !exists(${EXTRADICT}) +EXTRADICT= +.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=${EXTRADICT}}\"" >>local.h; \ + ${ECHO} "#define MASTERHASH \"americanmed+.hash\"" >>local.h; \ ${ECHO} "#define MASKBITS 64" >>local.h; \ ${ECHO} "#undef WORDS" >> local.h ; \ ${ECHO} '#define WORDS "${EXTRADICT}"' >> local.h ; \ - ${ECHO} '#undef ELISPDIR' >> local.h; \ - ${ECHO} "#define ELISPDIR \"${PREFIX}/share/emacs/site-lisp\"" >> local.h; \ ${ECHO} "#define CFLAGS \"${CFLAGS}\"" >> local.h .if ${OPSYS} == "SunOS" cd ${WRKSRC}; \ diff --git a/textproc/ispell-base/PLIST b/textproc/ispell-base/PLIST index 0deecbfe524..718fb110373 100644 --- a/textproc/ispell-base/PLIST +++ b/textproc/ispell-base/PLIST @@ -1,23 +1,21 @@ -@comment $NetBSD: PLIST,v 1.4 2004/03/11 13:18:08 seb Exp $ +@comment $NetBSD: PLIST,v 1.5 2004/12/01 12:18:21 markd Exp $ bin/buildhash +bin/deformat-c +bin/deformat-sh bin/findaffix bin/icombine bin/ijoin bin/ispell bin/munchlist -bin/sq bin/tryaffix -bin/unsq 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 +man/man1/buildhash.1 +man/man1/findaffix.1 +man/man1/ispell.1 +man/man1/munchlist.1 +man/man1/tryaffix.1 +man/man4/ispell.4 +man/man4/english.4 diff --git a/textproc/ispell-base/distinfo b/textproc/ispell-base/distinfo index 8436a9667c7..62de1637a59 100644 --- a/textproc/ispell-base/distinfo +++ b/textproc/ispell-base/distinfo @@ -1,23 +1,16 @@ -$NetBSD: distinfo,v 1.7 2004/03/19 06:20:21 uebayasi Exp $ +$NetBSD: distinfo,v 1.8 2004/12/01 12:18:21 markd Exp $ -SHA1 (ispell-3.1.20.tar.gz) = f8f849a3868ef3d88c1ba6fe5b49505f75de786e -Size (ispell-3.1.20.tar.gz) = 677987 bytes -SHA1 (ispell-patch1.gz) = 61d7237cdbb8af1f2cb1f673e1c06aea0669089b -Size (ispell-patch1.gz) = 1110 bytes +SHA1 (ispell-3.2.06.tar.gz) = 35f496322cda172d56610417e4e1c7b962f734d7 +Size (ispell-3.2.06.tar.gz) = 580742 bytes SHA1 (patch-aa) = cf8e0863e62103526d75ba5f0f25c760d4ee8e32 -SHA1 (patch-ab) = f67725f76e3fe9136381e55e3aab37ef8b729cf7 -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-ab) = 8be9baccc9bc75027b2e2a1fb8be14e5d9cd5b05 +SHA1 (patch-ac) = 5d72462faf73b0205cce77d2b8b5769626294732 +SHA1 (patch-ad) = fb49b658513f43ecc07f17cdde0eeebc0b59a9b9 +SHA1 (patch-ae) = 4ebef741c4e092e3d25ec49ff8a45f3fbd8d1d20 SHA1 (patch-ai) = 210d80ca55fc1d4fb5aa308205d8630a7f4bfb67 -SHA1 (patch-aj) = 645d9c15fe6148e4ced398729aab6ffc9662c1d8 -SHA1 (patch-ak) = 99c95d0761999000523fa02bf1290639e1954242 +SHA1 (patch-ak) = 4b06d06ae9641b62bcc46692aaf79460215d161f SHA1 (patch-al) = 8e75a7b529e76ed7137510e5e18f7b87084c62a8 -SHA1 (patch-am) = d42829fe0c22bc4f42bc60f403576f80dde7e66a -SHA1 (patch-an) = b1f17843e68a1ff6d6ddb4814c8fcf070add2f8e +SHA1 (patch-am) = 15d74f643f88f67a08923a491018cc341bdac44b SHA1 (patch-ao) = 6ddf8412689f17cff7632a90ea443513da9d8448 SHA1 (patch-ap) = 47411640b343a5d60b9d9e8d28574bd0397dde45 SHA1 (patch-aq) = b37bfe33f3b710bef1141afabb2dae3d9b1776cd diff --git a/textproc/ispell-base/patches/patch-ab b/textproc/ispell-base/patches/patch-ab index 5c88ad602f1..04a4240d288 100644 --- a/textproc/ispell-base/patches/patch-ab +++ b/textproc/ispell-base/patches/patch-ab @@ -1,63 +1,17 @@ -$NetBSD: patch-ab,v 1.2 2002/02/18 15:14:43 seb Exp $ +$NetBSD: patch-ab,v 1.3 2004/12/01 12:18:21 markd Exp $ ---- Makefile.orig Thu Oct 12 20:04:06 1995 +--- Makefile.orig 2001-07-26 09:51:45.000000000 +1200 +++ Makefile -@@ -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; \ -@@ -323,8 +307,8 @@ - . ./config.sh; \ - set $(SHELLDEBUG); \ - if [ -d $$TEXINFODIR ]; then \ -- if sh iwhich makeinfo >/dev/null \ -- && makeinfo ispell.texinfo 2>/dev/null; then \ -+ if true >/dev/null \ -+ && $(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 +@@ -486,7 +486,7 @@ local.h: + set +e; \ + [ -r local.h ] || (cp local.h.samp local.h; chmod u+w local.h) -msgs.h: config.sh FRC -+msgs.h: config.sh ++msgs.h: config.sh @. ./config.sh; \ set $(SHELLDEBUG); \ set +e; \ -@@ -522,7 +506,8 @@ +@@ -500,7 +500,8 @@ msgs.h: config.sh FRC else \ set -x; \ rm -f msgs.h; ln $$msgs msgs.h || cp $$msgs msgs.h; \ diff --git a/textproc/ispell-base/patches/patch-ac b/textproc/ispell-base/patches/patch-ac index a0f3dcc071f..8ecdeaeeeed 100644 --- a/textproc/ispell-base/patches/patch-ac +++ b/textproc/ispell-base/patches/patch-ac @@ -1,7 +1,8 @@ -$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 @@ +$NetBSD: patch-ac,v 1.2 2004/12/01 12:18:21 markd Exp $ + +--- ispell.h.orig 2001-07-26 09:51:46.000000000 +1200 ++++ ispell.h +@@ -136,6 +136,16 @@ #include <stdio.h> @@ -9,23 +10,23 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/03/14 12:10:22 agc Exp $ +#include <inttypes.h> +#define PTRSIZE intptr_t +#else -+#define PTRSIZE int ++#define PTRSIZE unsigned int +#endif +#if !defined(HAVE_INTTYPES_H) && defined(__alpha) && defined(__NetBSD__) -+#define PTRSIZE long ++#define PTRSIZE unsigned 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 */ +@@ -372,8 +382,8 @@ struct hashheader + unsigned short maxstringcharlen; /* Max strchr len supported */ + unsigned 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 */ +- 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 */ - int tblsize; /* No. entries in hash tbl */ - int stblsize; /* No. entries in sfx tbl */ - int ptblsize; /* No. entries in pfx 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-base/patches/patch-ad b/textproc/ispell-base/patches/patch-ad index 39d44a490a8..64e9bc0a61b 100644 --- a/textproc/ispell-base/patches/patch-ad +++ b/textproc/ispell-base/patches/patch-ad @@ -1,16 +1,17 @@ -$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 @@ +$NetBSD: patch-ad,v 1.2 2004/12/01 12:18:21 markd Exp $ + +--- buildhash.c.orig 2001-07-26 09:51:45.000000000 +1200 ++++ buildhash.c +@@ -237,7 +237,7 @@ static void output () { register FILE * houtfile; register struct dent * dp; - int strptr; -+ PTRSIZE strptr; ++ PTRSIZE strptr; int n; - int i; + unsigned int i; int maxplen; -@@ -336,7 +336,7 @@ +@@ -362,7 +362,7 @@ static void output () { if (dp->next != 0) { diff --git a/textproc/ispell-base/patches/patch-ae b/textproc/ispell-base/patches/patch-ae index 4a7c544a151..c8aecbf6779 100644 --- a/textproc/ispell-base/patches/patch-ae +++ b/textproc/ispell-base/patches/patch-ae @@ -1,8 +1,9 @@ -$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) +$NetBSD: patch-ae,v 1.2 2004/12/01 12:18:21 markd Exp $ + +--- lookup.c.orig 2001-07-26 09:51:46.000000000 +1200 ++++ lookup.c +@@ -243,22 +243,22 @@ int linit () + if (dp->word == (unsigned char *) -1) dp->word = NULL; else - dp->word = &hashstrings [ (int)(dp->word) ]; diff --git a/textproc/ispell-base/patches/patch-af b/textproc/ispell-base/patches/patch-af deleted file mode 100644 index 4b963da5077..00000000000 --- a/textproc/ispell-base/patches/patch-af +++ /dev/null @@ -1,20 +0,0 @@ -$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 deleted file mode 100644 index 72170f461e8..00000000000 --- a/textproc/ispell-base/patches/patch-ag +++ /dev/null @@ -1,11 +0,0 @@ -$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 deleted file mode 100644 index 29c240f8509..00000000000 --- a/textproc/ispell-base/patches/patch-ah +++ /dev/null @@ -1,11 +0,0 @@ -$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-aj b/textproc/ispell-base/patches/patch-aj deleted file mode 100644 index 413d41f4f09..00000000000 --- a/textproc/ispell-base/patches/patch-aj +++ /dev/null @@ -1,16 +0,0 @@ -$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/patches/patch-ak b/textproc/ispell-base/patches/patch-ak index 1a58edef2af..731c1248a6a 100644 --- a/textproc/ispell-base/patches/patch-ak +++ b/textproc/ispell-base/patches/patch-ak @@ -1,4 +1,4 @@ -$NetBSD: patch-ak,v 1.2 2004/03/19 06:20:21 uebayasi Exp $ +$NetBSD: patch-ak,v 1.3 2004/12/01 12:18:21 markd Exp $ --- term.c.orig Wed Nov 2 19:44:28 1994 +++ term.c @@ -7,7 +7,7 @@ $NetBSD: patch-ak,v 1.2 2004/03/19 06:20:21 uebayasi Exp $ #include "proto.h" #include "msgs.h" -#ifdef USG -+#if defined(__NetBSD__) || defined(linux) ++#if defined(__NetBSD__) || defined(linux) || defined(__sgi) +#define USE_TERMIOS +#include <termios.h> +#elif defined(USG) diff --git a/textproc/ispell-base/patches/patch-am b/textproc/ispell-base/patches/patch-am index 23562fe7dff..2e65450946a 100644 --- a/textproc/ispell-base/patches/patch-am +++ b/textproc/ispell-base/patches/patch-am @@ -1,8 +1,8 @@ -$NetBSD: patch-am,v 1.2 2002/08/25 21:51:17 jlam Exp $ +$NetBSD: patch-am,v 1.3 2004/12/01 12:18:21 markd Exp $ ---- munchlist.X.orig Fri Jul 19 21:47:10 2002 -+++ munchlist.X Fri Jul 19 21:48:24 2002 -@@ -128,7 +128,7 @@ +--- munchlist.X.orig 2001-07-26 09:51:46.000000000 +1200 ++++ munchlist.X +@@ -160,7 +160,7 @@ then set -vx fi LIBDIR=!!LIBDIR!! @@ -10,4 +10,4 @@ $NetBSD: patch-am,v 1.2 2002/08/25 21:51:17 jlam Exp $ +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 deleted file mode 100644 index 2737617d80e..00000000000 --- a/textproc/ispell-base/patches/patch-an +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-an,v 1.2 2002/08/25 21:51:18 jlam 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) |