4 files changed, 20 insertions, 19 deletions
diff --git a/databases/tokyotyrant/Makefile b/databases/tokyotyrant/Makefile
index f78dfcb5dc7..554ad6635c0 100644
--- a/databases/tokyotyrant/Makefile
+++ b/databases/tokyotyrant/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2009/12/19 12:56:45 obache Exp $
+# $NetBSD: Makefile,v 1.27 2010/01/17 02:49:05 obache Exp $
 #
 
-DISTNAME=	tokyotyrant-1.1.33
-PKGREVISION=	1
+DISTNAME=	tokyotyrant-1.1.39
 CATEGORIES=	databases net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
+MASTER_SITES=	${HOMEPAGE}
 
 MAINTAINER=	obache@NetBSD.org
 HOMEPAGE=	http://1978th.net/tokyotyrant/
diff --git a/databases/tokyotyrant/PLIST b/databases/tokyotyrant/PLIST
index d4f8aa5365c..b5837a3697f 100644
--- a/databases/tokyotyrant/PLIST
+++ b/databases/tokyotyrant/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2009/07/21 11:31:23 obache Exp $
+@comment $NetBSD: PLIST,v 1.24 2010/01/17 02:49:05 obache Exp $
 bin/tcrmgr
 bin/tcrmttest
 bin/tcrtest
@@ -11,12 +11,12 @@ include/ttutil.h
 lib/libtokyotyrant.a
 lib/libtokyotyrant.so
 lib/libtokyotyrant.so.3
-lib/libtokyotyrant.so.3.16.0
+lib/libtokyotyrant.so.3.22.0
+lib/pkgconfig/tokyotyrant.pc
 lib/ttskeldir.so
 lib/ttskelmock.so
 lib/ttskelnull.so
 lib/ttskelproxy.so
-lib/pkgconfig/tokyotyrant.pc
 man/man1/tcrmgr.1
 man/man1/tcrmttest.1
 man/man1/tcrtest.1
@@ -31,7 +31,9 @@ sbin/ttservctl
 share/tokyotyrant/COPYING
 share/tokyotyrant/ChangeLog
 share/tokyotyrant/THANKS
+share/tokyotyrant/doc/common.css
 share/tokyotyrant/doc/index.html
+share/tokyotyrant/doc/spex.html
 share/tokyotyrant/ext/mapreduce.lua
 share/tokyotyrant/ext/queue.lua
 share/tokyotyrant/ext/senatus.lua
diff --git a/databases/tokyotyrant/distinfo b/databases/tokyotyrant/distinfo
index 1a3d96e9bc2..08f29b4eb00 100644
--- a/databases/tokyotyrant/distinfo
+++ b/databases/tokyotyrant/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.22 2009/07/21 11:31:23 obache Exp $
+$NetBSD: distinfo,v 1.23 2010/01/17 02:49:05 obache Exp $
 
-SHA1 (tokyotyrant-1.1.33.tar.gz) = d0e7e15935e80baa19d1c74eccc7ac9f01ecee9a
-RMD160 (tokyotyrant-1.1.33.tar.gz) = b2f565e18c75c18475fd8547079677dc04eced66
-Size (tokyotyrant-1.1.33.tar.gz) = 185691 bytes
+SHA1 (tokyotyrant-1.1.39.tar.gz) = ddcde87d7f591e5930985ad0cce70fdd5bf8c17b
+RMD160 (tokyotyrant-1.1.39.tar.gz) = f62bce995767a27891dedabbc5dc0d9d91620167
+Size (tokyotyrant-1.1.39.tar.gz) = 203743 bytes
 SHA1 (patch-aa) = d1c6aa7e3197b33a1988320ca5ad865ae3fa23c4
 SHA1 (patch-ab) = c263651729d1b8ce4fccb877869cc577577b260e
-SHA1 (patch-ac) = b9b7b2f523f38984b59a04030b7b1ba28a96916e
+SHA1 (patch-ac) = fc87f88b82b8c49f340eb6707f4c2f8382eb2a7b
diff --git a/databases/tokyotyrant/patches/patch-ac b/databases/tokyotyrant/patches/patch-ac
index dc8a143b614..4558c33566e 100644
--- a/databases/tokyotyrant/patches/patch-ac
+++ b/databases/tokyotyrant/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.5 2009/05/07 11:03:50 obache Exp $
+$NetBSD: patch-ac,v 1.6 2010/01/17 02:49:05 obache Exp $
 
 Add NetBSD and DragonFly support.
 http://sourceforge.net/tracker/index.php?func=detail&aid=2447593&group_id=200242&atid=972717
 
---- myconf.h.orig	2009-05-05 07:55:39.000000000 +0000
+--- myconf.h.orig	2009-12-08 08:34:21.000000000 +0000
 +++ myconf.h
 @@ -44,6 +44,11 @@
  #define _SYS_OPENBSD_
@@ -14,7 +14,7 @@ http://sourceforge.net/tracker/index.php?func=detail&aid=2447593&group_id=200242
 +#define _SYS_DRAGONFLY_
 +#define TTSYSNAME   "DragonFly"
 +
- #elif defined(__sun__)
+ #elif defined(__sun__) || defined(__sun)
  
  #define _SYS_SUNOS_
 @@ -92,7 +97,7 @@
@@ -26,7 +26,7 @@ http://sourceforge.net/tracker/index.php?func=detail&aid=2447593&group_id=200242
  #error =======================================
  #error Your platform is not supported.  Sorry.
  #error =======================================
-@@ -214,7 +219,7 @@
+@@ -215,7 +220,7 @@
  #include <tctdb.h>
  #include <tcadb.h>
  
@@ -35,12 +35,12 @@ http://sourceforge.net/tracker/index.php?func=detail&aid=2447593&group_id=200242
  #define TTUSEKQUEUE    1
  #elif defined(_SYS_SUNOS_)
  
-@@ -243,7 +248,7 @@ typedef struct { int portev_object; } po
+@@ -242,7 +247,7 @@ typedef struct { int portev_object; } po
+  *************************************************************************************************/
  
- #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)
+ #define nanl(TC_a)     ((long double)strtod("nan", NULL))
  #endif
-