Update mecab to 0.97.

Pkgsrc changes:
* fix some pkglint warining
* add DESTDIR support.

Changes:
* Fix a bug of exclusive control when dictionary is opened in MultiThreading environment.
* When installing the Windows version, it came to be able to specify the character-code of the dictionary.
* Fix a problem that was not able to be compiled correctly by some compilers.
* Add API that changes partial, analytical mode (Tagger::set_partial())
* Add API that changes generation level of lattice (Tagger::set_lattice_level())
* Add API that changes temperature parameter (Tagger::set_theta())
* Add API that changes all candidate output mode (Tagger::set_all_morphs())

14 files changed, 66 insertions, 50 deletions

diff --git a/textproc/java-mecab/Makefile b/textproc/java-mecab/Makefile
index 243ec5246cc..f4bbd49ad86 100644
--- a/textproc/java-mecab/Makefile
+++ b/textproc/java-mecab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/05/12 13:53:46 obache Exp $
+# $NetBSD: Makefile,v 1.2 2008/02/04 04:58:52 obache Exp $
 #
 
 .include "../../textproc/mecab/Makefile.common"
@@ -9,13 +9,17 @@ CATEGORIES+=	java
 
 COMMENT=	MeCab java module
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LANGUAGES=	c++
 
 TEST_TARGET=	test
 
 do-install:
-	${INSTALL_LIB} ${WRKSRC:Q}/libMeCab.so ${PREFIX:Q}/lib
-	${INSTALL_LIB} ${WRKSRC:Q}/MeCab.jar ${PREFIX:Q}/lib
+	${INSTALL_LIB} ${WRKSRC}/libMeCab.so ${DESTDIR}${PREFIX}/lib
+	${INSTALL_LIB} ${WRKSRC}/MeCab.jar ${DESTDIR}${PREFIX}/lib
+
+BUILDLINK_API_DEPENDS.mecab+=	mecab>=${MECAB_VERSION}
 
 .include "../../textproc/mecab/buildlink3.mk"
 .include "../../mk/java-vm.mk"
diff --git a/textproc/java-mecab/distinfo b/textproc/java-mecab/distinfo
index 48213fcc9f9..3e58319058f 100644
--- a/textproc/java-mecab/distinfo
+++ b/textproc/java-mecab/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2007/12/31 12:23:41 obache Exp $
+$NetBSD: distinfo,v 1.4 2008/02/04 04:58:52 obache Exp $
 
-SHA1 (mecab-java-0.96.tar.gz) = 81427793fc37e9317ab43958046067054c3051a1
-RMD160 (mecab-java-0.96.tar.gz) = 810a8a41af65e0c2f672317ce0e8ab1311275b76
-Size (mecab-java-0.96.tar.gz) = 24414 bytes
+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 (patch-aa) = bf051dc3f5472de15e9ba813f691cafc94cea81f
diff --git a/textproc/mecab-base/Makefile b/textproc/mecab-base/Makefile
index 91d4d7c85e6..f5364b11a78 100644
--- a/textproc/mecab-base/Makefile
+++ b/textproc/mecab-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/06/23 04:31:55 obache Exp $
+# $NetBSD: Makefile,v 1.4 2008/02/04 04:58:53 obache Exp $
 #
 
 .include "../../textproc/mecab/Makefile.common"
@@ -8,6 +8,8 @@ PKGNAME=		mecab-base-${MECAB_VERSION}
 
 COMMENT=		Yet Another Part-of-Speech and Morphological Analyzer
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
@@ -38,11 +40,5 @@ SUBST_SED.pthread=	-e 's|-lpthread||g'
 
 PTHREAD_AUTO_VARS=	yes
 
-# XXX: avoid compiler error with -O2.
-.include "../../mk/compiler.mk"
-.if !empty(CC_VERSION:Mgcc*)
-BUILDLINK_TRANSFORM+=	rename:-O2:-O3
-.endif
-
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/mecab-base/distinfo b/textproc/mecab-base/distinfo
index 12ebfbcbb23..1bffa5873ae 100644
--- a/textproc/mecab-base/distinfo
+++ b/textproc/mecab-base/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2007/06/23 04:31:55 obache Exp $
+$NetBSD: distinfo,v 1.4 2008/02/04 04:58:53 obache Exp $
 
