Update tokyocabinet to 1.3.11.

2008-09-23  Mikio Hirabayashi

	* tchdb.c (tchdbputimpl): performance of the ADDINT mode was improved.

	* tcbdb.c (tcbdbleafaddrec): performance of the ADDINT mode was improved.

	* tcfdb.c (tcfdbputimpl): performance of the ADDINT mode was improved.

	* tcutil.c (tcpagealign): new function.

	* tchdb.c (tchdbsetxmsiz): the parameter is now rounded up to multiple of the page size.

	* tcfdb.c (tcfdbtune): the parameter is now rounded up to multiple of the page size.

	* tchdb.c (tcseekwrite, tcseekread, tcseekreadtry): page border handling was added.

	- Release: 1.3.11

2008-09-20  Mikio Hirabayashi

	* tcutil.c (tcunlock): new function.

	* tchdb.c (tchdbsetmutex): useless locking was eliminated.

	* tcbdb.c (tcbdbsetmutex): useless locking was eliminated.

	* tcfdb.c (tcfdbsetmutex): useless locking was eliminated.

	- Release: 1.3.10

2008-09-10  Mikio Hirabayashi

	* tchdb.c (tchdblockallrecords, tchdbunlockallrecords): new functions.

	* tcfdb.c (tcfdblockallrecords, tcfdbunlockallrecords): new functions.

	- Release: 1.3.9

5 files changed, 30 insertions, 21 deletions

diff --git a/databases/tokyocabinet/Makefile b/databases/tokyocabinet/Makefile
index 96f6b81c8b7..68ec7d288fc 100644
--- a/databases/tokyocabinet/Makefile
+++ b/databases/tokyocabinet/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2008/09/05 07:15:25 obache Exp $
+# $NetBSD: Makefile,v 1.3 2008/10/06 10:41:25 obache Exp $
 #
 
-DISTNAME=	tokyocabinet-1.3.8
+DISTNAME=	tokyocabinet-1.3.11
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
 
diff --git a/databases/tokyocabinet/PLIST b/databases/tokyocabinet/PLIST
index 56e9d994585..1b422895cc7 100644
--- a/databases/tokyocabinet/PLIST
+++ b/databases/tokyocabinet/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2008/09/05 07:15:25 obache Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/10/06 10:41:25 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.2.0
+lib/libtokyocabinet.so.5.6.0
 lib/pkgconfig/tokyocabinet.pc
 libexec/tcawmgr.cgi
 man/man1/tcamgr.1
diff --git a/databases/tokyocabinet/distinfo b/databases/tokyocabinet/distinfo
index 0571aa5ef64..51971bb71f9 100644
--- a/databases/tokyocabinet/distinfo
+++ b/databases/tokyocabinet/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2008/09/05 07:15:25 obache Exp $
+$NetBSD: distinfo,v 1.3 2008/10/06 10:41:25 obache Exp $
 
-SHA1 (tokyocabinet-1.3.8.tar.gz) = d614def2b2a07a4d6c6dea04fe00f94a4e948490
-RMD160 (tokyocabinet-1.3.8.tar.gz) = 2873317612d9d426982b8835881ce458d13117be
-Size (tokyocabinet-1.3.8.tar.gz) = 443894 bytes
-SHA1 (patch-aa) = 0bccf7e2f027a19af7d96f593aa302717a6c252f
-SHA1 (patch-ab) = ea56d5fe1176ac3a8d8546d2bd46eca6b63b3a55
+SHA1 (tokyocabinet-1.3.11.tar.gz) = 97cf455161a8f774f125711d9a2425db9956a075
+RMD160 (tokyocabinet-1.3.11.tar.gz) = 3165f4f147aaaa194dea4419ccf7d6ea0dc3f8dd
+Size (tokyocabinet-1.3.11.tar.gz) = 445551 bytes
+SHA1 (patch-aa) = d66ee31d4ebfb6c822cb137bfc092a890b2e438e
+SHA1 (patch-ab) = cf7ec539a76f1f3fe0eb162cc55d9580e2341c61
diff --git a/databases/tokyocabinet/patches/patch-aa b/databases/tokyocabinet/patches/patch-aa
index ab8fe71ae65..85b99cad3db 100644
--- a/databases/tokyocabinet/patches/patch-aa
+++ b/databases/tokyocabinet/patches/patch-aa
@@ -1,21 +1,30 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/09/04 12:10:28 obache Exp $
+$NetBSD: patch-aa,v 1.2 2008/10/06 10:41:25 obache Exp $
 
---- configure.orig	2008-08-25 01:32:42.000000000 +0000
+--- configure.orig	2008-09-29 02:53:37.000000000 +0000
 +++ configure
-@@ -1737,9 +1737,9 @@ MYDOCUMENTFILES="COPYING ChangeLog THANK
+@@ -1738,18 +1738,15 @@ MYDOCUMENTFILES="COPYING ChangeLog THANK
  MYPCFILES="tokyocabinet.pc"
  
  # Building flags
 -MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2"
--MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -L$HOME/include -L/usr/local/include -DNDEBUG -D_GNU_SOURCE=1"
+-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include -DNDEBUG -D_GNU_SOURCE=1"
 -MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib"
 +MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char"
 +MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -DNDEBUG -D_GNU_SOURCE=1"
 +MYLDFLAGS="-L. -L\$(LIBDIR)"
+ MYCMDLDFLAGS=""
  MYRUNPATH="\$(LIBDIR)"
  MYLDLIBPATHENV="LD_LIBRARY_PATH"
  MYPOSTCMD="true"
-@@ -4074,7 +4074,7 @@ _ACEOF
+ 
+ # Building paths
+-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"
+ 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
  fi
  
  fi
@@ -24,7 +33,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/09/04 12:10:28 obache Exp $
  then
  
  { echo "$as_me:$LINENO: checking for main in -llzma" >&5
-@@ -4142,7 +4142,7 @@ _ACEOF
+@@ -4144,7 +4141,7 @@ _ACEOF
  fi
  
  fi
@@ -33,7 +42,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/09/04 12:10:28 obache Exp $
  then
  
  { echo "$as_me:$LINENO: checking for main in -llzo2" >&5
-@@ -5427,7 +5427,7 @@ fi
+@@ -5429,7 +5426,7 @@ fi
  
  
  fi
@@ -42,7 +51,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/09/04 12:10:28 obache Exp $
  then
    if test "${ac_cv_header_lzmalib_h+set}" = set; then
    { echo "$as_me:$LINENO: checking for lzmalib.h" >&5
-@@ -5564,7 +5564,7 @@ fi
+@@ -5566,7 +5563,7 @@ fi
  
  
  fi
diff --git a/databases/tokyocabinet/patches/patch-ab b/databases/tokyocabinet/patches/patch-ab
index f1e909cbfc8..96f9278cf13 100644
--- a/databases/tokyocabinet/patches/patch-ab
+++ b/databases/tokyocabinet/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/09/04 12:10:28 obache Exp $
+$NetBSD: patch-ab,v 1.2 2008/10/06 10:41:25 obache Exp $
 
---- Makefile.in.orig	2008-08-26 13:39:59.000000000 +0000
+--- 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)\"" \
@@ -10,6 +10,6 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/09/04 12:10:28 obache Exp $
 -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@:.
- RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@