CWS-TOOLING: integrate CWS hunspell4thesaurus

2009-02-02 16:45:01 +0100 hjs  r267278 : #i98415# - kick touch here - go for the root cause elsewhere
2009-02-02 12:09:15 +0100 hjs  r267257 : #i98415# - fix parameters of touch
2009-01-23 23:13:00 +0100 mba  r266855 : fixed warning
2009-01-23 18:59:55 +0100 mba  r266848 : #i98415#: touch copied files
2009-01-21 09:58:05 +0100 nemeth  r266633 : CWS-TOOLING: rebase CWS hunspell4thesaurus to trunk@266428 (milestone: DEV300:m39)
2009-01-21 09:04:48 +0100 nemeth  r266629 : Issue: #19563
Submitted by: nemeth
Reviewed by: nemeth
Patch: handle bad dictionary items for back compatibility (affix separator without affix flags)
2009-01-20 20:04:10 +0100 nemeth  r266622 : Issue: #19563
Submitted by: nemeth
Reviewed by:nemeth
Add two small fixes for SF.net Hunspell Bug ID 2487684 2519814
2008-12-10 00:21:41 +0100 nemeth  r265141 : CWS-TOOLING: rebase CWS hunspell4thesaurus to trunk@264807 (milestone: DEV300:m37)
2008-12-09 16:12:56 +0100 nemeth  r265113 : #i19563#: fixed stemming, and #i90028#: fixed and improved hyphenation
2008-11-26 23:09:05 +0100 nemeth  r264438 : #i90028#: CWS hunspell4thesaurus: Windows fixes of the Hunspell patch.
2008-11-26 22:51:03 +0100 nemeth  r264436 : CWS-TOOLING: rebase CWS hunspell4thesaurus to trunk@264325 (milestone: DEV300:m36)
2008-11-22 09:02:20 +0100 nemeth  r264182 : CWS-TOOLING: rebase CWS hunspell4thesaurus to trunk@263288 (milestone: DEV300:m35)
2008-11-22 08:23:10 +0100 nemeth  r264181 : CWS-TOOLING: rebase CWS hunspell4thesaurus to trunk@263288 (milestone: DEV300:m35)
2008-11-21 22:15:21 +0100 nemeth  r264176 : #i90028#: migrate CWS hunspell4thesaurus to SVN.

3 files changed, 628 insertions, 554 deletions

