Update mecab to 0.96 and mecab-ipadic to 2.7.0-20070610.

Fix buffer overflow bug, dictionary incompatibility issue, some functionary
enhancements for dictionary

11 files changed, 57 insertions, 57 deletions

diff --git a/textproc/java-mecab/distinfo b/textproc/java-mecab/distinfo
index 46e0537d051..ae09833c1ed 100644
--- a/textproc/java-mecab/distinfo
+++ b/textproc/java-mecab/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/05/12 13:53:46 obache Exp $
+$NetBSD: distinfo,v 1.2 2007/06/23 04:31:55 obache Exp $
 
-SHA1 (mecab-java-0.95.tar.gz) = 76cb1639486cbcdbfadb2f206a0097e501fc92b8
-RMD160 (mecab-java-0.95.tar.gz) = 604b7e1ffaeda47bc3f281d61af94f02915bdee3
-Size (mecab-java-0.95.tar.gz) = 11444 bytes
+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 (patch-aa) = 28cc3dffacefb67acde561547055ffd1fe165696
diff --git a/textproc/mecab-base/Makefile b/textproc/mecab-base/Makefile
index 19a3ed002fc..91d4d7c85e6 100644
--- a/textproc/mecab-base/Makefile
+++ b/textproc/mecab-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/05/17 15:38:26 obache Exp $
+# $NetBSD: Makefile,v 1.3 2007/06/23 04:31:55 obache Exp $
 #
 
 .include "../../textproc/mecab/Makefile.common"
@@ -38,5 +38,11 @@ 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 aaccddf1b74..12ebfbcbb23 100644
--- a/textproc/mecab-base/distinfo
+++ b/textproc/mecab-base/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2007/05/17 15:38:26 obache Exp $
+$NetBSD: distinfo,v 1.3 2007/06/23 04:31:55 obache Exp $
 
-SHA1 (mecab-0.95.tar.gz) = 676af69b652393e3fdbb58ddf99b9aae13a87c4a
-RMD160 (mecab-0.95.tar.gz) = bd8393ddae802fc98a999dd68f25564e8317f5c0
-Size (mecab-0.95.tar.gz) = 1385805 bytes
-SHA1 (patch-aa) = 1d0229b81f6d1b376be8868ae4f243cd26e0f725
-SHA1 (patch-ab) = e1c5749239bf75fe19ab150552604ccb1d08d8de
+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 (patch-ab) = 2849effb4aa6e5e81d1be3280958e50cba0273d8
diff --git a/textproc/mecab-base/patches/patch-aa b/textproc/mecab-base/patches/patch-aa
index 1e80b03eb61..85021a92e6c 100644
--- a/textproc/mecab-base/patches/patch-aa
+++ b/textproc/mecab-base/patches/patch-aa
@@ -1,17 +1,15 @@
-$NetBSD: patch-aa,v 1.1 2007/05/17 15:38:26 obache Exp $
+$NetBSD: patch-aa,v 1.2 2007/06/23 04:31:55 obache Exp $
 
---- configure.orig	2007-03-11 15:31:34.000000000 +0000
+--- configure.orig	2007-03-20 08:33:35.000000000 +0000
 +++ configure
-@@ -25843,12 +25843,6 @@ echo "$as_me: error: \"SUN make does not
-         fi
+@@ -25844,8 +25844,8 @@ echo "$as_me: error: \"SUN make does not
  fi
  
--if test -n "$GCC"; then
+ if test -n "$GCC"; then
 -   CFLAGS="-O3 -Wall -Wno-deprecated"
 -   CXXFLAGS="-O3 -Wall -Wno-deprecated"
--fi
--
--
- # Check whether --with-charset was given.
- if test "${with_charset+set}" = set; then
-   withval=$with_charset; CHARSET=${withval}
++   CFLAGS="${CFLAGS} -Wall -Wno-deprecated"
++   CXXFLAGS="${CXXFLAGS} -Wall -Wno-deprecated"
+ fi
+ 
+ 
diff --git a/textproc/mecab-base/patches/patch-ab b/textproc/mecab-base/patches/patch-ab
index 8b994a7f1aa..ac872967023 100644
--- a/textproc/mecab-base/patches/patch-ab
+++ b/textproc/mecab-base/patches/patch-ab
@@ -1,19 +1,15 @@
-$NetBSD: patch-ab,v 1.1 2007/05/17 15:38:26 obache Exp $
+$NetBSD: patch-ab,v 1.2 2007/06/23 04:31:55 obache Exp $
 
---- configure.in.orig	2007-03-07 14:05:27.000000000 +0000
+--- configure.in.orig	2007-03-20 08:33:22.000000000 +0000
 +++ configure.in
-@@ -94,14 +94,6 @@ else
- fi
- 
+@@ -97,8 +97,8 @@ dnl
+ dnl check gcc
  dnl
--dnl check gcc
--dnl
--if test -n "$GCC"; then
+ if test -n "$GCC"; then
 -   CFLAGS="-O3 -Wall -Wno-deprecated"
 -   CXXFLAGS="-O3 -Wall -Wno-deprecated"
