Update tokyocabinet to 1.3.16.

Changes:
2008-10-30  Mikio Hirabayashi

	* tcutil.c (tcmapdup): performance was improved.

	* tcutil.c (tctreenew, tctreedel, tctreeput, tctreeout, tctreeget): new functions.

	* tcutil.c (tcsystem): new function.

	* tchdb.c (tchdbopenimpl): memory usage of reader declined.

	* tcadb.c (tcadbsync, tcadbcopy): on-memory database is now supported.

	- Release: 1.3.16

5 files changed, 29 insertions, 31 deletions

diff --git a/databases/tokyocabinet/Makefile b/databases/tokyocabinet/Makefile
index 2ad79c943f0..d8e2f160c1f 100644
--- a/databases/tokyocabinet/Makefile
+++ b/databases/tokyocabinet/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2008/10/26 10:47:07 obache Exp $
+# $NetBSD: Makefile,v 1.8 2008/11/07 11:49:08 obache Exp $
 #
 
-DISTNAME=	tokyocabinet-1.3.15
+DISTNAME=	tokyocabinet-1.3.16
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
 
@@ -13,6 +13,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake pkg-config
+USE_LANGUAGES=	c99
 
 PKGCONFIG_OVERRIDE+=	tokyocabinet.pc.in
 
diff --git a/databases/tokyocabinet/PLIST b/databases/tokyocabinet/PLIST
index 010dc5aa037..9d22cfb7dfc 100644
--- a/databases/tokyocabinet/PLIST
+++ b/databases/tokyocabinet/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2008/10/26 10:47:07 obache Exp $
+@comment $NetBSD: PLIST,v 1.8 2008/11/07 11:49:08 obache Exp $
 bin/tcamgr
 bin/tcatest
 bin/tcbmgr
@@ -21,7 +21,7 @@ include/tcutil.h
 lib/libtokyocabinet.a
 lib/libtokyocabinet.so
 lib/libtokyocabinet.so.5
-lib/libtokyocabinet.so.5.10.0
+lib/libtokyocabinet.so.5.11.0
 lib/pkgconfig/tokyocabinet.pc
 libexec/tcawmgr.cgi
 man/man1/tcamgr.1
diff --git a/databases/tokyocabinet/distinfo b/databases/tokyocabinet/distinfo
index 52c1b3c3045..6b08534284a 100644
--- a/databases/tokyocabinet/distinfo
+++ b/databases/tokyocabinet/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.7 2008/10/26 10:47:07 obache Exp $
+$NetBSD: distinfo,v 1.8 2008/11/07 11:49:08 obache Exp $
 
-SHA1 (tokyocabinet-1.3.15.tar.gz) = 0fa790eaedc0d26e43d03e04a053c589b38e6675
-RMD160 (tokyocabinet-1.3.15.tar.gz) = 617177db4f398c78e62d3bc67c11954100c61611
-Size (tokyocabinet-1.3.15.tar.gz) = 447186 bytes
-SHA1 (patch-aa) = 58c1affab124d88b342f1a978576e1a34f3bbafb
-SHA1 (patch-ab) = cf7ec539a76f1f3fe0eb162cc55d9580e2341c61
+SHA1 (tokyocabinet-1.3.16.tar.gz) = e19f4b04700bcabd262bd0d43521da4d7e24360c
+RMD160 (tokyocabinet-1.3.16.tar.gz) = b9efd51c8394273ce266eb0bdae97d9b570630a9
+Size (tokyocabinet-1.3.16.tar.gz) = 459245 bytes
+SHA1 (patch-aa) = c855b6d09136a9a3f1e084e44287c4f53983cd1f
diff --git a/databases/tokyocabinet/patches/patch-aa b/databases/tokyocabinet/patches/patch-aa
index c5c788cc756..79b5e919ddd 100644
--- a/databases/tokyocabinet/patches/patch-aa
+++ b/databases/tokyocabinet/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2008/10/13 05:39:46 obache Exp $
+$NetBSD: patch-aa,v 1.4 2008/11/07 11:49:08 obache Exp $
 
---- configure.orig	2008-10-08 01:29:33.000000000 +0000
+--- configure.orig	2008-10-28 13:58:35.000000000 +0000
 +++ configure
 @@ -1738,18 +1738,15 @@ MYDOCUMENTFILES="COPYING ChangeLog THANK
  MYPCFILES="tokyocabinet.pc"
@@ -24,7 +24,20 @@ $NetBSD: patch-aa,v 1.3 2008/10/13 05:39:46 obache Exp $
  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"
-@@ -4076,7 +4073,7 @@ _ACEOF
+@@ -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
  fi
  
  fi
@@ -33,7 +46,7 @@ $NetBSD: patch-aa,v 1.3 2008/10/13 05:39:46 obache Exp $
  then
  
  { echo "$as_me:$LINENO: checking for main in -llzma" >&5
-@@ -4144,7 +4141,7 @@ _ACEOF
+@@ -4149,7 +4146,7 @@ _ACEOF
  fi
  
  fi
@@ -42,7 +55,7 @@ $NetBSD: patch-aa,v 1.3 2008/10/13 05:39:46 obache Exp $
  then
  
  { echo "$as_me:$LINENO: checking for main in -llzo2" >&5
-@@ -5489,7 +5486,7 @@ fi
+@@ -5494,7 +5491,7 @@ fi
  
  
  fi
@@ -51,7 +64,7 @@ $NetBSD: patch-aa,v 1.3 2008/10/13 05:39:46 obache Exp $
  then
    if test "${ac_cv_header_lzmalib_h+set}" = set; then
    { echo "$as_me:$LINENO: checking for lzmalib.h" >&5
-@@ -5626,7 +5623,7 @@ fi
+@@ -5631,7 +5628,7 @@ fi
  
  
  fi
diff --git a/databases/tokyocabinet/patches/patch-ab b/databases/tokyocabinet/patches/patch-ab
deleted file mode 100644
index 96f9278cf13..00000000000
--- a/databases/tokyocabinet/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2008/10/06 10:41:25 obache Exp $
-
---- Makefile.in.orig	2008-09-29 01:22:12.000000000 +0000
-+++ Makefile.in
-@@ -50,8 +50,8 @@ CPPFLAGS = @MYCPPFLAGS@ \
-   -D_TC_PREFIX="\"$(prefix)\"" -D_TC_INCLUDEDIR="\"$(INCLUDEDIR)\"" \
-   -D_TC_LIBDIR="\"$(LIBDIR)\"" -D_TC_BINDIR="\"$(BINDIR)\"" -D_TC_LIBEXECDIR="\"$(LIBEXECDIR)\"" \
-   -D_TC_APPINC="\"-I$(INCLUDEDIR)\"" -D_TC_APPLIBS="\"-L$(LIBDIR) -ltokyocabinet @LIBS@\""
--CFLAGS = @MYCFLAGS@
--LDFLAGS = @MYLDFLAGS@
-+CFLAGS = @CFLAGS@ @MYCFLAGS@
-+LDFLAGS = @LDFLAGS@ @MYLDFLAGS@
- CMDLDFLAGS = @MYCMDLDFLAGS@
- LIBS = @LIBS@
- LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:.