-SHA1 (mecab-0.96.tar.gz) = a9dc9b0dd25287ee81fd16dc09066c3640e2ed11
-RMD160 (mecab-0.96.tar.gz) = 8032ff1cea3ee8201d4f32d540e45b277e8846e8
-Size (mecab-0.96.tar.gz) = 1387493 bytes
-SHA1 (patch-aa) = 101d0084a6bdce044559746fc91944852e92bfa9
+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
diff --git a/textproc/mecab-base/patches/patch-aa b/textproc/mecab-base/patches/patch-aa
index 85021a92e6c..94fc771de36 100644
--- a/textproc/mecab-base/patches/patch-aa
+++ b/textproc/mecab-base/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2007/06/23 04:31:55 obache Exp $
+$NetBSD: patch-aa,v 1.3 2008/02/04 04:58:53 obache Exp $
 
---- configure.orig	2007-03-20 08:33:35.000000000 +0000
+--- configure.orig	2008-01-21 12:59:59.000000000 +0000
 +++ configure
-@@ -25844,8 +25844,8 @@ echo "$as_me: error: \"SUN make does not
+@@ -25106,8 +25106,8 @@ echo "$as_me: error: \"SUN make does not
  fi
  
  if test -n "$GCC"; then
diff --git a/textproc/mecab-ipadic/Makefile b/textproc/mecab-ipadic/Makefile
index 0be532e40c7..f88853c55ad 100644
--- a/textproc/mecab-ipadic/Makefile
+++ b/textproc/mecab-ipadic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/06/23 04:31:56 obache Exp $
+# $NetBSD: Makefile,v 1.3 2008/02/04 04:58:53 obache Exp $
 #
 
 .include "../../textproc/mecab/Makefile.common"
@@ -8,6 +8,8 @@ PKGNAME=	mecab-ipadic-2.7.0.20070610
 
 COMMENT=	Japanese Morphological Dictionary for MeCab
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 
 .include "../../textproc/mecab-base/buildlink3.mk"
diff --git a/textproc/mecab/Makefile b/textproc/mecab/Makefile
index 69ceed660fd..a51fc858a13 100644
--- a/textproc/mecab/Makefile
+++ b/textproc/mecab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/10/25 22:01:06 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2008/02/04 04:58:52 obache Exp $
 
 .include "Makefile.common"
 
@@ -8,13 +8,8 @@ DISTFILES=	#empty
 COMMENT=	Yet Another Part-of-Speech and Morphological Analyzer
 
 DEPENDS+=	{mecab-ipadic>=2.7.0,mecab-jumandic>=5.1}:../../textproc/mecab-ipadic
+DEPENDS+=	mecab-base>=${MECAB_VERSION}:../../textproc/mecab-base
 
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-PLIST_SRC=	#empty
+META_PACKAGE=	yes
 
-do-install:	#empty
-
-.include "../../textproc/mecab-base/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/mecab/Makefile.common b/textproc/mecab/Makefile.common
index b9fb44653e1..01bb43d5e97 100644
--- a/textproc/mecab/Makefile.common
+++ b/textproc/mecab/Makefile.common
@@ -1,7 +1,14 @@
-# $NetBSD: Makefile.common,v 1.2 2007/06/23 04:31:55 obache Exp $
+# $NetBSD: Makefile.common,v 1.3 2008/02/04 04:58:53 obache Exp $
 #
+# used by textproc/mecab-base/Makefile
+# used by textproc/java-mecab/Makefile
+# used by textproc/p5-mecab/Makefile
+# used by textproc/py-mecab/Makefile
+# used by textproc/ruby-mecab/Makefile
+# used by textproc/mecab-ipadic/Makefile
+# used by textproc/mecab-jumandic/Makefile
 
-MECAB_VERSION=	0.96
+MECAB_VERSION=	0.97
 
 CATEGORIES=	japanese textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mecab/}
diff --git a/textproc/p5-mecab/Makefile b/textproc/p5-mecab/Makefile
index 76a5f285789..6311bdbbeaa 100644
--- a/textproc/p5-mecab/Makefile
+++ b/textproc/p5-mecab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/05/12 13:55:03 obache Exp $
+# $NetBSD: Makefile,v 1.2 2008/02/04 04:58:53 obache Exp $
 #
 
 .include "../../textproc/mecab/Makefile.common"
@@ -9,12 +9,16 @@ CATEGORIES+=		perl5
 
 COMMENT=		MeCab perl module
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PERL5_CONFIGURE=	yes
 USE_LANGUAGES=		c++
 
 PERL5_PACKLIST=		auto/MeCab/.packlist
 REPLACE_PERL+=		test.pl
 
+BUILDLINK_API_DEPENDS.mecab+=	mecab>=${MECAB_VERSION}
+
 .include "../../textproc/mecab/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-mecab/distinfo b/textproc/p5-mecab/distinfo
