From 1034bacd2a794af329b61e4370d94caa7704b9ef Mon Sep 17 00:00:00 2001 From: obache Date: Thu, 5 Feb 2009 15:36:34 +0000 Subject: Update TokyoCabinet to 1.4.4. Changes: 2009-01-29 Mikio Hirabayashi * tcutil.c (tcmapputproc, tctreeputproc, tcmdbputproc, tcndbputproc): new functions. * tchdb.c (tchdbputproc): new function. * tchdb.c (TDBTHREADYIELD): "sched_yield" is now used instead of "pthread_yield". * tcbdb.c (tcbdbputproc): new function. * tcbdb.c (tcbdbcurkey, tcbdbcurval): the type of the return value was modified. * tcfdb.c (tcfdbputproc): new function. * tcadb.c (tcadbputproc): new function. * tcadb.c (tcadbmisc): sub funcitons "put", "out", and "get" were added. * tcadb.c (tcstrisnum): new function. - Release: 1.4.4 --- databases/tokyocabinet/Makefile | 4 ++-- databases/tokyocabinet/PLIST | 4 ++-- databases/tokyocabinet/distinfo | 11 +++++------ databases/tokyocabinet/patches/patch-aa | 12 ++++++------ databases/tokyocabinet/patches/patch-ac | 18 ------------------ 5 files changed, 15 insertions(+), 34 deletions(-) delete mode 100644 databases/tokyocabinet/patches/patch-ac (limited to 'databases/tokyocabinet') diff --git a/databases/tokyocabinet/Makefile b/databases/tokyocabinet/Makefile index c0afd11b175..b162cd90371 100644 --- a/databases/tokyocabinet/Makefile +++ b/databases/tokyocabinet/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2009/01/27 09:19:06 obache Exp $ +# $NetBSD: Makefile,v 1.20 2009/02/05 15:36:34 obache Exp $ # -DISTNAME= tokyocabinet-1.4.3 +DISTNAME= tokyocabinet-1.4.4 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/} diff --git a/databases/tokyocabinet/PLIST b/databases/tokyocabinet/PLIST index 8785dfb0889..3bc81aaff47 100644 --- a/databases/tokyocabinet/PLIST +++ b/databases/tokyocabinet/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.19 2009/01/27 09:19:06 obache Exp $ +@comment $NetBSD: PLIST,v 1.20 2009/02/05 15:36:34 obache Exp $ bin/tcamgr bin/tcatest bin/tcbmgr @@ -25,7 +25,7 @@ include/tcutil.h lib/libtokyocabinet.a lib/libtokyocabinet.so lib/libtokyocabinet.so.7 -lib/libtokyocabinet.so.7.8.0 +lib/libtokyocabinet.so.7.9.0 lib/pkgconfig/tokyocabinet.pc libexec/tcawmgr.cgi man/man1/tcamgr.1 diff --git a/databases/tokyocabinet/distinfo b/databases/tokyocabinet/distinfo index 3df74625bcb..bfa37fd3079 100644 --- a/databases/tokyocabinet/distinfo +++ b/databases/tokyocabinet/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.20 2009/01/27 09:19:06 obache Exp $ +$NetBSD: distinfo,v 1.21 2009/02/05 15:36:34 obache Exp $ -SHA1 (tokyocabinet-1.4.3.tar.gz) = 1b5a9a6c59cf0cd71d6c2c0a256023d2bfcd01d3 -RMD160 (tokyocabinet-1.4.3.tar.gz) = 82f4b93074e1cd4252425a07fc9789a9cd204df2 -Size (tokyocabinet-1.4.3.tar.gz) = 856311 bytes -SHA1 (patch-aa) = 3eb1e5e340be5e4e79a60277df1e014884d6eb78 -SHA1 (patch-ac) = 12524014241c14d83ecd4d4d353f1dc016e3a02b +SHA1 (tokyocabinet-1.4.4.tar.gz) = 6a8815c6c8792b6b2faaab80ae4f4512100cd638 +RMD160 (tokyocabinet-1.4.4.tar.gz) = 242ca6385e0fa20b0939097f9f97108f9774292e +Size (tokyocabinet-1.4.4.tar.gz) = 861039 bytes +SHA1 (patch-aa) = ab8f9c8ae46f14f6e34f57c1e732d5987354e1be diff --git a/databases/tokyocabinet/patches/patch-aa b/databases/tokyocabinet/patches/patch-aa index 16db92f31db..13fc248b37e 100644 --- a/databases/tokyocabinet/patches/patch-aa +++ b/databases/tokyocabinet/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.6 2009/01/27 09:19:06 obache Exp $ +$NetBSD: patch-aa,v 1.7 2009/02/05 15:36:34 obache Exp $ ---- configure.orig 2009-01-27 02:53:35.000000000 +0000 +--- configure.orig 2009-01-30 06:43:48.000000000 +0000 +++ configure @@ -1744,19 +1744,16 @@ MYDOCUMENTFILES="COPYING ChangeLog THANK MYPCFILES="tokyocabinet.pc" @@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.6 2009/01/27 09:19:06 obache Exp $ CPATH="$HOME/include:/usr/local/include:$CPATH" LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH" LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH" -@@ -4121,7 +4118,7 @@ _ACEOF +@@ -4186,7 +4183,7 @@ _ACEOF fi fi @@ -34,7 +34,7 @@ $NetBSD: patch-aa,v 1.6 2009/01/27 09:19:06 obache Exp $ then { echo "$as_me:$LINENO: checking for main in -llzma" >&5 -@@ -4189,7 +4186,7 @@ _ACEOF +@@ -4254,7 +4251,7 @@ _ACEOF fi fi @@ -43,7 +43,7 @@ $NetBSD: patch-aa,v 1.6 2009/01/27 09:19:06 obache Exp $ then { echo "$as_me:$LINENO: checking for main in -llzo2" >&5 -@@ -5534,7 +5531,7 @@ fi +@@ -5599,7 +5596,7 @@ fi fi @@ -52,7 +52,7 @@ $NetBSD: patch-aa,v 1.6 2009/01/27 09:19:06 obache Exp $ then if test "${ac_cv_header_lzmalib_h+set}" = set; then { echo "$as_me:$LINENO: checking for lzmalib.h" >&5 -@@ -5671,7 +5668,7 @@ fi +@@ -5736,7 +5733,7 @@ fi fi diff --git a/databases/tokyocabinet/patches/patch-ac b/databases/tokyocabinet/patches/patch-ac deleted file mode 100644 index 4cca9a01ca1..00000000000 --- a/databases/tokyocabinet/patches/patch-ac +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2009/01/04 11:00:35 obache Exp $ - -https://sourceforge.net/tracker2/?func=detail&aid=2484842&group_id=200242&atid=972717 - ---- myconf.h.orig 2009-01-03 12:51:23.000000000 +0000 -+++ myconf.h -@@ -258,6 +258,11 @@ - #define nan(TC_a) strtod("nan", NULL) - #endif - -+#if defined(_SYS_NETBSD_) && TCUSEPTHREAD -+#include -+#define pthread_yield() sched_yield() -+#endif -+ - #if ! defined(PATH_MAX) - #if defined(MAXPATHLEN) - #define PATH_MAX MAXPATHLEN -- cgit v1.2.3