Hello community,
here is the log from the commit of package ispell
checked in at Sun Jun 3 21:25:25 CEST 2007.
--------
--- ispell/ispell.changes 2007-05-31 16:02:56.000000000 +0200
+++ /mounts/work_src_done/STABLE/ispell/ispell.changes 2007-05-31 19:28:38.634067000 +0200
@@ -1,0 +2,6 @@
+Thu May 31 19:25:20 CEST 2007 - werner@suse.de
+
+- Update ispell to version 3.3.02 including various bug fixes
+ and add new old html parser and support for UTF-8.
+
+-------------------------------------------------------------------
Old:
----
ispell-3.2.06-bison.patch
ispell-3.2.06-brkgcc.patch
ispell-3.2.06-config.patch
ispell-3.2.06-defdict.patch
ispell-3.2.06.dif
ispell-3.2.06-flagbits.patch
ispell-3.2.06-iso-more-html-notported.patch
ispell-3.2.06-languages.patch
ispell-3.2.06-masktype.patch
ispell-3.2.06-mkdir.patch
ispell-3.2.06-sq.patch
ispell-3.2.06-strip.patch
ispell-3.2.06.tar.bz2
ispell-3.2.06-terminal.patch
ispell-3.2.06-types.patch
New:
----
ispell-3.3.02-brkgcc.patch
ispell-3.3.02-config.patch
ispell-3.3.02.dif
ispell-3.3.02-languages.patch
ispell-3.3.02-mkdir.patch
ispell-3.3.02-sq.patch
ispell-3.3.02-strip.patch
ispell-3.3.02.tar.bz2
ispell-3.3.02-terminal.patch
ispell-3.3.02-types.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ispell.spec ++++++
--- /var/tmp/diff_new_pack.e15857/_old 2007-06-03 21:25:04.000000000 +0200
+++ /var/tmp/diff_new_pack.e15857/_new 2007-06-03 21:25:04.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package ispell (Version 3.2.06)
+# spec file for package ispell (Version 3.3.02)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,35 +12,30 @@
Name: ispell
BuildRequires: bison ncurses-devel words
-URL: http://fmg-www.cs.ucla.edu/fmg-members/geoff/ispell.html
+URL: http://www.lasr.cs.ucla.edu/geoff/ispell.html
License: BSD License and BSD-like
Group: Productivity/Text/Spell
PreReq: fillup fileutils
Provides: spell
Requires: words ispell_english_dictionary ispell_dictionary
Autoreqprov: on
-Version: 3.2.06
-Release: 519
+Version: 3.3.02
+Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: A Spell Checker
-Source: ispell-3.2.06.tar.bz2
+Source: ispell-3.3.02.tar.bz2
Source1: SuSEconfig.ispell
Source2: sysconfig.ispell
-Patch: ispell-3.2.06.dif
-Patch1: ispell-3.2.06-suse.patch
-Patch2: ispell-3.2.06-config.patch
-Patch3: ispell-3.2.06-languages.patch
-Patch4: ispell-3.2.06-defdict.patch
-Patch5: ispell-3.2.06-flagbits.patch
-Patch6: ispell-3.2.06-types.patch
-Patch7: ispell-3.2.06-terminal.patch
-Patch8: ispell-3.2.06-sq.patch
-Patch9: ispell-3.2.06-brkgcc.patch
-Patch10: ispell-3.2.06-masktype.patch
-Patch11: ispell-3.2.06-iso-more-html-notported.patch
-Patch12: ispell-3.2.06-bison.patch
-Patch13: ispell-3.2.06-mkdir.patch
-Patch14: ispell-3.2.06-strip.patch
+Patch: ispell-3.3.02.dif
+Patch1: ispell-3.3.02-config.patch
+Patch2: ispell-3.2.06-suse.patch
+Patch3: ispell-3.3.02-languages.patch
+Patch4: ispell-3.3.02-types.patch
+Patch5: ispell-3.3.02-terminal.patch
+Patch6: ispell-3.3.02-sq.patch
+Patch7: ispell-3.3.02-brkgcc.patch
+Patch8: ispell-3.3.02-mkdir.patch
+Patch9: ispell-3.3.02-strip.patch
%description
Ispell is a fast, screen-oriented spell checker that shows you your
@@ -98,20 +93,15 @@
%prep
%setup
%patch -P 0 -p 0 -b .dif
-%patch -P 1 -p 0 -b .suse
-%patch -P 2 -p 0 -b .config
+%patch -P 1 -p 0 -b .config
+%patch -P 2 -p 0 -b .suse
%patch -P 3 -p 0 -b .languages
-%patch -P 4 -p 0 -b .defdict
-%patch -P 5 -p 0 -b .flagbits
-%patch -P 6 -p 0 -b .types
-%patch -P 7 -p 0 -b .terminal
-%patch -P 8 -p 0 -b .sq
-%patch -P 9 -p 0 -b .brkgcc
-%patch -P 10 -p 0 -b .masktype
-#%patch -P 11 -p 0 -b .isohtml
-%patch -P 12 -p 0 -b .bison
-%patch -P 13 -p 0 -b .mkdir
-%patch -P 14
+%patch -P 4 -p 0 -b .types
+%patch -P 5 -p 0 -b .terminal
+%patch -P 6 -p 0 -b .sq
+%patch -P 7 -p 0 -b .brkgcc
+%patch -P 8 -p 0 -b .mkdir
+%patch -P 9 -p 0 -b .strip
%build
PATH=$PATH:$PWD
@@ -152,7 +142,7 @@
rm -f ${DESTDIR}/usr/lib/ispell/english.aff
ln -sf /var/lib/dict/english.hash ${DESTDIR}/usr/lib/ispell/
ln -sf /var/lib/dict/english.aff ${DESTDIR}/usr/lib/ispell/
- rm -f ${DESTDIR}/usr/bin/deformat-*
+ rm -f ${DESTDIR}/usr/bin/defmt-*
%post
%{fillup_only}
@@ -207,6 +197,9 @@
%changelog
* Thu May 31 2007 - werner@suse.de
+- Update ispell to version 3.3.02 including various bug fixes
+ and add new old html parser and support for UTF-8.
+* Thu May 31 2007 - werner@suse.de
- Fix sq/unsq, hint from Thomas Rachel
* Thu Mar 29 2007 - rguenther@suse.de
- Add bison and ncurses-devel BuildRequires.
++++++ ispell-3.2.06-brkgcc.patch -> ispell-3.3.02-brkgcc.patch ++++++
--- ispell/ispell-3.2.06-brkgcc.patch 2002-02-20 14:36:02.000000000 +0100
+++ /mounts/work_src_done/STABLE/ispell/ispell-3.3.02-brkgcc.patch 2007-05-31 18:24:17.363637000 +0200
@@ -1,6 +1,6 @@
--- parse.y
-+++ parse.y Thu Sep 27 14:10:54 2001
-@@ -1832,8 +1832,10 @@
++++ parse.y 2007-05-31 18:23:51.044846032 +0200
+@@ -1877,8 +1877,10 @@ static int addstringchar (str, lower, up
*/
for (mslot = hashheader.nstrchars + SET_SIZE; --mslot >= slot; )
{
@@ -12,16 +12,16 @@
(char *) &hashheader.stringchars[mslot - SET_SIZE][0]);
hashheader.lowerchars[mslot + 1] = hashheader.lowerchars[mslot];
hashheader.upperchars[mslot + 1] = hashheader.upperchars[mslot];
-@@ -1846,10 +1848,8 @@
+@@ -1891,10 +1893,8 @@ static int addstringchar (str, lower, up
hashheader.lowerconv[mslot + 1] = hashheader.lowerconv[mslot];
hashheader.upperconv[mslot + 1] = hashheader.upperconv[mslot];
hashheader.sortorder[mslot + 1] = hashheader.sortorder[mslot];
- hashheader.stringdups[mslot + 1 - SET_SIZE] =
- hashheader.stringdups[mslot - SET_SIZE];
-- hashheader.dupnos[mslot + 1 - SET_SIZE] =
-- hashheader.dupnos[mslot - SET_SIZE];
+- hashheader.groupnos[mslot + 1 - SET_SIZE] =
+- hashheader.groupnos[mslot - SET_SIZE];
+ hashheader.stringdups[ia64_1] = hashheader.stringdups[mslot - SET_SIZE];
-+ hashheader.dupnos[ia64_1] = hashheader.dupnos[mslot - SET_SIZE];
++ hashheader.groupnos[ia64_1] = hashheader.groupnos[mslot - SET_SIZE];
}
/*
* Insert the new string character into the slot we made. The
++++++ ispell-3.2.06-config.patch -> ispell-3.3.02-config.patch ++++++
--- ispell/ispell-3.2.06-config.patch 2005-07-01 16:18:00.000000000 +0200
+++ /mounts/work_src_done/STABLE/ispell/ispell-3.3.02-config.patch 2007-05-31 19:21:22.419721000 +0200
@@ -1,6 +1,6 @@
--- Makefile
-+++ Makefile Thu Sep 27 13:10:23 2001
-@@ -201,6 +201,10 @@
++++ Makefile 2007-05-31 17:28:33.532557680 +0200
+@@ -249,6 +249,10 @@ EXTRADICT = Use_config.sh
SHELL = /bin/sh
MAKE = make
@@ -11,73 +11,50 @@
#
# Set this to "-vx" in the make command line if you need to
# debug the complex shell commands.
-@@ -482,9 +486,9 @@
- >> config.h
-
+@@ -638,7 +642,7 @@ config.h: config.X local.h
# Create a sample local.h if no such file currently exists
--local.h:
-+local.h: local.h.samp
+ local.h:
set +e; \
-- [ -r local.h ] || (cp local.h.samp local.h; chmod u+w local.h)
-+ sed "s/.[{(]\?RPM_OPT_FLAGS[})]\?/$(RPM_OPT_FLAGS)/" < local.h.samp > local.h
+- [ -r local.h ] || (cp local.h.generic local.h; chmod u+w local.h)
++ sed "s/.[{(]\?RPM_OPT_FLAGS[})]\?/$(RPM_OPT_FLAGS)/" < local.h.linux > local.h
msgs.h: config.sh FRC
@. ./config.sh; \
---- ispell.1X
-+++ ispell.1X Thu Sep 27 13:58:23 2001
-@@ -1487,7 +1487,7 @@
- List of TeX keywords that have a single argument that
- .I ispell
- should ignore.
--.IP TEXSKIP1
-+.IP TEXSKIP2
- List of TeX keywords that have two arguments that
- .I ispell
- should ignore.
-@@ -1504,7 +1504,7 @@
- .IP !!LIBDIR!!/!!DEFLANG!!
- Affix-definition file for
- .I munchlist
--.IP "/usr/dict/web2 or /usr/dict/words"
-+.IP "/usr/share/dict/web2 or /usr/share/dict/words"
- For the Lookup function (depending on the WORDS compilation option).
- .IP $HOME/.ispell_\fIhashfile\fP
- User's private dictionary
---- local.h.samp
-+++ local.h.samp Thu Sep 27 13:50:53 2001
-@@ -105,19 +105,45 @@
- */
-
- #define MINIMENU /* Display a mini-menu at the bottom of the screen */
--#define NO8BIT /* Remove this if you use ISO character sets */
--#undef USG /* Define on System V or if term.c won't compile */
--#undef NO_FCNTL_H /* Define if you get compile errors on fcntl.h */
--#undef NO_MKSTEMP /* Define if you get compile or link errors */
-+#undef NO8BIT /* Remove this if you use ISO character sets */
-+#define USG /* Define on System V or if term.c won't compile */
+--- local.h.linux
++++ local.h.linux 2007-05-31 17:48:04.745014132 +0200
+@@ -68,6 +68,8 @@
+ #define GENERATE_LIBRARY_PROTOS
+ #define EGREPCMD "grep -Ei"
+ #define HAS_RENAME
+#undef NO_FCNTL_H /* Define if you get compile errors on fcntl.h */
+#undef NO_MKSTEMP /* Define if you get compile or link errors */
/*
- * Important directory paths
+ * Important directory paths. If you change MAN45DIR from man5 to
+@@ -75,14 +77,43 @@
+ * MAN45EXT (but not if you keep the man pages in section 5 and just
+ * store them in a different place).
*/
-#define BINDIR "/usr/local/bin"
-#define LIBDIR "/usr/local/lib"
-#define MAN1DIR "/usr/local/man/man1"
--#define MAN4DIR "/usr/local/man/man4"
-+#define BINDIR "/usr/bin"
-+#define LIBDIR "/usr/lib/ispell"
-+#define MAN1DIR "/usr/share/man/man1"
-+#define MAN4DIR "/usr/share/man/man5"
-+#define MAN4EXT ".5"
+-#define MAN45DIR "/usr/local/man/man5"
+-#define MAN45EXT ".5"
++#define BINDIR "/usr/bin"
++#define LIBDIR "/usr/lib/ispell"
++#define MAN1DIR "/usr/share/man/man1"
++#define MAN45DIR "/usr/share/man/man5"
++#define MAN45EXT ".5"
/*
* Place any locally-required #include statements here
*/
+
+#define WORDS "/usr/share/dict/words"
+#define CC "gcc"
+#define CFLAGS "$RPM_OPT_FLAGS -pipe"
+#define TERMLIB "-lncurses"
++#define LINK "ln -s"
+#define LANGUAGES "{american,MASTERDICTS=american.xlg,HASHFILES=americanxlg.hash,EXTRADICT=} {british,MASTERDICTS=british.xlg,HASHFILES=britishxlg.hash,EXTRADICT=} {american,MASTERDICTS=american.med,HASHFILES=americanmed.hash,EXTRADICT=} {british,MASTERDICTS=british.med,HASHFILES=britishmed.hash,EXTRADICT=}"
+
+/*
@@ -87,15 +64,19 @@
+#define COMMANDFORSPACE
+#define MASKBITS 64
+#define INPUTWORDLEN 256
-+#define MAXAFFIXLEN 32
++#define MAXAFFIXLEN 48
+#define MAXSTRINGCHARS 512
+#define MASTERHASH "britishxlg.hash"
-+#define HAS_RENAME
+#define DEFNOBACKUPFLAG 0
-+#define BAKEXT "~"
++#define BAKEX "~"
+#define DEFTEXFLAG DEFORMAT_TEX
-+#define EGREPCMD "/bin/grep -E"
++#undef EGREPCMD
++#define EGREPCMD "/bin/grep -iE"
+#define LOOK "/usr/bin/look -df"
+#define MAKE_SORTTMP "-T ${TMPDIR-/var/tmp}"
-+#define SORTPERSONAL 2000
++#define SORTPERSONAL 6000
+#define USESH
++#undef TIB_XREF
++#define TIB_XREF ".IR tib (not\\ available),"
++
+ #endif /* LOCAL_H_INCLUDED */
++++++ ispell-3.2.06.dif -> ispell-3.3.02.dif ++++++
--- ispell/ispell-3.2.06.dif 2004-12-21 16:46:46.000000000 +0100
+++ /mounts/work_src_done/STABLE/ispell/ispell-3.3.02.dif 2007-05-31 19:05:41.047729000 +0200
@@ -1,32 +1,18 @@
--- .pkgextract
-+++ .pkgextract Tue Dec 21 16:18:58 2004
-@@ -0,0 +1,12 @@
-+patch -p0 -s --backup --suffix=.config < ../ispell-3.2.06-config.patch
++++ .pkgextract 2004-12-21 16:18:58.000000000 +0100
+@@ -0,0 +1,9 @@
++patch -p0 -s --backup --suffix=.config < ../ispell-3.3.02-config.patch
+patch -p0 -s --backup --suffix=.suse < ../ispell-3.2.06-suse.patch
-+patch -p0 -s --backup --suffix=.languages < ../ispell-3.2.06-languages.patch
-+patch -p0 -s --backup --suffix=.defdict < ../ispell-3.2.06-defdict.patch
-+patch -p0 -s --backup --suffix=.flagbits < ../ispell-3.2.06-flagbits.patch
-+patch -p0 -s --backup --suffix=.types < ../ispell-3.2.06-types.patch
-+patch -p0 -s --backup --suffix=.terminal < ../ispell-3.2.06-terminal.patch
-+patch -p0 -s --backup --suffix=.sq < ../ispell-3.2.06-sq.patch
-+patch -p0 -s --backup --suffix=.brkgcc < ../ispell-3.2.06-brkgcc.patch
-+patch -p0 -s --backup --suffix=.masktype < ../ispell-3.2.06-masktype.patch
-+#patch -p0 -s --backup --suffix=.isohtml < ../ispell-3.2.06-iso-more-html.patch
-+patch -p0 -s --backup --suffix=.bison < ../ispell-3.2.06-bison.patch
---- Makefile
-+++ Makefile Tue Dec 21 16:18:58 2004
-@@ -414,7 +414,7 @@
- cat config.X local.h \
- | sed -n -e "s/^#define[ ]*$$var[ ]*"'"'"/$$var=/p" \
- | sed -e 's/".*$$/'"'/" -e "s/=/='/" \
-- | tail -1; \
-+ | tail -n 1; \
- done > config.sh; \
- echo 'case "$$MAKE_SORTTMP" in "") \
- SORTTMP="-e /!!SORTTMP!!/s/=.*$$/=/";; *) SORTTMP=;; esac' \
++patch -p0 -s --backup --suffix=.languages < ../ispell-3.3.02-languages.patch
++patch -p0 -s --backup --suffix=.types < ../ispell-3.3.02-types.patch
++patch -p0 -s --backup --suffix=.terminal < ../ispell-3.3.02-terminal.patch
++patch -p0 -s --backup --suffix=.sq < ../ispell-3.3.02-sq.patch
++patch -p0 -s --backup --suffix=.brkgcc < ../ispell-3.3.02-brkgcc.patch
++patch -p0 -s --backup --suffix=.mkdir < ../ispell-3.3.02-mkdir.patch
++patch -p0 -s --backup --suffix=.strip < ../ispell-3.3.02-strip.patch
--- buildhash.c
-+++ buildhash.c Tue Dec 21 16:46:20 2004
-@@ -99,6 +99,7 @@
++++ buildhash.c 2004-12-21 16:46:20.000000000 +0100
+@@ -112,6 +112,7 @@ static char Rcs_Id[] =
#include "version.h"
#include
#include
@@ -34,19 +20,19 @@
int main P ((int argc, char * argv[]));
static void output P ((void));
-@@ -134,6 +135,9 @@
- int stats[NSTAT];
+@@ -145,6 +146,9 @@ int main (argc, argv)
unsigned int i;
int j;
-+
+
+ (void)setlocale(LC_CTYPE, "POSIX");
+ (void)setlocale(LC_COLLATE, "POSIX");
-
++
while (argc > 1 && *argv[1] == '-')
{
+ argc--;
--- defmt.c
-+++ defmt.c Tue Dec 21 16:18:58 2004
-@@ -672,6 +672,14 @@
++++ defmt.c 2004-12-21 16:18:58.000000000 +0100
+@@ -686,6 +686,14 @@ void checkline (ofile)
p = ctoken;
endp = skipoverword (currentchar);
@@ -62,8 +48,8 @@
*p++ = *currentchar++;
*p = 0;
--- fields.c
-+++ fields.c Tue Dec 21 16:31:41 2004
-@@ -109,6 +109,7 @@
++++ fields.c 2004-12-21 16:31:41.000000000 +0100
+@@ -112,6 +112,7 @@ field_t * fieldread (file, delims, flags
if (linesize == 0)
{
free (linebuf);
@@ -71,7 +57,7 @@
return NULL;
}
return fieldmake (linebuf, 1, delims, flags, maxf);
-@@ -429,8 +430,15 @@
+@@ -433,8 +434,15 @@ void fieldfree (fieldp)
if (fieldp == NULL)
return;
if (fieldp->linebuf != NULL)
@@ -87,48 +73,9 @@
free ((char *) fieldp);
+ fieldp = NULL;
}
---- findaffix.X
-+++ findaffix.X Tue Dec 21 16:18:58 2004
-@@ -1,4 +1,4 @@
--: Use /bin/sh
-+#! /bin/sh
- #
- # $Id: findaffix.X,v 1.18 2001/07/25 21:51:46 geoff Exp $
- #
-@@ -152,7 +152,7 @@
- elimlen=1
- lowcount=10
- cleanout=no
--finalsortopts='+3rn -4 +2rn -3 +1 -2 +0 -1'
-+finalsortopts='-k 4rn,4 -k 3rn,3 -k 2,2 -k 1,1'
- tabch=/
- while :
- do
-@@ -177,7 +177,7 @@
- shift
- ;;
- -f)
-- finalsortopts='+2rn -3 +3rn -4 +1 -2 +0 -1'
-+ finalsortopts='-k 3rn,3 -k 4rn,4 -k 2,2 -k 1,1'
- shift
- ;;
- -c)
-@@ -256,10 +256,10 @@
- next
- '"$LOOP"'
- }' < ${TMP}a \
-- | sort "-t$tabch" +0 -1 +1 $SORTTMP -o ${TMP}a
-+ | sort "-t$tabch" -k 1,1 -k 2 $SORTTMP -o ${TMP}a
- join "-t$tabch" -o 1.2 2.2 2.3 ${TMP}a ${TMP}a \
- | awk "-F$tabch" "BEGIN{elimlen=$elimlen}$ELIM" \
-- | sort "-t$tabch" +1 -2 +0 -1 $SORTTMP \
-+ | sort "-t$tabch" -k 2,2 -k 1,1 $SORTTMP \
- | awk "-F$tabch" 'BEGIN{tabch="'"$tabch"'"; lowcount='"$lowcount"'}
- {
- if ($1 == last1 && $2 == last2)
--- icombine.c
-+++ icombine.c Tue Dec 21 16:46:24 2004
-@@ -88,6 +88,7 @@
++++ icombine.c 2007-05-31 16:47:19.557830000 +0200
+@@ -89,6 +89,7 @@ static char Rcs_Id[] =
#include "ispell.h"
#include "proto.h"
#include "msgs.h"
@@ -136,19 +83,19 @@
char * Lfile; /* Language-description file */
-@@ -106,6 +107,9 @@
- {
- char * argp;
+@@ -109,6 +110,9 @@ int main (argc, argv)
char * preftype = NULL;
-+
+ char * wchars = NULL;
+
+ (void)setlocale(LC_CTYPE, "POSIX");
+ (void)setlocale(LC_COLLATE, "POSIX");
-
++
while (argc > 1 && argv[1][0] == '-')
{
+ argc--;
--- ijoin.c
-+++ ijoin.c Tue Dec 21 16:46:28 2004
-@@ -115,6 +115,7 @@
++++ ijoin.c 2004-12-21 16:46:28.000000000 +0100
+@@ -119,6 +119,7 @@ static char Rcs_Id[] =
#include "ispell.h"
#include "proto.h"
#include "fields.h"
@@ -156,7 +103,7 @@
#ifdef __STDC__
#define SIGNED signed
-@@ -174,6 +175,9 @@
+@@ -176,6 +177,9 @@ int main (argc, argv) /* Join files */
char * argv[]; /* Argument vector */
{
@@ -167,310 +114,80 @@
{
argc--;
--- ispell.c
-+++ ispell.c Tue Dec 21 16:46:32 2004
-@@ -210,6 +210,7 @@
++++ ispell.c 2004-12-21 16:46:32.000000000 +0100
+@@ -236,6 +236,7 @@ static char Rcs_Id[] =
#include
#endif /* NO_FCNTL_H */
#include
+#include
static void usage P ((void));
- static void initckch P ((char * wchars));
-@@ -337,6 +338,9 @@
- Cmd = *argv;
+ int main P ((int argc, char * argv[]));
+@@ -283,6 +284,9 @@ int main (argc, argv)
Trynum = 0;
-+
+
+ (void)setlocale(LC_CTYPE, "POSIX");
+ (void)setlocale(LC_COLLATE, "POSIX");
-
- p = getenv ("DICTIONARY");
- if (p != NULL)
++
+ p = getenv (LIBRARYVAR);
+ if (p == NULL)
+ (void) strcpy (libdir, LIBDIR);
--- munchlist.X
-+++ munchlist.X Tue Dec 21 16:23:15 2004
-@@ -1,4 +1,4 @@
--: Use /bin/sh
-+#! /bin/sh
- #
- # $Id: munchlist.X,v 1.61 2001/07/25 21:51:46 geoff Exp $
- #
-@@ -153,16 +153,16 @@
- # Get rid of all old RCS log lines in preparation for the 3.1 release.
- #
- #
-+LIBDIR=!!LIBDIR!!
-+TDIR=${TMPDIR-/var/tmp}
-+TMP=$(mktemp -d ${TDIR}/munchXXXXXX)/ || exit 1
-+SORTTMP="-T ${TMP}" # !!SORTTMP!!
- if [ "X$MUNCHMAIL" != X ]
- then
-- exec 2> /tmp/munchlist.mail
-+ exec 2> ${TMP}munchlist.mail
++++ munchlist.X 2007-05-31 16:53:52.551491000 +0200
+@@ -191,7 +191,7 @@ then
echo "munchlist $*" 1>&2
set -vx
fi
--LIBDIR=!!LIBDIR!!
--TDIR=${TMPDIR-/usr/tmp}
--TMP=${TDIR}/munch$$
-SORTTMP="-T ${TDIR}" # !!SORTTMP!!
++SORTTMP="-T ${MUNCHDIR}" # !!SORTTMP!!
- #
- # Set up some program names. This prefers the versions that are in
-@@ -223,10 +223,10 @@
+ DBDIR=${MUNCHDEBUGDIR-$MAILDEBUGDIR}
+
+@@ -278,20 +278,20 @@ fi
# The following is necessary so that some internationalized versions of
# sort(1) don't confuse things by sorting into a nonstandard order.
#
-LANG=C
-LOCALE=C
+-LC_ALL=C
+-LC_COLLATE=C
-LC_CTYPE=C
--export LANG LOCALE LC_CTYPE
+LANG=POSIX
-+LC_CTYPE=POSIX
++LOCALE=POSIX
++LC_ALL=POSIX
+LC_COLLATE=POSIX
-+export LANG LC_CTYPE LC_COLLATE
-
- debug=no
- dictopt=
-@@ -259,6 +259,7 @@
- if [ ! -r "$langtabs" ]
- then
- echo "Can't open language table '$2'" 1>&2
-+ /bin/rm -rf ${TMP}
- exit 1
- fi
- shift
-@@ -272,6 +273,7 @@
- convtabs="${LIBDIR}/$2"
- else
- echo "Can't open conversion language table '$2'" 1>&2
-+ /bin/rm -rf ${TMP}
- exit 1
- fi
- shift
-@@ -305,6 +307,7 @@
- -*)
- echo 'Usage: munchlist [-l lang] [-c lang] [-T suff] [-s hashfile] [-D] [-w chars] [-v] [file] ...' \
- 1>&2
-+ /bin/rm -rf ${TMP}
- exit 2
- ;;
- *)
-@@ -318,7 +321,7 @@
- verbose=true
- debug=yes
- fi
--trap "/bin/rm -f ${TMP}*; exit 1" 1 2 13 15
-+trap "/bin/rm -rf ${TMP}; exit 1" 1 2 13 15
- #
- # Names of temporary files. This is just to make the code a little easier
- # to read.
-@@ -381,7 +384,7 @@
- esac
- echo 'QQQQQQQQ' > $FAKEDICT
- $BUILDHASH -s $FAKEDICT $convtabs $FAKEHASH \
-- || (echo "Couldn't create fake hash file" 1>&2; /bin/rm -f ${TMP}*; exit 1) \
-+ || (echo "Couldn't create fake hash file" 1>&2; /bin/rm -rf ${TMP}; exit 1) \
- || exit 1
- #
- # Figure out how 'sort' sorts signed fields, for arguments to ijoin.
-@@ -422,7 +425,7 @@
- cat "$@" | $ISPELL "$wchars" -e1 -d $FAKEHASH -p /dev/null | tr " " '
- '
- fi \
-- | sort $SORTTMP -u +0f -1 +0 \
-+ | sort $SORTTMP -u -k 1f,1 -k 1 \
- | $COMBINE $icflags $langtabs \
- | sort $SORTTMP -u > $EXPANDEDINPUT
- #
-@@ -435,7 +438,7 @@
- *)
- $BUILDHASH -s $FAKEDICT $langtabs $FAKEHASH \
- || (echo "Couldn't create fake hash file" 1>&2; \
-- /bin/rm -f ${TMP}*; exit 1) \
-+ /bin/rm -rf ${TMP}; exit 1) \
- || exit 1
- ;;
- esac
-@@ -482,7 +485,7 @@
- $ISPELL "$wchars" -c -W0 -d $FAKEHASH -p /dev/null < $STRIPPEDINPUT \
- | tr " " '
- ' \
-- | egrep "$flagmarker" | sort $SORTTMP -u "-t$flagmarker" +0 -1 +1 \
-+ | egrep "$flagmarker" | sort $SORTTMP -u "-t$flagmarker" -k 1,1 -k 2 \
- | $JOIN $SIGNED "-t$flagmarker" - $EXPANDEDINPUT > $CRUNCHEDINPUT
- #
- # We now have a list of legal roots, and of affixes that apply to the
-@@ -508,7 +511,7 @@
- #
- $verbose && echo 'Expanding dictionary into EXPANDEDPAIRS.' 1>&2
- $ISPELL "$wchars" -e3 -d $FAKEHASH -p /dev/null < $CRUNCHEDINPUT \
-- | sort $SORTTMP +1 > $EXPANDEDPAIRS
-+ | sort $SORTTMP -k 2 > $EXPANDEDPAIRS
- #
- # Now we want to extract the lines in EXPANDEDPAIRS in which the second field
- # is *not* listed in the original dictionary EXPANDEDINPUT; these illegal
-@@ -536,7 +539,7 @@
- | (sed -e 's; .*$;;' ; /bin/rm -f $JOINEDPAIRS $EXPANDEDPAIRS) \
- | uniq \
- | (comm -13 - $CRUNCHEDINPUT ; /bin/rm -f $CRUNCHEDINPUT) \
-- | sort $SORTTMP -u "-t$flagmarker" +0f -1 +0 \
-+ | sort $SORTTMP -u "-t$flagmarker" -k 1f,1 -k 1 \
- | $COMBINE $langtabs > $LEGALFLAGLIST
-
- #
-@@ -566,7 +569,7 @@
- | sort $SORTTMP \
- | uniq -c \
- | tr ' ' ' ' \
-- | sort $SORTTMP +0rn -1 +2 > $PRODUCTLIST
-+ | sort $SORTTMP -k 1rn,1 -k 3 > $PRODUCTLIST
-
- if [ `egrep ' p ' $PRODUCTLIST | wc -l` -gt 0 \
- -a `egrep ' s ' $PRODUCTLIST | wc -l` -gt 0 ]
-@@ -681,7 +684,7 @@
- #
- $verbose && echo "Creating cross expansions (pass $dbnum)." 1>&2
- $ISPELL "$wchars" -e3 -d $FAKEHASH -p /dev/null < $CROSSROOTS \
-- | sort $SORTTMP +1 > $CROSSEXPANDED
-+ | sort $SORTTMP -k 2 > $CROSSEXPANDED
- #
- # Now we join CROSSEXPANDED against EXPANDEDINPUT to produce
- # CROSSPAIRS, and then comm that against CROSSEXPANDED to
-@@ -731,15 +734,15 @@
- if [ $dbnum -gt 100 ]
- then
- echo "Too many passes, aborting cross-product loop. Munchlist failed." 1>&2
-- /bin/rm -f ${TMP}*
- if [ "X$MUNCHMAIL" != X ]
- then
- (
- ls -ld ${TDIR}/[A-Z]*
-- cat /tmp/munchlist.mail
-+ cat ${TMP}munchlist.mail
- ) | mail "$MUNCHMAIL"
-- /bin/rm -f /tmp/munchlist.mail
-+ /bin/rm -f ${TMP}munchlist.mail
- fi
-+ /bin/rm -rf ${TMP}
- exit 1
- fi
- done
-@@ -765,7 +768,7 @@
- D
- }' \
- | comm -23 - $ILLEGALCOMBOS \
-- | sort $SORTTMP -u "-t$flagmarker" +0f -1 +0 \
-+ | sort $SORTTMP -u "-t$flagmarker" -k 1f,1 -k 1 \
- | $COMBINE $langtabs > $CROSSROOTS
- mv $CROSSROOTS $LEGALFLAGLIST
- if [ "$debug" = yes ]
-@@ -801,10 +804,10 @@
- #
- $verbose && echo 'Eliminating non-optimal affixes.' 1>&2
- $ISPELL "$wchars" -e4 -d $FAKEHASH -p /dev/null < $LEGALFLAGLIST \
-- | sort $SORTTMP +1 -2 +2rn -3 +0 -1 \
-- | sort $SORTTMP -um +1 -2 \
-+ | sort $SORTTMP -k 2,2 -k 3rn,3 -k 1,1 \
-+ | sort $SORTTMP -um -k 2,2 \
- | sed -e 's; .*$;;' \
-- | sort $SORTTMP -u "-t$flagmarker" +0f -1 +0 > $MINIMALAFFIXES
-+ | sort $SORTTMP -u "-t$flagmarker" -k 1f,1 -k 1 > $MINIMALAFFIXES
- /bin/rm -f $LEGALFLAGLIST
- #
- # Now we're almost done. MINIMALAFFIXES covers some (with luck, most)
-@@ -820,7 +823,7 @@
- then
- $BUILDHASH -s $MINIMALAFFIXES $langtabs $FAKEHASH > /dev/null \
- || (echo "Couldn't create intermediate hash file" 1>&2;
-- /bin/rm -f ${TMP}*;
-+ /bin/rm -rf ${TMP};
- exit 1) \
- || exit 1
- if [ "$debug" = yes ]
-@@ -832,18 +835,18 @@
- fi
- ($ISPELL "$wchars" -l -d $FAKEHASH -p /dev/null < $STRIPPEDINPUT; \
- $COMBINE $langtabs < $MINIMALAFFIXES) \
-- | sort $SORTTMP "-t$flagmarker" -u +0f -1 +0
-+ | sort $SORTTMP "-t$flagmarker" -u -k 1f,1 -k 1
- else
- # MINIMALAFFIXES is empty; just produce a sorted version of STRIPPEDINPUT
-- sort $SORTTMP "-t$flagmarker" -u +0f -1 +0 $STRIPPEDINPUT
-+ sort $SORTTMP "-t$flagmarker" -u -k 1f,1 -k 1 $STRIPPEDINPUT
- fi
--/bin/rm -f ${TMP}*
- if [ "X$MUNCHMAIL" != X ]
- then
- (
-- ls -ld ${TDIR}/[A-Z]*
-- cat /tmp/munchlist.mail
-+ ls -ld ${TMP}[A-Z]*
-+ cat ${TMP}munchlist.mail
- ) | mail "$MUNCHMAIL"
-- /bin/rm -f /tmp/munchlist.mail
-+ /bin/rm -f ${TMP}munchlist.mail
- fi
-+/bin/rm -rf ${TMP}
- exit 0
---- subset.X
-+++ subset.X Tue Dec 21 16:18:58 2004
-@@ -1,4 +1,4 @@
--: Use /bin/sh
-+#! /bin/sh
- #
- # $Id: subset.X,v 1.18 2001/07/25 21:51:46 geoff Exp $
- #
---- tryaffix.X
-+++ tryaffix.X Tue Dec 21 16:18:58 2004
-@@ -1,4 +1,4 @@
--: Use /bin/sh
-+#! /bin/sh
- #
- # $Id: tryaffix.X,v 1.9 2001/07/25 21:51:47 geoff Exp $
- #
---- zapdups.X
-+++ zapdups.X Tue Dec 21 16:18:58 2004
-@@ -1,4 +1,4 @@
--: Use /bin/sh
-+#! /bin/sh
- #
- # $Id: zapdups.X,v 1.9 2001/07/25 21:51:47 geoff Exp $
++LC_CTYPE=POSIX
+ export LANG LOCALE LC_COLLATE LC_CTYPE
#
---- languages/english/Makefile
-+++ languages/english/Makefile Tue Dec 21 16:18:58 2004
-@@ -336,7 +336,7 @@
- done; \
- trap "rm -f english.sml" 1 2 15; \
- set -x; \
-- eval sort -u -t/ +0f -1 +0 $$MAKE_SORTTMP -o english.sml $$dicts
-+ eval sort -u -t/ -k 1f,1 -k 1 $$MAKE_SORTTMP -o english.sml $$dicts
-
- $(DBUILD)english.sml+: $(CONFIG) $(EXTRADICT)
- $(DBUILD)english.sml+: english.0
-@@ -376,7 +376,7 @@
- done; \
- trap "rm -f english.med" 1 2 15; \
- set -x; \
-- eval sort -u -t/ +0f -1 +0 $$MAKE_SORTTMP -o english.med $$dicts
-+ eval sort -u -t/ -k 1f,1 -k 1 $$MAKE_SORTTMP -o english.med $$dicts
-
- $(DBUILD)english.med+: $(CONFIG) $(EXTRADICT)
- $(DBUILD)english.med+: english.0
-@@ -424,7 +424,7 @@
- done; \
- trap "rm -f english.lrg" 1 2 15; \
- set -x; \
-- eval sort -u -t/ +0f -1 +0 $$MAKE_SORTTMP -o english.lrg $$dicts
-+ eval sort -u -t/ -k 1f,1 -k 1 $$MAKE_SORTTMP -o english.lrg $$dicts
-
- $(DBUILD)english.lrg+: $(CONFIG) $(EXTRADICT)
- $(DBUILD)english.lrg+: english.0
-@@ -477,7 +477,7 @@
- done; \
- trap "rm -f english.xlg" 1 2 15; \
- set -x; \
-- eval sort -u -t/ +0f -1 +0 $$MAKE_SORTTMP -o english.xlg $$dicts
-+ eval sort -u -t/ -k 1f,1 -k 1 $$MAKE_SORTTMP -o english.xlg $$dicts
+ # The following aren't strictly necessary, but I've been made paranoid
+ # by problems with the stuff above. It can't hurt to set them to a
+ # sensible value.
+-LC_MESSAGES=C
+-LC_MONETARY=C
+-LC_NUMERIC=C
+-LC_TIME=C
++LC_MESSAGES=POSIX
++LC_MONETARY=POSIX
++LC_NUMERIC=POSIX
++LC_TIME=POSIX
+ export LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
- $(DBUILD)english.xlg+: $(CONFIG) $(EXTRADICT)
- $(DBUILD)english.xlg+: english.0
+ debug=no
+--- languages/english/msgs.h
++++ languages/english/msgs.h 2007-05-31 19:05:33.090884439 +0200
+@@ -182,10 +182,10 @@
+ #define CORR_C_HELP_4 "next to each one. You have the option of replacing the word%s\n"
+ #define CORR_C_HELP_5 "completely, or choosing one of the suggested words.%s\n"
+ /* You may add HELP_6 through HELP_9 if your language needs more lines */
+-#define CORR_C_HELP_6 ""
+-#define CORR_C_HELP_7 ""
+-#define CORR_C_HELP_8 ""
+-#define CORR_C_HELP_9 ""
++#define CORR_C_HELP_6 "%s"
++#define CORR_C_HELP_7 "%s"
++#define CORR_C_HELP_8 "%s"
++#define CORR_C_HELP_9 "%s"
+ #define CORR_C_HELP_COMMANDS "%s\nCommands are:%s\n%s\n"
+ #define CORR_C_HELP_R_CMD "R Replace the misspelled word completely.%s\n"
+ #define CORR_C_HELP_BLANK "Space Accept the word this time only.%s\n"
++++++ ispell-3.2.06-languages.patch -> ispell-3.3.02-languages.patch ++++++
++++ 730 lines (skipped)
++++ between ispell/ispell-3.2.06-languages.patch
++++ and /mounts/work_src_done/STABLE/ispell/ispell-3.3.02-languages.patch
++++++ ispell-3.2.06-mkdir.patch -> ispell-3.3.02-mkdir.patch ++++++
--- ispell/ispell-3.2.06-mkdir.patch 2005-07-01 16:33:11.000000000 +0200
+++ /mounts/work_src_done/STABLE/ispell/ispell-3.3.02-mkdir.patch 2007-05-31 18:46:16.788010000 +0200
@@ -1,51 +1,13 @@
--- Makefile
-+++ Makefile 2005-07-01 16:29:11.000000000 +0200
-@@ -249,7 +249,7 @@
- install-basic:
- @. ./config.sh; \
- set -x; \
-- [ -d $$BINDIR ] || (mkdir $$BINDIR; chmod 755 $$BINDIR); \
-+ [ -d $$BINDIR ] || (mkdir -p $$BINDIR; chmod 755 $$BINDIR); \
- cd $$BINDIR; \
- rm -f ispell
- @. ./config.sh; \
-@@ -262,8 +262,8 @@
- chmod 755 ispell
- @. ./config.sh; \
- set -x; \
-- [ -d $$MAN1DIR ] || (mkdir $$MAN1DIR; chmod 755 $$MAN1DIR); \
-- [ -d $$MAN4DIR ] || (mkdir $$MAN4DIR; chmod 755 $$MAN4DIR); \
-+ [ -d $$MAN1DIR ] || (mkdir -p $$MAN1DIR; chmod 755 $$MAN1DIR); \
-+ [ -d $$MAN4DIR ] || (mkdir -p $$MAN4DIR; chmod 755 $$MAN4DIR); \
- cd $$MAN1DIR; \
- rm -f ispell$$MAN1EXT; \
- cd $$MAN4DIR; \
-@@ -287,7 +287,7 @@
- install-dictbuild:
- @. ./config.sh; \
- set -x; \
-- [ -d $$BINDIR ] || (mkdir $$BINDIR; chmod 755 $$BINDIR); \
-+ [ -d $$BINDIR ] || (mkdir -p $$BINDIR; chmod 755 $$BINDIR); \
- cd $$BINDIR; \
- rm -f buildhash icombine ijoin \
- munchlist findaffix tryaffix sq unsq; \
-@@ -304,8 +304,8 @@
- munchlist findaffix tryaffix
- @. ./config.sh; \
- set -x; \
-- [ -d $$MAN1DIR ] || (mkdir $$MAN1DIR; chmod 755 $$MAN1DIR); \
-- [ -d $$MAN4DIR ] || (mkdir $$MAN4DIR; chmod 755 $$MAN4DIR)
-+ [ -d $$MAN1DIR ] || (mkdir -p $$MAN1DIR; chmod 755 $$MAN1DIR); \
-+ [ -d $$MAN4DIR ] || (mkdir -p $$MAN4DIR; chmod 755 $$MAN4DIR)
- @. ./config.sh; \
- set -x; \
- for m in buildhash munchlist findaffix tryaffix; do \
-@@ -322,7 +322,7 @@
- $(MAKE) LANGUAGE_TARGET=install SHELLDEBUG=$(SHELLDEBUG) \
- language-subdirs
- . ./config.sh; \
-- [ -d $$LIBDIR ] || (mkdir $$LIBDIR; chmod 755 $$LIBDIR); \
-+ [ -d $$LIBDIR ] || (mkdir -p $$LIBDIR; chmod 755 $$LIBDIR); \
- set -x; \
- cd $$LIBDIR; \
- if [ $$MASTERHASH != $$DEFHASH ]; then \
++++ Makefile 2007-05-31 18:46:01.110343871 +0200
+@@ -342,8 +342,8 @@ mkdirpath:
+ for i in `echo $(NEWDIR) | tr / ' '`; do \
+ path="$$path/$$i"; \
+ if [ ! -d $$path ]; then \
+- echo mkdir $$path; \
+- mkdir $$path; \
++ echo mkdir -p $$path; \
++ mkdir -p $$path; \
+ fi; \
+ done
+
++++++ ispell-3.2.06-sq.patch -> ispell-3.3.02-sq.patch ++++++
--- ispell/ispell-3.2.06-sq.patch 2007-05-31 16:00:04.000000000 +0200
+++ /mounts/work_src_done/STABLE/ispell/ispell-3.3.02-sq.patch 2007-05-31 18:55:48.492778000 +0200
@@ -1,217 +1,83 @@
--- Makefile
-+++ Makefile 2001-12-13 14:44:12.000000000 +0100
-@@ -213,7 +213,7 @@ all: all-languages
++++ Makefile 2007-05-31 16:37:29.331247861 +0200
+@@ -261,7 +261,7 @@ all: all-languages
programs: buildhash findaffix tryaffix ispell
programs: icombine ijoin munchlist
-programs: subset zapdups
+programs: subset zapdups sq unsq
- deformatter-programs:
+ defmt-programs:
cd deformatters; $(MAKE) all
-@@ -267,7 +267,9 @@ install-basic:
+@@ -320,11 +320,15 @@ install-basic:
@. ./config.sh; \
set -x; \
$$INSTALL ispell.1 $$MAN1DIR/ispell$$MAN1EXT; \
-- $$INSTALL ispell.4 $$MAN4DIR/ispell$$MAN4EXT
-+ $$INSTALL ispell.4 $$MAN4DIR/ispell$$MAN4EXT; \
+- $$INSTALL ispell.5 $$MAN45DIR/ispell$$MAN45EXT
++ $$INSTALL ispell.5 $$MAN45DIR/ispell$$MAN45EXT; \
+ $$INSTALL sq.1 $$MAN1DIR/sq$$MAN1EXT; \
+ echo .so man1/sq.1 > $$MAN1DIR/unsq$$MAN1EXT
@. ./config.sh; \
set -x; \
cd $$MAN1DIR; \
-@@ -288,7 +290,7 @@ install-dictbuild:
- rm -f $$LIBDIR/icombine
+ chmod 644 ispell$$MAN1EXT; \
++ chmod 644 sq$$MAN1EXT; \
++ chmod 644 unsq$$MAN1EXT; \
+ cd $$MAN45DIR; \
+ chmod 644 ispell$$MAN45EXT
+
+@@ -357,7 +361,7 @@ install-dictbuild:
@. ./config.sh; \
set -x; \
-- $$INSTALL buildhash icombine ijoin munchlist findaffix tryaffix \
-+ $$INSTALL buildhash icombine ijoin munchlist findaffix tryaffix sq unsq \
+ $$INSTALL buildhash icombine ijoin munchlist findaffix \
+- tryaffix \
++ tryaffix sq unsq \
$$BINDIR
@. ./config.sh; \
set -x; \
-@@ -299,9 +301,7 @@ install-dictbuild:
- @. ./config.sh; \
- set -x; \
- [ -d $$MAN1DIR ] || (mkdir $$MAN1DIR; chmod 755 $$MAN1DIR); \
-- [ -d $$MAN4DIR ] || (mkdir $$MAN4DIR; chmod 755 $$MAN4DIR); \
-- cd $$MAN1DIR; \
-- rm -f sq$$MAN1EXT unsq$$MAN1EXT
-+ [ -d $$MAN4DIR ] || (mkdir $$MAN4DIR; chmod 755 $$MAN4DIR)
- @. ./config.sh; \
- set -x; \
- for m in buildhash munchlist findaffix tryaffix; do \
---- sq.1
-+++ sq.1 2001-12-13 14:44:12.000000000 +0100
-@@ -0,0 +1,82 @@
-+.\"
-+.\" $Id: sq.1,v 1.6 1994/01/25 07:12:07 geoff Exp $
-+.\"
-+.\" Copyright 1992, 1993, Geoff Kuenning, Granada Hills, CA
-+.\" All rights reserved.
-+.\"
-+.\" Redistribution and use in source and binary forms, with or without
-+.\" modification, are permitted provided that the following conditions
-+.\" are met:
-+.\"
-+.\" 1. Redistributions of source code must retain the above copyright
-+.\" notice, this list of conditions and the following disclaimer.
-+.\" 2. Redistributions in binary form must reproduce the above copyright
-+.\" notice, this list of conditions and the following disclaimer in the
-+.\" documentation and/or other materials provided with the distribution.
-+.\" 3. All modifications to the source code must be clearly marked as
-+.\" such. Binary redistributions based on modified source code
-+.\" must be clearly marked as modified versions in the documentation
-+.\" and/or other materials provided with the distribution.
-+.\" 4. All advertising materials mentioning features or use of this software
-+.\" must display the following acknowledgment:
-+.\" This product includes software developed by Geoff Kuenning and
-+.\" other unpaid contributors.
-+.\" 5. The name of Geoff Kuenning may not be used to endorse or promote
-+.\" products derived from this software without specific prior
-+.\" written permission.
-+.\"
-+.\" THIS SOFTWARE IS PROVIDED BY GEOFF KUENNING AND CONTRIBUTORS ``AS IS'' AND
-+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+.\" ARE DISCLAIMED. IN NO EVENT SHALL GEOFF KUENNING OR CONTRIBUTORS BE LIABLE
-+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+.\" SUCH DAMAGE.
-+.\"
-+.\" $Log: sq.1,v $
-+.\" Revision 1.6 1994/01/25 07:12:07 geoff
-+.\" Get rid of all old RCS log lines in preparation for the 3.1 release.
-+.\"
-+.\"
-+.TH SQ 1 LOCAL
-+.SH NAME
-+sq \- squeeze a sorted word list
-+unsq \- unsqueeze a sorted word list
-+.SH SYNOPSIS
-+.B sq
-+< infile > outfile
-+.PP
-+.B unsq
-+< infile > outfile
-+.SH DESCRIPTION
-+.I sq
-+compresses a sorted list of words (a dictionary).
-+For example:
-+.RS
-+sort /usr/share/dict/words | sq | gzip > words.sq.Z
-+.RE
-+will compress dict by about a factor of 4.
-+.PP
-+.I unsq
-+uncompress the output of
-+.I sq.
-+For example:
-+.RS
-+gzip -d < words.sq.Z | unsq | sort -f -o words
-+.RE
-+will uncompress a dictionary compressed with
-+.I sq.
-+.P
-+The squeezing is achieved by eliminating common prefixes, and replacing
-+them with a single character which encodes the number of characters
-+shared with the preceding word.
-+The prefix size is encoded as a single printable character:
-+0-9 represent 0-9, A-Z represent 10-35, and a-z represent 36-61.
-+.SH AUTHOR
-+Mike Wexler
-+.SH SEE ALSO
-+gzip(1), sort(1).
--- sq.c
-+++ sq.c 2007-05-31 15:53:21.574485913 +0200
-@@ -0,0 +1,117 @@
-+#ifndef lint
++++ sq.c 2007-05-31 16:24:23.215866303 +0200
+@@ -1,5 +1,5 @@
+ #ifndef lint
+-static char Rcs_Id[] =
+static char Rcs_Id[] __attribute__ ((unused)) =
-+ "$Id: sq.c,v 1.12 1994/01/25 07:12:09 geoff Exp $";
-+#endif
-+
-+/*
-+ * Copyright 1993, Geoff Kuenning, Granada Hills, CA
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. All modifications to the source code must be clearly marked as
-+ * such. Binary redistributions based on modified source code
-+ * must be clearly marked as modified versions in the documentation
-+ * and/or other materials provided with the distribution.
-+ * 4. All advertising materials mentioning features or use of this software
-+ * must display the following acknowledgment:
-+ * This product includes software developed by Geoff Kuenning and
-+ * other unpaid contributors.
-+ * 5. The name of Geoff Kuenning may not be used to endorse or promote
-+ * products derived from this software without specific prior
-+ * written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY GEOFF KUENNING AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL GEOFF KUENNING OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+
-+/*
-+ * $Log: sq.c,v $
-+ * Revision 1.12 1994/01/25 07:12:09 geoff
-+ * Get rid of all old RCS log lines in preparation for the 3.1 release.
-+ *
-+ */
-+
-+#include
+ "$Id: sq.c,v 1.16 2005/04/14 14:38:23 geoff Exp $";
+ #endif
+
+@@ -59,6 +59,7 @@ static char Rcs_Id[] =
+ */
+
+ #include
+#include
-+
-+#ifdef __STDC__
-+#define P(x) x
-+#else /* __STDC__ */
-+#define P(x) ()
-+#endif /* __STDC__ */
-+
-+int main P ((int argc, char * argv[]));
+
+ #ifdef __STDC__
+ #define P(x) x
+@@ -67,7 +68,7 @@ static char Rcs_Id[] =
+ #endif /* __STDC__ */
+
+ int main P ((int argc, char * argv[]));
+-static void trunc P ((char * word, char * prev));
+static void sqtrunc P ((const char * word, char * prev));
-+
-+/*
-+ * The following table encodes prefix sizes as a single character. A
-+ * matching table will be found in unsq.c.
-+ */
-+static char size_encodings[] =
-+ {
-+ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', /* 00-09 */
-+ 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', /* 10-19 */
-+ 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', /* 20-29 */
-+ 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', /* 30-39 */
-+ 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', /* 40-49 */
-+ 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', /* 50-59 */
-+ 'y', 'z' /* 60-61 */
-+ };
-+
+
+ /*
+ * The following table encodes prefix sizes as a single character. A
+@@ -84,27 +85,34 @@ static char size_encodings[] =
+ 'y', 'z' /* 60-61 */
+ };
+
+-#define MAX_PREFIX (sizeof (size_encodings) - 1)
+#define MAX_PREFIX ((sizeof(size_encodings)/sizeof(char)) - 1)
+#define UNSEQBUFSIZE 257
-+
-+int main (argc, argv)
-+ int argc;
-+ char * argv[];
-+ {
+
+ int main (argc, argv)
+ int argc;
+ char * argv[];
+ {
+- char word[257];
+- static char prev[257] = "";
+-
+- while (gets (word) != NULL)
+- trunc (word, prev);
+ char word[UNSEQBUFSIZE];
+ char * nl;
+ static char prev[UNSEQBUFSIZE] = "";
@@ -223,162 +89,125 @@
+ word[UNSEQBUFSIZE - 1] = '\0';
+ sqtrunc (word, prev);
+ }
-+ return 0;
-+ }
-+
+ return 0;
+ }
+
+-static void trunc (word, prev)
+- char * word;
+static void sqtrunc (word, prev)
+ const char * word;
-+ char * prev;
-+ {
+ char * prev;
+ {
+- register char * wordp;
+- register char * prevp;
+- register int same_count;
+ const register char * wordp;
+ const register char * prevp;
+ register int same_count;
-+
-+ wordp = word;
-+ prevp = prev;
-+ for (same_count = 0; *wordp == *prevp++; ++wordp, ++same_count)
-+ ;
-+ if (same_count>MAX_PREFIX)
-+ same_count = MAX_PREFIX;
-+ (void) putchar (size_encodings[same_count]);
+
+ wordp = word;
+ prevp = prev;
+@@ -113,7 +121,7 @@ static void trunc (word, prev)
+ if (same_count>MAX_PREFIX)
+ same_count = MAX_PREFIX;
+ (void) putchar (size_encodings[same_count]);
+- (void) puts (wordp);
+ (void) puts (&word[same_count]);
-+ (void) strcpy (prev, word);
-+ }
-+
+ (void) strcpy (prev, word);
+ }
+
--- unsq.c
-+++ unsq.c 2007-05-31 15:57:31.060946909 +0200
-@@ -0,0 +1,134 @@
-+#ifndef lint
++++ unsq.c 2007-05-31 16:27:53.326157111 +0200
+@@ -1,5 +1,5 @@
+ #ifndef lint
+-static char Rcs_Id[] =
+static char Rcs_Id[] __attribute__ ((unused)) =
-+ "$Id: unsq.c,v 1.14 1994/01/25 07:12:19 geoff Exp $";
-+#endif
-+
-+/*
-+ * Copyright 1993, Geoff Kuenning, Granada Hills, CA
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. All modifications to the source code must be clearly marked as
-+ * such. Binary redistributions based on modified source code
-+ * must be clearly marked as modified versions in the documentation
-+ * and/or other materials provided with the distribution.
-+ * 4. All advertising materials mentioning features or use of this software
-+ * must display the following acknowledgment:
-+ * This product includes software developed by Geoff Kuenning and
-+ * other unpaid contributors.
-+ * 5. The name of Geoff Kuenning may not be used to endorse or promote
-+ * products derived from this software without specific prior
-+ * written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY GEOFF KUENNING AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL GEOFF KUENNING OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+
-+/*
-+ * $Log: unsq.c,v $
-+ * Revision 1.14 1994/01/25 07:12:19 geoff
-+ * Get rid of all old RCS log lines in preparation for the 3.1 release.
-+ *
-+ */
-+
+ "$Id: unsq.c,v 1.18 2005/04/14 14:38:23 geoff Exp $";
+ #endif
+
+@@ -58,7 +58,9 @@ static char Rcs_Id[] =
+ *
+ */
+
+#include
-+#include
+ #include
+#include
-+#include "msgs.h"
-+
-+#ifdef __STDC__
-+#define P(x) x
-+#else /* __STDC__ */
-+#define P(x) ()
-+#endif /* __STDC__ */
-+
-+int main P ((int argc, char * argv[]));
+ #include "msgs.h"
+
+ #ifdef __STDC__
+@@ -68,7 +70,7 @@ static char Rcs_Id[] =
+ #endif /* __STDC__ */
+
+ int main P ((int argc, char * argv[]));
+-static int expand P ((char * word, char * prev));
+static int sqexpand P ((char * word, char * prev));
-+
-+/*
-+ * The following table encodes prefix sizes as a single character. A
-+ * matching table will be found in sq.c.
-+ */
-+static char size_encodings[] =
-+ {
-+ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', /* 00-09 */
-+ 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', /* 10-19 */
-+ 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', /* 20-29 */
-+ 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', /* 30-39 */
-+ 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', /* 40-49 */
-+ 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', /* 50-59 */
-+ 'y', 'z' /* 60-61 */
-+ };
-+
+
+ /*
+ * The following table encodes prefix sizes as a single character. A
+@@ -85,39 +87,40 @@ static char size_encodings[] =
+ 'y', 'z' /* 60-61 */
+ };
+
+-#define MAX_PREFIX (sizeof (size_encodings) - 1)
+-
+-extern void exit P ((int status));
+#define MAX_PREFIX ((sizeof(size_encodings)/sizeof(char)) - 1)
+#define UNSEQBUFSIZE 257
-+
-+int main (argc, argv)
-+ int argc;
-+ char * argv[];
-+ {
+
+ int main (argc, argv)
+ int argc;
+ char * argv[];
+ {
+- char word[257];
+- static char prev[257] = "";
+ char word[UNSEQBUFSIZE];
+ static char prev[UNSEQBUFSIZE] = "";
-+
+
+- while (!expand (word, prev))
+ while (!sqexpand (word, prev))
-+ puts (word);
-+ return 0;
-+ }
-+
+ puts (word);
+ return 0;
+ }
+
+-static int expand (word, prev)
+static int sqexpand (word, prev)
-+ char * word;
-+ char * prev;
-+ {
-+ register char * wordp;
-+ register char * prevp;
+ char * word;
+ char * prev;
+ {
+ register char * wordp;
+ register char * prevp;
+ register char * nl;
-+ register int same_count;
-+ register int count_char;
+ register int same_count;
+ register int count_char;
+ register off_t size;
-+
-+ count_char = getchar ();
-+ if (count_char == EOF)
-+ return(1);
-+ for (same_count = 0;
+
+ count_char = getchar ();
+ if (count_char == EOF)
+ return(1);
+ for (same_count = 0;
+- same_count < MAX_PREFIX && size_encodings[same_count] != count_char;
+ same_count <= MAX_PREFIX && size_encodings[same_count] != count_char;
-+ same_count++)
-+ ;
+ same_count++)
+ ;
+- if (same_count == MAX_PREFIX)
+ if (same_count > MAX_PREFIX)
-+ {
-+ (void) fprintf (stderr, UNSQ_C_BAD_COUNT, (unsigned int) count_char);
-+ exit (1);
-+ }
-+ prevp = prev;
-+ wordp = word;
-+ while (same_count--)
-+ *wordp++ = (*prevp++);
+ {
+ (void) fprintf (stderr, UNSQ_C_BAD_COUNT, (unsigned int) count_char);
+ exit (1);
+@@ -126,11 +129,15 @@ static int expand (word, prev)
+ wordp = word;
+ while (same_count--)
+ *wordp++ = (*prevp++);
+- if (gets (wordp) == NULL)
+ size = UNSEQBUFSIZE - (wordp - word);
+ if (fgets(wordp, size <= UNSEQBUFSIZE ? size : 0, stdin) == NULL)
-+ {
-+ (void) fprintf (stderr, UNSQ_C_SURPRISE_EOF);
-+ exit (1);
-+ }
+ {
+ (void) fprintf (stderr, UNSQ_C_SURPRISE_EOF);
+ exit (1);
+ }
+ word[UNSEQBUFSIZE - 1] = '\0'; /* In case of no newline */
+ if ((nl = strrchr(wordp, '\n')))
+ *nl = '\0';
-+ (void) strcpy (prev, word);
-+ return 0 ;
-+ }
-+
+ (void) strcpy (prev, word);
+ return 0 ;
+ }
++++++ ispell-3.2.06-strip.patch -> ispell-3.3.02-strip.patch ++++++
--- ispell/ispell-3.2.06-strip.patch 2006-05-22 21:21:43.000000000 +0200
+++ /mounts/work_src_done/STABLE/ispell/ispell-3.3.02-strip.patch 2007-05-31 18:32:14.646435000 +0200
@@ -1,18 +1,18 @@
--- Makefile
-+++ Makefile
-@@ -258,7 +258,6 @@
++++ Makefile 2007-05-31 18:32:00.212899117 +0200
+@@ -311,7 +311,6 @@ install-basic:
@. ./config.sh; \
set -x; \
cd $$BINDIR; \
-- strip ispell; \
- chmod 755 ispell
+- strip ispell$$EXEEXT; \
+ chmod 755 ispell$$EXEEXT
@. ./config.sh; \
set -x; \
-@@ -299,7 +298,6 @@
+@@ -370,7 +369,6 @@ install-dictbuild:
@. ./config.sh; \
set -x; \
cd $$BINDIR; \
-- strip buildhash icombine ijoin; \
- chmod 755 buildhash icombine ijoin \
+- strip buildhash$$EXEEXT icombine$$EXEEXT ijoin$$EXEEXT; \
+ chmod 755 buildhash$$EXEEXT icombine$$EXEEXT ijoin$$EXEEXT \
munchlist findaffix tryaffix
@. ./config.sh; \
++++++ ispell-3.2.06.tar.bz2 -> ispell-3.3.02.tar.bz2 ++++++
++++ 30739 lines of diff (skipped)
++++++ ispell-3.2.06-terminal.patch -> ispell-3.3.02-terminal.patch ++++++
--- ispell/ispell-3.2.06-terminal.patch 2002-02-20 14:36:02.000000000 +0100
+++ /mounts/work_src_done/STABLE/ispell/ispell-3.3.02-terminal.patch 2007-05-31 18:18:59.089872000 +0200
@@ -1,202 +1,24 @@
--- correct.c
-+++ correct.c Thu Sep 27 14:37:40 2001
-@@ -193,6 +193,7 @@
- #include "proto.h"
- #include "msgs.h"
- #include "version.h"
-+#include
-
- void givehelp P ((int interactive));
- void checkfile P ((void));
-@@ -249,7 +250,7 @@
-
- if (interactive)
- {
-- erase ();
-+ ierase ();
- helpout = stdout;
- }
- else
-@@ -407,7 +408,7 @@
- if (good (itok, 0, 0, 0, 0) || compoundgood (itok, 0))
- return;
-
-- erase ();
-+ ierase ();
- (void) printf (" %s", (char *) ctok);
- if (currentfile)
- (void) printf (CORR_C_FILE_LABEL, currentfile);
-@@ -441,9 +442,9 @@
- for (i = 0; i < pcount; i++)
- {
- #ifdef BOTTOMCONTEXT
-- move (2 + (i % col_ht), (maxposslen + 8) * (i / col_ht));
-+ imove (2 + (i % col_ht), (maxposslen + 8) * (i / col_ht));
- #else /* BOTTOMCONTEXT */
-- move (3 + contextsize + (i % col_ht), (maxposslen + 8) * (i / col_ht));
-+ imove (3 + contextsize + (i % col_ht), (maxposslen + 8) * (i / col_ht));
- #endif /* BOTTOMCONTEXT */
- if (i >= easypossibilities)
- (void) printf ("??: %s", possibilities[i]);
-@@ -454,9 +455,9 @@
- }
-
- #ifdef BOTTOMCONTEXT
-- move (li - contextsize - 1 - minimenusize, 0);
-+ imove (li - contextsize - 1 - minimenusize, 0);
- #else /* BOTTOMCONTEXT */
-- move (2, 0);
-+ imove (2, 0);
- #endif /* BOTTOMCONTEXT */
- for (i = contextsize; --i > 0; )
- show_line (contextbufs[i], contextbufs[i], 0);
-@@ -481,7 +482,7 @@
-
- if (minimenusize != 0)
- {
-- move (li - 2, 0);
-+ imove (li - 2, 0);
- (void) printf (CORR_C_MINI_MENU);
- }
++++ correct.c 2007-05-31 18:03:19.794187729 +0200
+@@ -201,6 +201,7 @@ static char Rcs_Id[] =
+ */
-@@ -492,10 +493,10 @@
- {
- case 'Z' & 037:
- stop ();
-- erase ();
-+ ierase ();
- goto checkagain;
- case ' ':
-- erase ();
-+ ierase ();
- (void) fflush (stdout);
- return;
- case 'q': case 'Q':
-@@ -509,7 +510,7 @@
- c = 'y';
- if (c == 'y' || c == 'Y')
- {
-- erase ();
-+ ierase ();
- (void) fflush (stdout);
- done (0);
- }
-@@ -517,7 +518,7 @@
- case 'i': case 'I':
- treeinsert (ichartosstr (strtosichar (ctok, 0), 1),
- ICHARTOSSTR_SIZE, 1);
-- erase ();
-+ ierase ();
- (void) fflush (stdout);
- changes = 1;
- return;
-@@ -525,14 +526,14 @@
- itok = strtosichar (ctok, 0);
- lowcase (itok);
- treeinsert (ichartosstr (itok, 1), ICHARTOSSTR_SIZE, 1);
-- erase ();
-+ ierase ();
- (void) fflush (stdout);
- changes = 1;
- return;
- case 'a': case 'A':
- treeinsert (ichartosstr (strtosichar (ctok, 0), 1),
- ICHARTOSSTR_SIZE, 0);
-- erase ();
-+ ierase ();
- (void) fflush (stdout);
- return;
- case 'L' & 037:
-@@ -544,12 +545,12 @@
- {
- unsigned char buf[200];
-
-- move (li - 1, 0);
-+ imove (li - 1, 0);
- (void) putchar ('!');
- if (getline ((char *) buf) == NULL)
- {
- (void) putchar (7);
-- erase ();
-+ ierase ();
- (void) fflush (stdout);
- goto checkagain;
- }
-@@ -560,11 +561,11 @@
- #else
- (void) shellescape ((char *) buf);
- #endif
-- erase ();
-+ ierase ();
- goto checkagain;
- }
- case 'r': case 'R':
-- move (li - 1, 0);
-+ imove (li - 1, 0);
- if (readonly)
- {
- (void) putchar (7);
-@@ -591,7 +592,7 @@
- }
- changes = 1;
- }
-- erase ();
-+ ierase ();
- if (icharlen (itok) <= minword)
- return; /* Accept very short replacements */
- goto checkagain;
-@@ -618,10 +619,10 @@
- inserttoken (filteredbuf,
- filteredbuf + (begintoken - contextbufs[0]),
- ctok, curchar, 1);
-- erase ();
-+ ierase ();
- if (readonly)
- {
-- move (li - 1, 0);
-+ imove (li - 1, 0);
- (void) putchar (7);
- (void) printf ("%s", CORR_C_READONLY);
- (void) fflush (stdout);
-@@ -637,23 +638,23 @@
- case 'l': case 'L':
- {
- unsigned char buf[100];
-- move (li - 1, 0);
-+ imove (li - 1, 0);
- (void) printf (CORR_C_LOOKUP_PROMPT);
- if (getline ((char *) buf) == NULL)
- {
- (void) putchar (7);
-- erase ();
-+ ierase ();
- goto checkagain;
- }
- (void) printf ("\r\n");
- (void) fflush (stdout);
- lookharder (buf);
-- erase ();
-+ ierase ();
- goto checkagain;
- }
- case 'x': case 'X':
- quit = 1;
-- erase ();
-+ ierase ();
- (void) fflush (stdout);
- return;
- default:
+ #include
++#include
+ #include "config.h"
+ #include "ispell.h"
+ #include "proto.h"
--- ispell.h
-+++ ispell.h Thu Sep 27 14:34:00 2001
-@@ -135,6 +135,7 @@
- */
++++ ispell.h 2007-05-31 18:04:06.795177229 +0200
+@@ -143,6 +143,7 @@
+ #include "config.h"
#include
+#include
#ifdef __STDC__
#define P(x) x
-@@ -567,7 +568,11 @@
+@@ -575,7 +576,11 @@ extern ichar_t mytoupper P ((unsigned in
# define EXTERN extern
#endif
@@ -208,29 +30,9 @@
EXTERN char * cd; /* clear to end of display */
EXTERN char * cl; /* clear display */
EXTERN char * cm; /* cursor movement */
---- proto.h
-+++ proto.h Thu Sep 27 14:38:34 2001
-@@ -127,7 +127,7 @@
- extern char * do_regex_lookup P ((char * expr, int whence));
- extern SIGNAL_TYPE done P ((int));
- extern void dumpmode P ((void));
--extern void erase P ((void));
-+extern void ierase P ((void));
- extern int expand_pre P ((unsigned char * croot, ichar_t * rootword,
- MASKTYPE mask[], int option, unsigned char *extra));
- extern int expand_suf P ((unsigned char * croot, ichar_t * rootword,
-@@ -162,7 +162,7 @@
- extern int makedent P ((unsigned char * lbuf, int lbuflen,
- struct dent * d));
- extern void makepossibilities P ((ichar_t * word));
--extern void move P ((int row, int col));
-+extern void imove P ((int row, int col));
- extern void normal P ((void));
- extern char * printichar P ((int in));
- extern int init_keyword_table P ((char * rawtags, char * envvar,
--- term.c
-+++ term.c Thu Sep 27 14:34:00 2001
-@@ -81,14 +81,21 @@
++++ term.c 2007-05-31 18:18:53.861317891 +0200
+@@ -87,13 +87,20 @@ static char Rcs_Id[] =
#include "proto.h"
#include "msgs.h"
#ifdef USG
@@ -240,39 +42,18 @@
#include
+#endif
#else
+ #ifndef __DJGPP__
#include
#endif
+ #endif
#include
+#include
+#include
+#include
--void erase P ((void));
--void move P ((int row, int col));
-+void ierase P ((void));
-+void imove P ((int row, int col));
- void inverse P ((void));
- void normal P ((void));
- void backup P ((void));
-@@ -104,7 +111,7 @@
- void shescape P ((char * buf));
- #endif /* USESH */
-
--void erase ()
-+void ierase ()
- {
-
- if (cl)
-@@ -119,7 +126,7 @@
- }
- }
-
--void move (row, col)
-+void imove (row, col)
- int row;
- int col;
- {
-@@ -152,8 +159,13 @@
+ void ierase P ((void));
+ void imove P ((int row, int col));
+@@ -166,8 +173,13 @@ static int iputch (c)
}
#ifdef USG
@@ -286,7 +67,7 @@
#else
static struct sgttyb sbuf;
static struct sgttyb osbuf;
-@@ -177,9 +189,13 @@
+@@ -190,9 +202,13 @@ void terminit ()
int tpgrp;
#else
#ifdef TIOCGPGRP
@@ -300,7 +81,7 @@
#ifdef TIOCGWINSZ
struct winsize wsize;
#endif /* TIOCGWINSZ */
-@@ -263,7 +279,11 @@
+@@ -276,7 +292,11 @@ retry:
(void) fprintf (stderr, TERM_C_NO_BATCH);
exit (1);
}
@@ -312,7 +93,7 @@
termchanged = 1;
sbuf = osbuf;
-@@ -272,7 +292,11 @@
+@@ -285,7 +305,11 @@ retry:
sbuf.c_iflag &= ~(INLCR | IGNCR | ICRNL);
sbuf.c_cc[VMIN] = 1;
sbuf.c_cc[VTIME] = 1;
@@ -324,7 +105,7 @@
uerasechar = osbuf.c_cc[VERASE];
ukillchar = osbuf.c_cc[VKILL];
-@@ -285,7 +309,11 @@
+@@ -298,7 +322,11 @@ retry:
#endif
#endif
#ifdef TIOCGPGRP
@@ -336,9 +117,9 @@
{
(void) fprintf (stderr, TERM_C_NO_BATCH);
exit (1);
-@@ -360,7 +388,11 @@
+@@ -373,7 +401,11 @@ SIGNAL_TYPE done (signo)
if (te)
- tputs (te, 1, putch);
+ tputs (te, 1, iputch);
#ifdef USG
+#if defined(__GLIBC__) && __GLIBC__ >= 2
+ (void) tcsetattr (0, TCSADRAIN, &osbuf);
@@ -348,40 +129,31 @@
#else
(void) ioctl (0, TIOCSETP, (char *) &osbuf);
#ifdef TIOCSLTC
-@@ -376,7 +408,11 @@
- int signo;
- {
+@@ -394,7 +426,11 @@ static SIGNAL_TYPE onstop (signo)
+ if (te)
+ tputs (te, 1, iputch);
#ifdef USG
+#if defined(__GLIBC__) && __GLIBC__ >= 2
-+ (void) tcsetattr (0, TCSADRAIN, &osbuf);
++ (void) tcsetattr (0, TCSADRAIN, &osbuf);
+#else
- (void) ioctl (0, TCSETAW, (char *) &osbuf);
+ (void) ioctl (0, TCSETAW, (char *) &osbuf);
+#endif
#else
- (void) ioctl (0, TIOCSETP, (char *) &osbuf);
+ (void) ioctl (0, TIOCSETP, (char *) &osbuf);
#ifdef TIOCSLTC
-@@ -391,7 +427,11 @@
- /* stop here until continued */
- (void) signal (signo, onstop);
+@@ -413,7 +449,11 @@ static SIGNAL_TYPE onstop (signo)
+ if (termchanged)
+ {
#ifdef USG
+#if defined(__GLIBC__) && __GLIBC__ >= 2
-+ (void) tcsetattr (0, TCSADRAIN, &sbuf);
++ (void) tcsetattr (0, TCSADRAIN, &sbuf);
+#else
- (void) ioctl (0, TCSETAW, (char *) &sbuf);
+ (void) ioctl (0, TCSETAW, (char *) &sbuf);
+#endif
#else
- (void) ioctl (0, TIOCSETP, (char *) &sbuf);
+ (void) ioctl (0, TIOCSETP, (char *) &sbuf);
#ifdef TIOCSLTC
-@@ -407,7 +447,7 @@
- onstop (SIGTSTP);
- #else
- /* for System V */
-- move (li - 1, 0);
-+ imove (li - 1, 0);
- (void) fflush (stdout);
- if (getenv ("SHELL"))
- (void) shellescape (getenv ("SHELL"));
-@@ -451,7 +491,11 @@
+@@ -481,7 +521,11 @@ int shellescape (buf)
argv[i] = NULL;
#ifdef USG
@@ -393,7 +165,7 @@
#else
(void) ioctl (0, TIOCSETP, (char *) &osbuf);
#ifdef TIOCSLTC
-@@ -497,7 +541,11 @@
+@@ -527,7 +571,11 @@ int shellescape (buf)
#endif
#ifdef USG
@@ -405,7 +177,7 @@
#else
(void) ioctl (0, TIOCSETP, (char *) &sbuf);
#ifdef TIOCSLTC
-@@ -530,7 +578,11 @@
+@@ -563,7 +611,11 @@ void shescape (buf)
#endif
#ifdef USG
@@ -417,7 +189,7 @@
#else
(void) ioctl (0, TIOCSETP, (char *) &osbuf);
#ifdef TIOCSLTC
-@@ -562,7 +614,11 @@
+@@ -611,7 +663,11 @@ void shescape (buf)
#endif
#ifdef USG
++++++ ispell-3.2.06-types.patch -> ispell-3.3.02-types.patch ++++++
--- ispell/ispell-3.2.06-types.patch 2002-02-20 14:36:02.000000000 +0100
+++ /mounts/work_src_done/STABLE/ispell/ispell-3.3.02-types.patch 2007-05-31 18:00:35.824779000 +0200
@@ -1,109 +1,16 @@
---- buildhash.c
-+++ buildhash.c Thu Sep 27 14:43:47 2001
-@@ -237,7 +237,7 @@
- {
- register FILE * houtfile;
- register struct dent * dp;
-- int strptr;
-+ intptr_t strptr;
- int n;
- unsigned int i;
- int maxplen;
-@@ -362,7 +362,7 @@
- {
- if (dp->next != 0)
- {
-- int x;
-+ intptr_t x;
- x = dp->next - hashtbl;
- dp->next = (struct dent *)x;
- }
--- config.X
-+++ config.X Thu Sep 27 14:47:57 2001
-@@ -166,6 +166,10 @@
++++ config.X 2007-05-31 17:58:34.971948256 +0200
+@@ -212,6 +212,7 @@
#undef USG /* Define this in local.h for System V machines */
#endif /* USG */
-+#if defined(__GLIBC__) && ((__GLIBC__ == 2 && __GLIBC_MINOR__ > 0) || (__GLIBC__ > 2))
-+# include
-+#endif
-+
++#include
#include
#include
#ifndef USG
-@@ -404,8 +408,13 @@
-
- /* Aliases for some routines */
- #ifdef USG
-+#ifndef __linux__
- #define BCOPY(s, d, n) memcpy (d, s, n)
- #define BZERO(d, n) memset (d, 0, n)
-+#else
-+#define BCOPY(s, d, n) bcopy (s, d, n)
-+#define BZERO(d, n) bzero (d, n)
-+#endif
- #define index strchr
- #define rindex strrchr
- #else
-@@ -522,13 +531,21 @@
-
- /* buffer size to use for file names if not in sys/param.h */
- #ifndef MAXPATHLEN
-+#ifdef PATH_MAX
-+#define MAXPATHLEN PATH_MAX
-+#else
- #define MAXPATHLEN 240
- #endif
-+#endif
-
- /* max file name length (will truncate to fit BAKEXT) if not in sys/param.h */
- #ifndef MAXNAMLEN
-+#ifdef NAME_MAX
-+#define MAXNAMLEN NAME_MAX
-+#else
- #define MAXNAMLEN 14
- #endif
-+#endif
-
- /* define if you want .bak file names truncated to MAXNAMLEN characters */
- #ifndef TRUNCATEBAK
-@@ -579,16 +596,19 @@
- ** division-by-zero errors!
- */
- #ifndef MASKTYPE
--#define MASKTYPE long
-+#define MASKTYPE long int
- #endif
- #ifndef MASKTYPE_WIDTH
-+#ifdef __WORDSIZE
-+#define MASKTYPE_WIDTH __WORDSIZE
-+#else
- #define MASKTYPE_WIDTH 32
- #endif
-+#endif
- #if MASKBITS < MASKTYPE_WIDTH
- #undef MASKBITS
- #define MASKBITS MASKTYPE_WIDTH
- #endif /* MASKBITS < MASKTYPE_WIDTH */
--
-
- /* maximum number of include files supported by xgets; set to 0 to disable */
- #ifndef MAXINCLUDEFILES
---- ijoin.c
-+++ ijoin.c Thu Sep 27 14:58:09 2001
-@@ -165,7 +165,9 @@
- static int unpairable1 = 0; /* NZ if -a1 */
- static int unpairable2 = 0; /* NZ if -a2 */
-
-+#ifndef NO_STDLIB_H
- extern int strcmp ();
-+#endif
-
- int main (argc, argv) /* Join files */
- int argc; /* Argument count */
--- ispell.c
-+++ ispell.c Thu Sep 27 16:11:46 2001
-@@ -205,6 +205,7 @@
++++ ispell.c 2007-05-31 17:56:56.177457827 +0200
+@@ -231,6 +231,7 @@ static char Rcs_Id[] =
#include "msgs.h"
#include "version.h"
#include
@@ -112,8 +19,8 @@
#include
#endif /* NO_FCNTL_H */
--- lookup.c
-+++ lookup.c Thu Sep 27 16:15:05 2001
-@@ -88,6 +88,11 @@
++++ lookup.c 2007-05-31 17:57:23.772388056 +0200
+@@ -89,6 +89,11 @@ static char Rcs_Id[] =
#include "ispell.h"
#include "proto.h"
#include "msgs.h"
@@ -125,54 +32,3 @@
int linit P ((void));
#ifdef INDEXDUMP
-@@ -243,22 +248,22 @@
- if (dp->word == (unsigned char *) -1)
- dp->word = NULL;
- else
-- dp->word = &hashstrings [ (int)(dp->word) ];
-+ dp->word = &hashstrings [ (intptr_t)(dp->word) ];
- if (dp->next == (struct dent *) -1)
- dp->next = NULL;
- else
-- dp->next = &hashtbl [ (int)(dp->next) ];
-+ dp->next = &hashtbl [ (intptr_t)(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[(intptr_t) entry->strip];
- else
- entry->strip = NULL;
- if (entry->affl)
-- entry->affix = (ichar_t *) &hashstrings[(int) entry->affix];
-+ entry->affix = (ichar_t *) &hashstrings[(intptr_t) entry->affix];
- else
- entry->affix = NULL;
- }
---- proto.h
-+++ proto.h Thu Sep 27 14:42:37 2001
-@@ -108,6 +108,21 @@
- *
- */
-
-+#if defined(__GLIBC__) && ((__GLIBC__ == 2 && __GLIBC_MINOR__ > 0) || (__GLIBC__ > 2))
-+# include
-+#endif
-+#if defined(__WORDSIZE) && __WORDSIZE == 64
-+# ifndef __intptr_t_defined
-+ typedef long int intptr_t;
-+# define __intptr_t_defined
-+# endif
-+#else
-+# ifndef __intptr_t_defined
-+ typedef int intptr_t;
-+# define __intptr_t_defined
-+# endif
-+#endif
-+
- extern int addvheader P ((struct dent * ent));
- extern void askmode P ((void));
- extern void backup P ((void));
++++++ ispell.test ++++++
--- ispell/ispell.test 2002-02-20 14:36:02.000000000 +0100
+++ /mounts/work_src_done/STABLE/ispell/ispell.test 2007-05-31 18:56:59.208292000 +0200
@@ -1,7 +1,7 @@
Testform f�r ispell
===================
-27.09.2001: 3.2.06
+30.05.2007: 3.3.02
Maintainer: werner
Vorraussetzungen:
@@ -20,7 +20,7 @@
ispell erkennt z.T. an den endungen, was f�r eine
Kodierung verwendet wird (zB TeX).
-Genaueres in den man pages ispell(1), ispell(4), english(4),
+Genaueres in den man pages ispell(1), ispell(5), english(5),
... in der Paketbeschreibung.
Ergebnisse:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org