Update mecab to 0.994.

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

9 files changed, 46 insertions, 30 deletions

diff --git a/textproc/java-mecab/distinfo b/textproc/java-mecab/distinfo
index 70405d6de84..c98ca1f5430 100644
--- a/textproc/java-mecab/distinfo
+++ b/textproc/java-mecab/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2012/02/27 11:53:06 obache Exp $
+$NetBSD: distinfo,v 1.7 2012/06/10 11:54:44 obache Exp $
 
-SHA1 (mecab-java-0.993.tar.gz) = ab0d26dd293497049074425fb4f22a799bdee8b7
-RMD160 (mecab-java-0.993.tar.gz) = 73ad41677b1e86414732b24b86943a2148b991c5
-Size (mecab-java-0.993.tar.gz) = 28287 bytes
+SHA1 (mecab-java-0.994.tar.gz) = b06ad35374a3e2c7e35eb4537ab742777218af16
+RMD160 (mecab-java-0.994.tar.gz) = f875a287ea27cf743da7046ff285af16ae2dad7f
+Size (mecab-java-0.994.tar.gz) = 28307 bytes
 SHA1 (patch-aa) = 3d246a6a6f0d27c97fc042bbfa710aaf21ffd19e
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));
diff --git a/textproc/mecab/Makefile.common b/textproc/mecab/Makefile.common
index 17d6f4461ff..14300738ba7 100644
--- a/textproc/mecab/Makefile.common
+++ b/textproc/mecab/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2012/02/27 11:53:07 obache Exp $
+# $NetBSD: Makefile.common,v 1.6 2012/06/10 11:54:44 obache Exp $
 #
 # used by textproc/mecab-base/Makefile
 # used by textproc/java-mecab/Makefile
@@ -8,7 +8,7 @@
 # used by textproc/mecab-ipadic/Makefile
 # used by textproc/mecab-jumandic/Makefile
 
-MECAB_VERSION=	0.993
+MECAB_VERSION=	0.994
 
 CATEGORIES=	japanese textproc
 MASTER_SITES=	http://mecab.googlecode.com/files/
diff --git a/textproc/p5-mecab/distinfo b/textproc/p5-mecab/distinfo
index 846ba62c3ac..4b52d51d64b 100644
--- a/textproc/p5-mecab/distinfo
+++ b/textproc/p5-mecab/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2012/02/27 11:53:07 obache Exp $
+$NetBSD: distinfo,v 1.6 2012/06/10 11:54:44 obache Exp $
 
-SHA1 (mecab-perl-0.993.tar.gz) = 362cfe0f2d11e32524e1ad88e56b1cfe0a76ac34
-RMD160 (mecab-perl-0.993.tar.gz) = 0b9bbb4edff0caeb15cbeafcf2b66297c425ec4c
-Size (mecab-perl-0.993.tar.gz) = 44307 bytes
+SHA1 (mecab-perl-0.994.tar.gz) = f5a57d1c13f987e001172d870f0e1e73cf6d8610
+RMD160 (mecab-perl-0.994.tar.gz) = 6fc5f621434c53c79e8ca8552f7ce60522565978
+Size (mecab-perl-0.994.tar.gz) = 44660 bytes
diff --git a/textproc/py-mecab/distinfo b/textproc/py-mecab/distinfo
index a797f132035..bd32abf84f3 100644
--- a/textproc/py-mecab/distinfo
+++ b/textproc/py-mecab/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2012/02/27 11:53:07 obache Exp $
+$NetBSD: distinfo,v 1.6 2012/06/10 11:54:44 obache Exp $
 
-SHA1 (mecab-python-0.993.tar.gz) = b544c64e1399879a61ae50c084fdf293f7bc9fd8
-RMD160 (mecab-python-0.993.tar.gz) = 552440d5e55793ecd9e45103300e355960bc91c9
-Size (mecab-python-0.993.tar.gz) = 63267 bytes
+SHA1 (mecab-python-0.994.tar.gz) = eb588874dc7d6c182df9ece0817791daca7070d0
+RMD160 (mecab-python-0.994.tar.gz) = ddaef4f9ae8ab8f08dc4e5f3008087b8d481f789
+Size (mecab-python-0.994.tar.gz) = 61978 bytes
diff --git a/textproc/ruby-mecab/distinfo b/textproc/ruby-mecab/distinfo
index 984ab3a039c..58a9cd4d971 100644
--- a/textproc/ruby-mecab/distinfo
+++ b/textproc/ruby-mecab/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2012/02/27 11:53:07 obache Exp $
+$NetBSD: distinfo,v 1.6 2012/06/10 11:54:45 obache Exp $
 
-SHA1 (mecab-ruby-0.993.tar.gz) = 6a9fcea067c8914f6da80a40fd8cac74aadde75f
-RMD160 (mecab-ruby-0.993.tar.gz) = 8596943da117daa67aaaec4fa262b644cf134806
-Size (mecab-ruby-0.993.tar.gz) = 44004 bytes
+SHA1 (mecab-ruby-0.994.tar.gz) = cb52217e4d6d7c598691b41174606c5339a5bd17
+RMD160 (mecab-ruby-0.994.tar.gz) = cfd828e6090a915c2655e46c5e208885bd099ed4
+Size (mecab-ruby-0.994.tar.gz) = 44483 bytes