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

4 files changed, 32 insertions, 32 deletions

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