Update mecab to 0.996.

2013-02-18 MeCab 0.996
* fixes missing linkage with iconv.
* Add function to generate new CSV file from adding costs and left/right context
  ID of CVS for user's dictionary.
* Add Lattice::set_result() method for generated analysis result to Lattice
2013-01-24 MeCab 0.995
* Reimplementation of partial analysis function
* Add API for partial analysis function (Lattice:set_boundary_constrant,
  Lattice::set_feature_constranit)

9 files changed, 41 insertions, 40 deletions

diff --git a/textproc/java-mecab/distinfo b/textproc/java-mecab/distinfo
index c98ca1f5430..ca7dd707b2b 100644
--- a/textproc/java-mecab/distinfo
+++ b/textproc/java-mecab/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2012/06/10 11:54:44 obache Exp $
+$NetBSD: distinfo,v 1.8 2013/02/28 12:31:37 obache Exp $
 
-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 (mecab-java-0.996.tar.gz) = 3a8d4e998b40e0058dfadb4259c6bec0bff38b06
+RMD160 (mecab-java-0.996.tar.gz) = 8f07939ab2114aa11549a432aa85e8a2c8c27099
+Size (mecab-java-0.996.tar.gz) = 33216 bytes
 SHA1 (patch-aa) = 3d246a6a6f0d27c97fc042bbfa710aaf21ffd19e
diff --git a/textproc/mecab-base/distinfo b/textproc/mecab-base/distinfo
index a985d70068a..c6c8c18bee9 100644
--- a/textproc/mecab-base/distinfo
+++ b/textproc/mecab-base/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.7 2012/06/10 11:54:44 obache Exp $
+$NetBSD: distinfo,v 1.8 2013/02/28 12:31:38 obache Exp $
 
-SHA1 (mecab-0.994.tar.gz) = 9d283f9d243b1a58a2845ff60797c11a88b1f926
-RMD160 (mecab-0.994.tar.gz) = 9e81a408c91fddfae7ce18e4b1b5f236d75d6afb
-Size (mecab-0.994.tar.gz) = 1387966 bytes
+SHA1 (mecab-0.996.tar.gz) = 15baca0983a61c1a49cffd4a919463a0a39ef127
+RMD160 (mecab-0.996.tar.gz) = a06fa0c0eb44eef8c45171b769b43c655971ac4a
+Size (mecab-0.996.tar.gz) = 1398663 bytes
 SHA1 (patch-aa) = 58d512643fcd8298eea8f8357aca4f9b364f3220
 SHA1 (patch-ab) = 801df711f04aff5ea1ef1280f7642b36733df8ec
-SHA1 (patch-src_utils.cpp) = 76115c96545bf975a3446908514b93bf89afa20d
diff --git a/textproc/mecab-base/patches/patch-src_utils.cpp b/textproc/mecab-base/patches/patch-src_utils.cpp
deleted file mode 100644
index fbec8773325..00000000000
--- a/textproc/mecab-base/patches/patch-src_utils.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$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 14300738ba7..5ac449f01dc 100644
--- a/textproc/mecab/Makefile.common
+++ b/textproc/mecab/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2012/06/10 11:54:44 obache Exp $
+# $NetBSD: Makefile.common,v 1.7 2013/02/28 12:31:38 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.994
+MECAB_VERSION=	0.996
 
 CATEGORIES=	japanese textproc
 MASTER_SITES=	http://mecab.googlecode.com/files/
diff --git a/textproc/p5-mecab/Makefile b/textproc/p5-mecab/Makefile
index 498c659ee3b..5f209546d6c 100644
--- a/textproc/p5-mecab/Makefile
+++ b/textproc/p5-mecab/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2012/10/25 06:56:44 asau Exp $
+# $NetBSD: Makefile,v 1.10 2013/02/28 12:31:38 obache Exp $
 #
 
 .include "../../textproc/mecab/Makefile.common"
 
 DISTNAME=		mecab-perl-${MECAB_VERSION}
 PKGNAME=		p5-mecab-${MECAB_VERSION}
-PKGREVISION=		1
 CATEGORIES+=		perl5
 
 COMMENT=		MeCab perl module
diff --git a/textproc/p5-mecab/distinfo b/textproc/p5-mecab/distinfo
index 4b52d51d64b..b6b0478b437 100644
--- a/textproc/p5-mecab/distinfo
+++ b/textproc/p5-mecab/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2012/06/10 11:54:44 obache Exp $
+$NetBSD: distinfo,v 1.7 2013/02/28 12:31:38 obache Exp $
 
-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
+SHA1 (mecab-perl-0.996.tar.gz) = 4e34fab226800dd99f8d8f2dbd3d891d99059990
+RMD160 (mecab-perl-0.996.tar.gz) = 0fb41c1a8bbc15da0283f649a17fd227fde3756f
+Size (mecab-perl-0.996.tar.gz) = 49888 bytes
diff --git a/textproc/py-mecab/distinfo b/textproc/py-mecab/distinfo
index bd32abf84f3..745432c481b 100644
--- a/textproc/py-mecab/distinfo
+++ b/textproc/py-mecab/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2012/06/10 11:54:44 obache Exp $
+$NetBSD: distinfo,v 1.7 2013/02/28 12:31:38 obache Exp $
 
-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
+SHA1 (mecab-python-0.996.tar.gz) = b7801d78b4def5118903f3d7b97968b106aa8ea8
+RMD160 (mecab-python-0.996.tar.gz) = c46ee001b058fa84cff4694f25369dc5d46995a4
+Size (mecab-python-0.996.tar.gz) = 62338 bytes
diff --git a/textproc/ruby-mecab/distinfo b/textproc/ruby-mecab/distinfo
index 58a9cd4d971..cf20f82b23b 100644
--- a/textproc/ruby-mecab/distinfo
+++ b/textproc/ruby-mecab/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2012/06/10 11:54:45 obache Exp $
+$NetBSD: distinfo,v 1.7 2013/02/28 12:31:38 obache Exp $
 
-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
+SHA1 (mecab-ruby-0.996.tar.gz) = 5730d9667118d79ad6f2c49f45476d0874718d10
+RMD160 (mecab-ruby-0.996.tar.gz) = 916fbe29716988936abf19be1728b184b0afc0a6
+Size (mecab-ruby-0.996.tar.gz) = 48723 bytes
+SHA1 (patch-MeCab__wrap.cpp) = bfefcacd978c3ec1c6284c6204f111be34342af3
diff --git a/textproc/ruby-mecab/patches/patch-MeCab__wrap.cpp b/textproc/ruby-mecab/patches/patch-MeCab__wrap.cpp
new file mode 100644
index 00000000000..b5eeadf5528
--- /dev/null
+++ b/textproc/ruby-mecab/patches/patch-MeCab__wrap.cpp
@@ -0,0 +1,17 @@
+$NetBSD: patch-MeCab__wrap.cpp,v 1.1 2013/02/28 12:31:39 obache Exp $
+
+* Ruby-1.8 compatibility fix
+  http://code.google.com/p/mecab/issues/detail?id=3
+
+--- MeCab_wrap.cpp.orig	2013-02-17 17:24:16.000000000 +0000
++++ MeCab_wrap.cpp
+@@ -1856,8 +1856,7 @@ static VALUE mMeCab;
+ 
+ /* Workaround for ruby1.9.x */
+ #if defined SWIGRUBY
+-#include "ruby/version.h"
+-#if RUBY_API_VERSION_CODE >= 10900
++#if HAVE_RUBY_ENCODING_H
+ #include "ruby/encoding.h"
+ #define rb_str_new rb_external_str_new
+ #endif