diff options
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/tokyotyrant/Makefile | 8 | ||||
| -rw-r--r-- | databases/tokyotyrant/PLIST | 8 | ||||
| -rw-r--r-- | databases/tokyotyrant/distinfo | 12 | ||||
| -rw-r--r-- | databases/tokyotyrant/patches/patch-ab | 24 | ||||
| -rw-r--r-- | databases/tokyotyrant/patches/patch-ac | 10 |
5 files changed, 25 insertions, 37 deletions
diff --git a/databases/tokyotyrant/Makefile b/databases/tokyotyrant/Makefile index 9994c16b3e8..2d8b7cda5ce 100644 --- a/databases/tokyotyrant/Makefile +++ b/databases/tokyotyrant/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2009/03/21 05:46:54 obache Exp $ +# $NetBSD: Makefile,v 1.16 2009/05/07 11:03:50 obache Exp $ # -DISTNAME= tokyotyrant-1.1.18 +DISTNAME= tokyotyrant-1.1.24 CATEGORIES= databases net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/} @@ -9,6 +9,8 @@ MAINTAINER= obache@NetBSD.org HOMEPAGE= http://tokyocabinet.sourceforge.net/ COMMENT= Network interface of Tokyo Cabinet +LICENSE= gnu-lgpl-v2.1 + PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= yes @@ -20,7 +22,7 @@ TEST_TARGET= check .include "options.mk" -BUILDLINK_API_DEPENDS.tokyocabinet+= tokyocabinet>=1.4.10 +BUILDLINK_API_DEPENDS.tokyocabinet+= tokyocabinet>=1.4.15 .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 6386ea4022a..d422df23d1a 100644 --- a/databases/tokyotyrant/PLIST +++ b/databases/tokyotyrant/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.14 2009/03/21 05:46:54 obache Exp $ +@comment $NetBSD: PLIST,v 1.15 2009/05/07 11:03:50 obache Exp $ bin/tcrmgr bin/tcrmttest bin/tcrtest @@ -11,7 +11,10 @@ include/ttutil.h lib/libtokyotyrant.a lib/libtokyotyrant.so lib/libtokyotyrant.so.3 -lib/libtokyotyrant.so.3.2.0 +lib/libtokyotyrant.so.3.7.0 +lib/ttskeldir.so +lib/ttskelmock.so +lib/ttskelproxy.so lib/pkgconfig/tokyotyrant.pc man/man1/tcrmgr.1 man/man1/tcrmttest.1 @@ -28,6 +31,7 @@ share/tokyotyrant/COPYING share/tokyotyrant/ChangeLog share/tokyotyrant/THANKS share/tokyotyrant/doc/index.html +share/tokyotyrant/ext/mapreduce.lua share/tokyotyrant/ext/senatus.lua share/tokyotyrant/ext/usherette.lua @dirrm share/tokyotyrant/ext diff --git a/databases/tokyotyrant/distinfo b/databases/tokyotyrant/distinfo index 4673f9dcfe2..f5d50f7514c 100644 --- a/databases/tokyotyrant/distinfo +++ b/databases/tokyotyrant/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.14 2009/04/07 19:18:05 hasso Exp $ +$NetBSD: distinfo,v 1.15 2009/05/07 11:03:50 obache Exp $ -SHA1 (tokyotyrant-1.1.18.tar.gz) = b39dda2f0250ea8274eda1b38f4aac205f35c0b0 -RMD160 (tokyotyrant-1.1.18.tar.gz) = e1b4bbcea994e9a6b359608de083b08de6ca5b53 -Size (tokyotyrant-1.1.18.tar.gz) = 165652 bytes +SHA1 (tokyotyrant-1.1.24.tar.gz) = 977b81c28f75a21affcf06b7b3115b3da44d092c +RMD160 (tokyotyrant-1.1.24.tar.gz) = 50431d25cbd4928f7261ee47567302fd7a4aee74 +Size (tokyotyrant-1.1.24.tar.gz) = 178416 bytes SHA1 (patch-aa) = d1c6aa7e3197b33a1988320ca5ad865ae3fa23c4 -SHA1 (patch-ab) = ccacfe7b3593ce4bfd995813189d1dd655a98095 -SHA1 (patch-ac) = 5c66a9730ee0c46368360a348f0ca2bf5851ef4d +SHA1 (patch-ab) = 2bdeeef0137556350c289378ba0aab04b4387f3e +SHA1 (patch-ac) = b9b7b2f523f38984b59a04030b7b1ba28a96916e diff --git a/databases/tokyotyrant/patches/patch-ab b/databases/tokyotyrant/patches/patch-ab index 10d098dc46b..779b07ec07c 100644 --- a/databases/tokyotyrant/patches/patch-ab +++ b/databases/tokyotyrant/patches/patch-ab @@ -1,10 +1,10 @@ -$NetBSD: patch-ab,v 1.6 2009/03/21 05:36:53 obache Exp $ +$NetBSD: patch-ab,v 1.7 2009/05/07 11:03:50 obache Exp $ Avoid to break pkgsrc's tools. ---- configure.orig 2009-03-10 02:09:03.000000000 +0000 +--- configure.orig 2009-05-05 07:54:12.000000000 +0000 +++ configure -@@ -1746,12 +1746,9 @@ MYLDLIBPATHENV="LD_LIBRARY_PATH" +@@ -1747,12 +1747,9 @@ MYLDLIBPATHENV="LD_LIBRARY_PATH" MYPOSTCMD="true" # Building paths @@ -17,21 +17,3 @@ 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 -@@ -4433,7 +4430,7 @@ _ACEOF - - fi - --if test "$enable_lua" == "yes" -+if test "$enable_lua" = "yes" - then - - { echo "$as_me:$LINENO: checking for main in -llua" >&5 -@@ -5300,7 +5297,7 @@ echo "$as_me: error: tcutil.h is require - fi - - --if test "$enable_lua" == "yes" -+if test "$enable_lua" = "yes" - then - if test "${ac_cv_header_lua_h+set}" = set; then - { echo "$as_me:$LINENO: checking for lua.h" >&5 diff --git a/databases/tokyotyrant/patches/patch-ac b/databases/tokyotyrant/patches/patch-ac index f6f67cac943..dc8a143b614 100644 --- a/databases/tokyotyrant/patches/patch-ac +++ b/databases/tokyotyrant/patches/patch-ac @@ -1,10 +1,10 @@ -$NetBSD: patch-ac,v 1.4 2009/04/07 19:18:05 hasso Exp $ +$NetBSD: patch-ac,v 1.5 2009/05/07 11:03:50 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-03-21 07:00:42 +0200 -+++ myconf.h 2009-04-06 13:39:51 +0300 +--- myconf.h.orig 2009-05-05 07:55:39.000000000 +0000 ++++ myconf.h @@ -44,6 +44,11 @@ #define _SYS_OPENBSD_ #define TTSYSNAME "OpenBSD" @@ -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 ======================================= -@@ -213,7 +218,7 @@ +@@ -214,7 +219,7 @@ #include <tctdb.h> #include <tcadb.h> @@ -35,7 +35,7 @@ http://sourceforge.net/tracker/index.php?func=detail&aid=2447593&group_id=200242 #define TTUSEKQUEUE 1 #elif defined(_SYS_SUNOS_) -@@ -242,7 +247,7 @@ typedef struct { int portev_object; } po +@@ -243,7 +248,7 @@ typedef struct { int portev_object; } po #define sizeof(a) ((int)sizeof(a)) |