textproc/hunspell: update to 1.5.4

Changes:	https://github.com/hunspell/hunspell/blob/v1.5.4/ChangeLog
PR:		214837
Exp-run by:	antoine (for 1.5.3)
Approved by:	office (bapt)

13 files changed, 145 insertions, 81 deletions

diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
index e3101e37eda8..29a6f6ed5bbf 100644
--- a/textproc/enchant/Makefile
+++ b/textproc/enchant/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	enchant
 PORTVERSION=	1.6.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	textproc gnome
 MASTER_SITES=	http://www.abisource.com/downloads/${PORTNAME}/${PORTVERSION}/
 DIST_SUBDIR=	gnome2
@@ -39,7 +39,7 @@ HSPELL_BUILD_DEPENDS=	${LOCALBASE}/lib/libhspell.a:hebrew/hspell
 HSPELL_CONFIGURE_ENABLE=	hspell
 HSPELL_CONFIGURE_ON=	--with-hspell-prefix=${LOCALBASE}
 
-HUNSPELL_LIB_DEPENDS=	libhunspell-1.3.so:textproc/hunspell
+HUNSPELL_LIB_DEPENDS=	libhunspell-1.5.so:textproc/hunspell
 HUNSPELL_CONFIGURE_ENABLE=	myspell
 HUNSPELL_CONFIGURE_ON=	--with-system-myspell=yes \
 			--with-myspell-dir=${LOCALBASE}/share/hunspell
diff --git a/textproc/goldendict/Makefile b/textproc/goldendict/Makefile
index c8088b151b0e..4473f1deabcb 100644
--- a/textproc/goldendict/Makefile
+++ b/textproc/goldendict/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	goldendict
 PORTVERSION=	1.0.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:C|(.*)\.[0-9]*$|\1|}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -13,7 +13,7 @@ COMMENT=	Feature-rich Qt4 based dictionary lookup program
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libhunspell-1.3.so:textproc/hunspell \
+LIB_DEPENDS=	libhunspell-1.5.so:textproc/hunspell \
 		libvorbis.so:audio/libvorbis
 
 NO_WRKSUBDIR=	yes
diff --git a/textproc/hunspell/Makefile b/textproc/hunspell/Makefile
index 4028bbb4575d..bed986105b3d 100644
--- a/textproc/hunspell/Makefile
+++ b/textproc/hunspell/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	hunspell
-PORTVERSION=	1.3.3
+PORTVERSION=	1.5.4
+DISTVERSIONPREFIX=	v
 CATEGORIES=	textproc
-MASTER_SITES=	SF/${PORTNAME}/Hunspell/${PORTVERSION}
-DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Improved spell-checker for Hungarian and other languages
@@ -19,6 +18,7 @@ CONFLICTS_INSTALL=	tinker-[0-9]*
 CONFIGURE_ARGS=	--disable-nls ${ICONV_CONFIGURE_ARG} --with-readline --with-ui
 GNU_CONFIGURE=	yes
 USES=		libtool:keepla pathfix iconv ncurses readline shebangfix perl5
+USE_GITHUB=	yes
 SHEBANG_FILES=	src/tools/ispellaff2myspell
 USE_LDCONFIG=	yes
 USE_PERL5=	run
