6 files changed, 58 insertions, 16 deletions

diff --git a/textproc/hunspell/Makefile b/textproc/hunspell/Makefile
index ecc685ef6fdd..dc57e1e674a5 100644
--- a/textproc/hunspell/Makefile
+++ b/textproc/hunspell/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	hunspell
-PORTVERSION=	1.2.7
+PORTVERSION=	1.2.8
 CATEGORIES=	hungarian textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S@$@:code@:S@%SUBDIR%@${PORTNAME}@} \
 		${MASTER_SITE_SOURCEFORGE:S@$@:data@:S@%SUBDIR%@magyarispell@}
@@ -31,7 +31,7 @@ ALL_TARGET=	-j`${SYSCTL} -n hw.ncpu`
 MAN1=		hunspell.1
 MAN4=		hunspell.4
 
-DICTVERSION=	1.3
+DICTVERSION=	1.4
 PORTDOCS=	README README.myspell
 
 .include <bsd.port.pre.mk>
diff --git a/textproc/hunspell/distinfo b/textproc/hunspell/distinfo
index 32b4776bdac7..fa75a194b819 100644
--- a/textproc/hunspell/distinfo
+++ b/textproc/hunspell/distinfo
@@ -1,6 +1,6 @@
-MD5 (hunspell-1.2.7.tar.gz) = 9a4f345c3cfaeb8e6306285488a3127a
-SHA256 (hunspell-1.2.7.tar.gz) = 37d0de21d39a28bcefdc0cb3f24fe8ea10992ff8752139a54807698ec2653046
-SIZE (hunspell-1.2.7.tar.gz) = 782364
-MD5 (hu_HU-1.3.tar.gz) = 498c47666414fcebdd328e3a5ae20e05
-SHA256 (hu_HU-1.3.tar.gz) = 4f7d61e3f06d4cfb61aecbde457474a8f03b664a9500718d34015c253fff5a06
-SIZE (hu_HU-1.3.tar.gz) = 1384493
+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
diff --git a/textproc/hunspell/files/patch-src_tools_hunspell.cxx b/textproc/hunspell/files/patch-src_tools_hunspell.cxx
index 3207ac49b3f9..edf36c455f84 100644
--- a/textproc/hunspell/files/patch-src_tools_hunspell.cxx
+++ b/textproc/hunspell/files/patch-src_tools_hunspell.cxx
@@ -1,6 +1,19 @@
---- src/tools/hunspell.cxx	2008-08-15 06:06:33.000000000 -0400
-+++ src/tools/hunspell.cxx	2008-08-26 06:24:36.000000000 -0400
-@@ -70,18 +70,12 @@
+
+$FreeBSD$
+
+--- src/tools/hunspell.cxx.orig
++++ src/tools/hunspell.cxx
+@@ -63,25 +63,21 @@
+ #include "firstparser.hxx"
+ 
+ #define LIBDIR \
+-    "/usr/share/hunspell:" \
+-    "/usr/share/myspell:" \
+-    "/usr/share/myspell/dicts"
++    "%%PREFIX%%/share/hunspell:" \
++    "%%PREFIX%%/share/myspell:" \
++    "%%PREFIX%%/share/myspell/dicts"
+ #define USEROOODIR \
      ".openoffice.org2/user/wordbook:" \
      ".openoffice.org2.0/user/wordbook"
  #define OOODIR \
@@ -16,11 +29,13 @@
 -    "/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_m29/share/dict/ooo:"	\
-+	"%%PREFIX%%/openoffice.org-3.0.0.b2/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.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"
  #define HOME getenv("HOME")
  #define DICBASENAME ".hunspell_"
diff --git a/textproc/hunspell/patch-src_tools_Makefile.am b/textproc/hunspell/patch-src_tools_Makefile.am
new file mode 100644
index 000000000000..b200053a3598
--- /dev/null
+++ b/textproc/hunspell/patch-src_tools_Makefile.am
@@ -0,0 +1,11 @@
+
+$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
new file mode 100644
index 000000000000..a22d5725516c
--- /dev/null
+++ b/textproc/hunspell/patch-src_tools_Makefile.in
@@ -0,0 +1,15 @@
+
+$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-plist b/textproc/hunspell/pkg-plist
index 0b67bb2a9d32..17c80bd29a24 100644
--- a/textproc/hunspell/pkg-plist
+++ b/textproc/hunspell/pkg-plist
@@ -14,6 +14,7 @@ include/hunspell/hunzip.hxx
 include/hunspell/langnum.hxx
 include/hunspell/license.hunspell
 include/hunspell/phonet.hxx
+include/hunspell/replist.hxx
 include/hunspell/suggestmgr.hxx
 include/hunspell/w_char.hxx
 @dirrm include/hunspell