index 950ae22175c..55ae8bd8007 100644
--- a/textproc/p5-mecab/distinfo
+++ b/textproc/p5-mecab/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2007/06/23 04:31:56 obache Exp $
+$NetBSD: distinfo,v 1.3 2008/02/04 04:58:53 obache Exp $
 
-SHA1 (mecab-perl-0.96.tar.gz) = 79eec3056690343a6286106cb3aedd7770208c43
-RMD160 (mecab-perl-0.96.tar.gz) = 2c614b1d78afd1cf783a8ad00af6e549d316f4b6
-Size (mecab-perl-0.96.tar.gz) = 39547 bytes
+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
diff --git a/textproc/py-mecab/Makefile b/textproc/py-mecab/Makefile
index 90ff64ef3db..95abd8879cf 100644
--- a/textproc/py-mecab/Makefile
+++ b/textproc/py-mecab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/05/12 13:56:34 obache Exp $
+# $NetBSD: Makefile,v 1.2 2008/02/04 04:58:53 obache Exp $
 #
 
 .include "../../textproc/mecab/Makefile.common"
@@ -9,6 +9,8 @@ CATEGORIES+=	python
 
 COMMENT=	MeCab python module
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LANGUAGES=	c c++
 
 PYDISTUTILSPKG=	yes
@@ -17,10 +19,12 @@ PYBINMODULE=	yes
 TEST_ENV+=	PYTHONPATH=${WRKSRC:Q}/build/lib.${LOWER_OPSYS}-${OS_VERSION}-${MACHINE_ARCH}-${PYVERSSUFFIX}
 
 do-test:
-	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}			\
+	${RUN}								\
 	cd ${WRKSRC};							\
 	env ${TEST_ENV} ${PYTHONBIN} test.py
 
+BUILDLINK_API_DEPENDS.mecab+=	mecab>=${MECAB_VERSION}
+
 .include "../../textproc/mecab/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-mecab/distinfo b/textproc/py-mecab/distinfo
index 51a48ebe8f5..9c76c50627e 100644
--- a/textproc/py-mecab/distinfo
+++ b/textproc/py-mecab/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2007/06/23 04:31:56 obache Exp $
+$NetBSD: distinfo,v 1.3 2008/02/04 04:58:53 obache Exp $
 
-SHA1 (mecab-python-0.96.tar.gz) = 53089465107a3b45b0b31a8bd69f654ea561a200
-RMD160 (mecab-python-0.96.tar.gz) = 1f62a74d1673867a611de0ce9181ef011df67e46
-Size (mecab-python-0.96.tar.gz) = 51276 bytes
+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
diff --git a/textproc/ruby-mecab/Makefile b/textproc/ruby-mecab/Makefile
index 67422b1d780..819a379e2f7 100644
--- a/textproc/ruby-mecab/Makefile
+++ b/textproc/ruby-mecab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/05/12 13:57:22 obache Exp $
+# $NetBSD: Makefile,v 1.2 2008/02/04 04:58:53 obache Exp $
 
 .include "../../textproc/mecab/Makefile.common"
 
@@ -8,16 +8,20 @@ CATEGORIES+=	ruby
 
 COMMENT=	MeCab ruby module
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LANGUAGES=	c c++
 REPLACE_RUBY+=		test.rb
 RUBY_HAS_ARCHLIB=	yes
 USE_RUBY_EXTCONF=	yes
 
 do-test:
-	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}			\
+	${RUN}								\
 	cd ${WRKSRC};							\
 	env ${TEST_ENV} ${RUBY} test.rb
 
+BUILDLINK_API_DEPENDS.mecab+=	mecab>=${MECAB_VERSION}
+
 .include "../../textproc/mecab/buildlink3.mk"
 .include "../../lang/ruby/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ruby-mecab/distinfo b/textproc/ruby-mecab/distinfo
index 9d9674bf30f..0f6f3c548b7 100644
--- a/textproc/ruby-mecab/distinfo
+++ b/textproc/ruby-mecab/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2007/06/23 04:31:56 obache Exp $
+$NetBSD: distinfo,v 1.3 2008/02/04 04:58:54 obache Exp $
 
-SHA1 (mecab-ruby-0.96.tar.gz) = 2831121ed5121802c3bc0cbeedee7a04563e3bfd
-RMD160 (mecab-ruby-0.96.tar.gz) = bb0063b20162c0a6d02b529f9e451d8fe0e7b518
-Size (mecab-ruby-0.96.tar.gz) = 37936 bytes
+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