Index: textproc/hunspell/Makefile
===================================================================
--- textproc/hunspell/Makefile
+++ textproc/hunspell/Makefile
@@ -2,22 +2,24 @@
 # $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_GPLv3=	${WRKSRC}/COPYING
+LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.LESSER
 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
Index: textproc/hunspell/distinfo
===================================================================
--- textproc/hunspell/distinfo
+++ 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 = 1482426870
+SHA256 (hunspell/hunspell-hunspell-v1.6.0_GH0.tar.gz) = 512e7d2ee69dad0b35ca011076405e56e0f10963a02d4859dbcc4faf53ca68e2
+SIZE (hunspell/hunspell-hunspell-v1.6.0_GH0.tar.gz) = 699377
Index: textproc/hunspell/files/patch-add-const
===================================================================
--- textproc/hunspell/files/patch-add-const
+++ textproc/hunspell/files/patch-add-const
@@ -66,25 +66,3 @@
  
    /* 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);