textproc/hunspell: update to 1.7.0

- Drop const optimization as v2 API moved to nuspell

Changes:	https://github.com/hunspell/hunspell/releases/tag/v1.7.0

14 files changed, 33 insertions, 91 deletions

diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
index 0c4c11345926..2d915f73636c 100644
--- a/textproc/enchant/Makefile
+++ b/textproc/enchant/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	enchant
 PORTVERSION=	1.6.0
-PORTREVISION=	8
+PORTREVISION=	9
 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.6.so:textproc/hunspell
+HUNSPELL_LIB_DEPENDS=	libhunspell-1.7.so:textproc/hunspell
 HUNSPELL_CONFIGURE_ENABLE=	myspell
 HUNSPELL_CONFIGURE_ON=	--with-system-myspell=yes \
 			--with-myspell-dir=${LOCALBASE}/share/hunspell
diff --git a/textproc/enchant2/Makefile b/textproc/enchant2/Makefile
index b5d58cd1a522..6cdd22824ba3 100644
--- a/textproc/enchant2/Makefile
+++ b/textproc/enchant2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	enchant
 PORTVERSION=	2.2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc gnome
 MASTER_SITES=	https://github.com/AbiWord/enchant/releases/download/v${PORTVERSION}/
 PKGNAMESUFFIX=	2
@@ -39,7 +39,7 @@ HSPELL_LIB_DEPENDS=	libhspell.so.0:hebrew/hspell
 HSPELL_CONFIGURE_WITH=	hspell
 HSPELL_CONFIGURE_ON=	--with-hspell-dir=${LOCALBASE}/share/hspell
 
-HUNSPELL_LIB_DEPENDS=	libhunspell-1.6.so:textproc/hunspell
+HUNSPELL_LIB_DEPENDS=	libhunspell-1.7.so:textproc/hunspell
 HUNSPELL_CONFIGURE_WITH=	hunspell
 HUNSPELL_CONFIGURE_ON=	--with-hunspell-dir=${LOCALBASE}/share/hunspell
 
diff --git a/textproc/goldendict/Makefile b/textproc/goldendict/Makefile
index 66e7b865895b..bd33e316493d 100644
--- a/textproc/goldendict/Makefile
+++ b/textproc/goldendict/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	goldendict
 PORTVERSION=	1.0.1
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:C|(.*)\.[0-9]*$|\1|}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -16,7 +16,7 @@ LICENSE=	GPLv3
 DEPRECATED=		Qt4 has been EOL since december 2015
 EXPIRATION_DATE=	2019-03-15
 
-LIB_DEPENDS=	libhunspell-1.6.so:textproc/hunspell \
+LIB_DEPENDS=	libhunspell-1.7.so:textproc/hunspell \
 		libvorbis.so:audio/libvorbis
 
 NO_WRKSUBDIR=	yes
diff --git a/textproc/hunspell/Makefile b/textproc/hunspell/Makefile
index d348bb3ee16c..58e306e7bbca 100644
--- a/textproc/hunspell/Makefile
+++ b/textproc/hunspell/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hunspell
-PORTVERSION=	1.6.2
-PORTREVISION=	2
+PORTVERSION=	1.7.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	textproc
 DIST_SUBDIR=	${PORTNAME}
diff --git a/textproc/hunspell/distinfo b/textproc/hunspell/distinfo
index e93343bcdf17..04245686e7a5 100644
--- a/textproc/hunspell/distinfo
+++ b/textproc/hunspell/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504718698
-SHA256 (hunspell/hunspell-hunspell-v1.6.2_GH0.tar.gz) = 3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4
-SIZE (hunspell/hunspell-hunspell-v1.6.2_GH0.tar.gz) = 721165
+TIMESTAMP = 1542055136
+SHA256 (hunspell/hunspell-hunspell-v1.7.0_GH0.tar.gz) = bb27b86eb910a8285407cf3ca33b62643a02798cf2eef468c0a74f6c3ee6bc8a
+SIZE (hunspell/hunspell-hunspell-v1.7.0_GH0.tar.gz) = 482156
diff --git a/textproc/hunspell/files/patch-add-const b/textproc/hunspell/files/patch-add-const
deleted file mode 100644
index b43c48b95b84..000000000000
--- a/textproc/hunspell/files/patch-add-const
+++ /dev/null
@@ -1,68 +0,0 @@
-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 */
- 
diff --git a/textproc/hunspell/pkg-plist b/textproc/hunspell/pkg-plist
index 0fcec9407c8c..047fa7b645ac 100644
--- a/textproc/hunspell/pkg-plist
+++ b/textproc/hunspell/pkg-plist
@@ -11,8 +11,6 @@ bin/unmunch
 bin/wordforms
 bin/wordlist2hunspell
 include/hunspell/atypes.hxx
-include/hunspell/csutil.hxx
-include/hunspell/htypes.hxx
 include/hunspell/hunspell.h
 include/hunspell/hunspell.hxx
 include/hunspell/hunvisapi.h
