9 files changed, 57 insertions, 71 deletions

diff --git a/textproc/hunspell/Makefile b/textproc/hunspell/Makefile
index a4c9e6dddfac..85c74019a407 100644
--- a/textproc/hunspell/Makefile
+++ b/textproc/hunspell/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	hunspell
-PORTVERSION=	1.2.8
-PORTREVISION=	1
+PORTVERSION=	1.2.11
 CATEGORIES=	hungarian textproc
 MASTER_SITES=	SF/${PORTNAME}/Hunspell/${PORTVERSION}:code \
 		SF/magyarispell/Magyar%20Ispell/${DICTVERSION}:data
@@ -19,12 +18,12 @@ COMMENT=	Improved spell-checker for Hungarian and other languages
 
 #EXTRACT_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
-USE_GETTEXT=	yes
-USE_ICONV=	yes
+#USE_GETTEXT=	yes
+#USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-ui --with-libintl-prefix=${PREFIX} --with-readline
+CONFIGURE_ARGS=	--with-ui --with-readline --disable-nls
 CONFIGURE_ENV=	CPPFLAGS=-I${PREFIX}/include LDFLAGS=-L${PREFIX}/lib
 EXTRACT_AFTER_ARGS=|${TAR} -xpf - --exclude intl
 ALL_TARGET=	-j`${SYSCTL} -n hw.ncpu`
@@ -32,7 +31,7 @@ ALL_TARGET=	-j`${SYSCTL} -n hw.ncpu`
 MAN1=		hunspell.1
 MAN4=		hunspell.4
 
-DICTVERSION=	1.4
+DICTVERSION=	1.6.1
 PORTDOCS=	README README.myspell
 
 .include <bsd.port.pre.mk>
diff --git a/textproc/hunspell/distinfo b/textproc/hunspell/distinfo
index fa75a194b819..12e69216c624 100644
--- a/textproc/hunspell/distinfo
+++ b/textproc/hunspell/distinfo
@@ -1,6 +1,6 @@
-MD5 (hunspell-1.2.8.tar.gz) = 1177af54a09e320d2c24015f29c3a93e
-SHA256 (hunspell-1.2.8.tar.gz) = af563e13646620e608052b46974e10d0fc3e4d48b1b996f9771cbfac6dfc3c38
-SIZE (hunspell-1.2.8.tar.gz) = 784360
-MD5 (hu_HU-1.4.tar.gz) = 40c7945b7c9a576a4e31290be4e8b196
-SHA256 (hu_HU-1.4.tar.gz) = cdc7463f6f990172a618aaa1922bef7f23785ba58e29e7dac165591bf9005841
-SIZE (hu_HU-1.4.tar.gz) = 703570
+MD5 (hunspell-1.2.11.tar.gz) = 8f57cdc4db091d69e1f682ed4d8ab282
+SHA256 (hunspell-1.2.11.tar.gz) = 3f975c056e0e8883b38ebe75f04a32e3983ea9d951afa035181806b070d06e93
+SIZE (hunspell-1.2.11.tar.gz) = 926658
+MD5 (hu_HU-1.6.1.tar.gz) = 01286775e368e13a5dc6f83977ff1897
+SHA256 (hu_HU-1.6.1.tar.gz) = 0a1ab4672bf75acc1c29c4b3fbcab5d10b7883ba1e7fc25e8054d2209f0352c2
+SIZE (hu_HU-1.6.1.tar.gz) = 730641
diff --git a/textproc/hunspell/files/patch-Makefile.in b/textproc/hunspell/files/patch-Makefile.in
new file mode 100644
index 000000000000..672e80e67f74
--- /dev/null
+++ b/textproc/hunspell/files/patch-Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig
++++ Makefile.in
+@@ -320,7 +320,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ ACLOCAL_AMFLAGS = -I m4
+-SUBDIRS = intl po src man m4 tests
++SUBDIRS = po src man m4 tests
+ pkgconfdir = $(libdir)/pkgconfig
+ pkgconf_DATA = hunspell.pc
+ EXTRA_DIST = BUGS README.myspell AUTHORS.myspell license.myspell license.hunspell \
diff --git a/textproc/hunspell/files/patch-src_tools_hunspell.cxx b/textproc/hunspell/files/patch-src_tools_hunspell.cxx
index edf36c455f84..6928f3adfc74 100644
--- a/textproc/hunspell/files/patch-src_tools_hunspell.cxx
+++ b/textproc/hunspell/files/patch-src_tools_hunspell.cxx
@@ -3,7 +3,7 @@ $FreeBSD$
 
 --- src/tools/hunspell.cxx.orig
 +++ src/tools/hunspell.cxx
