summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/tokyotyrant/Makefile7
-rw-r--r--databases/tokyotyrant/PLIST4
-rw-r--r--databases/tokyotyrant/distinfo10
-rw-r--r--databases/tokyotyrant/patches/patch-ab22
4 files changed, 28 insertions, 15 deletions
diff --git a/databases/tokyotyrant/Makefile b/databases/tokyotyrant/Makefile
index f7c954f55e0..3d6f2f07768 100644
--- a/databases/tokyotyrant/Makefile
+++ b/databases/tokyotyrant/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2008/12/15 11:18:41 obache Exp $
+# $NetBSD: Makefile,v 1.7 2009/01/04 11:04:35 obache Exp $
#
-DISTNAME= tokyotyrant-1.1.9
-PKGREVISION= 1
+DISTNAME= tokyotyrant-1.1.11
CATEGORIES= databases net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
@@ -21,7 +20,7 @@ TEST_TARGET= check
.include "options.mk"
-BUILDLINK_API_DEPENDS.tokyocabinet+= tokyocabinet>=1.3.23
+BUILDLINK_API_DEPENDS.tokyocabinet+= tokyocabinet>=1.3.27
.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 dde814a080d..e789b55a3a4 100644
--- a/databases/tokyotyrant/PLIST
+++ b/databases/tokyotyrant/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2008/12/07 11:34:53 obache Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/01/04 11:04:35 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.1.0
+lib/libtokyotyrant.so.2.3.0
lib/pkgconfig/tokyotyrant.pc
man/man1/tcrmgr.1
man/man1/tcrmttest.1
diff --git a/databases/tokyotyrant/distinfo b/databases/tokyotyrant/distinfo
index 0c3f9e21700..49734c67e5a 100644
--- a/databases/tokyotyrant/distinfo
+++ b/databases/tokyotyrant/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2008/12/18 12:02:34 obache Exp $
+$NetBSD: distinfo,v 1.7 2009/01/04 11:04:35 obache Exp $
-SHA1 (tokyotyrant-1.1.9.tar.gz) = a07fcec354f9be28fa3b60850667cc3778147325
-RMD160 (tokyotyrant-1.1.9.tar.gz) = 7b390727c6585ee128e3a858ac605a80b9f99a4f
-Size (tokyotyrant-1.1.9.tar.gz) = 144390 bytes
+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) = 0358a2b058eaac5a05e55de5ef352ecffa39014b
+SHA1 (patch-ab) = 78838c7880b618a9f4c8c3ae8f9fc774a4f54f3c
SHA1 (patch-ac) = 0ff0811b359e8a2687ad962f85758b2b60b265b1
diff --git a/databases/tokyotyrant/patches/patch-ab b/databases/tokyotyrant/patches/patch-ab
index fbdb5557327..b8286f18ba0 100644
--- a/databases/tokyotyrant/patches/patch-ab
+++ b/databases/tokyotyrant/patches/patch-ab
@@ -1,8 +1,22 @@
-$NetBSD: patch-ab,v 1.2 2008/10/13 05:58:31 obache Exp $
+$NetBSD: patch-ab,v 1.3 2009/01/04 11:04:35 obache Exp $
---- configure.orig 2008-10-09 09:24:27.000000000 +0000
+--- configure.orig 2008-12-27 09:46:51.000000000 +0000
+++ configure
-@@ -4368,7 +4368,7 @@ _ACEOF
+@@ -1745,13 +1745,9 @@ MYLDLIBPATHENV="LD_LIBRARY_PATH"
+ MYPOSTCMD="true"
+
+ # 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"
+ CPATH="$HOME/include:/usr/local/include:$CPATH"
+ LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
+ LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
+-PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
+ 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
fi
@@ -11,7 +25,7 @@ $NetBSD: patch-ab,v 1.2 2008/10/13 05:58:31 obache Exp $
then
{ echo "$as_me:$LINENO: checking for main in -llua" >&5
-@@ -5235,7 +5235,7 @@ echo "$as_me: error: tcutil.h is require
+@@ -5294,7 +5290,7 @@ echo "$as_me: error: tcutil.h is require
fi