Update mecab to 0.994.

* add relearning function
* add automatic estimation of word cost for user dictionary

4 files changed, 28 insertions, 12 deletions

diff --git a/textproc/mecab-base/distinfo b/textproc/mecab-base/distinfo
index d3de26923ab..a985d70068a 100644
--- a/textproc/mecab-base/distinfo
+++ b/textproc/mecab-base/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2012/02/27 11:53:07 obache Exp $
+$NetBSD: distinfo,v 1.7 2012/06/10 11:54:44 obache Exp $
 
-SHA1 (mecab-0.993.tar.gz) = 7e5daa765e83fe0f5d46f33a3b96dfab49299946
-RMD160 (mecab-0.993.tar.gz) = 639b8a278ab4387b4760453400db95034428d3d1
-Size (mecab-0.993.tar.gz) = 1387081 bytes
-SHA1 (patch-aa) = c7da3fd209a278634b95871d9ea7c5ef6ea2be27
-SHA1 (patch-ab) = 05e58405cc8f085b9535aa93c471cc90a4f8afb9
+SHA1 (mecab-0.994.tar.gz) = 9d283f9d243b1a58a2845ff60797c11a88b1f926
+RMD160 (mecab-0.994.tar.gz) = 9e81a408c91fddfae7ce18e4b1b5f236d75d6afb
+Size (mecab-0.994.tar.gz) = 1387966 bytes
+SHA1 (patch-aa) = 58d512643fcd8298eea8f8357aca4f9b364f3220
+SHA1 (patch-ab) = 801df711f04aff5ea1ef1280f7642b36733df8ec
+SHA1 (patch-src_utils.cpp) = 76115c96545bf975a3446908514b93bf89afa20d
diff --git a/textproc/mecab-base/patches/patch-aa b/textproc/mecab-base/patches/patch-aa
index 93478716aae..e9defa75dc7 100644
--- a/textproc/mecab-base/patches/patch-aa
+++ b/textproc/mecab-base/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.5 2012/02/27 11:53:07 obache Exp $
+$NetBSD: patch-aa,v 1.6 2012/06/10 11:54:44 obache Exp $
 
 * Use own optimization flags.
 
---- configure.orig	2012-01-10 16:30:37.000000000 +0000
+--- configure.orig	2012-06-04 14:15:35.000000000 +0000
 +++ configure
-@@ -17981,8 +17981,8 @@ $as_echo "no" >&6; }
+@@ -18036,8 +18036,8 @@ $as_echo "no" >&6; }
  fi
  
  if test -n "$GCC"; then
diff --git a/textproc/mecab-base/patches/patch-ab b/textproc/mecab-base/patches/patch-ab
index 6bb2ff15e7c..a04dfb0e30c 100644
--- a/textproc/mecab-base/patches/patch-ab
+++ b/textproc/mecab-base/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.4 2012/02/27 11:53:07 obache Exp $
+$NetBSD: patch-ab,v 1.5 2012/06/10 11:54:44 obache Exp $
 
 * Use own optimization flags.
 
---- configure.in.orig	2012-01-10 16:30:02.000000000 +0000
+--- configure.in.orig	2012-04-01 14:21:02.000000000 +0000
 +++ configure.in
-@@ -89,8 +89,8 @@ dnl
+@@ -90,8 +90,8 @@ dnl
  dnl check gcc
  dnl
  if test -n "$GCC"; then
diff --git a/textproc/mecab-base/patches/patch-src_utils.cpp b/textproc/mecab-base/patches/patch-src_utils.cpp
new file mode 100644
index 00000000000..fbec8773325
--- /dev/null
+++ b/textproc/mecab-base/patches/patch-src_utils.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_utils.cpp,v 1.1 2012/06/10 11:54:44 obache Exp $
+
+* `function not inlinable' with gcc-4.1.2 -O2 on NetBSD-5.1.2.
+
+--- src/utils.cpp.orig	2012-04-12 15:46:14.000000000 +0000
++++ src/utils.cpp
+@@ -408,7 +408,7 @@ namespace {
+ 
+ #else   // defined(_MSC_VER)
+ 
+-#define FORCE_INLINE __attribute__((always_inline))
++#define FORCE_INLINE inline __attribute__((always_inline))
+ 
+ inline uint32_t rotl32 ( uint32_t x, uint8_t r ) {
+   return (x << r) | (x >> (32 - r));