11 files changed, 42 insertions, 41 deletions

diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
index 29a6f6ed5bbf..357acb23fde1 100644
--- a/textproc/enchant/Makefile
+++ b/textproc/enchant/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	enchant
 PORTVERSION=	1.6.0
-PORTREVISION=	6
+PORTREVISION=	7
 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.5.so:textproc/hunspell
+HUNSPELL_LIB_DEPENDS=	libhunspell-1.6.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 4473f1deabcb..71a528cfdc36 100644
--- a/textproc/goldendict/Makefile
+++ b/textproc/goldendict/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	goldendict
 PORTVERSION=	1.0.1
-PORTREVISION=	9
+PORTREVISION=	10
 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.5.so:textproc/hunspell \
+LIB_DEPENDS=	libhunspell-1.6.so:textproc/hunspell \
 		libvorbis.so:audio/libvorbis
 
 NO_WRKSUBDIR=	yes
diff --git a/textproc/hunspell/Makefile b/textproc/hunspell/Makefile
index bed986105b3d..e027c9ad797c 100644
--- a/textproc/hunspell/Makefile
+++ b/textproc/hunspell/Makefile
@@ -2,22 +2,25 @@
 # $FreeBSD$
 
 PORTNAME=	hunspell
-PORTVERSION=	1.5.4
+PORTVERSION=	1.6.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	textproc
+DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Improved spell-checker for Hungarian and other languages
 
-LICENSE=	GPLv2 LGPL21 MPL
+LICENSE=	GPLv2+ LGPL21+ MPL
 LICENSE_COMB=	dual
-LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LGPL
+LICENSE_FILE_GPLv2+ =	${_LICENSE_STORE}/GPLv2
+LICENSE_FILE_LGPL21+ =	${_LICENSE_STORE}/LGPL21
 LICENSE_FILE_MPL=	${WRKSRC}/COPYING.MPL
 
 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
+USES=		autoreconf libtool:keepla pathfix iconv ncurses \
+		readline shebangfix perl5
 USE_GITHUB=	yes
 SHEBANG_FILES=	src/tools/ispellaff2myspell
 USE_LDCONFIG=	yes
@@ -29,4 +32,10 @@ PLIST_SUB=	SHLIB_VER=${PORTVERSION:R}
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/tools/hunspell.cxx
 
+makepatch-clean:
+	@${RM} ${WRKSRC}/tests/suggestiontest/Makefile.orig
+
 .include <bsd.port.mk>
+
+# XXX Don't override definition in Mk/bsd.port.mk
+makepatch:	makepatch-clean
diff --git a/textproc/hunspell/distinfo b/textproc/hunspell/distinfo
index 78b26ff658c3..66b8c01359f4 100644
--- a/textproc/hunspell/distinfo
+++ b/textproc/hunspell/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480524200
-SHA256 (hunspell-hunspell-v1.5.4_GH0.tar.gz) = 852c01a2e3b87eb1f2adb5261466608ba79f1f950202e18a2a1735de5098fc59
-SIZE (hunspell-hunspell-v1.5.4_GH0.tar.gz) = 1110858
+TIMESTAMP = 1482369634
+SHA256 (hunspell/hunspell-hunspell-v1.6.0_GH0.tar.gz) = 512e7d2ee69dad0b35ca011076405e56e0f10963a02d4859dbcc4faf53ca68e2
+SIZE (hunspell/hunspell-hunspell-v1.6.0_GH0.tar.gz) = 699377
diff --git a/textproc/hunspell/files/patch-add-const b/textproc/hunspell/files/patch-add-const
index d8c7bd38cf37..b43c48b95b84 100644
--- a/textproc/hunspell/files/patch-add-const
+++ b/textproc/hunspell/files/patch-add-const
@@ -66,25 +66,3 @@ reverting https://github.com/hunspell/hunspell/commit/dd4b14899bfb
  
    /* 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/kf5-sonnet/Makefile b/textproc/kf5-sonnet/Makefile
index bb7efc49215f..1445c919eeb4 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.5.so:textproc/hunspell
+		libhunspell-1.6.so:textproc/hunspell
 
 USES=		cmake:outsource compiler:c++11-lib kde: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..00e5a0848cd8
--- /dev/null
+++ b/textproc/kf5-sonnet/files/patch-cmake_FindHUNSPELL.cmake
@@ -0,0 +1,12 @@
+--- cmake/FindHUNSPELL.cmake.orig	2016-12-03 21:15:34 UTC
++++ cmake/FindHUNSPELL.cmake
+@@ -14,7 +14,8 @@ ENDIF (HUNSPELL_INCLUDE_DIR AND HUNSPELL
+ 
+ FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx )
+ 
+-FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2)
++FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.6
++             hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2 hunspell)
+ 
+ # handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE if 
+ # all listed variables are TRUE
diff --git a/textproc/mythes/Makefile b/textproc/mythes/Makefile
index 5f68a665351d..23dbc153b0fa 100644
--- a/textproc/mythes/Makefile
+++ b/textproc/mythes/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mythes
 PORTVERSION=	1.2.4
-PORTREVISION=	2
+PORTREVISION=	3
 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.5.so:textproc/hunspell
+LIB_DEPENDS=	libhunspell-1.6.so:textproc/hunspell
 
 USES=		libtool pathfix perl5 pkgconfig shebangfix
 USE_LDCONFIG=	yes
diff --git a/textproc/py-hunspell/Makefile b/textproc/py-hunspell/Makefile
index c1646750d195..0bd14252ac17 100644
--- a/textproc/py-hunspell/Makefile
+++ b/textproc/py-hunspell/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	hunspell
 PORTVERSION=	0.4.1
+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.5
+HSPLVER=	1.6
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/hunspell.so
 
 pre-configure:
diff --git a/textproc/sigil/Makefile b/textproc/sigil/Makefile
index a37f21589a88..6af714759fb5 100644
--- a/textproc/sigil/Makefile
+++ b/textproc/sigil/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sigil
 PORTVERSION=	0.9.7
-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.5.so:textproc/hunspell
+		libhunspell-1.6.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.5.so and
+# Upstream uses pkg-config output to pass libhunspell-1.6.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 44ac453894a0..c89bd38b9b1d 100644
--- a/textproc/te-hunspell/Makefile
+++ b/textproc/te-hunspell/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	hunspell
 DISTVERSION=	0.01-2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	GNU/aspell/dict/te
 PKGNAMEPREFIX=	te-