summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2012-02-27 11:53:06 +0000
committerobache <obache@pkgsrc.org>2012-02-27 11:53:06 +0000
commit43f6d4b4b858a725512f5cf3b9160bdb372f31d0 (patch)
tree1ee942f73364b1cd2b8383a5024e223cf68053da
parenta28f5aecc65d1e48ace8f58b6b48121a39365c62 (diff)
downloadpkgsrc-43f6d4b4b858a725512f5cf3b9160bdb372f31d0.tar.gz
Update mecab to 0.993.
2012-01-27 MeCab 0.993 * Fix to works well for MeCab::Tagger::formatNode() * To reduce stack size, save almost of local variables(arrays) to heap. 2012-01-14 MeCab 0.992 * Fix typos in source codes. 2012-01-14 MeCab 0.991 * Fix parse error with null strings or space strings. * Fix failure for creation of user dictionaries. 2011-12-24 MeCab 0.99 * Add MeCab::Model MeCab::Lattice classes. Improve usabilities on multi threads environment. Multiple threads can parse with shareing same dictionary. * Remove function for automatic dictionary reference share when refereing same dictionaly (You can do same works with MeCab::Model). * Add function for atomic dictionaly update in parsing. Model::swap() * Change Windows version to Unicode binary. * Remove experimental online learning, HMM and EM learning codes. * Remove MeCab::Node:(begin|end)_node_list members. * minor bug fixes.
Diffstat
-rw-r--r--textproc/java-mecab/Makefile8
-rw-r--r--textproc/java-mecab/distinfo10
-rw-r--r--textproc/java-mecab/patches/patch-aa8
-rw-r--r--textproc/mecab-base/Makefile13
-rw-r--r--textproc/mecab-base/buildlink3.mk4
-rw-r--r--textproc/mecab-base/distinfo12
-rw-r--r--textproc/mecab-base/patches/patch-aa8
-rw-r--r--textproc/mecab-base/patches/patch-ab8
-rw-r--r--textproc/mecab/Makefile.common6
-rw-r--r--textproc/mecab/buildlink3.mk4
-rw-r--r--textproc/p5-mecab/Makefile3
-rw-r--r--textproc/p5-mecab/distinfo8
-rw-r--r--textproc/py-mecab/Makefile3
-rw-r--r--textproc/py-mecab/distinfo9
-rw-r--r--textproc/py-mecab/patches/patch-aa12
-rw-r--r--textproc/ruby-mecab/Makefile5
-rw-r--r--textproc/ruby-mecab/distinfo8
17 files changed, 62 insertions, 67 deletions
diff --git a/textproc/java-mecab/Makefile b/textproc/java-mecab/Makefile
index 50fc1c8deb0..32e3f2f549f 100644
--- a/textproc/java-mecab/Makefile
+++ b/textproc/java-mecab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/12/28 01:01:19 obache Exp $
+# $NetBSD: Makefile,v 1.5 2012/02/27 11:53:06 obache Exp $
#
.include "../../textproc/mecab/Makefile.common"
@@ -27,9 +27,5 @@ 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
+CXXFLAGS+= -I${PKG_JAVA_HOME}/include/${LOWER_OPSYS}
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/java-mecab/distinfo b/textproc/java-mecab/distinfo
index ec10556e0f5..70405d6de84 100644
--- a/textproc/java-mecab/distinfo
+++ b/textproc/java-mecab/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2009/10/14 08:22:35 obache Exp $
+$NetBSD: distinfo,v 1.6 2012/02/27 11:53:06 obache Exp $
-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
+SHA1 (mecab-java-0.993.tar.gz) = ab0d26dd293497049074425fb4f22a799bdee8b7
+RMD160 (mecab-java-0.993.tar.gz) = 73ad41677b1e86414732b24b86943a2148b991c5
+Size (mecab-java-0.993.tar.gz) = 28287 bytes
+SHA1 (patch-aa) = 3d246a6a6f0d27c97fc042bbfa710aaf21ffd19e
diff --git a/textproc/java-mecab/patches/patch-aa b/textproc/java-mecab/patches/patch-aa
index d3bf3baf4f7..ed12b49536d 100644
--- a/textproc/java-mecab/patches/patch-aa
+++ b/textproc/java-mecab/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2007/12/31 12:23:41 obache Exp $
+$NetBSD: patch-aa,v 1.3 2012/02/27 11:53:07 obache Exp $
---- Makefile.orig 2007-06-10 14:32:44.000000000 +0000
+--- Makefile.orig 2012-01-13 14:58:07.000000000 +0000
+++ Makefile
@@ -2,22 +2,20 @@ TARGET=MeCab
JAVAC=javac
JAVA=java
JAR=jar
-CXX=c++
--INCLUDE=/usr/local/jdk/include
+-INCLUDE=/usr/lib/jvm/java-6-openjdk/include
PACKAGE=org/chasen/mecab
@@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.2 2007/12/31 12:23:41 obache Exp $
$(JAR) cfv $(TARGET).jar $(PACKAGE)/*.class
test:
-+ $(JAVAC) -encoding EUC_JP test.java
++ $(JAVAC) -encoding UTF-8 test.java
env LD_LIBRARY_PATH=. $(JAVA) test
clean:
diff --git a/textproc/mecab-base/Makefile b/textproc/mecab-base/Makefile
index cab92d27553..59b5f1eb46a 100644
--- a/textproc/mecab-base/Makefile
+++ b/textproc/mecab-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/12/16 16:49:26 hans Exp $
+# $NetBSD: Makefile,v 1.7 2012/02/27 11:53:07 obache Exp $
#
.include "../../textproc/mecab/Makefile.common"
@@ -45,5 +45,16 @@ SUBST_SED.pthread= -e 's|-lpthread||g'
PTHREAD_AUTO_VARS= yes
+# No TLS support for NetBSD.
+.if !empty(MACHINE_PLATFORM:MNetBSD-[1-5].*-*)
+SUBST_SED.pthread+= -e 's|enable_tls=yes|enable_tls=no|g'
+.endif
+
+# require i486 features for atomic_op.
+.if ${MACHINE_ARCH} == "i386"
+CFLAGS+= -march=i486
+CXXFLAGS+= -march=i486
+.endif
+
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/mecab-base/buildlink3.mk b/textproc/mecab-base/buildlink3.mk
index e396fc8ce0f..4f738824b52 100644
--- a/textproc/mecab-base/buildlink3.mk
+++ b/textproc/mecab-base/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2012/02/27 11:53:07 obache Exp $
BUILDLINK_TREE+= mecab-base
.if !defined(MECAB_BASE_BUILDLINK3_MK)
MECAB_BASE_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.mecab-base+= mecab-base>=0.90
+BUILDLINK_API_DEPENDS.mecab-base+= mecab-base>=0.99
BUILDLINK_PKGSRCDIR.mecab-base?= ../../textproc/mecab-base
BUILDLINK_FILES.mecab-base+= include/mecab.h
BUILDLINK_FILES.mecab-base+= lib/libmecab.*
diff --git a/textproc/mecab-base/distinfo b/textproc/mecab-base/distinfo
index 3178a3bf3f3..d3de26923ab 100644
--- a/textproc/mecab-base/distinfo
+++ b/textproc/mecab-base/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2009/10/14 08:22:35 obache Exp $
+$NetBSD: distinfo,v 1.6 2012/02/27 11:53:07 obache Exp $
-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
+SHA1 (mecab-0.993.tar.gz) = 7e5daa765e83fe0f5d46f33a3b96dfab49299946
+RMD160 (mecab-0.993.tar.gz) = 639b8a278ab4387b4760453400db95034428d3d1
+Size (mecab-0.993.tar.gz) = 1387081 bytes
+SHA1 (patch-aa) = c7da3fd209a278634b95871d9ea7c5ef6ea2be27
+SHA1 (patch-ab) = 05e58405cc8f085b9535aa93c471cc90a4f8afb9
diff --git a/textproc/mecab-base/patches/patch-aa b/textproc/mecab-base/patches/patch-aa
index 186d0a6e29f..93478716aae 100644
--- a/textproc/mecab-base/patches/patch-aa
+++ b/textproc/mecab-base/patches/patch-aa
@@ -1,8 +1,10 @@
-$NetBSD: patch-aa,v 1.4 2009/10/14 08:22:35 obache Exp $
+$NetBSD: patch-aa,v 1.5 2012/02/27 11:53:07 obache Exp $
---- configure.orig 2009-09-27 08:02:36.000000000 +0000
+* Use own optimization flags.
+
+--- configure.orig 2012-01-10 16:30:37.000000000 +0000
+++ configure
-@@ -21593,8 +21593,8 @@ $as_echo "$as_me: error: \"SUN make does
+@@ -17981,8 +17981,8 @@ $as_echo "no" >&6; }
fi
if test -n "$GCC"; then
diff --git a/textproc/mecab-base/patches/patch-ab b/textproc/mecab-base/patches/patch-ab
index c5ee7efbe35..6bb2ff15e7c 100644
--- a/textproc/mecab-base/patches/patch-ab
+++ b/textproc/mecab-base/patches/patch-ab
@@ -1,8 +1,10 @@
-$NetBSD: patch-ab,v 1.3 2009/10/14 08:22:35 obache Exp $
+$NetBSD: patch-ab,v 1.4 2012/02/27 11:53:07 obache Exp $
---- configure.in.orig 2009-09-27 08:02:17.000000000 +0000
+* Use own optimization flags.
+
+--- configure.in.orig 2012-01-10 16:30:02.000000000 +0000
+++ configure.in
-@@ -98,8 +98,8 @@ dnl
+@@ -89,8 +89,8 @@ dnl
dnl check gcc
dnl
if test -n "$GCC"; then
diff --git a/textproc/mecab/Makefile.common b/textproc/mecab/Makefile.common
index 73e47579f12..17d6f4461ff 100644
--- a/textproc/mecab/Makefile.common
+++ b/textproc/mecab/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2009/10/14 08:22:35 obache Exp $
+# $NetBSD: Makefile.common,v 1.5 2012/02/27 11:53:07 obache Exp $
#
# used by textproc/mecab-base/Makefile
# used by textproc/java-mecab/Makefile
@@ -8,10 +8,10 @@
# used by textproc/mecab-ipadic/Makefile
# used by textproc/mecab-jumandic/Makefile
-MECAB_VERSION= 0.98
+MECAB_VERSION= 0.993
CATEGORIES= japanese textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mecab/}
+MASTER_SITES= http://mecab.googlecode.com/files/
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://mecab.sourceforge.net/
diff --git a/textproc/mecab/buildlink3.mk b/textproc/mecab/buildlink3.mk
index e5a56e36801..1609365842d 100644
--- a/textproc/mecab/buildlink3.mk
+++ b/textproc/mecab/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2012/02/27 11:53:07 obache Exp $
BUILDLINK_TREE+= mecab
.if !defined(MECAB_BUILDLINK3_MK)
MECAB_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.mecab+= mecab>=0.90
+BUILDLINK_API_DEPENDS.mecab+= mecab>=0.99
BUILDLINK_PKGSRCDIR.mecab?= ../../textproc/mecab
.include "../../textproc/mecab-base/buildlink3.mk"
diff --git a/textproc/p5-mecab/Makefile b/textproc/p5-mecab/Makefile
index 8a20f7d9217..ef41ff68ff2 100644
--- a/textproc/p5-mecab/Makefile
+++ b/textproc/p5-mecab/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2011/08/14 15:14:22 obache Exp $
+# $NetBSD: Makefile,v 1.7 2012/02/27 11:53:07 obache Exp $
#
.include "../../textproc/mecab/Makefile.common"
DISTNAME= mecab-perl-${MECAB_VERSION}
PKGNAME= p5-mecab-${MECAB_VERSION}
-PKGREVISION= 2
CATEGORIES+= perl5
COMMENT= MeCab perl module
diff --git a/textproc/p5-mecab/distinfo b/textproc/p5-mecab/distinfo
index f2c87ddf26a..846ba62c3ac 100644
--- a/textproc/p5-mecab/distinfo
+++ b/textproc/p5-mecab/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2009/10/14 08:22:35 obache Exp $
+$NetBSD: distinfo,v 1.5 2012/02/27 11:53:07 obache Exp $
-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
+SHA1 (mecab-perl-0.993.tar.gz) = 362cfe0f2d11e32524e1ad88e56b1cfe0a76ac34
+RMD160 (mecab-perl-0.993.tar.gz) = 0b9bbb4edff0caeb15cbeafcf2b66297c425ec4c
+Size (mecab-perl-0.993.tar.gz) = 44307 bytes
diff --git a/textproc/py-mecab/Makefile b/textproc/py-mecab/Makefile
index 8d591e1ec02..e0e5a30abcb 100644
--- a/textproc/py-mecab/Makefile
+++ b/textproc/py-mecab/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2011/10/25 08:36:20 obache Exp $
+# $NetBSD: Makefile,v 1.6 2012/02/27 11:53:07 obache Exp $
#
.include "../../textproc/mecab/Makefile.common"
DISTNAME= mecab-python-${MECAB_VERSION}
PKGNAME= ${PYPKGPREFIX}-mecab-${MECAB_VERSION}
-PKGREVISION= 1
CATEGORIES+= python
COMMENT= MeCab python module
diff --git a/textproc/py-mecab/distinfo b/textproc/py-mecab/distinfo
index d2640db31ca..a797f132035 100644
--- a/textproc/py-mecab/distinfo
+++ b/textproc/py-mecab/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2009/10/14 08:22:35 obache Exp $
+$NetBSD: distinfo,v 1.5 2012/02/27 11:53:07 obache Exp $
-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
+SHA1 (mecab-python-0.993.tar.gz) = b544c64e1399879a61ae50c084fdf293f7bc9fd8
+RMD160 (mecab-python-0.993.tar.gz) = 552440d5e55793ecd9e45103300e355960bc91c9
+Size (mecab-python-0.993.tar.gz) = 63267 bytes
diff --git a/textproc/py-mecab/patches/patch-aa b/textproc/py-mecab/patches/patch-aa
deleted file mode 100644
index 3a8abf2714b..00000000000
--- a/textproc/py-mecab/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$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 6691e12acaf..bbfd51642fc 100644
--- a/textproc/ruby-mecab/Makefile
+++ b/textproc/ruby-mecab/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2011/02/21 16:01:21 taca Exp $
+# $NetBSD: Makefile,v 1.7 2012/02/27 11:53:07 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
@@ -19,7 +18,7 @@ USE_RUBY_EXTCONF= yes
do-test:
${RUN} \
cd ${WRKSRC}; \
- env ${TEST_ENV} ${RUBY} test.rb
+ ${SETENV} ${TEST_ENV} ${RUBY} -I${WRKSRC} test.rb
BUILDLINK_API_DEPENDS.mecab+= mecab>=${MECAB_VERSION}
diff --git a/textproc/ruby-mecab/distinfo b/textproc/ruby-mecab/distinfo
index 2a9b1ba1d4f..984ab3a039c 100644
--- a/textproc/ruby-mecab/distinfo
+++ b/textproc/ruby-mecab/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2009/10/14 08:22:35 obache Exp $
+$NetBSD: distinfo,v 1.5 2012/02/27 11:53:07 obache Exp $
-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
+SHA1 (mecab-ruby-0.993.tar.gz) = 6a9fcea067c8914f6da80a40fd8cac74aadde75f
+RMD160 (mecab-ruby-0.993.tar.gz) = 8596943da117daa67aaaec4fa262b644cf134806
+Size (mecab-ruby-0.993.tar.gz) = 44004 bytes
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-17 23:52:30 +0000