Update TokyoTyrant to 1.1.12.

Changes:
2009-02-03  Mikio Hirabayashi  <mikio@users.sourceforge.net>

	* myconf.c (nan): xBSDs are now supported.

	* ttserver (proc): parameter checking and warning were added.

	* tcrmgr.c (runmisc, procmisc): table database is now supported.

	* tcrdb.c (tcrdbtblput, tcrdbtblout, tcrdbtblget): new functions.

	* tcrdb.c (tcrdbtblsetindex, tcrdbtblgenuid, tcrdbqrysearch): new functions.

	- Release: 1.1.12

6 files changed, 32 insertions, 18 deletions

diff --git a/databases/tokyotyrant/Makefile b/databases/tokyotyrant/Makefile
index 3d6f2f07768..16779d0bc26 100644
--- a/databases/tokyotyrant/Makefile
+++ b/databases/tokyotyrant/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2009/01/04 11:04:35 obache Exp $
+# $NetBSD: Makefile,v 1.8 2009/02/03 13:57:56 obache Exp $
 #
 
-DISTNAME=	tokyotyrant-1.1.11
+DISTNAME=	tokyotyrant-1.1.12
 CATEGORIES=	databases net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
 
@@ -20,7 +20,7 @@ TEST_TARGET=	check
 
 .include "options.mk"
 
-BUILDLINK_API_DEPENDS.tokyocabinet+=	tokyocabinet>=1.3.27
+BUILDLINK_API_DEPENDS.tokyocabinet+=	tokyocabinet>=1.4.4
 .include "../../databases/tokyocabinet/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 PTHREAD_AUTO_VARS=	yes
diff --git a/databases/tokyotyrant/PLIST b/databases/tokyotyrant/PLIST
index e789b55a3a4..42761c55c68 100644
--- a/databases/tokyotyrant/PLIST
+++ b/databases/tokyotyrant/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/01/04 11:04:35 obache Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/02/03 13:57:56 obache Exp $
 bin/tcrmgr
 bin/tcrmttest
 bin/tcrtest
@@ -11,7 +11,7 @@ include/ttutil.h
 lib/libtokyotyrant.a
 lib/libtokyotyrant.so
 lib/libtokyotyrant.so.2
-lib/libtokyotyrant.so.2.3.0
+lib/libtokyotyrant.so.2.4.0
 lib/pkgconfig/tokyotyrant.pc
 man/man1/tcrmgr.1
 man/man1/tcrmttest.1
diff --git a/databases/tokyotyrant/distinfo b/databases/tokyotyrant/distinfo
index 49734c67e5a..613c25c93b4 100644
--- a/databases/tokyotyrant/distinfo
+++ b/databases/tokyotyrant/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2009/01/04 11:04:35 obache Exp $
+$NetBSD: distinfo,v 1.8 2009/02/03 13:57:56 obache Exp $
 
-SHA1 (tokyotyrant-1.1.11.tar.gz) = 1927ecc0e313e82815d216336052529cf40a4f9e
-RMD160 (tokyotyrant-1.1.11.tar.gz) = 165ad5df56812cdea9cf772ac2a7fc78512d9400
-Size (tokyotyrant-1.1.11.tar.gz) = 150615 bytes
-SHA1 (patch-aa) = 94d950d5ddee5520cc1637f7026270ce0b5e1af5
-SHA1 (patch-ab) = 78838c7880b618a9f4c8c3ae8f9fc774a4f54f3c
-SHA1 (patch-ac) = 0ff0811b359e8a2687ad962f85758b2b60b265b1
+SHA1 (tokyotyrant-1.1.12.tar.gz) = 8309184bae3439f86bd515f0e61c7ec00e211fb0
+RMD160 (tokyotyrant-1.1.12.tar.gz) = dfe9ed375725adf2e133cc2f3ff6b1cb442bc86d
+Size (tokyotyrant-1.1.12.tar.gz) = 156659 bytes
+SHA1 (patch-aa) = 3e6c0c507c8b224bc922ef8649076bfe6a9c677a
+SHA1 (patch-ab) = 1957e87484587425a59ecf18685eebad875f2915
+SHA1 (patch-ac) = d3e44e7cdc81682422b4d4fa25cef4effeaaf1cd
diff --git a/databases/tokyotyrant/patches/patch-aa b/databases/tokyotyrant/patches/patch-aa
index e98cbf55558..a41356265bb 100644
--- a/databases/tokyotyrant/patches/patch-aa
+++ b/databases/tokyotyrant/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/10/11 12:26:24 obache Exp $
+$NetBSD: patch-aa,v 1.2 2009/02/03 13:57:56 obache Exp $
+
+Honor CFLAGS and LDFLAGS passwed to configure script.
 
 --- Makefile.in.orig	2008-09-29 02:32:50.000000000 +0000
 +++ Makefile.in
diff --git a/databases/tokyotyrant/patches/patch-ab b/databases/tokyotyrant/patches/patch-ab
index b8286f18ba0..6c08e1f632f 100644
--- a/databases/tokyotyrant/patches/patch-ab
+++ b/databases/tokyotyrant/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2009/01/04 11:04:35 obache Exp $
+$NetBSD: patch-ab,v 1.4 2009/02/03 13:57:56 obache Exp $
+
+Avoid to break pkgsrc's tools.
 
 --- configure.orig	2008-12-27 09:46:51.000000000 +0000
 +++ configure
diff --git a/databases/tokyotyrant/patches/patch-ac b/databases/tokyotyrant/patches/patch-ac
index 39736e2a768..6a44c4dff9b 100644
--- a/databases/tokyotyrant/patches/patch-ac
+++ b/databases/tokyotyrant/patches/patch-ac
@@ -1,8 +1,9 @@
-$NetBSD: patch-ac,v 1.1 2008/12/18 12:02:34 obache Exp $
+$NetBSD: patch-ac,v 1.2 2009/02/03 13:57:56 obache Exp $
 
 Add NetBSD support.
+http://sourceforge.net/tracker/index.php?func=detail&aid=2447593&group_id=200242&atid=972717
 
---- myconf.h.orig	2008-12-07 02:38:46.000000000 +0000
+--- myconf.h.orig	2009-02-02 02:33:22.000000000 +0000
 +++ myconf.h
 @@ -91,7 +91,7 @@
  
@@ -13,8 +14,8 @@ Add NetBSD support.
  #error =======================================
  #error Your platform is not supported.  Sorry.
  #error =======================================
-@@ -209,7 +209,7 @@
- #include <tcbdb.h>
+@@ -211,7 +211,7 @@
+ #include <tctdb.h>
  #include <tcadb.h>
  
 -#if defined(_SYS_FREEBSD_) || defined(_SYS_MACOSX_)
@@ -22,3 +23,12 @@ Add NetBSD support.
  #define TTUSEKQUEUE    1
  #else
  #include <sys/epoll.h>
+@@ -227,7 +227,7 @@
+ 
+ #define sizeof(a)      ((int)sizeof(a))
+ 
+-#if defined(_SYS_FREEBSD_) || defined(_SYS_NETBSD_) || defined(_SYS_OPENBSD_)
++#if defined(_SYS_FREEBSD_)
+ #define nan(TC_a)      strtod("nan", NULL)
+ #endif
+