Update tokyotyrant to 1.1.16.

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

	* tcrdb.h: the macro "RDBITOPT" was added.

	* mycond.h, mycond.c, ttutil.c: Solaris portability was added thanks to tamtam.

	- Release: 1.1.16

6 files changed, 29 insertions, 29 deletions

diff --git a/databases/tokyotyrant/Makefile b/databases/tokyotyrant/Makefile
index 3ee4999c67e..a3f094c379f 100644
--- a/databases/tokyotyrant/Makefile
+++ b/databases/tokyotyrant/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2009/02/15 09:00:52 obache Exp $
+# $NetBSD: Makefile,v 1.13 2009/02/19 06:31:55 obache Exp $
 #
 
-DISTNAME=	tokyotyrant-1.1.15
+DISTNAME=	tokyotyrant-1.1.16
 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.4.6
+BUILDLINK_API_DEPENDS.tokyocabinet+=	tokyocabinet>=1.4.7
 .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 de2be42a1c0..ee2d0ec4666 100644
--- a/databases/tokyotyrant/PLIST
+++ b/databases/tokyotyrant/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/02/15 09:00:52 obache Exp $
+@comment $NetBSD: PLIST,v 1.12 2009/02/19 06:31:55 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.6.0
+lib/libtokyotyrant.so.2.7.0
 lib/pkgconfig/tokyotyrant.pc
 man/man1/tcrmgr.1
 man/man1/tcrmttest.1
diff --git a/databases/tokyotyrant/distinfo b/databases/tokyotyrant/distinfo
index 0923c8e38a4..6f8f34705cd 100644
--- a/databases/tokyotyrant/distinfo
+++ b/databases/tokyotyrant/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2009/02/15 09:00:52 obache Exp $
+$NetBSD: distinfo,v 1.11 2009/02/19 06:31:55 obache Exp $
 
-SHA1 (tokyotyrant-1.1.15.tar.gz) = f3ee3c2f9a9ca59cbc65b00a4c706ad18085a420
-RMD160 (tokyotyrant-1.1.15.tar.gz) = cb002151f2cfcbb4ca45f082bc7774cdf81b6db1
-Size (tokyotyrant-1.1.15.tar.gz) = 163635 bytes
-SHA1 (patch-aa) = 3e6c0c507c8b224bc922ef8649076bfe6a9c677a
-SHA1 (patch-ab) = 1957e87484587425a59ecf18685eebad875f2915
-SHA1 (patch-ac) = d3e44e7cdc81682422b4d4fa25cef4effeaaf1cd
+SHA1 (tokyotyrant-1.1.16.tar.gz) = f344576d62e190b2c33028d94c41139dd3844ec6
+RMD160 (tokyotyrant-1.1.16.tar.gz) = 1ec5015b5b4499bb3660807ca71862bca19779cc
+Size (tokyotyrant-1.1.16.tar.gz) = 164416 bytes
+SHA1 (patch-aa) = d1c6aa7e3197b33a1988320ca5ad865ae3fa23c4
+SHA1 (patch-ab) = 740213a95f7bdacced101b1a85f8f5d17188d11c
+SHA1 (patch-ac) = e83f1c1f8de4e371be4fa06d91242258f313bda4
diff --git a/databases/tokyotyrant/patches/patch-aa b/databases/tokyotyrant/patches/patch-aa
index a41356265bb..33a09b16153 100644
--- a/databases/tokyotyrant/patches/patch-aa
+++ b/databases/tokyotyrant/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2009/02/03 13:57:56 obache Exp $
+$NetBSD: patch-aa,v 1.3 2009/02/19 06:31:55 obache Exp $
 
 Honor CFLAGS and LDFLAGS passwed to configure script.
 
---- Makefile.in.orig	2008-09-29 02:32:50.000000000 +0000
+--- Makefile.in.orig	2009-02-16 08:35:25.000000000 +0000
 +++ Makefile.in
 @@ -54,8 +54,8 @@ CPPFLAGS = @MYCPPFLAGS@ \
    -D_TT_PREFIX="\"$(prefix)\"" -D_TT_INCLUDEDIR="\"$(INCLUDEDIR)\"" \
