Update tokyotyant to 1.1.5.

Pkgsrc Changes:
 * Added lua option and enabled by default.

Changes:
2008-10-07  Mikio Hirabayashi

	* scrext.c (serv_codec, serv_hash, serv_sleep, serv_stat, serv_glob):
          new functions.

	- Release: 1.1.5

5 files changed, 36 insertions, 13 deletions

diff --git a/databases/tokyotyrant/Makefile b/databases/tokyotyrant/Makefile
index 63b51067832..63c7be328c8 100644
--- a/databases/tokyotyrant/Makefile
+++ b/databases/tokyotyrant/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/10/11 12:26:24 obache Exp $
+# $NetBSD: Makefile,v 1.2 2008/10/13 05:58:31 obache Exp $
 #
 
-DISTNAME=	tokyotyrant-1.1.4
+DISTNAME=	tokyotyrant-1.1.5
 CATEGORIES=	databases net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
 
@@ -18,7 +18,16 @@ PKGCONFIG_OVERRIDE+=	tokyotyrant.pc.in
 
 TEST_TARGET=	check
 
+.include "options.mk"
+
 .include "../../databases/tokyocabinet/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+PTHREAD_AUTO_VARS=	yes
 .include "../../mk/pthread.buildlink3.mk"
+.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "none"
+SUBST_CLASSES+=		pthread
+SUBST_STAGE.pthread=	pre-configure
+SUBST_FILES.pthread=	configure
+SUBST_SED.pthread=	-e 's|-lpthread|${PTHREAD_LIBS}|'
+.endif
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/tokyotyrant/PLIST b/databases/tokyotyrant/PLIST
index d882605bd5b..a488e491a72 100644
--- a/databases/tokyotyrant/PLIST
+++ b/databases/tokyotyrant/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/10/11 12:26:24 obache Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/10/13 05:58:31 obache Exp $
 bin/tcrmgr
 bin/tcrmttest
 bin/tcrtest
@@ -8,7 +8,7 @@ bin/ttultest
 include/tcrdb.h
 include/tculog.h
 include/ttutil.h
-lib/libtokyotyrant.1.22.0.so
+lib/libtokyotyrant.1.23.0.so
 lib/libtokyotyrant.1.so
 lib/libtokyotyrant.a
 lib/libtokyotyrant.so
diff --git a/databases/tokyotyrant/distinfo b/databases/tokyotyrant/distinfo
index 533797595a6..ebd318a1c29 100644
--- a/databases/tokyotyrant/distinfo
+++ b/databases/tokyotyrant/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/10/11 12:26:24 obache Exp $
+$NetBSD: distinfo,v 1.2 2008/10/13 05:58:31 obache Exp $
 
-SHA1 (tokyotyrant-1.1.4.tar.gz) = 99d70421fa02e47cb8564ca0d95acadf1cd6d766
-RMD160 (tokyotyrant-1.1.4.tar.gz) = 0089003241fb2621f6cf20ebd1cd07e4d4922d05
-Size (tokyotyrant-1.1.4.tar.gz) = 172812 bytes
+SHA1 (tokyotyrant-1.1.5.tar.gz) = 02f416f947b727fe43623d4ed5e8d2515b01f66d
+RMD160 (tokyotyrant-1.1.5.tar.gz) = 054a0d2875e1a20694944e05eb5f4a2c2d34116d
+Size (tokyotyrant-1.1.5.tar.gz) = 175626 bytes
 SHA1 (patch-aa) = 94d950d5ddee5520cc1637f7026270ce0b5e1af5
-SHA1 (patch-ab) = 9d717b7c31d80bf196ef1cbc6817d5bb4e061250
+SHA1 (patch-ab) = 0358a2b058eaac5a05e55de5ef352ecffa39014b
diff --git a/databases/tokyotyrant/options.mk b/databases/tokyotyrant/options.mk
new file mode 100644
index 00000000000..8bdbe480361
--- /dev/null
+++ b/databases/tokyotyrant/options.mk
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2008/10/13 05:58:31 obache Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.tokyotyrant
+PKG_SUPPORTED_OPTIONS=	lua
+PKG_SUGGESTED_OPTIONS=	lua
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mlua)
+CONFIGURE_ARGS+=	--enable-lua
+.include "../../lang/lua/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-lua
+.endif
diff --git a/databases/tokyotyrant/patches/patch-ab b/databases/tokyotyrant/patches/patch-ab
index 21d493b8acd..fbdb5557327 100644
--- a/databases/tokyotyrant/patches/patch-ab
+++ b/databases/tokyotyrant/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/10/11 12:26:24 obache Exp $
+$NetBSD: patch-ab,v 1.2 2008/10/13 05:58:31 obache Exp $
 
---- configure.orig	2008-09-29 02:49:28.000000000 +0000
+--- configure.orig	2008-10-09 09:24:27.000000000 +0000
 +++ configure
-@@ -4303,7 +4303,7 @@ _ACEOF
+@@ -4368,7 +4368,7 @@ _ACEOF
  
  fi
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/10/11 12:26:24 obache Exp $
  then
  
  { echo "$as_me:$LINENO: checking for main in -llua" >&5
-@@ -5110,7 +5110,7 @@ echo "$as_me: error: tcutil.h is require
+@@ -5235,7 +5235,7 @@ echo "$as_me: error: tcutil.h is require
  fi