diff --git a/hunspell/hunspell-1.1.12.patch b/hunspell/hunspell-1.1.12.patch
deleted file mode 100644
index aaa2fdc56ef8..000000000000
--- a/hunspell/hunspell-1.1.12.patch
+++ /dev/null
@@ -1,532 +0,0 @@
---- misc/hunspell-1.1.12/configure	2007-09-04 02:20:37.000000000 +0200
-+++ misc/build/hunspell-1.1.12/configure	2008-04-24 12:17:58.000000000 +0200
-@@ -1629,9 +1629,6 @@
-   test "$program_prefix$program_suffix$program_transform_name" = \
-     NONENONEs,x,x, &&
-   program_prefix=${target_alias}-
--case "$host" in
--arm*) XFAILED="flagutf8.test maputf.test";;
--esac
- 
- 
- am__api_version="1.9"
---- misc/hunspell-1.1.12/intl/localename.c	2007-04-06 17:05:34.000000000 +0900
-+++ misc/build/hunspell-1.1.12/intl/localename.c	2008-06-20 19:47:59.000875000 +0900
-@@ -140,6 +140,9 @@
- # ifndef LANG_SINDHI
- # define LANG_SINDHI 0x59
- # endif
-+# ifndef LANG_SORBIAN
-+# define LANG_SORBIAN 0x2e
-+# endif
- # ifndef LANG_SLOVAK
- # define LANG_SLOVAK 0x1b
- # endif
---- misc/hunspell-1.1.12/src/hunspell/affixmgr.cxx	2007-09-04 09:49:30.000000000 +0200
-+++ misc/build/hunspell-1.1.12/src/hunspell/affixmgr.cxx	2008-04-23 22:59:31.000000000 +0200
-@@ -25,6 +25,10 @@
- #endif
- #endif
- 
-+#ifdef OS2
-+#undef DEBUG
-+#endif
-+
- AffixMgr::AffixMgr(const char * affpath, HashMgr* ptr) 
- {
-   // register hash manager and load affix data from aff file
-@@ -2789,7 +2793,7 @@
- 
- int AffixMgr::expand_rootword(struct guessword * wlst, int maxn, const char * ts,
-     int wl, const unsigned short * ap, unsigned short al, char * bad, int badl,
--    char * phone)
-+    char * phone_)
- {
- 
-     int nh=0;
-@@ -2801,8 +2805,8 @@
-        wlst[nh].orig = NULL;
-        nh++;
-        // add special phonetic version
--       if (phone && (nh < maxn)) {
--    	    wlst[nh].word = mystrdup(phone);
-+       if (phone_ && (nh < maxn)) {
-+    	    wlst[nh].word = mystrdup(phone_);
-     	    wlst[nh].allow = (1 == 0);
-     	    wlst[nh].orig = mystrdup(ts);
-     	    nh++;
-@@ -2832,11 +2836,11 @@
-                     wlst[nh].orig = NULL;
-                     nh++;
-                     // add special phonetic version
--    		    if (phone && (nh < maxn)) {
-+    		    if (phone_ && (nh < maxn)) {
-     			char st[MAXWORDUTF8LEN];
--    			strcpy(st, phone);
-+    			strcpy(st, phone_);
-     			strcat(st, sptr->getKey());
--    			reverseword(st + strlen(phone));
-+    			reverseword(st + strlen(phone_));
-     			wlst[nh].word = mystrdup(st);
-     			wlst[nh].allow = (1 == 0);
-     			wlst[nh].orig = mystrdup(newword);
---- misc/hunspell-1.1.12/src/hunspell/affixmgr.hxx	Fri Aug 31 18:00:04 2007
-+++ misc/build/hunspell-1.1.12/src/hunspell/affixmgr.hxx	Fri Aug 22 15:28:42 2008
-@@ -2,9 +2,6 @@
- #define _AFFIXMGR_HXX_
- 
- #ifdef MOZILLA_CLIENT
--#ifdef __SUNPRO_CC // for SunONE Studio compiler
--using namespace std;
--#endif
- #include <stdio.h>
- #else
- #include <cstdio>
---- misc/hunspell-1.1.12/src/hunspell/atypes.hxx	Sat Sep  1 08:57:35 2007
-+++ misc/build/hunspell-1.1.12/src/hunspell/atypes.hxx	Mon Jun 16 15:50:27 2008
-@@ -1,6 +1,8 @@
- #ifndef _ATYPES_HXX_
- #define _ATYPES_HXX_
- 
-+#include <stdio.h>
-+
- #ifndef HUNSPELL_WARNING
- #ifdef HUNSPELL_WARNING_ON
- #define HUNSPELL_WARNING fprintf
-@@ -9,7 +11,7 @@
- static inline void HUNSPELL_WARNING(FILE *, const char *, ...) {}
- #endif
- #endif
--
-+ 
- // HUNSTEM def.
- #define HUNSTEM
- 
-@@ -91,8 +93,3 @@
- };
- 
- #endif
--
--
--
--
--
---- misc/hunspell-1.1.12/src/hunspell/csutil.cxx	Thu Aug 23 09:27:39 2007
-+++ misc/build/hunspell-1.1.12/src/hunspell/csutil.cxx	Fri Aug 22 15:28:20 2008
-@@ -18,12 +18,12 @@
- #include "langnum.hxx"
- 
- #ifdef OPENOFFICEORG
--#  include <unicode/uchar.h>
-+#include <unicode/uchar.h>
- #else
--#  ifndef MOZILLA_CLIENT
--#    include "utf_info.cxx"
--#    define UTF_LST_LEN (sizeof(utf_lst) / (sizeof(unicode_info)))
--#  endif
-+#ifndef MOZILLA_CLIENT
-+#include "utf_info.cxx"
-+#define UTF_LST_LEN (sizeof(utf_lst) / (sizeof(unicode_info)))
-+#endif
- #endif
- 
- #ifdef MOZILLA_CLIENT
-@@ -125,7 +125,7 @@
-         case 0x90:
-         case 0xa0:
-         case 0xb0: {
--            HUNSPELL_WARNING(stderr, "UTF-8 encoding error. Unexpected continuation bytes in %d. character position\n%s\n", u8 - src, src);    
-+            HUNSPELL_WARNING(stderr, "UTF-8 encoding error. Unexpected continuation bytes in %ld. character position\n%s\n", static_cast<long>(u8 - src), src);    
-             u2->h = 0xff;
-             u2->l = 0xfd;
-             break;
-@@ -137,7 +137,7 @@
-                 u2->l = (*u8 << 6) + (*(u8+1) & 0x3f);
-                 u8++;
-             } else {
--                HUNSPELL_WARNING(stderr, "UTF-8 encoding error. Missing continuation byte in %d. character position:\n%s\n", u8 - src, src);
-+                HUNSPELL_WARNING(stderr, "UTF-8 encoding error. Missing continuation byte in %ld. character position:\n%s\n", static_cast<long>(u8 - src), src);
-                 u2->h = 0xff;
-                 u2->l = 0xfd;
-             }
-@@ -151,12 +151,12 @@
-                     u2->l = (*u8 << 6) + (*(u8+1) & 0x3f);
-                     u8++;
-                 } else {
--                    HUNSPELL_WARNING(stderr, "UTF-8 encoding error. Missing continuation byte in %d. character position:\n%s\n", u8 - src, src);
-+                    HUNSPELL_WARNING(stderr, "UTF-8 encoding error. Missing continuation byte in %ld. character position:\n%s\n", static_cast<long>(u8 - src), src);
-                     u2->h = 0xff;
-                     u2->l = 0xfd;
-                 }
-             } else {
--                HUNSPELL_WARNING(stderr, "UTF-8 encoding error. Missing continuation byte in %d. character position:\n%s\n", u8 - src, src);
-+                HUNSPELL_WARNING(stderr, "UTF-8 encoding error. Missing continuation byte in %ld. character position:\n%s\n", static_cast<long>(u8 - src), src);
-                 u2->h = 0xff;
-                 u2->l = 0xfd;
-             }
-@@ -4939,7 +4939,7 @@
- { 0x00, 0xff, 0xff },
- };
- 
--struct enc_entry encds[] = {
-+static struct enc_entry encds[] = {
- {"ISO8859-1",iso1_tbl},
- {"ISO8859-2",iso2_tbl},
- {"ISO8859-3",iso3_tbl},
---- misc/hunspell-1.1.12/src/hunspell/csutil.hxx	Sun Sep  2 02:04:00 2007
-+++ misc/build/hunspell-1.1.12/src/hunspell/csutil.hxx	Tue Jun 17 12:51:49 2008
-@@ -21,7 +21,11 @@
- // default flags
- #define ONLYUPCASEFLAG 65535
- 
-+#ifdef GCC
-+typedef struct __attribute__ ((packed)) {
-+#else
- typedef struct {
-+#endif
-     unsigned char l;
-     unsigned char h;
- } w_char;
---- misc/hunspell-1.1.12/src/hunspell/hashmgr.hxx	Sun Aug 26 03:45:12 2007
-+++ misc/build/hunspell-1.1.12/src/hunspell/hashmgr.hxx	Fri Aug 22 15:28:50 2008
-@@ -3,6 +3,9 @@
- 
- #ifndef MOZILLA_CLIENT
- #include <cstdio>
-+#ifndef __SUNPRO_CC // for SunONE Studio compiler
-+using namespace std;
-+#endif
- #else
- #include <stdio.h>
- #endif
-@@ -61,11 +64,11 @@
-   int add_word(const char * word, int wbl, int wcl, unsigned short * ap,
-     int al, const char * desc, bool onlyupcase);
-   int load_config(const char * affpath);
--  int parse_aliasf(char * line, FILE * af);
-+  int parse_aliasf(char * line, std::FILE * af);
-   int add_hidden_capitalized_word(char * word, int wbl, int wcl,
-     unsigned short * flags, int al, char * dp, int captype);
- #ifdef HUNSPELL_EXPERIMENTAL
--  int parse_aliasm(char * line, FILE * af);
-+  int parse_aliasm(char * line, std::FILE * af);
- #endif
- 
- };
---- misc/hunspell-1.1.12/src/hunspell/hunspell.cxx	Tue Aug 28 15:17:30 2007
-+++ misc/build/hunspell-1.1.12/src/hunspell/hunspell.cxx	Fri Aug 22 15:29:06 2008
-@@ -1,3 +1,7 @@
-+#ifdef _MSC_VER
-+#pragma setlocale("C")
-+#endif
-+
- #include "license.hunspell"
- #include "license.myspell"
- 
-@@ -11,8 +15,16 @@
- #include <stdio.h> 
- #endif
- 
-+#ifdef __SUNPRO_CC
-+#include <cstdlib>
-+#endif
-+
- #include "hunspell.hxx"
--#include "hunspell.h"
-+#ifndef OPENOFFICEORG
-+#ifndef MOZILLA_CLIENT
-+//#include "hunspell.h"
-+#endif
-+#endif
- 
- #ifndef MOZILLA_CLIENT
- #ifndef W32
-@@ -1727,29 +1739,3 @@
- }
- 
- #endif // END OF HUNSPELL_EXPERIMENTAL CODE
--
--Hunhandle *Hunspell_create(const char * affpath, const char * dpath)
--{
--        return (Hunhandle*)(new Hunspell(affpath, dpath));
--}
--
--void Hunspell_destroy(Hunhandle *pHunspell)
--{
--        delete (Hunspell*)(pHunspell);
--}
--
--int Hunspell_spell(Hunhandle *pHunspell, const char *word)
--{
--        return ((Hunspell*)pHunspell)->spell(word);
--}
--
--char *Hunspell_get_dic_encoding(Hunhandle *pHunspell)
--{
--        return ((Hunspell*)pHunspell)->get_dic_encoding();
--}
--
--int Hunspell_suggest(Hunhandle *pHunspell, char*** slst, const char * word)
--{
--        return ((Hunspell*)pHunspell)->suggest(slst, word);
--}
--
---- misc/hunspell-1.1.12/src/hunspell/license.hunspell	2007-06-14 14:07:47.000000000 +0200
-+++ misc/build/hunspell-1.1.12/src/hunspell/license.hunspell	2008-04-23 22:59:31.000000000 +0200
-@@ -56,4 +56,3 @@
-  *
-  * ***** END LICENSE BLOCK ***** */
- 
--#include "config.h"
---- misc/hunspell-1.1.12/src/hunspell/makefile.mk	2007-04-06 10:05:32.000000000 +0200
-+++ misc/build/hunspell-1.1.12/src/hunspell/makefile.mk	2008-06-11 19:31:42.983723000 +0200
-@@ -60,11 +60,12 @@
- #
- #*************************************************************************
- 
--PRJ = ..
-+PRJ = ../../../../../..
- 
- PRJNAME	= hunspell
- TARGET	= hunspell
--LIBTARGET=NO
-+LIBTARGET=YES
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
- 
- #----- Settings ---------------------------------------------------------
- 
-@@ -73,7 +74,7 @@
- # --- Files --------------------------------------------------------
- 
- # all_target: ALLTAR DICTIONARY
--all_target: ALLTAR
-+#all_target: ALLTAR
- 
- ##CXXFLAGS += -I..$/..$/lingutil
- ##CFLAGSCXX += -I..$/..$/lingutil
-@@ -81,7 +82,7 @@
- 
- CDEFS+=-DOPENOFFICEORG
- 
--SLOFILES=	\
-+OBJFILES=	\
- 		$(SLO)$/affentry.obj \
- 		$(SLO)$/affixmgr.obj \
- 		$(SLO)$/dictmgr.obj \
-@@ -89,11 +90,12 @@
- 		$(SLO)$/utf_info.obj \
- 		$(SLO)$/hashmgr.obj \
- 		$(SLO)$/suggestmgr.obj \
-+		$(SLO)$/phonet.obj \
- 		$(SLO)$/hunspell.obj
- 
- LIB1TARGET= $(SLB)$/lib$(TARGET).lib
- LIB1ARCHIV= $(LB)/lib$(TARGET).a
--LIB1OBJFILES= $(SLOFILES)
-+LIB1OBJFILES= $(OBJFILES)
- 
- # DIC2BIN= \
- #	en_US.aff \
---- misc/hunspell-1.1.12/src/hunspell/phonet.cxx	Mon Aug 27 21:45:49 2007
-+++ misc/build/hunspell-1.1.12/src/hunspell/phonet.cxx	Tue Jun 17 12:51:33 2008
-@@ -32,6 +32,7 @@
- #include <cstring>
- #include <cstdio>
- #include <cctype>
-+using namespace std;
- #else
- #include <stdlib.h> 
- #include <string.h>
---- misc/hunspell-1.1.12/src/hunspell/suggestmgr.cxx	2007-09-04 13:21:26.000000000 +0200
-+++ misc/build/hunspell-1.1.12/src/hunspell/suggestmgr.cxx	2008-04-23 22:59:31.000000000 +0200
-@@ -118,7 +118,7 @@
-       return ns;
- }
- 
--// generate suggestions for a mispelled word
-+// generate suggestions for a misspelled word
- //    pass in address of array of char * pointers
- // onlycompoundsug: probably bad suggestions (need for ngram sugs, too)
- 
---- misc/hunspell-1.1.12/src/tools/hunspell.cxx	Tue Jul 24 13:47:52 2007
-+++ misc/build/hunspell-1.1.12/src/tools/hunspell.cxx	Fri Aug 22 15:29:12 2008
-@@ -8,6 +8,12 @@
- #include <cstdlib>
- #include <cstdio>
- 
-+#ifdef __SUNPRO_CC
-+using namespace std;
-+#include <string.h>
-+#include <malloc.h>
-+#endif
-+
- #include "config.h"
- #include "hunspell.hxx"
- 
-@@ -85,8 +91,10 @@
- #if ENABLE_NLS
- #ifdef HAVE_LOCALE_H
- #include <locale.h>
-+#ifdef HAVE_LANGINFO_CODESET
- #include <langinfo.h>
- #endif
-+#endif
- 
- #ifdef HAVE_LIBINTL_H
- #include <libintl.h>
-@@ -1227,7 +1235,9 @@
- #ifdef HAVE_LOCALE_H
- 	ui_lang = setlocale(LC_ALL, "");
- 	textdomain("hunspell");
-+#ifdef HAVE_LANGINFO_CODESET
-         ui_enc = nl_langinfo(CODESET);
-+#endif
- #endif
- #endif
- 
---- misc/hunspell-1.1.12/tests/Makefile.am	Tue Sep  4 01:25:35 2007
-+++ misc/build/hunspell-1.1.12/tests/Makefile.am	Wed Jun 18 11:53:11 2008
-@@ -6,29 +6,18 @@
- 
- TESTS =	\
- affixes.test \
--base.test \
- base_utf.test \
--allcaps.test \
- allcaps_utf.test \
--allcaps2.test \
--allcaps3.test \
--keepcase.test \
--i58202.test \
- map.test \
--rep.test \
--sug.test \
- sugutf.test \
--phone.test \
- flag.test \
- flaglong.test \
- flagnum.test \
- flagutf8.test \
--slash.test \
- forbiddenword.test \
- nosuggest.test \
- alias.test \
- alias2.test \
--alias3.test \
- break.test \
- needaffix.test \
- needaffix2.test \
-@@ -39,7 +28,6 @@
- fogemorpheme.test \
- onlyincompound.test \
- complexprefixes.test \
--complexprefixes2.test \
- complexprefixesutf.test \
- conditionalprefix.test \
- zeroaffix.test \
-@@ -51,7 +39,6 @@
- compoundrule.test \
- compoundrule2.test \
- compoundrule3.test \
--compoundrule4.test \
- compoundrule5.test \
- compoundrule6.test \
- compoundaffix.test \
-@@ -64,12 +51,7 @@
- checkcompoundcaseutf.test \
- checkcompoundpattern.test \
- utfcompound.test \
--checksharps.test \
- checksharpsutf.test \
--germancompounding.test \
--germancompoundingold.test \
--i35725.test \
--i53643.test \
- i54633.test \
- i54980.test \
- maputf.test \
-@@ -77,11 +59,8 @@
- ignore.test \
- ignoreutf.test \
- 1592880.test \
--1695964.test \
- 1463589.test \
- 1463589_utf.test \
--IJ.test \
--i68568.test \
- i68568utf.test \
- 1706659.test \
- digits_in_words.test \
---- misc/hunspell-1.1.12/tests/Makefile.in	Tue Sep  4 02:20:35 2007
-+++ misc/build/hunspell-1.1.12/tests/Makefile.in	Wed Jun 18 11:53:11 2008
-@@ -196,29 +196,18 @@
- XFAIL_TESTS = @XFAILED@
- TESTS = \
- affixes.test \
--base.test \
- base_utf.test \
--allcaps.test \
- allcaps_utf.test \
--allcaps2.test \
--allcaps3.test \
--keepcase.test \
--i58202.test \
- map.test \
--rep.test \
--sug.test \
- sugutf.test \
--phone.test \
- flag.test \
- flaglong.test \
- flagnum.test \
- flagutf8.test \
--slash.test \
- forbiddenword.test \
- nosuggest.test \
- alias.test \
- alias2.test \
--alias3.test \
- break.test \
- needaffix.test \
- needaffix2.test \
-@@ -229,7 +218,6 @@
- fogemorpheme.test \
- onlyincompound.test \
- complexprefixes.test \
--complexprefixes2.test \
- complexprefixesutf.test \
- conditionalprefix.test \
- zeroaffix.test \
-@@ -241,7 +229,6 @@
- compoundrule.test \
- compoundrule2.test \
- compoundrule3.test \
--compoundrule4.test \
- compoundrule5.test \
- compoundrule6.test \
- compoundaffix.test \
-@@ -254,12 +241,7 @@
- checkcompoundcaseutf.test \
- checkcompoundpattern.test \
- utfcompound.test \
--checksharps.test \
- checksharpsutf.test \
--germancompounding.test \
--germancompoundingold.test \
--i35725.test \
--i53643.test \
- i54633.test \
- i54980.test \
- maputf.test \
-@@ -267,11 +249,8 @@
- ignore.test \
- ignoreutf.test \
- 1592880.test \
--1695964.test \
- 1463589.test \
- 1463589_utf.test \
--IJ.test \
--i68568.test \
- i68568utf.test \
- 1706659.test \
- digits_in_words.test \
diff --git a/hunspell/hunspell-1.2.8.patch b/hunspell/hunspell-1.2.8.patch
new file mode 100644
index 000000000000..9b14f9b86fe3
--- /dev/null
+++ b/hunspell/hunspell-1.2.8.patch
@@ -0,0 +1,621 @@
+--- misc/hunspell-1.2.8/intl/localename.c	2007-04-06 10:05:34.000000000 +0200
++++ misc/build/hunspell-1.2.8/intl/localename.c	2008-11-01 16:30:49.000000000 +0100
+@@ -140,6 +140,9 @@
+ # ifndef LANG_SINDHI
+ # define LANG_SINDHI 0x59
+ # endif
++# ifndef LANG_SORBIAN
++# define LANG_SORBIAN 0x2e
++# endif
+ # ifndef LANG_SLOVAK
+ # define LANG_SLOVAK 0x1b
+ # endif
+--- misc/hunspell-1.2.8/src/hunspell/affixmgr.cxx	2008-11-01 08:00:41.000000000 +0100
++++ misc/build/hunspell-1.2.8/src/hunspell/affixmgr.cxx	2008-11-01 16:30:49.000000000 +0100
+@@ -25,6 +25,10 @@
+ #endif
+ #endif
+ 
++#ifdef OS2
++#undef DEBUG
++#endif
++
+ AffixMgr::AffixMgr(const char * affpath, HashMgr** ptr, int * md, const char * key) 
+ {
+   // register hash manager and load affix data from aff file
+@@ -2133,7 +2137,7 @@
+         while ((rv) && ((needaffix && TESTAFF(rv->astr, needaffix, rv->alen)) ||
+                         !((compoundflag && !words && TESTAFF(rv->astr, compoundflag, rv->alen)) ||
+                           (compoundend && !words && TESTAFF(rv->astr, compoundend, rv->alen)) ||
+-                           (numdefcpd && defcpd_check(&words, wnum + 1, rv, NULL,1))))) {
++                           (numdefcpd && words && defcpd_check(&words, wnum + 1, rv, NULL,1))))) {
+             rv = rv->next_homonym;
+         }
+ 
+--- misc/hunspell-1.2.8/src/hunspell/affixmgr.hxx	2008-10-30 21:28:59.000000000 +0100
++++ misc/build/hunspell-1.2.8/src/hunspell/affixmgr.hxx	2008-11-01 16:30:49.000000000 +0100
+@@ -2,9 +2,6 @@
+ #define _AFFIXMGR_HXX_
+ 
+ #ifdef MOZILLA_CLIENT
+-#ifdef __SUNPRO_CC // for SunONE Studio compiler
+-using namespace std;
+-#endif
+ #include <stdio.h>
+ #else
+ #include <cstdio>
+--- misc/hunspell-1.2.8/src/hunspell/atypes.hxx	2008-10-29 15:30:51.000000000 +0100
++++ misc/build/hunspell-1.2.8/src/hunspell/atypes.hxx	2008-11-01 16:30:49.000000000 +0100
+@@ -1,6 +1,8 @@
+ #ifndef _ATYPES_HXX_
+ #define _ATYPES_HXX_
+ 
++#include <stdio.h>
++
+ #ifndef HUNSPELL_WARNING
+ #ifdef HUNSPELL_WARNING_ON
+ #define HUNSPELL_WARNING fprintf
+--- misc/hunspell-1.2.8/src/hunspell/csutil.cxx	Wed Oct 22 12:15:28 2008
++++ misc/build/hunspell-1.2.8/src/hunspell/csutil.cxx	Thu Feb 19 18:13:34 2009
+@@ -18,13 +18,13 @@
+ #include "langnum.hxx"
+ 
+ #ifdef OPENOFFICEORG
+-#  include <unicode/uchar.h>
++#include <unicode/uchar.h>
+ #else
+-#  ifndef MOZILLA_CLIENT
+-#    include "utf_info.cxx"
+-#    define UTF_LST_LEN (sizeof(utf_lst) / (sizeof(unicode_info)))
+-#  endif
++#ifndef MOZILLA_CLIENT
++#include "utf_info.cxx"
++#define UTF_LST_LEN (sizeof(utf_lst) / (sizeof(unicode_info)))
+ #endif
++#endif
+ 
+ #ifdef MOZILLA_CLIENT
+ #include "nsCOMPtr.h"
+--- misc/hunspell-1.2.8/src/hunspell/filemgr.cxx	Sat Nov  1 15:09:41 2008
++++ misc/build/hunspell-1.2.8/src/hunspell/filemgr.cxx	Thu Feb 19 17:28:35 2009
+@@ -11,6 +11,7 @@
+ #include <stdio.h>
+ #endif
+ 
++using namespace std;
+ #include "filemgr.hxx"
+ 
+ int FileMgr::fail(const char * err, const char * par) {
+--- misc/hunspell-1.2.8/src/hunspell/filemgr.hxx	Mon Aug 11 11:32:02 2008
++++ misc/build/hunspell-1.2.8/src/hunspell/filemgr.hxx	Thu Feb 19 13:58:01 2009
+@@ -6,7 +6,7 @@
+ class FileMgr
+ {
+ protected:
+-    FILE * fin;
++    std::FILE * fin;
+     Hunzip * hin;
+     char in[BUFSIZE + 50]; // input buffer
+     int fail(const char * err, const char * par);
+--- misc/hunspell-1.2.8/src/hunspell/hashmgr.cxx	Thu Aug 14 16:49:33 2008
++++ misc/build/hunspell-1.2.8/src/hunspell/hashmgr.cxx	Thu Feb 19 17:25:33 2009
+@@ -6,6 +6,9 @@
+ #include <cstring>
+ #include <cstdio>
+ #include <cctype>
++//#ifdef __SUNPRO_CC // for SunONE Studio compiler
++//using namespace std;
++//#endif
+ #else
+ #include <stdlib.h> 
+ #include <string.h>
+@@ -13,10 +16,6 @@
+ #include <ctype.h>
+ #endif
+ 
+-#include "hashmgr.hxx"
+-#include "csutil.hxx"
+-#include "atypes.hxx"
+-
+ #ifdef MOZILLA_CLIENT
+ #ifdef __SUNPRO_CC // for SunONE Studio compiler
+ using namespace std;
+@@ -27,6 +26,10 @@
+ #endif
+ #endif
+ 
++#include "hashmgr.hxx"
++#include "csutil.hxx"
++#include "atypes.hxx"
++
+ // build a hash table from a munched word list
+ 
+ HashMgr::HashMgr(const char * tpath, const char * apath, const char * key)
+@@ -459,6 +462,10 @@
+         }
+       } else {
+         al = decode_flags(&flags, ap + 1, dict);
++        if (al == -1) {
++            HUNSPELL_WARNING(stderr, "Can't allocate memory.\n");
++            return 6;
++        }
+         flag_qsort(flags, 0, al);
+       }
+     } else {
+@@ -499,6 +506,11 @@
+ 
+ int HashMgr::decode_flags(unsigned short ** result, char * flags, FileMgr * af) {
+     int len;
++    if (*flags == '\0') {
++        HUNSPELL_WARNING(stderr, "error: line %d: bad flagvector\n", af->getlinenum());
++        *result = NULL;
++        return 0;
++    }
+     switch (flag_mode) {
+       case FLAG_LONG: { // two-character flags (1x2yZz -> 1x 2y Zz)
+         len = strlen(flags);
+--- misc/hunspell-1.2.8/src/hunspell/hashmgr.hxx	2008-08-12 12:22:54.000000000 +0200
++++ misc/build/hunspell-1.2.8/src/hunspell/hashmgr.hxx	2009-02-19 12:57:11.780108100 +0100
+@@ -3,6 +3,7 @@
+ 
+ #ifndef MOZILLA_CLIENT
+ #include <cstdio>
++/* using namespace std; */
+ #else
+ #include <stdio.h>
+ #endif
+--- misc/hunspell-1.2.8/src/hunspell/hunspell.cxx	Thu Oct 30 20:15:53 2008
++++ misc/build/hunspell-1.2.8/src/hunspell/hunspell.cxx	Thu Feb 19 18:13:35 2009
+@@ -1,3 +1,7 @@
++#ifdef _MSC_VER
++#pragma setlocale("C")
++#endif
++
+ #include "license.hunspell"
+ #include "license.myspell"
+ 
+@@ -11,11 +15,6 @@
+ #include <stdio.h>
+ #endif
+ 
+-#include "hunspell.hxx"
+-#include "hunspell.h"
+-#include "config.h"
+-#include "csutil.hxx"
+-
+ #ifndef MOZILLA_CLIENT
+ #ifndef WIN32
+ using namespace std;
+@@ -22,6 +21,9 @@
+ #endif
+ #endif
+ 
++#include "hunspell.hxx"
++#include "csutil.hxx"
++
+ Hunspell::Hunspell(const char * affpath, const char * dpath, const char * key)
+ {
+     encoding = NULL;
+@@ -338,7 +340,11 @@
+   char wspace[MAXWORDUTF8LEN];
+   w_char unicw[MAXWORDLEN];
+   // Hunspell supports XML input of the simplified API (see manual)
+-  if (strcmp(word, SPELL_XML) == 0) return 1;
++  if (strncmp(word, SPELL_XML, sizeof(SPELL_XML) - 3) == 0) {
++    if (strcmp(word, SPELL_XML) == 0) return 1; // query XML interface support
++    return 0;
++  }
++
+   int nc = strlen(word);
+   int wl2 = 0;
+   if (utf8) {
+@@ -1854,89 +1860,3 @@
+ }
+ 
+ #endif // END OF HUNSPELL_EXPERIMENTAL CODE
+-
+-Hunhandle *Hunspell_create(const char * affpath, const char * dpath)
+-{
+-        return (Hunhandle*)(new Hunspell(affpath, dpath));
+-}
+-
+-Hunhandle *Hunspell_create_key(const char * affpath, const char * dpath,
+-    const char * key)
+-{
+-        return (Hunhandle*)(new Hunspell(affpath, dpath, key));
+-}
+-
+-void Hunspell_destroy(Hunhandle *pHunspell)
+-{
+-        delete (Hunspell*)(pHunspell);
+-}
+-
+-int Hunspell_spell(Hunhandle *pHunspell, const char *word)
+-{
+-        return ((Hunspell*)pHunspell)->spell(word);
+-}
+-
+-char *Hunspell_get_dic_encoding(Hunhandle *pHunspell)
+-{
+-        return ((Hunspell*)pHunspell)->get_dic_encoding();
+-}
+-
+-int Hunspell_suggest(Hunhandle *pHunspell, char*** slst, const char * word)
+-{
+-        return ((Hunspell*)pHunspell)->suggest(slst, word);
+-}
+-
+-int Hunspell_analyze(Hunhandle *pHunspell, char*** slst, const char * word)
+-{
+-        return ((Hunspell*)pHunspell)->analyze(slst, word);
+-}
+-
+-int Hunspell_stem(Hunhandle *pHunspell, char*** slst, const char * word)
+-{
+-        return ((Hunspell*)pHunspell)->stem(slst, word);
+-}
+-
+-int Hunspell_stem(Hunhandle *pHunspell, char*** slst, char** desc, int n)
+-{
+-        return ((Hunspell*)pHunspell)->stem(slst, desc, n);
+-}
+-
+-int Hunspell_generate(Hunhandle *pHunspell, char*** slst, const char * word,
+-    const char * word2)
+-{
+-        return ((Hunspell*)pHunspell)->generate(slst, word, word2);
+-}
+-
+-int Hunspell_generate(Hunhandle *pHunspell, char*** slst, const char * word,
+-    char** desc, int n)
+-{
+-        return ((Hunspell*)pHunspell)->generate(slst, word, desc, n);
+-}
+-
+-  /* functions for run-time modification of the dictionary */
+-
+-  /* add word to the run-time dictionary */
+-
+-int Hunspell_add(Hunhandle *pHunspell, const char * word) {
+-        return ((Hunspell*)pHunspell)->add(word);
+-}
+-
+-  /* add word to the run-time dictionary with affix flags of
+-   * the example (a dictionary word): Hunspell will recognize
+-   * affixed forms of the new word, too.
+-   */
+-
+-int Hunspell_add_with_affix(Hunhandle *pHunspell, const char * word,
+-        const char * example) {
+-        return ((Hunspell*)pHunspell)->add_with_affix(word, example);
+-}
+-
+-  /* remove word from the run-time dictionary */
+-
+-int Hunspell_remove(Hunhandle *pHunspell, const char * word) {
+-        return ((Hunspell*)pHunspell)->remove(word);
+-}
+-
+-void Hunspell_free_list(Hunhandle *pHunspell, char *** slst, int n) {
+-        freelist(slst, n);
+-}
+--- misc/hunspell-1.2.8/src/hunspell/hunspell.hxx	2008-07-09 16:14:39.000000000 +0200
++++ misc/build/hunspell-1.2.8/src/hunspell/hunspell.hxx	2008-11-26 18:32:58.765625000 +0100
+@@ -28,11 +28,7 @@
+ 	#endif
+ #endif
+ 
+-#ifdef WIN32
+-class DLLEXPORT Hunspell
+-#else
+ class Hunspell
+-#endif
+ {
+   AffixMgr*       pAMgr;
+   HashMgr*        pHMgr[MAXDIC];
+--- misc/hunspell-1.2.8/src/hunspell/hunzip.cxx	Tue Jun 17 10:57:55 2008
++++ misc/build/hunspell-1.2.8/src/hunspell/hunzip.cxx	Thu Feb 19 17:29:19 2009
+@@ -8,6 +8,7 @@
+ #include <stdio.h> 
+ #endif
+ 
++using namespace std;
+ #include "hunzip.hxx"
+ 
+ #define CODELEN  65536
+--- misc/hunspell-1.2.8/src/hunspell/hunzip.hxx	Thu Feb 19 15:59:42 2009
++++ misc/build/hunspell-1.2.8/src/hunspell/hunzip.hxx	Thu Feb 19 18:13:35 2009
+@@ -18,6 +18,8 @@
+ #define MSG_MEMORY "error: %s: missing memory\n"
+ #define MSG_KEY    "error: %s: missing or bad password\n"
+ 
++#include <stdlib.h>
++
+ struct bit {
+     unsigned char c[2];
+     int v[2];
+--- misc/hunspell-1.2.8/src/hunspell/license.hunspell	2008-06-17 10:57:55.000000000 +0200
++++ misc/build/hunspell-1.2.8/src/hunspell/license.hunspell	2008-11-01 16:30:49.000000000 +0100
+@@ -56,4 +56,3 @@
+  *
+  * ***** END LICENSE BLOCK ***** */
+ 
+-#include "config.h"
+--- misc/hunspell-1.2.8/src/hunspell/makefile.mk	Tue Jun 17 10:57:55 2008
++++ misc/build/hunspell-1.2.8/src/hunspell/makefile.mk	Thu Feb 19 18:13:52 2009
+@@ -60,11 +60,12 @@
+ #
+ #*************************************************************************
+ 
+-PRJ = ..
++PRJ = ../../../../../..
+ 
+ PRJNAME	= hunspell
+ TARGET	= hunspell
+-LIBTARGET=NO
++LIBTARGET=YES
++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
+ 
+ #----- Settings ---------------------------------------------------------
+ 
+@@ -73,7 +74,7 @@
+ # --- Files --------------------------------------------------------
+ 
+ # all_target: ALLTAR DICTIONARY
+-all_target: ALLTAR
++#all_target: ALLTAR
+ 
+ ##CXXFLAGS += -I..$/..$/lingutil
+ ##CFLAGSCXX += -I..$/..$/lingutil
+@@ -89,6 +90,10 @@
+ 		$(SLO)$/utf_info.obj \
+ 		$(SLO)$/hashmgr.obj \
+ 		$(SLO)$/suggestmgr.obj \
++		$(SLO)$/phonet.obj \
++		$(SLO)$/hunzip.obj \
++		$(SLO)$/filemgr.obj \
++		$(SLO)$/replist.obj \
+ 		$(SLO)$/hunspell.obj
+ 
+ LIB1TARGET= $(SLB)$/lib$(TARGET).lib
+--- misc/hunspell-1.2.8/src/hunspell/phonet.cxx	2008-08-13 15:29:08.000000000 +0200
++++ misc/build/hunspell-1.2.8/src/hunspell/phonet.cxx	2008-11-01 16:30:49.000000000 +0100
+@@ -32,6 +32,7 @@
+ #include <cstring>
+ #include <cstdio>
+ #include <cctype>
++using namespace std;
+ #else
+ #include <stdlib.h> 
+ #include <string.h>
+--- misc/hunspell-1.2.8/src/hunspell/replist.cxx	Sat Nov  1 15:09:51 2008
++++ misc/build/hunspell-1.2.8/src/hunspell/replist.cxx	Thu Feb 19 14:02:51 2009
+@@ -13,6 +13,7 @@
+ 
+ #include "replist.hxx"
+ #include "csutil.hxx"
++using namespace std;
+ 
+ RepList::RepList(int n) {
+     dat = (replentry **) malloc(sizeof(replentry *) * n);
+--- misc/hunspell-1.2.8/src/tools/analyze.cxx	Tue Jun 17 13:44:50 2008
++++ misc/build/hunspell-1.2.8/src/tools/analyze.cxx	Thu Feb 19 18:13:35 2009
+@@ -3,13 +3,13 @@
+ #include <cstdlib>
+ #include <cstdio>
+ 
+-#include "hunspell.hxx"
+-
+ #ifndef WIN32
+ using namespace std;
+ #endif
+ 
++#include "hunspell.hxx"
+ 
++
+ 
+ int main(int argc, char **argv)
+ {
+--- misc/hunspell-1.2.8/src/tools/chmorph.cxx	Tue Jun 17 12:15:34 2008
++++ misc/build/hunspell-1.2.8/src/tools/chmorph.cxx	Thu Feb 19 17:36:46 2009
+@@ -2,13 +2,13 @@
+ #include <cstdlib>
+ #include <cstdio>
+ 
+-#include "hunspell.hxx"
+-#include "textparser.hxx"
+-
+ #ifndef W32
+ using namespace std;
+ #endif
+ 
++#include "hunspell.hxx"
++#include "textparser.hxx"
++
+ int 
+ main(int argc, char** argv)
+ {
+--- misc/hunspell-1.2.8/src/tools/example.cxx	Tue Jun 17 13:07:24 2008
++++ misc/build/hunspell-1.2.8/src/tools/example.cxx	Thu Feb 19 17:38:12 2009
+@@ -2,12 +2,12 @@
+ #include <cstdlib>
+ #include <cstdio>
+ 
++using namespace std;
++
+ #include "hunspell.hxx"
+ 
+ extern char * mystrdup(const char * s);
+ 
+-using namespace std;
+-
+ int 
+ main(int argc, char** argv)
+ {
+--- misc/hunspell-1.2.8/src/tools/hunspell.cxx	2008-09-04 15:44:19.000000000 +0200
++++ misc/build/hunspell-1.2.8/src/tools/hunspell.cxx	2008-11-01 16:31:24.000000000 +0100
+@@ -7,10 +7,20 @@
+ 
+ #include <cstdlib>
+ #include <cstdio>
++
++#ifdef __SUNPRO_CC
++using namespace std;
++#include <string.h>
++#include <malloc.h>
++#endif
++
+ #include "config.h"
+ #include "hunspell.hxx"
+ #include "csutil.hxx"
+ 
++// switch off iconv support for tests (fixing Solaris problems)
++#undef HAVE_ICONV
++
+ #ifndef HUNSPELL_EXTRA
+ #define suggest_auto suggest
+ #endif
+@@ -98,8 +108,10 @@
+ #if ENABLE_NLS
+ #ifdef HAVE_LOCALE_H
+ #include <locale.h>
++#ifdef HAVE_LANGINFO_CODESET
+ #include <langinfo.h>
+ #endif
++#endif
+ 
+ #ifdef HAVE_LIBINTL_H
+ #include <libintl.h>
+@@ -1385,9 +1397,11 @@
+ #ifdef HAVE_LOCALE_H
+ 	ui_lang = setlocale(LC_ALL, "");
+ 	textdomain("hunspell");
++#ifdef HAVE_LANGINFO_CODESET
+         ui_enc = nl_langinfo(CODESET);
+ #endif
+ #endif
++#endif
+ 
+ #ifdef HAVE_READLINE
+ 	rl_set_key("", rl_escape, rl_get_keymap());
+--- misc/hunspell-1.2.8/src/tools/hunzip.cxx	Tue Jan 15 11:10:04 2008
++++ misc/build/hunspell-1.2.8/src/tools/hunzip.cxx	Thu Feb 19 17:38:12 2009
+@@ -2,6 +2,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
++using namespace std;
++
+ #include "hunzip.hxx"
+ 
+ #define DESC "hunzip - decompress a hzip file to the standard output\n" \
+--- misc/hunspell-1.2.8/src/tools/hzip.c	Fri Apr  4 15:20:10 2008
++++ misc/build/hunspell-1.2.8/src/tools/hzip.c	Thu Feb 19 18:13:35 2009
+@@ -44,7 +44,7 @@
+     if (tree->type != code_NODE) {
+         int i = tree->word;
+         code[deep] = '\0';
+-        if (tree->type == code_TERM) i = CODELEN; // terminal code
++        if (tree->type == code_TERM) i = CODELEN; 
+         table[i] = malloc((deep + 1) * sizeof(char));
+ 	strcpy(table[i], code);
+     }        
+@@ -63,7 +63,7 @@
+     return ni;
+ }
+ 
+-// return length of the freq array
++
+ int get_freqdata(struct item *** dest, FILE * f, unsigned short * termword) {
+     int freq[CODELEN];
+     int i, j, k, n;
+@@ -88,7 +88,7 @@
+        (*dest)[n]->word = i;
+        n++;
+     }
+-    // terminal sequence (also contains the last odd byte of the file)
++    
+     (*dest)[n] = newitem(1, NULL, NULL, code_TERM);
+     *termword = *((unsigned short *) c);
+     return n + 1;
+@@ -134,20 +134,20 @@
+     char c[2];
+     char * enc = key;
+ 
+-    // header and codes
+-    fprintf(f2, "%s", (key ? MAGIC_ENCRYPTED : MAGIC)); // 3-byte HEADER
++    
++    fprintf(f2, "%s", (key ? MAGIC_ENCRYPTED : MAGIC)); 
+     cl = (unsigned char) (n & 0x00ff);
+     ch = (unsigned char) (n >> 8);
+     if (key) {
+         unsigned char cs;
+         for (cs = 0; *enc; enc++) cs ^= *enc;
+-        fprintf(f2, "%c", cs);  // 1-byte check sum
++        fprintf(f2, "%c", cs);  
+         enc = key;        
+         ch ^= *enc;
+         if ((*(++enc)) == '\0') enc = key;
+         cl ^= *enc;
+     }
+-    fprintf(f2, "%c%c", ch, cl);   // upper and lower byte of record count
++    fprintf(f2, "%c%c", ch, cl);   
+     for (i = 0; i < BUFSIZE; i++) bitbuf[i] = '\0';
+     for (i = 0; i < CODELEN + 1; i++) if (table[i]) {
+         unsigned short * d = (unsigned short *) &c;
+@@ -159,7 +159,7 @@
+             if (*(++enc) == '\0') enc = key;
+             c[1] ^= *enc;
+         }        
+-        fprintf(f2, "%c%c", c[0], c[1]); // 2-character code id
++        fprintf(f2, "%c%c", c[0], c[1]); 
+         bits = 0;
+         write_bits(f2, bitbuf, &bits, table[i]);
+         if (key) {
+@@ -169,11 +169,11 @@
+                 if (*(++enc) == '\0') enc = key;
+                 bitbuf[cl] ^= *enc;
+             }
+-        } else fprintf(f2, "%c", (unsigned char) bits); // 1-byte code length
+-        fwrite(bitbuf, sizeof(char), bits/8 + 1, f2);   // x-byte code
++        } else fprintf(f2, "%c", (unsigned char) bits); 
++        fwrite(bitbuf, sizeof(char), bits/8 + 1, f2);   
+     }
+ 
+-    // file encoding 
++    
+     bits = 0;
+     while((cx[0] = getc(f)) != -1 && (cx[1] = getc(f)) != -1) {
+         c[0] = cx[0];
+@@ -180,7 +180,7 @@
+         c[1] = cx[1];
+         write_bits(f2, bitbuf, &bits, table[*((unsigned short *) c)]);
+     }
+-    // terminal suffixes
++    
+     write_bits(f2, bitbuf, &bits, table[CODELEN]);
+     if (bits > 0) fwrite(bitbuf, sizeof(char), bits/8 + 1, f2);
+ }
+@@ -201,11 +201,11 @@
+             } else pfx = 0;
+         }
+         if (i > 0 && buf[i - 1] == '\n') {
+-            if (j == i) j--; // line duplicate
++            if (j == i) j--; 
+             if (j > 29) j = 29;
+             c = j;
+             if (c == '\t') c = 30;
+-            // common suffix
++            
+             for (; buf[i - m - 2] == prev[prevlen - m - 2] && 
+                 m < i - j - 1 && m < 15; m++);
+             if (m == 1) m = 0;
+@@ -221,7 +221,7 @@
+             *p = buf[k];
+         }
+         if (m > 0) {
+-            *p = m + 31; // 33-46
++            *p = m + 31; 
+             p++;
+         }
+         if (i > 0 && buf[i - 1] == '\n') {
diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk
index 0032166c83f6..d0d60abc672b 100644
--- a/hunspell/makefile.mk
+++ b/hunspell/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.9 $
+# $Revision: 1.6.4.1 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -40,12 +40,12 @@ TARGET=hunspell
 
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=hunspell-1.1.12-2
-TARFILE_ROOTDIR=hunspell-1.1.12
+TARFILE_NAME=hunspell-1.2.8
+TARFILE_ROOTDIR=hunspell-1.2.8
 
 #ADDITIONAL_FILES += src/hunspell/makefile.mk
 
-PATCH_FILES=hunspell-1.1.12.patch
+PATCH_FILE_NAME=hunspell-1.2.8.patch
 
 .IF "$(GUI)"=="UNX"
 #CONFIGURE_DIR=$(BUILD_DIR)
@@ -57,36 +57,21 @@ CONFIGURE_FLAGS= --disable-shared --with-pic
 CONFIGURE_FLAGS+= CFLAGS=-xc99=none
 .ENDIF                  # "$(COMNAME)"=="sunpro5"
 
-.IF "$(COM)"=="C52" && "$(CPU)"=="U"
-LCL_CONFIGURE_CFLAGS+=-m64
-.ENDIF
-
 .IF "$(SYSBASE)"!=""
 .IF "$(EXTRA_CFLAGS)"!=""
-LCL_CONFIGURE_CFLAGS+=$(EXTRA_CFLAGS)
-.ENDIF # "$(EXTRA_CFLAGS)"!=""
+CONFIGURE_FLAGS+= CFLAGS="$(EXTRA_CFLAGS)" CXXFLAGS="$(EXTRA_CFLAGS)"
 .ENDIF # "$(SYSBASE)"!=""
-
-.IF "$(LCL_CONFIGURE_CFLAGS)"!=""
-CONFIGURE_FLAGS+=CFLAGS='$(LCL_CONFIGURE_CFLAGS)' CXXFLAGS='$(LCL_CONFIGURE_CFLAGS)'
-.ENDIF
+.ENDIF # "$(EXTRA_CFLAGS)"!=""
 
 BUILD_ACTION=make && make check
 
-OUT2LIB=$(BUILD_DIR)$/src$/hunspell$/.libs$/libhunspell-1.1.a
+OUT2LIB=$(BUILD_DIR)$/src$/hunspell$/.libs$/libhunspell-1.2.a
 
 .ENDIF # "$(GUI)"=="UNX"
 
 
 .IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-CONFIGURE_ACTION=configure
-CONFIGURE_FLAGS= --disable-shared --with-pic
-BUILD_ACTION=make
-OUT2LIB=$(BUILD_DIR)$/src$/hunspell$/.libs$/libhunspell-1.1.a
-.ELSE
 BUILD_ACTION=cd src/hunspell && dmake
-.ENDIF
 .ENDIF # "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="OS2"