-@@ -63,25 +63,21 @@
+@@ -61,26 +61,22 @@
  #include "firstparser.hxx"
  
  #define LIBDIR \
@@ -14,6 +14,7 @@ $FreeBSD$
 +    "%%PREFIX%%/share/myspell:" \
 +    "%%PREFIX%%/share/myspell/dicts"
  #define USEROOODIR \
+     ".openoffice.org/3/user/wordbook:" \
      ".openoffice.org2/user/wordbook:" \
      ".openoffice.org2.0/user/wordbook"
  #define OOODIR \
@@ -29,14 +30,14 @@ $FreeBSD$
 -    "/usr/lib/openoffice.org2.1/share/dict/ooo:" \
 -    "/opt/openoffice.org2.0/share/dict/ooo:" \
 -    "/usr/lib/openoffice.org2.0/share/dict/ooo"
-+	"%%PREFIX%%/openoffice.org-DEV300_m41/share/dict/ooo:"  \
-+	"%%PREFIX%%/openoffice.org-3.0.0/share/dict/ooo:"    \
-+	"%%PREFIX%%/openoffice.org-2.4.2/share/dict/ooo:" \
-+	"%%PREFIX%%/openoffice.org-2.4.1/share/dict/ooo:" \
-+	"%%PREFIX%%/openoffice.org-2.4/share/dict/ooo:" \
-+	"%%PREFIX%%/openoffice.org-2.2/share/dict/ooo:" \
-+	"%%PREFIX%%/openoffice.org-2.1/share/dict/ooo:" \
-+	"%%PREFIX%%/openoffice.org2.0/share/dict/ooo"
++    "%%PREFIX%%/openoffice.org3/share/dict/ooo:" \
++    "%%PREFIX%%/openoffice.org-3.0.0/share/dict/ooo:" \
++    "%%PREFIX%%/openoffice.org-2.4.2/share/dict/ooo:" \
++    "%%PREFIX%%/openoffice.org-2.4.1/share/dict/ooo:" \
++    "%%PREFIX%%/openoffice.org-2.4/share/dict/ooo:" \
++    "%%PREFIX%%/openoffice.org-2.2/share/dict/ooo:" \
++    "%%PREFIX%%/openoffice.org-2.1/share/dict/ooo:" \
++    "%%PREFIX%%/openoffice.org2.0/share/dict/ooo:"
  #define HOME getenv("HOME")
  #define DICBASENAME ".hunspell_"
  #define LOGFILE "/tmp/hunspell.log"
diff --git a/textproc/hunspell/files/patch-sysintl b/textproc/hunspell/files/patch-sysintl
index d8c0d3dda0f9..d44d394cba79 100644
--- a/textproc/hunspell/files/patch-sysintl
+++ b/textproc/hunspell/files/patch-sysintl
@@ -1,18 +1,14 @@
---- configure	2008-08-14 05:53:13.000000000 -0400
-+++ configure	2008-08-26 06:35:15.000000000 -0400
-@@ -24576,5 +24576,5 @@
+
+$FreeBSD$
+
+--- configure.orig
++++ configure
+@@ -20562,7 +20562,7 @@
+ fi
  
  
--ac_config_files="$ac_config_files Makefile hunspell.pc man/Makefile man/hu/Makefile intl/Makefile po/Makefile.in m4/Makefile src/Makefile src/hunspell/Makefile src/parsers/Makefile src/tools/Makefile src/win_api/Makefile tests/Makefile tests/suggestiontest/Makefile"
-+ac_config_files="$ac_config_files Makefile hunspell.pc man/Makefile man/hu/Makefile po/Makefile.in m4/Makefile src/Makefile src/hunspell/Makefile src/parsers/Makefile src/tools/Makefile src/win_api/Makefile tests/Makefile tests/suggestiontest/Makefile"
+-ac_config_files="$ac_config_files Makefile hunspell.pc man/Makefile man/hu/Makefile intl/Makefile po/Makefile.in m4/Makefile src/Makefile src/hunspell/Makefile src/hunspell/hunvisapi.h src/parsers/Makefile src/tools/Makefile src/win_api/Makefile tests/Makefile tests/suggestiontest/Makefile"
++ac_config_files="$ac_config_files Makefile hunspell.pc man/Makefile man/hu/Makefile po/Makefile.in m4/Makefile src/Makefile src/hunspell/Makefile src/hunspell/hunvisapi.h src/parsers/Makefile src/tools/Makefile src/win_api/Makefile tests/Makefile tests/suggestiontest/Makefile"
  
  cat >confcache <<\_ACEOF
