Update MeCab to 0.98.

2009-09-27 MeCab 0.98
 * UTF16 support (experimental)
 * On Windows, changed to use Native API (ex. MultiByteToWideChar) for
   codeset conversion.
 * Convert source code to Google coding style.
 * Add EON (end of N-best) format option (-S or --eon-format)
 * Fixes problems hankaku-kana handling on Shift-JIS environment
 * support online leraning (experimental)
 * Now buildable without -Wno-deprecated
 * and some small fixes.

14 files changed, 67 insertions, 45 deletions

diff --git a/textproc/java-mecab/Makefile b/textproc/java-mecab/Makefile
index f4bbd49ad86..6ec341436d5 100644
--- a/textproc/java-mecab/Makefile
+++ b/textproc/java-mecab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/02/04 04:58:52 obache Exp $
+# $NetBSD: Makefile,v 1.3 2009/10/14 08:22:35 obache Exp $
 #
 
 .include "../../textproc/mecab/Makefile.common"
@@ -8,6 +8,7 @@ PKGNAME=	java-mecab-${MECAB_VERSION}
 CATEGORIES+=	java
 
 COMMENT=	MeCab java module
+LICENSE=	gnu-gpl-v2 OR gnu-lgpl-v2.1 OR modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -23,4 +24,10 @@ BUILDLINK_API_DEPENDS.mecab+=	mecab>=${MECAB_VERSION}
 
 .include "../../textproc/mecab/buildlink3.mk"
 .include "../../mk/java-vm.mk"