--fi
--
--dnl
- dnl check Char Code
- dnl 
- AC_ARG_WITH(
++   CFLAGS="$CFLAGS -Wall -Wno-deprecated"
++   CXXFLAGS="$CXXFLAGS -Wall -Wno-deprecated"
+ fi
+ 
+ dnl
diff --git a/textproc/mecab-ipadic/Makefile b/textproc/mecab-ipadic/Makefile
index 1b6a9e01b62..0be532e40c7 100644
--- a/textproc/mecab-ipadic/Makefile
+++ b/textproc/mecab-ipadic/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/05/12 13:50:17 obache Exp $
+# $NetBSD: Makefile,v 1.2 2007/06/23 04:31:56 obache Exp $
 #
 
 .include "../../textproc/mecab/Makefile.common"
 
-DISTNAME=	mecab-ipadic-2.7.0-20060707
-PKGNAME=	mecab-ipadic-2.7.0.20060707
+DISTNAME=	mecab-ipadic-2.7.0-20070610
+PKGNAME=	mecab-ipadic-2.7.0.20070610
 
 COMMENT=	Japanese Morphological Dictionary for MeCab
 
diff --git a/textproc/mecab-ipadic/distinfo b/textproc/mecab-ipadic/distinfo
index de98110e5ce..b09062675ef 100644
--- a/textproc/mecab-ipadic/distinfo
+++ b/textproc/mecab-ipadic/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/05/12 13:50:17 obache Exp $
+$NetBSD: distinfo,v 1.2 2007/06/23 04:31:56 obache Exp $
 
-SHA1 (mecab-ipadic-2.7.0-20060707.tar.gz) = 373be900f9be22957636acc54f120fea013f8818
-RMD160 (mecab-ipadic-2.7.0-20060707.tar.gz) = cf2f7ad97e50cae6d0a9e9f13bc9328aeab33304
-Size (mecab-ipadic-2.7.0-20060707.tar.gz) = 12025605 bytes
+SHA1 (mecab-ipadic-2.7.0-20070610.tar.gz) = a79897d494b0dea4bc08d1da36134d9098a9bb6b
+RMD160 (mecab-ipadic-2.7.0-20070610.tar.gz) = d402f7b4eef1b169e1d49810987e79314a572d29
+Size (mecab-ipadic-2.7.0-20070610.tar.gz) = 12125695 bytes
diff --git a/textproc/mecab/Makefile.common b/textproc/mecab/Makefile.common
index a073abce3e6..b9fb44653e1 100644
--- a/textproc/mecab/Makefile.common
+++ b/textproc/mecab/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2007/05/12 13:48:24 obache Exp $
+# $NetBSD: Makefile.common,v 1.2 2007/06/23 04:31:55 obache Exp $
 #
 
-MECAB_VERSION=	0.95
+MECAB_VERSION=	0.96
 
 CATEGORIES=	japanese textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mecab/}
diff --git a/textproc/p5-mecab/distinfo b/textproc/p5-mecab/distinfo
index 65ee42dc9dd..950ae22175c 100644
--- a/textproc/p5-mecab/distinfo
+++ b/textproc/p5-mecab/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/05/12 13:55:03 obache Exp $
+$NetBSD: distinfo,v 1.2 2007/06/23 04:31:56 obache Exp $
 
-SHA1 (mecab-perl-0.95.tar.gz) = 95f37327d46b341d9ccafd04eb25cc2094b71109
-RMD160 (mecab-perl-0.95.tar.gz) = 0d1319e0d9f590214474fcd68f69a5e4993fa8ad
-Size (mecab-perl-0.95.tar.gz) = 33743 bytes
+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
diff --git a/textproc/py-mecab/distinfo b/textproc/py-mecab/distinfo
index d79514ccda2..51a48ebe8f5 100644
--- a/textproc/py-mecab/distinfo
+++ b/textproc/py-mecab/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/05/12 13:56:34 obache Exp $
+$NetBSD: distinfo,v 1.2 2007/06/23 04:31:56 obache Exp $
 
-SHA1 (mecab-python-0.95.tar.gz) = 3b3b3daafecf76fc21650b1321a842941a179385
-RMD160 (mecab-python-0.95.tar.gz) = f1755dd951dbacdfe605876a6cdb87c928d53537
-Size (mecab-python-0.95.tar.gz) = 38361 bytes
+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
diff --git a/textproc/ruby-mecab/distinfo b/textproc/ruby-mecab/distinfo
index 742203317e7..9d9674bf30f 100644
--- a/textproc/ruby-mecab/distinfo
+++ b/textproc/ruby-mecab/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/05/12 13:57:22 obache Exp $
+$NetBSD: distinfo,v 1.2 2007/06/23 04:31:56 obache Exp $
 
-SHA1 (mecab-ruby-0.95.tar.gz) = bf6f25bc8e2b614b219ff913cd18f9bb1f70e05b
-RMD160 (mecab-ruby-0.95.tar.gz) = 32437307471e3ee3583dc253691f83ba24ef8957
-Size (mecab-ruby-0.95.tar.gz) = 25282 bytes
+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