Update cabocha to 0.67

* improve 20% analysis speed
* fixes build errors on OSX
* show version number correctly on Windows

5 files changed, 45 insertions, 30 deletions

diff --git a/textproc/cabocha/Makefile.common b/textproc/cabocha/Makefile.common
index 2c804ca00aa..3d8dfdc5ca5 100644
--- a/textproc/cabocha/Makefile.common
+++ b/textproc/cabocha/Makefile.common
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile.common,v 1.2 2013/05/22 13:14:29 obache Exp $
+# $NetBSD: Makefile.common,v 1.3 2014/01/01 07:49:32 obache Exp $
+# used by textproc/cabocha/Makefile
 # used by textproc/p5-cabocha/Makefile
 # used by textproc/py-cabocha/Makefile
 # used by textproc/ruby-cabocha/Makefile
 
-DISTNAME=	cabocha-0.66
+DISTNAME=	cabocha-0.67
 CATEGORIES=	textproc
 MASTER_SITES=	http://cabocha.googlecode.com/files/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/textproc/cabocha/distinfo b/textproc/cabocha/distinfo
index e697b3165b9..3c79549bdcc 100644
--- a/textproc/cabocha/distinfo
+++ b/textproc/cabocha/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2013/05/23 15:07:58 joerg Exp $
+$NetBSD: distinfo,v 1.8 2014/01/01 07:49:32 obache Exp $
 
-SHA1 (cabocha-0.66.tar.bz2) = 33172b7973239a53d98eabbd309f70d88e36c94c
-RMD160 (cabocha-0.66.tar.bz2) = 23bd1ac45ca9a065c91f223542f61ddf18d97dfd
-Size (cabocha-0.66.tar.bz2) = 111166592 bytes
-SHA1 (patch-src_utils.cpp) = 7829fa0d851bb581739d24f41748b76d68f11c6b
+SHA1 (cabocha-0.67.tar.bz2) = 457a9bd0d264a1146a5eb1c5a504dd90a8b51fb8
+RMD160 (cabocha-0.67.tar.bz2) = 625c4b9a9f4bbc1f454e52988ecdc87e471631e0
+Size (cabocha-0.67.tar.bz2) = 111149677 bytes
+SHA1 (patch-configure) = 1f95f39ee33a95993079e51137e5b61cbfd6dadd
+SHA1 (patch-configure.in) = a6e6e448283821a543d4ed0f534a94f3fc54f1ad
diff --git a/textproc/cabocha/patches/patch-configure b/textproc/cabocha/patches/patch-configure
new file mode 100644
index 00000000000..0aa68555b34
--- /dev/null
+++ b/textproc/cabocha/patches/patch-configure
@@ -0,0 +1,18 @@
+$NetBSD: patch-configure,v 1.3 2014/01/01 07:49:32 obache Exp $
+
+* prevent to overwrite CFLAGS/CXXFLAGS
+
+--- configure.orig	2014-01-01 01:45:18.000000000 +0000
++++ configure
+@@ -17601,11 +17601,6 @@ ac_link='$CXX -o conftest$ac_exeext $CXX
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ 
+ 
+-if test -n "$GCC"; then
+-   CFLAGS="-O3  -Wno-deprecated -Wall"
+-   CXXFLAGS="-O3 -Wno-deprecated -Wall"
+-fi
+-
+ 
+ # Check whether --with-charset was given.
+ if test "${with_charset+set}" = set; then :
diff --git a/textproc/cabocha/patches/patch-configure.in b/textproc/cabocha/patches/patch-configure.in
new file mode 100644
index 00000000000..34db9154d1f
--- /dev/null
+++ b/textproc/cabocha/patches/patch-configure.in
@@ -0,0 +1,18 @@
+$NetBSD: patch-configure.in,v 1.1 2014/01/01 07:49:32 obache Exp $
+
+* prevent to overwrite CFLAGS/CXXFLAGS
+
+--- configure.in.orig	2013-12-30 15:20:11.000000000 +0000
++++ configure.in
+@@ -49,11 +49,6 @@ AC_CHECK_FUNCS(opendir)
+ AC_CHECK_FUNCS(snprintf)
+ AC_LANG(C++)
+ 
+-if test -n "$GCC"; then
+-   CFLAGS="-O3  -Wno-deprecated -Wall"
+-   CXXFLAGS="-O3 -Wno-deprecated -Wall"
+-fi
+-
+ AC_ARG_WITH(
+     charset,
+      [  --with-charset=charset  set default charset (EUC-JP|CP932|UTF8))],
diff --git a/textproc/cabocha/patches/patch-src_utils.cpp b/textproc/cabocha/patches/patch-src_utils.cpp
deleted file mode 100644
index 27965346804..00000000000
--- a/textproc/cabocha/patches/patch-src_utils.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-src_utils.cpp,v 1.1 2013/05/23 15:07:58 joerg Exp $
-
---- src/utils.cpp.orig	2013-05-23 10:52:37.000000000 +0000
-+++ src/utils.cpp
-@@ -4,4 +4,9 @@
- //
- //  Copyright(C) 2001-2008 Taku Kudo <taku@chasen.org>
-+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
-@@ -16,8 +21,4 @@
- #include "utils.h"
- 
--#ifdef HAVE_CONFIG_H
--#include "config.h"
--#endif
--
- namespace CaboCha {
-