---- Makefile.in	2008-08-14 05:53:15.000000000 -0400
-+++ Makefile.in	2008-08-26 06:37:41.000000000 -0400
-@@ -230,5 +230,5 @@
- top_srcdir = @top_srcdir@
- ACLOCAL_AMFLAGS = -I m4
--SUBDIRS = intl po src man m4 tests
-+SUBDIRS = po src man m4 tests
- pkgconfdir = $(libdir)/pkgconfig
- pkgconf_DATA = hunspell.pc
+ # This file is a shell script that caches the results of configure
diff --git a/textproc/hunspell/patch-src_tools_Makefile.am b/textproc/hunspell/patch-src_tools_Makefile.am
deleted file mode 100644
index b200053a3598..000000000000
--- a/textproc/hunspell/patch-src_tools_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-
-$FreeBSD$
-
---- src/tools/Makefile.am.orig
-+++ src/tools/Makefile.am
-@@ -1,4 +1,4 @@
--bin_PROGRAMS=analyze chmorph example hunspell munch unmunch hzip hunzip
-+bin_PROGRAMS=analyze chmorph example hunspell munch unmunch
- 
- INCLUDES=-I${top_srcdir}/src/hunspell -I${top_srcdir}/src/parsers
- 
diff --git a/textproc/hunspell/patch-src_tools_Makefile.in b/textproc/hunspell/patch-src_tools_Makefile.in
deleted file mode 100644
index a22d5725516c..000000000000
--- a/textproc/hunspell/patch-src_tools_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- src/tools/Makefile.in.orig
-+++ src/tools/Makefile.in
-@@ -35,8 +35,7 @@
- host_triplet = @host@
- target_triplet = @target@
- bin_PROGRAMS = analyze$(EXEEXT) chmorph$(EXEEXT) example$(EXEEXT) \
--	hunspell$(EXEEXT) munch$(EXEEXT) unmunch$(EXEEXT) \
--	hzip$(EXEEXT) hunzip$(EXEEXT)
-+	hunspell$(EXEEXT) munch$(EXEEXT) unmunch$(EXEEXT)
- noinst_PROGRAMS = example$(EXEEXT)
- subdir = src/tools
- DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
diff --git a/textproc/hunspell/pkg-descr b/textproc/hunspell/pkg-descr
index ceaba2f1737e..12b121008bdd 100644
--- a/textproc/hunspell/pkg-descr
+++ b/textproc/hunspell/pkg-descr
@@ -5,15 +5,15 @@ It has better affix rules than hu-ispell.
 It is installing hungarian dictionary by default, but other dictionaries can
 be found at: http://wiki.services.openoffice.org/wiki/Dictionaries
 
-Magyar helyesírás ellenőrző hunspell. Előnyök az ispell-hez képest:
-- Több karakter változással járó tipikus hibákra javítási javaslat.
-- Helyes összetett szónak látszó szavak tiltása.
-- 6-3-as szabály
-- mozgószabály
-- összetételi szabályok
-- többszörös képzők helyes használata
-- ékezetesítési javaslatok
-Alepesetben csak a magyar szótárat installálja, de további szótárak
-elérhetöek: http://wiki.services.openoffice.org/wiki/Dictionaries
+Magyar helyes.r.s ellen.rz. hunspell. El.ny.k az ispell-hez k.pest:
+- T.bb karakter v.ltoz.ssal j.r. tipikus hib.kra jav.t.si javaslat.
+- Helyes .sszetett sz.nak l.tsz. szavak tilt.sa.
+- 6-3-as szab.ly
+- mozg.szab.ly
+- .sszet.teli szab.lyok
+- t.bbsz.r.s k.pz.k helyes haszn.lata
+- .kezetes.t.si javaslatok
+Alepesetben csak a magyar sz.t.rat install.lja, de tov.bbi sz.t.rak
+el.rhet.ek: http://wiki.services.openoffice.org/wiki/Dictionaries
 
 WWW: http://magyarispell.sourceforge.net/
diff --git a/textproc/hunspell/pkg-plist b/textproc/hunspell/pkg-plist
index 17c80bd29a24..0e68b39d1aae 100644
--- a/textproc/hunspell/pkg-plist
+++ b/textproc/hunspell/pkg-plist
@@ -17,6 +17,8 @@ include/hunspell/phonet.hxx
 include/hunspell/replist.hxx
 include/hunspell/suggestmgr.hxx
 include/hunspell/w_char.hxx
+include/hunspell/hunvisapi.h
+include/hunspell/hunvisapi.h.in
 @dirrm include/hunspell
 lib/libhunspell-1.2.a
 lib/libhunspell-1.1.la