+CXXFLAGS+=	-I${PKG_JAVA_HOME}/include
+.for d in ${PKG_JAVA_HOME}/include/*
+.  if exists(${d}/jni_md.h)
+CXXFLAGS+=	-I${d}
+.  endif
+.endfor
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/java-mecab/distinfo b/textproc/java-mecab/distinfo
index 3e58319058f..ec10556e0f5 100644
--- a/textproc/java-mecab/distinfo
+++ b/textproc/java-mecab/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2008/02/04 04:58:52 obache Exp $
+$NetBSD: distinfo,v 1.5 2009/10/14 08:22:35 obache Exp $
 
-SHA1 (mecab-java-0.97.tar.gz) = 0d3e1439f3cf8bbff314fccb09cbffde5aec77cf
-RMD160 (mecab-java-0.97.tar.gz) = 8b25f1de2fbb8a66540ce93f0934b009fd82300e
-Size (mecab-java-0.97.tar.gz) = 25541 bytes
+SHA1 (mecab-java-0.98.tar.gz) = f0cabca9ac031b26aff6e59b62b54609583d4fbb
+RMD160 (mecab-java-0.98.tar.gz) = 50606cb61adab2b495963a2e79ae09899a9683ae
+Size (mecab-java-0.98.tar.gz) = 25597 bytes
 SHA1 (patch-aa) = bf051dc3f5472de15e9ba813f691cafc94cea81f
diff --git a/textproc/mecab-base/Makefile b/textproc/mecab-base/Makefile
index f5364b11a78..ee3717313e5 100644
--- a/textproc/mecab-base/Makefile
+++ b/textproc/mecab-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/02/04 04:58:53 obache Exp $
+# $NetBSD: Makefile,v 1.5 2009/10/14 08:22:35 obache Exp $
 #
 
 .include "../../textproc/mecab/Makefile.common"
@@ -7,6 +7,7 @@ DISTNAME=		mecab-${MECAB_VERSION}
 PKGNAME=		mecab-base-${MECAB_VERSION}
 
 COMMENT=		Yet Another Part-of-Speech and Morphological Analyzer
+LICENSE=		gnu-gpl-v2 OR gnu-lgpl-v2.1 OR modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/textproc/mecab-base/distinfo b/textproc/mecab-base/distinfo
index 1bffa5873ae..3178a3bf3f3 100644
--- a/textproc/mecab-base/distinfo
+++ b/textproc/mecab-base/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2008/02/04 04:58:53 obache Exp $
+$NetBSD: distinfo,v 1.5 2009/10/14 08:22:35 obache Exp $
 
-SHA1 (mecab-0.97.tar.gz) = 43ceea0e7acbb760c1022abe94709bd95f1035a0
-RMD160 (mecab-0.97.tar.gz) = a20d86c2993e1febd98eb6969125981c759389f5
-Size (mecab-0.97.tar.gz) = 1364214 bytes
-SHA1 (patch-aa) = da7abb1b86af09f15d4ed18bbf4bb0c490730ddd
-SHA1 (patch-ab) = 2849effb4aa6e5e81d1be3280958e50cba0273d8
+SHA1 (mecab-0.98.tar.gz) = 8977d7760638ec65132e1f9bfc66655ac761f964
+RMD160 (mecab-0.98.tar.gz) = d63f396b2fc1b979f98213ba1b0b86a3a5c77cbd
+Size (mecab-0.98.tar.gz) = 1424588 bytes
+SHA1 (patch-aa) = 9dd68308b7a0ce277234e815046d552a08531055
+SHA1 (patch-ab) = 07fda67825dea594779a031e72b5049ee1863867
diff --git a/textproc/mecab-base/patches/patch-aa b/textproc/mecab-base/patches/patch-aa
index 94fc771de36..186d0a6e29f 100644
--- a/textproc/mecab-base/patches/patch-aa
+++ b/textproc/mecab-base/patches/patch-aa
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.3 2008/02/04 04:58:53 obache Exp $
+$NetBSD: patch-aa,v 1.4 2009/10/14 08:22:35 obache Exp $
 
---- configure.orig	2008-01-21 12:59:59.000000000 +0000
+--- configure.orig	2009-09-27 08:02:36.000000000 +0000
 +++ configure
-@@ -25106,8 +25106,8 @@ echo "$as_me: error: \"SUN make does not
+@@ -21593,8 +21593,8 @@ $as_echo "$as_me: error: \"SUN make does
  fi
  
  if test -n "$GCC"; then
--   CFLAGS="-O3 -Wall -Wno-deprecated"
--   CXXFLAGS="-O3 -Wall -Wno-deprecated"
-+   CFLAGS="${CFLAGS} -Wall -Wno-deprecated"
-+   CXXFLAGS="${CXXFLAGS} -Wall -Wno-deprecated"
+-   CFLAGS="-O3 -Wall "
+-   CXXFLAGS="-O3 -Wall "
++   CFLAGS="${CFLAGS} -Wall "
++   CXXFLAGS="${CXXFLAGS} -Wall "
  fi
  
  
diff --git a/textproc/mecab-base/patches/patch-ab b/textproc/mecab-base/patches/patch-ab
index ac872967023..c5ee7efbe35 100644
--- a/textproc/mecab-base/patches/patch-ab
+++ b/textproc/mecab-base/patches/patch-ab
@@ -1,15 +1,15 @@
-$NetBSD: patch-ab,v 1.2 2007/06/23 04:31:55 obache Exp $
+$NetBSD: patch-ab,v 1.3 2009/10/14 08:22:35 obache Exp $
 
---- configure.in.orig	2007-03-20 08:33:22.000000000 +0000
+--- configure.in.orig	2009-09-27 08:02:17.000000000 +0000
 +++ configure.in
-@@ -97,8 +97,8 @@ dnl
+@@ -98,8 +98,8 @@ dnl
  dnl check gcc
  dnl
  if test -n "$GCC"; then
--   CFLAGS="-O3 -Wall -Wno-deprecated"
--   CXXFLAGS="-O3 -Wall -Wno-deprecated"
-+   CFLAGS="$CFLAGS -Wall -Wno-deprecated"
-+   CXXFLAGS="$CXXFLAGS -Wall -Wno-deprecated"
+-   CFLAGS="-O3 -Wall "
+-   CXXFLAGS="-O3 -Wall "
++   CFLAGS="${CFLAGS} -Wall "
++   CXXFLAGS="${CXXFLAGS} -Wall "
  fi
  
  dnl
diff --git a/textproc/mecab/Makefile.common b/textproc/mecab/Makefile.common
index 01bb43d5e97..73e47579f12 100644
--- a/textproc/mecab/Makefile.common
+++ b/textproc/mecab/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2008/02/04 04:58:53 obache Exp $
+# $NetBSD: Makefile.common,v 1.4 2009/10/14 08:22:35 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.97
+MECAB_VERSION=	0.98
 
 CATEGORIES=	japanese textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mecab/}
diff --git a/textproc/p5-mecab/Makefile b/textproc/p5-mecab/Makefile
index d75e355a4e8..cb22e43ca8d 100644
--- a/textproc/p5-mecab/Makefile
+++ b/textproc/p5-mecab/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2008/10/19 19:18:55 he Exp $
+# $NetBSD: Makefile,v 1.4 2009/10/14 08:22:35 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
+LICENSE=		gnu-gpl-v2 OR gnu-lgpl-v2.1 OR modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/textproc/p5-mecab/distinfo b/textproc/p5-mecab/distinfo
index 55ae8bd8007..f2c87ddf26a 100644
--- a/textproc/p5-mecab/distinfo
+++ b/textproc/p5-mecab/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2008/02/04 04:58:53 obache Exp $
+$NetBSD: distinfo,v 1.4 2009/10/14 08:22:35 obache Exp $
 
-SHA1 (mecab-perl-0.97.tar.gz) = 7c6671c8b22e698becd8547a3ea8420f813be8cd
-RMD160 (mecab-perl-0.97.tar.gz) = eb986913c08456ea1100b1ddf121f44ee69b2102
-Size (mecab-perl-0.97.tar.gz) = 41089 bytes
+SHA1 (mecab-perl-0.98.tar.gz) = de0f41c734bdfb150c1855c3be01c7b561728a76
+RMD160 (mecab-perl-0.98.tar.gz) = 5e016a1db88674ce55d433ab57d5c9baf7e38e72
+Size (mecab-perl-0.98.tar.gz) = 41246 bytes
diff --git a/textproc/py-mecab/Makefile b/textproc/py-mecab/Makefile
index 99120880d40..9b81313c9db 100644
--- a/textproc/py-mecab/Makefile
+++ b/textproc/py-mecab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/03/05 18:51:32 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2009/10/14 08:22:35 obache Exp $
 #
 
 .include "../../textproc/mecab/Makefile.common"
@@ -8,6 +8,7 @@ PKGNAME=	${PYPKGPREFIX}-mecab-${MECAB_VERSION}
 CATEGORIES+=	python
 
 COMMENT=	MeCab python module
+LICENSE=	gnu-gpl-v2 OR gnu-lgpl-v2.1 OR modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/textproc/py-mecab/distinfo b/textproc/py-mecab/distinfo
index 9c76c50627e..d2640db31ca 100644
--- a/textproc/py-mecab/distinfo
+++ b/textproc/py-mecab/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2008/02/04 04:58:53 obache Exp $
+$NetBSD: distinfo,v 1.4 2009/10/14 08:22:35 obache Exp $
 
-SHA1 (mecab-python-0.97.tar.gz) = a816f27f65eeadbf637366423002e0a10f194d18
-RMD160 (mecab-python-0.97.tar.gz) = 68ab557404bc3921cbec9d52d215a83c50114935
-Size (mecab-python-0.97.tar.gz) = 53415 bytes
+SHA1 (mecab-python-0.98.tar.gz) = 1833496a2411aa9ab911ad5d337e8e406103bcf2
+RMD160 (mecab-python-0.98.tar.gz) = 64b55420bfe1326110277bd47d9e37e17789af9d
+Size (mecab-python-0.98.tar.gz) = 51651 bytes
+SHA1 (patch-aa) = 2af6c8b0a840c3b4fd1459d16833175c726b7872
diff --git a/textproc/py-mecab/patches/patch-aa b/textproc/py-mecab/patches/patch-aa
new file mode 100644
index 00000000000..3a8abf2714b
--- /dev/null
+++ b/textproc/py-mecab/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.1 2009/10/14 08:22:35 obache Exp $
+
+http://www.python.org/dev/peps/pep-0263/
+
+--- test.py.orig	2009-09-27 08:40:18.000000000 +0000
++++ test.py
+@@ -1,4 +1,5 @@
+ #!/usr/bin/python
++#encoding=utf-8
+ 
+ import MeCab
+ import sys
diff --git a/textproc/ruby-mecab/Makefile b/textproc/ruby-mecab/Makefile
index a38464c5bfe..5d76371702f 100644
--- a/textproc/ruby-mecab/Makefile
+++ b/textproc/ruby-mecab/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2008/06/19 14:56:39 taca Exp $
+# $NetBSD: Makefile,v 1.4 2009/10/14 08:22:35 obache Exp $
 
 .include "../../textproc/mecab/Makefile.common"
 
 DISTNAME=	mecab-ruby-${MECAB_VERSION}
 PKGNAME=	${RUBY_PKGPREFIX}-mecab-${MECAB_VERSION}
-PKGREVISION=	1
 CATEGORIES+=	ruby
 
 COMMENT=	MeCab ruby module
+LICENSE=	gnu-gpl-v2 OR gnu-lgpl-v2.1 OR modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/textproc/ruby-mecab/distinfo b/textproc/ruby-mecab/distinfo
index 0f6f3c548b7..2a9b1ba1d4f 100644
--- a/textproc/ruby-mecab/distinfo
+++ b/textproc/ruby-mecab/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2008/02/04 04:58:54 obache Exp $
+$NetBSD: distinfo,v 1.4 2009/10/14 08:22:35 obache Exp $
 
-SHA1 (mecab-ruby-0.97.tar.gz) = 9278f53d18e9dc8daa0d1da6d62833bec34500b4
-RMD160 (mecab-ruby-0.97.tar.gz) = 60b93134e13de94437611a894ad648335b9cb0c7
-Size (mecab-ruby-0.97.tar.gz) = 41355 bytes
+SHA1 (mecab-ruby-0.98.tar.gz) = fd9c6354b228de787d1de4a0645a74188c08900d
+RMD160 (mecab-ruby-0.98.tar.gz) = 66ea105e366b7567a514fba8d29e15d0cb0856c6
+Size (mecab-ruby-0.98.tar.gz) = 41674 bytes