diff --git a/textproc/ibus-typing-booster/Makefile b/textproc/ibus-typing-booster/Makefile
index e1d9edfbfa7f..ae5524440c3a 100644
--- a/textproc/ibus-typing-booster/Makefile
+++ b/textproc/ibus-typing-booster/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ibus-typing-booster
 PORTVERSION=	2.4.1
+PORTREVISION=	1
 CATEGORIES=	textproc
 
 MAINTAINER=	thierry@FreeBSD.org
diff --git a/textproc/kf5-sonnet/Makefile b/textproc/kf5-sonnet/Makefile
index fd0a30ea34d0..056af56f96dd 100644
--- a/textproc/kf5-sonnet/Makefile
+++ b/textproc/kf5-sonnet/Makefile
@@ -2,14 +2,14 @@
 
 PORTNAME=	sonnet
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KF5 plugin-based spell checking library
 
 LIB_DEPENDS=	libaspell.so:textproc/aspell \
-		libhunspell-1.6.so:textproc/hunspell
+		libhunspell-1.7.so:textproc/hunspell
 
 USES=		cmake compiler:c++11-lib kde:5 qt:5 tar:xz
 USE_KDE=	ecm
diff --git a/textproc/kf5-sonnet/files/patch-cmake_FindHUNSPELL.cmake b/textproc/kf5-sonnet/files/patch-cmake_FindHUNSPELL.cmake
new file mode 100644
index 000000000000..8688085984ee
--- /dev/null
+++ b/textproc/kf5-sonnet/files/patch-cmake_FindHUNSPELL.cmake
@@ -0,0 +1,11 @@
+--- cmake/FindHUNSPELL.cmake.orig	2019-01-06 20:29:23 UTC
++++ cmake/FindHUNSPELL.cmake
+@@ -40,7 +40,7 @@ find_path(HUNSPELL_INCLUDE_DIRS
+           HINTS ${PKG_HUNSPELL_INCLUDE_DIRS}
+ )
+ find_library(HUNSPELL_LIBRARIES
+-             NAMES ${PKG_HUNSPELL_LIBRARIES} hunspell hunspell-1.6 hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2 libhunspell
++             NAMES ${PKG_HUNSPELL_LIBRARIES} hunspell hunspell-1.7 hunspell-1.6 hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2 libhunspell
+              HINTS ${PKG_HUNSPELL_LIBRARY_DIRS}
+ )
+ 
diff --git a/textproc/link-grammar/Makefile b/textproc/link-grammar/Makefile
index e1e26223a9be..bd35547fcc3d 100644
--- a/textproc/link-grammar/Makefile
+++ b/textproc/link-grammar/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	link-grammar
 DISTVERSION=	5.4.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.abisource.com/downloads/${PORTNAME}/${PORTVERSION}/
 
@@ -39,7 +39,7 @@ EDITLINE_DESC=			Command line editing
 EDITLINE_USES=			libedit
 
 HUNSPELL_CONFIGURE_ENABLE=	hunspell
-HUNSPELL_LIB_DEPENDS=		libhunspell-1.6.so:textproc/hunspell
+HUNSPELL_LIB_DEPENDS=		libhunspell-1.7.so:textproc/hunspell
 
 JAVA_CONFIGURE_ENABLE=		java-bindings
 JAVA_USE=			JAVA
diff --git a/textproc/mythes/Makefile b/textproc/mythes/Makefile
index 903684524ba3..66c936e1645d 100644
--- a/textproc/mythes/Makefile
+++ b/textproc/mythes/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mythes
 PORTVERSION=	1.2.4
-PORTREVISION=	5
+PORTREVISION=	6
 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.6.so:textproc/hunspell
+LIB_DEPENDS=	libhunspell-1.7.so:textproc/hunspell
 
 USES=		compiler:c++11-lib libtool pathfix perl5 pkgconfig shebangfix
 USE_LDCONFIG=	yes
diff --git a/textproc/py-hunspell/Makefile b/textproc/py-hunspell/Makefile
index 37cae8d6a5b1..4f924832ea13 100644
--- a/textproc/py-hunspell/Makefile
+++ b/textproc/py-hunspell/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	hunspell
 PORTVERSION=	0.5.5
+PORTREVISION=	1
 CATEGORIES=	textproc devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,7 +19,7 @@ USES=		python
 USES+=		localbase
 USE_PYTHON=	distutils
 
-HSPLVER=	1.6
+HSPLVER=	1.7
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/hunspell.so
 
 pre-configure:
diff --git a/textproc/sigil/Makefile b/textproc/sigil/Makefile
index fda234e83b9c..908301477d4e 100644
--- a/textproc/sigil/Makefile
+++ b/textproc/sigil/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sigil
 PORTVERSION=	0.9.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 
 MAINTAINER=	ports@FreeBSD.org
@@ -13,7 +13,7 @@ LICENSE=	GPLv3+
 
 LIB_DEPENDS=	libminizip.so:archivers/minizip \
 		libpcre.so:devel/pcre \
-		libhunspell-1.6.so:textproc/hunspell
+		libhunspell-1.7.so:textproc/hunspell
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR}
 
 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.6.so and
+# Upstream uses pkg-config output to pass libhunspell-1.7.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