Update tokyocabinet to 1.3.23.

Changes:
2008-12-03  Mikio Hirabayashi

	* tcbdb.c (tcbdbtranbegin): conbination of non-transaction and transaction became safer.

	- Release: 1.3.23

2008-11-28  Mikio Hirabayashi

	* tcutil.c (tcmapput3, tcmdbput3, tcmapputcat3, tcmdbputcat3): new functions.

	* tcutil.c (tctreeput3, tcndbput3): new functions.

	* tcadb.c (tcadbput, tcadbputcat): LRU rule is now strictly applied.

	- Release: 1.3.22

5 files changed, 20 insertions, 32 deletions

diff --git a/databases/tokyocabinet/Makefile b/databases/tokyocabinet/Makefile
index 98643040024..126aa8e649b 100644
--- a/databases/tokyocabinet/Makefile
+++ b/databases/tokyocabinet/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2008/11/25 11:16:05 obache Exp $
+# $NetBSD: Makefile,v 1.13 2008/12/07 11:31:21 obache Exp $
 #
 
-DISTNAME=	tokyocabinet-1.3.21
+DISTNAME=	tokyocabinet-1.3.23
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
 
diff --git a/databases/tokyocabinet/PLIST b/databases/tokyocabinet/PLIST
index 416e8e84d87..76e4912ed3c 100644
--- a/databases/tokyocabinet/PLIST
+++ b/databases/tokyocabinet/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2008/11/25 11:16:05 obache Exp $
+@comment $NetBSD: PLIST,v 1.13 2008/12/07 11:31:21 obache Exp $
 bin/tcamgr
 bin/tcatest
 bin/tcbmgr
@@ -20,8 +20,8 @@ include/tchdb.h
 include/tcutil.h
 lib/libtokyocabinet.a
 lib/libtokyocabinet.so
-lib/libtokyocabinet.so.5
-lib/libtokyocabinet.so.5.16.0
+lib/libtokyocabinet.so.6
+lib/libtokyocabinet.so.6.2.0
 lib/pkgconfig/tokyocabinet.pc
 libexec/tcawmgr.cgi
 man/man1/tcamgr.1
diff --git a/databases/tokyocabinet/buildlink3.mk b/databases/tokyocabinet/buildlink3.mk
index 580fdffd597..6b0dd54f8ad 100644
--- a/databases/tokyocabinet/buildlink3.mk
+++ b/databases/tokyocabinet/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/09/04 12:10:28 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2008/12/07 11:31:21 obache Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TOKYOCABINET_BUILDLINK3_MK:=	${TOKYOCABINET_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tokyocabinet
 
 .if ${TOKYOCABINET_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.tokyocabinet+=	tokyocabinet>=1.3.7
+BUILDLINK_ABI_DEPENDS.tokyocabinet+=	tokyocabinet>=1.3.23
 BUILDLINK_PKGSRCDIR.tokyocabinet?=	../../databases/tokyocabinet
 .endif	# TOKYOCABINET_BUILDLINK3_MK
 
diff --git a/databases/tokyocabinet/distinfo b/databases/tokyocabinet/distinfo
index 9e6f6a0885a..771c9f11bd6 100644
--- a/databases/tokyocabinet/distinfo
+++ b/databases/tokyocabinet/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2008/11/25 11:16:05 obache Exp $
+$NetBSD: distinfo,v 1.13 2008/12/07 11:31:21 obache Exp $
 
-SHA1 (tokyocabinet-1.3.21.tar.gz) = dcac60181fb721f76ef1faafa939f2746d669b1a
-RMD160 (tokyocabinet-1.3.21.tar.gz) = 1c31d611849df7fcde3746a98d81b7d63a170ad9
-Size (tokyocabinet-1.3.21.tar.gz) = 767390 bytes
-SHA1 (patch-aa) = c855b6d09136a9a3f1e084e44287c4f53983cd1f
+SHA1 (tokyocabinet-1.3.23.tar.gz) = 465c42115906c9c00ae9e65a4b3f977813b50b0d
+RMD160 (tokyocabinet-1.3.23.tar.gz) = d628617642aa38b553e536ffb16217586b046863
+Size (tokyocabinet-1.3.23.tar.gz) = 767471 bytes
+SHA1 (patch-aa) = eb38eb79251d653122fa0f088fd78d1fb828340d
diff --git a/databases/tokyocabinet/patches/patch-aa b/databases/tokyocabinet/patches/patch-aa
index 79b5e919ddd..77f396b043e 100644
--- a/databases/tokyocabinet/patches/patch-aa
+++ b/databases/tokyocabinet/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2008/11/07 11:49:08 obache Exp $
+$NetBSD: patch-aa,v 1.5 2008/12/07 11:31:21 obache Exp $
 
---- configure.orig	2008-10-28 13:58:35.000000000 +0000
+--- configure.orig	2008-12-03 02:35:10.000000000 +0000
 +++ configure
-@@ -1738,18 +1738,15 @@ MYDOCUMENTFILES="COPYING ChangeLog THANK
+@@ -1744,18 +1744,15 @@ MYDOCUMENTFILES="COPYING ChangeLog THANK
  MYPCFILES="tokyocabinet.pc"
  
  # Building flags
@@ -21,23 +21,10 @@ $NetBSD: patch-aa,v 1.4 2008/11/07 11:49:08 obache Exp $
 -pathtmp="$PATH"
 -PATH="$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
 -PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+ 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"
- CPATH="$HOME/include:/usr/local/include:$CPATH"
-@@ -1950,9 +1947,9 @@ printf '#===============================
- #================================================================
- 
- # Reset variables
--test -n "$CFLAGS" && MYCFLAGS="$CFLAGS"
--test -n "$CPPFLAGS" && MYCPPFLAGS="$CPPFLAGS"
--test -n "$LDFLAGS" && MYLDFLAGS="$LDFLAGS"
-+test -n "$CFLAGS" && MYCFLAGS="$CFLAGS $MYCFLAGS"
-+test -n "$CPPFLAGS" && MYCPPFLAGS="$CPPFLAGS $MYCPPFLAGS"
-+test -n "$LDFLAGS" && MYLDFLAGS="$LDFLAGS $MYLDFLAGS"
- 
- # C compiler
- ac_ext=c
-@@ -4081,7 +4078,7 @@ _ACEOF
+@@ -4119,7 +4116,7 @@ _ACEOF
  fi
  
  fi
@@ -46,7 +33,7 @@ $NetBSD: patch-aa,v 1.4 2008/11/07 11:49:08 obache Exp $
  then
  
  { echo "$as_me:$LINENO: checking for main in -llzma" >&5
-@@ -4149,7 +4146,7 @@ _ACEOF
+@@ -4187,7 +4184,7 @@ _ACEOF
  fi
  
  fi
@@ -55,7 +42,7 @@ $NetBSD: patch-aa,v 1.4 2008/11/07 11:49:08 obache Exp $
  then
  
  { echo "$as_me:$LINENO: checking for main in -llzo2" >&5
-@@ -5494,7 +5491,7 @@ fi
+@@ -5532,7 +5529,7 @@ fi
  
  
  fi
@@ -64,7 +51,7 @@ $NetBSD: patch-aa,v 1.4 2008/11/07 11:49:08 obache Exp $
  then
    if test "${ac_cv_header_lzmalib_h+set}" = set; then
    { echo "$as_me:$LINENO: checking for lzmalib.h" >&5
-@@ -5631,7 +5628,7 @@ fi
+@@ -5669,7 +5666,7 @@ fi
  
  
  fi