diff --git a/databases/tokyotyrant/patches/patch-ab b/databases/tokyotyrant/patches/patch-ab
index 6c08e1f632f..1e450cb054c 100644
--- a/databases/tokyotyrant/patches/patch-ab
+++ b/databases/tokyotyrant/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.4 2009/02/03 13:57:56 obache Exp $
+$NetBSD: patch-ab,v 1.5 2009/02/19 06:31:55 obache Exp $
 
 Avoid to break pkgsrc's tools.
 
---- configure.orig	2008-12-27 09:46:51.000000000 +0000
+--- configure.orig	2009-02-17 09:48:58.000000000 +0000
 +++ configure
-@@ -1745,13 +1745,9 @@ MYLDLIBPATHENV="LD_LIBRARY_PATH"
+@@ -1746,13 +1746,9 @@ MYLDLIBPATHENV="LD_LIBRARY_PATH"
  MYPOSTCMD="true"
  
  # Building paths
@@ -18,7 +18,7 @@ Avoid to break pkgsrc's tools.
  export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH
  if type pkg-config > /dev/null 2>&1
  then
-@@ -4427,7 +4423,7 @@ _ACEOF
+@@ -4428,7 +4424,7 @@ _ACEOF
  
  fi
  
@@ -27,7 +27,7 @@ Avoid to break pkgsrc's tools.
  then
  
  { echo "$as_me:$LINENO: checking for main in -llua" >&5
-@@ -5294,7 +5290,7 @@ echo "$as_me: error: tcutil.h is require
+@@ -5295,7 +5291,7 @@ echo "$as_me: error: tcutil.h is require
  fi
  
  
diff --git a/databases/tokyotyrant/patches/patch-ac b/databases/tokyotyrant/patches/patch-ac
index 6a44c4dff9b..4c3135d8779 100644
--- a/databases/tokyotyrant/patches/patch-ac
+++ b/databases/tokyotyrant/patches/patch-ac
@@ -1,29 +1,29 @@
-$NetBSD: patch-ac,v 1.2 2009/02/03 13:57:56 obache Exp $
+$NetBSD: patch-ac,v 1.3 2009/02/19 06:31:55 obache Exp $
 
 Add NetBSD support.
 http://sourceforge.net/tracker/index.php?func=detail&aid=2447593&group_id=200242&atid=972717
 
---- myconf.h.orig	2009-02-02 02:33:22.000000000 +0000
+--- myconf.h.orig	2009-02-18 02:46:09.000000000 +0000
 +++ myconf.h
-@@ -91,7 +91,7 @@
- 
+@@ -92,7 +92,7 @@
  #endif
  
--#if !defined(_SYS_LINUX_) && !defined(_SYS_FREEBSD_) && !defined(_SYS_MACOSX_)
-+#if !defined(_SYS_LINUX_) && !defined(_SYS_FREEBSD_) && !defined(_SYS_MACOSX_) && !defined(_SYS_NETBSD_)
+ #if !defined(_SYS_LINUX_) && !defined(_SYS_FREEBSD_) && !defined(_SYS_MACOSX_) && \
+-  !defined(_SYS_SUNOS_)
++  !defined(_SYS_SUNOS_) && !defined(_SYS_NETBSD_)
  #error =======================================
  #error Your platform is not supported.  Sorry.
  #error =======================================
-@@ -211,7 +211,7 @@
+@@ -212,7 +212,7 @@
  #include <tctdb.h>
  #include <tcadb.h>
  
 -#if defined(_SYS_FREEBSD_) || defined(_SYS_MACOSX_)
 +#if defined(_SYS_FREEBSD_) || defined(_SYS_MACOSX_) || defined(_SYS_NETBSD_)
  #define TTUSEKQUEUE    1
- #else
- #include <sys/epoll.h>
-@@ -227,7 +227,7 @@
+ #elif defined(_SYS_SUNOS_)
+ 
+@@ -241,7 +241,7 @@ typedef struct { int portev_object; } po
  
  #define sizeof(a)      ((int)sizeof(a))