Update hunspell to 1.6.2. 1.6.2 Library changes: no. Same as 1.6.1. Command line tool: - Added German translation - Fixed bug with wrong output encoding, not respecting system locale. 1.6.1 Library changes: - Performance improvements in suggest() - Fixes regressions for Hungarian related to compounding. - Fixes regressions for Korean related to ICONV. Command line tool: - Added Tajik translation - Fix regarding serching of OOo dicts installed in user folder Manpages: - Fix microsoft-cp1251 to cp1251. Dicts should not use the first. - Typos. 1.6.0 Changes in the library: - Performance improvement in ngsuggest(), suggestions should be faster. - Revert MAXWORDLEN to 100 as in 1.3.3 for performance reasons. - MAXWORDLEN can be set during build time with -D defines. - Fix crash when word with 102 consecutive X is spelled. Changes in the command line tool: - -D shows all loaded dictionares insted of only the first. - -D properly lists all available dictionaries on Windows. 1.5.4 Fixes bug related to the Hungarian dictionary and the command COMPOUNDSYLLABLE 1.5.3 Remove a unneded #include header in the public hunspell.hxx 1.5.2 Fixes backward compatibility with 1.4 at API level. Now it should be complete. 1.5.1 - Lot of stability fixes - Fixed compilation errors on various systems (Windows, FreeBSD) - Small performance improvement compared to 1.4.0 - Added new API with C++ types (string, vector), yet full API backward compatibility with 1.4 is kept 1.4.1 Past begin() iterator decrement error VS Debug build threw error on decrement past begin. 1.4.0 New release that strips out fixed length buffers from large parts of the library Note: dictmgr.hxx header is droppeddiff -r1.27 -r1.28 pkgsrc/textproc/hunspell/Makefile
(bsiegert)
@@ -1,41 +1,46 @@ | @@ -1,41 +1,46 @@ | |||
1 | # $NetBSD: Makefile,v 1.27 2018/10/19 17:57:42 bsiegert Exp $ | 1 | # $NetBSD: Makefile,v 1.28 2018/10/23 11:45:34 bsiegert Exp $ | |
2 | 2 | |||
3 | DISTNAME= hunspell-1.3.3 | 3 | DISTNAME= hunspell-1.6.2 | |
4 | PKGREVISION= 8 | |||
5 | CATEGORIES= textproc | 4 | CATEGORIES= textproc | |
6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hunspell/} | 5 | MASTER_SITES= ${MASTER_SITE_GITHUB:=hunspell/} | |
6 | GITHUB_PROJECT= hunspell | |||
7 | GITHUB_TAG= v1.6.2 | |||
7 | 8 | |||
8 | MAINTAINER= ahoka@NetBSD.org | 9 | MAINTAINER= ahoka@NetBSD.org | |
9 | HOMEPAGE= http://hunspell.sourceforge.net/ | 10 | HOMEPAGE= https://hunspell.github.io/ | |
10 | COMMENT= Improved spellchecker | 11 | COMMENT= Improved spellchecker | |
11 | LICENSE= mpl-1.1 OR gnu-lgpl-v2.1 OR gnu-gpl-v2 | 12 | LICENSE= mpl-1.1 OR gnu-lgpl-v2.1 OR gnu-gpl-v2 | |
12 | 13 | |||
13 | WRKSRC= ${WRKDIR}/${DISTNAME:C/-[0-9]+$//} | 14 | #WRKSRC= ${WRKDIR}/${DISTNAME:C/-[0-9]+$//} | |
14 | GNU_CONFIGURE= yes | 15 | GNU_CONFIGURE= yes | |
15 | USE_LIBTOOL= yes | 16 | USE_LIBTOOL= yes | |
16 | USE_TOOLS+= pkg-config perl:run | 17 | USE_TOOLS+= pkg-config perl:run autoreconf autoconf automake | |
17 | USE_PKGLOCALEDIR= yes | 18 | USE_PKGLOCALEDIR= yes | |
18 | USE_LANGUAGES= c c++03 | 19 | USE_LANGUAGES= c c++03 | |
19 | 20 | |||
20 | CONFIGURE_ARGS+= --with-ui | 21 | CONFIGURE_ARGS+= --with-ui | |
21 | 22 | |||
22 | PKGCONFIG_OVERRIDE+= hunspell.pc.in | 23 | PKGCONFIG_OVERRIDE+= hunspell.pc.in | |
23 | 24 | |||
24 | SUBST_CLASSES+= paths | 25 | SUBST_CLASSES+= paths | |
25 | SUBST_MESSAGE.paths= Fixing default path to dictionaries. | 26 | SUBST_MESSAGE.paths= Fixing default path to dictionaries. | |
26 | SUBST_STAGE.paths= pre-configure | 27 | SUBST_STAGE.paths= pre-configure | |
27 | SUBST_FILES.paths= man/hunspell.1 man/hu/hunspell.1 src/tools/hunspell.cxx | 28 | SUBST_FILES.paths= man/hunspell.1 man/hu/hunspell.1 src/tools/hunspell.cxx | |
28 | SUBST_SED.paths+= -e 's,/usr/share/hunspell,${PREFIX}/share/hunspell,g' | 29 | SUBST_SED.paths+= -e 's,/usr/share/hunspell,${PREFIX}/share/hunspell,g' | |
29 | # Trailing slash important to not change hunspell.cxx | 30 | # Trailing slash important to not change hunspell.cxx | |
30 | SUBST_SED.paths+= -e 's,/usr/share/myspell/,${PREFIX}/share/hunspell/,g' | 31 | SUBST_SED.paths+= -e 's,/usr/share/myspell/,${PREFIX}/share/hunspell/,g' | |
31 | 32 | |||
32 | PLIST_SRC= PLIST | 33 | PLIST_SRC= PLIST | |
33 | PLIST_SUBST+= DISTNAME=${DISTNAME} | 34 | PLIST_SUBST+= DISTNAME=${DISTNAME} | |
34 | 35 | |||
35 | REPLACE_PERL= src/tools/ispellaff2myspell | 36 | REPLACE_PERL= src/tools/ispellaff2myspell | |
36 | 37 | |||
38 | post-patch: | |||
39 | cd ${WRKSRC} && ${TOOLS_PATH.autoreconf} -v -i | |||
40 | ||||
41 | ||||
37 | .include "options.mk" | 42 | .include "options.mk" | |
38 | 43 | |||
39 | .include "../../converters/libiconv/buildlink3.mk" | 44 | .include "../../converters/libiconv/buildlink3.mk" | |
40 | .include "../../devel/gettext-lib/buildlink3.mk" | 45 | .include "../../devel/gettext-lib/buildlink3.mk" | |
41 | .include "../../mk/bsd.pkg.mk" | 46 | .include "../../mk/bsd.pkg.mk" |
@@ -1,41 +1,28 @@ | @@ -1,41 +1,28 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.7 2018/10/19 17:57:42 bsiegert Exp $ | 1 | @comment $NetBSD: PLIST,v 1.8 2018/10/23 11:45:34 bsiegert Exp $ | |
2 | bin/affixcompress | 2 | bin/affixcompress | |
3 | bin/chmorph | 3 | bin/chmorph | |
4 | bin/hunspell | 4 | bin/hunspell | |
5 | bin/hunspell-analyze | 5 | bin/hunspell-analyze | |
6 | bin/hunspell-munch | 6 | bin/hunspell-munch | |
7 | bin/hunspell-unmunch | 7 | bin/hunspell-unmunch | |
8 | bin/hunzip | 8 | bin/hunzip | |
9 | bin/hzip | 9 | bin/hzip | |
10 | bin/ispellaff2myspell | 10 | bin/ispellaff2myspell | |
11 | bin/makealias | 11 | bin/makealias | |
12 | bin/wordforms | 12 | bin/wordforms | |
13 | bin/wordlist2hunspell | 13 | bin/wordlist2hunspell | |
14 | include/hunspell/affentry.hxx | |||
15 | include/hunspell/affixmgr.hxx | |||
16 | include/hunspell/atypes.hxx | 14 | include/hunspell/atypes.hxx | |
17 | include/hunspell/baseaffix.hxx | |||
18 | include/hunspell/csutil.hxx | 15 | include/hunspell/csutil.hxx | |
19 | include/hunspell/dictmgr.hxx | |||
20 | include/hunspell/filemgr.hxx | |||
21 | include/hunspell/hashmgr.hxx | |||
22 | include/hunspell/htypes.hxx | 16 | include/hunspell/htypes.hxx | |
23 | include/hunspell/hunspell.h | 17 | include/hunspell/hunspell.h | |
24 | include/hunspell/hunspell.hxx | 18 | include/hunspell/hunspell.hxx | |
25 | include/hunspell/hunvisapi.h | 19 | include/hunspell/hunvisapi.h | |
26 | include/hunspell/hunzip.hxx | |||
27 | include/hunspell/langnum.hxx | |||
28 | include/hunspell/phonet.hxx | |||
29 | include/hunspell/replist.hxx | |||
30 | include/hunspell/suggestmgr.hxx | |||
31 | include/hunspell/w_char.hxx | 20 | include/hunspell/w_char.hxx | |
32 | lib/libhunspell-1.3.la | 21 | lib/libhunspell-1.6.la | |
33 | lib/pkgconfig/hunspell.pc | 22 | lib/pkgconfig/hunspell.pc | |
34 | man/hu/man1/hunspell.1 | 23 | man/hu/man1/hunspell.1 | |
35 | man/man1/hunspell.1 | 24 | man/man1/hunspell.1 | |
36 | man/man1/hunzip.1 | 25 | man/man1/hunzip.1 | |
37 | man/man1/hzip.1 | 26 | man/man1/hzip.1 | |
38 | man/man3/hunspell.3 | 27 | man/man3/hunspell.3 | |
39 | man/man5/hunspell.5 | 28 | man/man5/hunspell.5 | |
40 | share/locale/hu/LC_MESSAGES/hunspell.mo | |||
41 | share/locale/it/LC_MESSAGES/hunspell.mo |
@@ -1,13 +1,13 @@ | @@ -1,13 +1,13 @@ | |||
1 | # $NetBSD: buildlink3.mk,v 1.4 2012/02/13 14:46:11 wiz Exp $ | 1 | # $NetBSD: buildlink3.mk,v 1.5 2018/10/23 11:45:34 bsiegert Exp $ | |
2 | 2 | |||
3 | BUILDLINK_TREE+= hunspell | 3 | BUILDLINK_TREE+= hunspell | |
4 | 4 | |||
5 | .if !defined(HUNSPELL_BUILDLINK3_MK) | 5 | .if !defined(HUNSPELL_BUILDLINK3_MK) | |
6 | HUNSPELL_BUILDLINK3_MK:= | 6 | HUNSPELL_BUILDLINK3_MK:= | |
7 | 7 | |||
8 | BUILDLINK_API_DEPENDS.hunspell+= hunspell>=1.2.2 | 8 | BUILDLINK_API_DEPENDS.hunspell+= hunspell>=1.2.2 | |
9 | BUILDLINK_ABI_DEPENDS.hunspell+= hunspell>=1.3.2 | 9 | BUILDLINK_ABI_DEPENDS.hunspell+= hunspell>=1.6.2 | |
10 | BUILDLINK_PKGSRCDIR.hunspell?= ../../textproc/hunspell | 10 | BUILDLINK_PKGSRCDIR.hunspell?= ../../textproc/hunspell | |
11 | .endif # HUNSPELL_BUILDLINK3_MK | 11 | .endif # HUNSPELL_BUILDLINK3_MK | |
12 | 12 | |||
13 | BUILDLINK_TREE+= -hunspell | 13 | BUILDLINK_TREE+= -hunspell |
@@ -1,11 +1,10 @@ | @@ -1,11 +1,10 @@ | |||
1 | $NetBSD: distinfo,v 1.10 2018/10/19 17:57:42 bsiegert Exp $ | 1 | $NetBSD: distinfo,v 1.11 2018/10/23 11:45:34 bsiegert Exp $ | |
2 | 2 | |||
3 | SHA1 (hunspell-1.3.3.tar.gz) = 219b20f305d6690f666ff3864a16e4674908a553 | 3 | SHA1 (hunspell-1.6.2.tar.gz) = 6572d1459deafd358b886d4482c179b715bc92e8 | |
4 | RMD160 (hunspell-1.3.3.tar.gz) = 6e45fdf0c602f0694f414b0cb33de34a5bf95683 | 4 | RMD160 (hunspell-1.6.2.tar.gz) = f966f805bfbd4b69bb10e573cc271314a0411ef6 | |
5 | SHA512 (hunspell-1.3.3.tar.gz) = 7599981d002a4a032c41c83f6287243a4942b0e25c408049a3ba86c16f63ce964800a3ac325ace0402b0d7256690c4a4151a66f19a8f58cc455af0498bb1af04 | 5 | SHA512 (hunspell-1.6.2.tar.gz) = a23127f1271da95ac06a1fb2f57b659485e959567b61da05b2bb350684003a0fb7e882b5e524c465fd890f79f513ed03174f38611989a1c09081147c47d6da11 | |
6 | Size (hunspell-1.3.3.tar.gz) = 986081 bytes | 6 | Size (hunspell-1.6.2.tar.gz) = 721165 bytes | |
7 | SHA1 (patch-aa) = b03a51d88bd57786f4a0ac01a3b760b4d8ba385a | 7 | SHA1 (patch-aa) = 8c6102ddb2e449b6f1abc23f679e0f6f38bfd0b5 | |
8 | SHA1 (patch-ab) = 01ff90fc2ebf1049d791a0669ddcc3f5495729c0 | 8 | SHA1 (patch-ab) = ee127b1d8f55ceefa807c2fa440885b4fa5d029c | |
9 | SHA1 (patch-ac) = 27cad6078b55bce7144f462ddebac9887392c93b | 9 | SHA1 (patch-ac) = c25cdfe80452cb4ca9850354c9fa8581c787c086 | |
10 | SHA1 (patch-src_tools_Makefile.in) = f365394c00a52ade0267f7f6469e34dbcb5a2c2a | 10 | SHA1 (patch-src_tools_Makefile.am) = 5a5bdd02f8acc64f0bd55c4d3ec11c2481bef851 | |
11 | SHA1 (patch-src_tools_hunspell.cxx) = c5fd2ec5c56ee62c1547fbbd69aee760c6002960 |
@@ -1,15 +1,15 @@ | @@ -1,15 +1,15 @@ | |||
1 | $NetBSD: patch-aa,v 1.2 2012/02/13 14:42:59 wiz Exp $ | 1 | $NetBSD: patch-aa,v 1.3 2018/10/23 11:45:34 bsiegert Exp $ | |
2 | 2 | |||
3 | --- src/hunspell/hunzip.hxx.orig 2010-04-15 11:22:09.000000000 +0000 | 3 | --- src/hunspell/hunzip.hxx.orig 2017-09-03 11:38:44.000000000 +0000 | |
4 | +++ src/hunspell/hunzip.hxx | 4 | +++ src/hunspell/hunzip.hxx | |
5 | @@ -4,6 +4,10 @@ | 5 | @@ -41,6 +41,10 @@ | |
6 | #ifndef _HUNZIP_HXX_ | 6 | #ifndef HUNZIP_HXX_ | |
7 | #define _HUNZIP_HXX_ | 7 | #define HUNZIP_HXX_ | |
8 | 8 | |||
9 | +#ifdef __SUNPRO_CC | 9 | +#ifdef __SUNPRO_CC | |
10 | +#include <iostream> | 10 | +#include <iostream> | |
11 | +#endif | 11 | +#endif | |
12 | + | 12 | + | |
13 | #include "hunvisapi.h" | 13 | #include "hunvisapi.h" | |
14 | 14 | |||
15 | #include <stdio.h> | 15 | #include <stdio.h> |
@@ -1,20 +1,20 @@ | @@ -1,20 +1,20 @@ | |||
1 | $NetBSD: patch-ab,v 1.1 2009/01/26 20:09:48 sketch Exp $ | 1 | $NetBSD: patch-ab,v 1.2 2018/10/23 11:45:34 bsiegert Exp $ | |
2 | 2 | |||
3 | --- src/hunspell/phonet.cxx.orig Mon Jan 26 19:59:48 2009 | 3 | --- src/hunspell/phonet.cxx.orig 2017-09-03 11:38:44.000000000 +0000 | |
4 | +++ src/hunspell/phonet.cxx Mon Jan 26 20:05:39 2009 | 4 | +++ src/hunspell/phonet.cxx | |
5 | @@ -42,6 +42,15 @@ | 5 | @@ -35,6 +35,15 @@ | |
6 | #include "csutil.hxx" | 6 | #include "csutil.hxx" | |
7 | #include "phonet.hxx" | 7 | #include "phonet.hxx" | |
8 | 8 | |||
9 | +#ifdef __SUNPRO_CC | 9 | +#ifdef __SUNPRO_CC | |
10 | +using std::isalpha; | 10 | +using std::isalpha; | |
11 | +using std::isdigit; | 11 | +using std::isdigit; | |
12 | +using std::strchr; | 12 | +using std::strchr; | |
13 | +using std::strcpy; | 13 | +using std::strcpy; | |
14 | +using std::strlen; | 14 | +using std::strlen; | |
15 | +using std::strstr; | 15 | +using std::strstr; | |
16 | +#endif | 16 | +#endif | |
17 | + | 17 | + | |
18 | void init_phonet_hash(phonetable & parms) | 18 | void init_phonet_hash(phonetable& parms) { | |
19 | { | 19 | for (int i = 0; i < HASHSIZE; i++) { | |
20 | int i, k; | 20 | parms.hash[i] = -1; |
@@ -1,20 +1,20 @@ | @@ -1,20 +1,20 @@ | |||
1 | $NetBSD: patch-ac,v 1.1 2009/09/22 09:16:51 sketch Exp $ | 1 | $NetBSD: patch-ac,v 1.2 2018/10/23 11:45:34 bsiegert Exp $ | |
2 | 2 | |||
3 | --- src/hunspell/replist.cxx.orig Sat Nov 1 14:09:51 2008 | 3 | --- src/hunspell/replist.cxx.orig 2017-09-03 11:38:44.000000000 +0000 | |
4 | +++ src/hunspell/replist.cxx Tue Sep 22 10:12:37 2009 | 4 | +++ src/hunspell/replist.cxx | |
5 | @@ -14,6 +14,15 @@ | 5 | @@ -76,6 +76,15 @@ | |
6 | #include "replist.hxx" | 6 | #include "replist.hxx" | |
7 | #include "csutil.hxx" | 7 | #include "csutil.hxx" | |
8 | 8 | |||
9 | +#ifdef __SUNPRO_CC | 9 | +#ifdef __SUNPRO_CC | |
10 | +using std::free; | 10 | +using std::free; | |
11 | +using std::malloc; | 11 | +using std::malloc; | |
12 | +using std::strcmp; | 12 | +using std::strcmp; | |
13 | +using std::strcpy; | 13 | +using std::strcpy; | |
14 | +using std::strlen; | 14 | +using std::strlen; | |
15 | +using std::strncmp; | 15 | +using std::strncmp; | |
16 | +#endif | 16 | +#endif | |
17 | + | 17 | + | |
18 | RepList::RepList(int n) { | 18 | RepList::RepList(int n) { | |
19 | dat = (replentry **) malloc(sizeof(replentry *) * n); | 19 | dat = (replentry**)malloc(sizeof(replentry*) * n); | |
20 | if (dat == 0) size = 0; else size = n; | 20 | if (dat == 0) |
$NetBSD: patch-src_tools_Makefile.am,v 1.1 2018/10/23 11:45:34 bsiegert Exp $
--- src/tools/Makefile.am.orig 2017-09-03 11:38:44.000000000 +0000
+++ src/tools/Makefile.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS=analyze chmorph hunspell munch unmunch hzip hunzip
+bin_PROGRAMS=hunspell-analyze chmorph hunspell hunspell-munch hunspell-unmunch hzip hunzip
AM_CPPFLAGS=-I${top_builddir}/src/hunspell -I${top_srcdir}/src/hunspell -I${top_srcdir}/src/parsers
@@ -6,8 +6,8 @@ hzip_SOURCES=hzip.cxx
hunzip_SOURCES=hunzip.cxx
hunzip_LDADD = ../hunspell/libhunspell-1.6.la
-munch_SOURCES=munch.cxx munch.h
-unmunch_SOURCES=unmunch.cxx unmunch.h
+hunspell_munch_SOURCES=munch.cxx munch.h
+hunspell_unmunch_SOURCES=unmunch.cxx unmunch.h
example_SOURCES=example.cxx
example_LDADD = ../hunspell/libhunspell-1.6.la
@@ -16,8 +16,8 @@ hunspell_SOURCES=hunspell.cxx
hunspell_LDADD = @LIBINTL@ @LIBICONV@ ../parsers/libparsers.a \
../hunspell/libhunspell-1.6.la @CURSESLIB@ @READLINELIB@
-analyze_SOURCES=analyze.cxx
-analyze_LDADD = ../hunspell/libhunspell-1.6.la
+hunspell_analyze_SOURCES=analyze.cxx
+hunspell_analyze_LDADD = ../hunspell/libhunspell-1.6.la
bulkcheck_SOURCES=bulkcheck.cxx
bulkcheck_LDADD = ../hunspell/libhunspell-1.6.la