diff --git a/textproc/hunspell/distinfo b/textproc/hunspell/distinfo
index eede83d80686..78b26ff658c3 100644
--- a/textproc/hunspell/distinfo
+++ b/textproc/hunspell/distinfo
@@ -1,2 +1,3 @@
-SHA256 (hunspell/hunspell-1.3.3.tar.gz) = a7b2c0de0e2ce17426821dc1ac8eb115029959b3ada9d80a81739fa19373246c
-SIZE (hunspell/hunspell-1.3.3.tar.gz) = 986081
+TIMESTAMP = 1480524200
+SHA256 (hunspell-hunspell-v1.5.4_GH0.tar.gz) = 852c01a2e3b87eb1f2adb5261466608ba79f1f950202e18a2a1735de5098fc59
+SIZE (hunspell-hunspell-v1.5.4_GH0.tar.gz) = 1110858
diff --git a/textproc/hunspell/files/patch-add-const b/textproc/hunspell/files/patch-add-const
new file mode 100644
index 000000000000..d8c7bd38cf37
--- /dev/null
+++ b/textproc/hunspell/files/patch-add-const
@@ -0,0 +1,90 @@
+Add back `const` keyword to keep consumers forward compatible by
+reverting https://github.com/hunspell/hunspell/commit/dd4b14899bfb
+
+--- src/hunspell/hunspell.cxx.orig	2016-11-28 10:34:55 UTC
++++ src/hunspell/hunspell.cxx
+@@ -110,7 +110,7 @@ public:
+   int remove(const std::string& word);
+   const std::string& get_version() const;
+   struct cs_info* get_csconv();
+-  std::vector<char> dic_encoding_vec;
++
+ 
+ private:
+   AffixMgr* pAMgr;
+@@ -181,9 +181,6 @@ HunspellImpl::HunspellImpl(const char* a
+   complexprefixes = pAMgr->get_complexprefixes();
+   wordbreak = pAMgr->get_breaktable();
+ 
+-  dic_encoding_vec.resize(encoding.size()+1);
+-  strcpy(&dic_encoding_vec[0], encoding.c_str());
+-
+   /* and finally set up the suggestion manager */
+   pSMgr = new SuggestMgr(try_string, MAXSUGGESTION, pAMgr);
+   if (try_string)
+@@ -1850,8 +1847,8 @@ int Hunspell::suffix_suggest(char*** sls
+   return munge_vector(slst, stems);
+ }
+ 
+-char* Hunspell::get_dic_encoding() {
+-  return &(m_Impl->dic_encoding_vec[0]);
++const char* Hunspell::get_dic_encoding() const {
++  return Hunspell_get_dic_encoding((Hunhandle*)(this));
+ }
+ 
+ int Hunspell::stem(char*** slst, char** desc, int n) {
+@@ -1896,8 +1893,8 @@ int Hunspell_spell(Hunhandle* pHunspell,
+   return reinterpret_cast<Hunspell*>(pHunspell)->spell(std::string(word));
+ }
+ 
+-char* Hunspell_get_dic_encoding(Hunhandle* pHunspell) {
+-  return reinterpret_cast<Hunspell*>(pHunspell)->get_dic_encoding();
++const char* Hunspell_get_dic_encoding(Hunhandle* pHunspell) {
++  return (reinterpret_cast<Hunspell*>(pHunspell)->get_dict_encoding()).c_str();
+ }
+ 
+ int Hunspell_suggest(Hunhandle* pHunspell, char*** slst, const char* word) {
+--- src/hunspell/hunspell.h.orig	2016-11-28 10:34:55 UTC
++++ src/hunspell/hunspell.h
+@@ -68,7 +68,7 @@ LIBHUNSPELL_DLL_EXPORTED int Hunspell_ad
+  */
+ LIBHUNSPELL_DLL_EXPORTED int Hunspell_spell(Hunhandle* pHunspell, const char*);
+ 
+-LIBHUNSPELL_DLL_EXPORTED char* Hunspell_get_dic_encoding(Hunhandle* pHunspell);
++LIBHUNSPELL_DLL_EXPORTED const char* Hunspell_get_dic_encoding(Hunhandle* pHunspell);
+ 
+ /* suggest(suggestions, word) - search suggestions
+  * input: pointer to an array of strings pointer and the (bad) word
+--- src/hunspell/hunspell.hxx.orig	2016-11-28 10:34:55 UTC
++++ src/hunspell/hunspell.hxx
+@@ -155,7 +155,7 @@ class LIBHUNSPELL_DLL_EXPORTED Hunspell 
+   H_DEPRECATED void free_list(char*** slst, int n);
+ 
+   const std::string& get_dict_encoding() const;
+-  char* get_dic_encoding();
++  H_DEPRECATED const char* get_dic_encoding() const;
+ 
+   /* morphological functions */
+ 
+--- src/win_api/hunspelldll.c.orig	2016-11-28 10:34:55 UTC
++++ src/win_api/hunspelldll.c
+@@ -73,7 +73,7 @@ LIBHUNSPELL_DLL_EXPORTED void hunspell_f
+   pMS->free_list(slst, len);
+ }
+ 
+-LIBHUNSPELL_DLL_EXPORTED char* hunspell_get_dic_encoding(Hunspell* pMS) {
++LIBHUNSPELL_DLL_EXPORTED const char* hunspell_get_dic_encoding(Hunspell* pMS) {
+   return pMS->get_dic_encoding();
+ }
+ 
+--- src/win_api/hunspelldll.h.orig	2016-11-28 10:34:55 UTC
++++ src/win_api/hunspelldll.h
+@@ -59,7 +59,7 @@ LIBHUNSPELL_DLL_EXPORTED void hunspell_f
+                                                  char*** slst,

+                                                  int len);

+ // make local copy of returned string!!

+-LIBHUNSPELL_DLL_EXPORTED char* hunspell_get_dic_encoding(Hunspell* pMS);

++LIBHUNSPELL_DLL_EXPORTED const char* hunspell_get_dic_encoding(Hunspell* pMS);

+ 

+ // add word to dict (word is valid until spell object is not destroyed)

+ LIBHUNSPELL_DLL_EXPORTED int hunspell_add(Hunspell* pMS, char* word);

diff --git a/textproc/hunspell/files/patch-configure b/textproc/hunspell/files/patch-configure
deleted file mode 100644
index 2c62f4863229..000000000000
--- a/textproc/hunspell/files/patch-configure
+++ /dev/null
@@ -1,26 +0,0 @@
---- configure.orig	2013-05-17 01:18:45.000000000 +0300
-+++ configure	2013-05-17 01:26:35.000000000 +0300
-@@ -11880,6 +11880,7 @@
- 
-   # Allow CC to be a program name with arguments.
-   lt_save_CC=$CC
-+  lt_save_CFLAGS=$CFLAGS
-   lt_save_LD=$LD
-   lt_save_GCC=$GCC
-   GCC=$GXX
-@@ -11897,6 +11898,7 @@
-   fi
-   test -z "${LDCXX+set}" || LD=$LDCXX
-   CC=${CXX-"c++"}
-+  CFLAGS=$CXXFLAGS
-   compiler=$CC
-   compiler_CXX=$CC
-   for cc_temp in $compiler""; do
-@@ -14618,6 +14620,7 @@
-   fi # test -n "$compiler"
- 
-   CC=$lt_save_CC
-+  CFLAGS=$lt_save_CFLAGS
-   LDCXX=$LD
-   LD=$lt_save_LD
-   GCC=$lt_save_GCC
diff --git a/textproc/hunspell/files/patch-src_tools_hunspell.cxx b/textproc/hunspell/files/patch-src_tools_hunspell.cxx
index e0470da14663..f733b4c55b0f 100644
--- a/textproc/hunspell/files/patch-src_tools_hunspell.cxx
+++ b/textproc/hunspell/files/patch-src_tools_hunspell.cxx
@@ -1,34 +1,40 @@
---- ./src/tools/hunspell.cxx.orig	2011-01-21 18:01:29.000000000 +0100
-+++ ./src/tools/hunspell.cxx	2011-07-19 07:16:58.346225286 +0200
-@@ -61,28 +61,23 @@
- #include "firstparser.hxx"
+--- src/tools/hunspell.cxx.orig	2016-11-28 10:34:55 UTC
++++ src/tools/hunspell.cxx
+@@ -112,28 +112,23 @@
+ #include "odfparser.hxx"
  
- #define LIBDIR \
--    "/usr/share/hunspell:" \
--    "/usr/share/myspell:" \
--    "/usr/share/myspell/dicts:" \
--    "/Library/Spelling"
+ #define LIBDIR                \
+-  "/usr/share/hunspell:"      \
+-  "/usr/share/myspell:"       \
+-  "/usr/share/myspell/dicts:" \
+-  "/Library/Spelling"
+-#define USEROOODIR                    \
+-  ".openoffice.org/3/user/wordbook:"  \
+-  ".openoffice.org2/user/wordbook:"   \
+-  ".openoffice.org2.0/user/wordbook:" \
+-  "Library/Spelling"
+-#define OOODIR                                       \
+-  "/opt/openoffice.org/basis3.0/share/dict/ooo:"     \
+-  "/usr/lib/openoffice.org/basis3.0/share/dict/ooo:" \
+-  "/opt/openoffice.org2.4/share/dict/ooo:"           \
+-  "/usr/lib/openoffice.org2.4/share/dict/ooo:"       \
+-  "/opt/openoffice.org2.3/share/dict/ooo:"           \
+-  "/usr/lib/openoffice.org2.3/share/dict/ooo:"       \
+-  "/opt/openoffice.org2.2/share/dict/ooo:"           \
+-  "/usr/lib/openoffice.org2.2/share/dict/ooo:"       \
+-  "/opt/openoffice.org2.1/share/dict/ooo:"           \
+-  "/usr/lib/openoffice.org2.1/share/dict/ooo:"       \
+-  "/opt/openoffice.org2.0/share/dict/ooo:"           \
+-  "/usr/lib/openoffice.org2.0/share/dict/ooo"
 +    "%%PREFIX%%/share/hunspell:" \
 +    "%%PREFIX%%/share/myspell:" \
 +    "%%PREFIX%%/share/myspell/dicts:"
- #define USEROOODIR \
-     ".openoffice.org/3/user/wordbook:" \
-     ".openoffice.org2/user/wordbook:" \
-     ".openoffice.org2.0/user/wordbook:" \
-     "Library/Spelling"
- #define OOODIR \
--    "/opt/openoffice.org/basis3.0/share/dict/ooo:" \
--    "/usr/lib/openoffice.org/basis3.0/share/dict/ooo:" \
--    "/opt/openoffice.org2.4/share/dict/ooo:" \
--    "/usr/lib/openoffice.org2.4/share/dict/ooo:" \
--    "/opt/openoffice.org2.3/share/dict/ooo:" \
--    "/usr/lib/openoffice.org2.3/share/dict/ooo:" \
--    "/opt/openoffice.org2.2/share/dict/ooo:" \
--    "/usr/lib/openoffice.org2.2/share/dict/ooo:" \
--    "/opt/openoffice.org2.1/share/dict/ooo:" \
--    "/usr/lib/openoffice.org2.1/share/dict/ooo:" \
--    "/opt/openoffice.org2.0/share/dict/ooo:" \
--    "/usr/lib/openoffice.org2.0/share/dict/ooo"
++#define USEROOODIR \
++    ".openoffice.org/3/user/wordbook:" \
++    ".openoffice.org2/user/wordbook:" \
++    ".openoffice.org2.0/user/wordbook:" \
++    "Library/Spelling"
++#define OOODIR \
 +    "%%PREFIX%%/openoffice.org3/share/dict/ooo:" \
 +    "%%PREFIX%%/openoffice.org-3.0.0/share/dict/ooo:" \
 +    "%%PREFIX%%/openoffice.org-2.4.2/share/dict/ooo:" \
diff --git a/textproc/hunspell/pkg-descr b/textproc/hunspell/pkg-descr
index b897d3ed8604..30140bf7a36b 100644
--- a/textproc/hunspell/pkg-descr
+++ b/textproc/hunspell/pkg-descr
@@ -1,4 +1,7 @@
-Hunspell is a widely used spell checker
+Hunspell is the spell checker of LibreOffice, OpenOffice.org, Mozilla
+Firefox 3 & Thunderbird, Google Chrome, and it is also used by
+proprietary software packages, like Mac OS X, InDesign, memoQ, Opera
+and SDL Trados.
 
 Main features:
 - Extended support for language peculiarities; Unicode character encoding,
diff --git a/textproc/hunspell/pkg-plist b/textproc/hunspell/pkg-plist
index 52ab40e754d1..74844953ea72 100644
--- a/textproc/hunspell/pkg-plist
+++ b/textproc/hunspell/pkg-plist
@@ -10,23 +10,12 @@ bin/munch
 bin/unmunch
 bin/wordforms
 bin/wordlist2hunspell
-include/hunspell/affentry.hxx
-include/hunspell/affixmgr.hxx
 include/hunspell/atypes.hxx
-include/hunspell/baseaffix.hxx
 include/hunspell/csutil.hxx
-include/hunspell/dictmgr.hxx
-include/hunspell/filemgr.hxx
-include/hunspell/hashmgr.hxx
 include/hunspell/htypes.hxx
 include/hunspell/hunspell.h
 include/hunspell/hunspell.hxx
 include/hunspell/hunvisapi.h
-include/hunspell/hunzip.hxx
-include/hunspell/langnum.hxx
-include/hunspell/phonet.hxx
-include/hunspell/replist.hxx
-include/hunspell/suggestmgr.hxx
 include/hunspell/w_char.hxx
 lib/libhunspell-%%SHLIB_VER%%.a
 lib/libhunspell-%%SHLIB_VER%%.la
diff --git a/textproc/kf5-sonnet/Makefile b/textproc/kf5-sonnet/Makefile
index badbafcc2968..ccadea955441 100644
--- a/textproc/kf5-sonnet/Makefile
+++ b/textproc/kf5-sonnet/Makefile
@@ -3,13 +3,14 @@
 
 PORTNAME=	sonnet
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	textproc kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KF5 plugin-based spell checking library
 
 LIB_DEPENDS=	libaspell.so:textproc/aspell \
-		libhunspell-1.3.so:textproc/hunspell
+		libhunspell-1.5.so:textproc/hunspell
 
 USES=		cmake:outsource compiler:c++11-lib kde:5 tar:xz
 USE_KDE=	ecm
diff --git a/textproc/mythes/Makefile b/textproc/mythes/Makefile
index da8e0cc4a555..5f68a665351d 100644
--- a/textproc/mythes/Makefile
+++ b/textproc/mythes/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mythes
 PORTVERSION=	1.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	SF/hunspell/MyThes/${PORTVERSION}/
 DIST_SUBDIR=	${PORTNAME}
@@ -13,7 +13,7 @@ COMMENT=	Simple thesaurus library
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libhunspell-1.3.so:textproc/hunspell
+LIB_DEPENDS=	libhunspell-1.5.so:textproc/hunspell
 
 USES=		libtool pathfix perl5 pkgconfig shebangfix
 USE_LDCONFIG=	yes
diff --git a/textproc/sigil/Makefile b/textproc/sigil/Makefile
index ec6a7f0f96a9..a37f21589a88 100644
--- a/textproc/sigil/Makefile
+++ b/textproc/sigil/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sigil
 PORTVERSION=	0.9.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 
 MAINTAINER=	ports@FreeBSD.org
@@ -13,7 +13,7 @@ LICENSE=	GPLv3+
 
 LIB_DEPENDS=	libminizip.so:archivers/minizip \
 		libpcre.so:devel/pcre \
-		libhunspell-1.3.so:textproc/hunspell
+		libhunspell-1.5.so:textproc/hunspell
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py3-lxml
 
 USE_GITHUB=	yes
@@ -32,7 +32,7 @@ CMAKE_ARGS=	-DUSE_SYSTEM_LIBS:BOOL=1 \
 		-DINSTALL_BUNDLED_DICTS:BOOL=0
 USE_LDCONFIG=	${PREFIX}/lib/sigil
 
-# Upstream uses pkg-config output to pass libhunspell-1.3.so and
+# Upstream uses pkg-config output to pass libhunspell-1.5.so and
 # libpcre16.so to the linker. pkg-config output does not include full
 # paths, so add a workaround to keep the port linking for now.
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/textproc/te-hunspell/Makefile b/textproc/te-hunspell/Makefile
index c4ef8b5e29b3..44ac453894a0 100644
--- a/textproc/te-hunspell/Makefile
+++ b/textproc/te-hunspell/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	hunspell
 DISTVERSION=	0.01-2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	GNU/aspell/dict/te
 PKGNAMEPREFIX=	te-