Adapt to Lua multiversion support.

12 files changed, 206 insertions, 35 deletions

diff --git a/databases/lua-sqlite/Makefile b/databases/lua-sqlite/Makefile
index 5293006e074..5247ce01846 100644
--- a/databases/lua-sqlite/Makefile
+++ b/databases/lua-sqlite/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2013/11/26 07:19:30 dholland Exp $
+# $NetBSD: Makefile,v 1.18 2014/05/03 13:01:24 alnsn Exp $
 #
 
 DISTNAME=	lsqlite_src
 PKGNAME=	${LUA_PKGPREFIX}-sqlite-20030228
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	databases
 MASTER_SITES=	http://lua-users.org/files/wiki_insecure/binary_modules/luasqlite/
 EXTRACT_SUFX=	.zip
@@ -19,18 +19,20 @@ LIBS+=		-llua -lsqlite
 
 LUA_VERSIONS_INCOMPATIBLE=	52
 
-AUTO_MKDIRS=	yes
+AUTO_MKDIRS=		yes
+INSTALLATION_DIRS+=	${LUA_CDIR} ${LUA_DOCDIR} ${LUA_EXAMPLESDIR}
 
 do-build:
 	cd ${WRKSRC}; ${CC} -shared ${CFLAGS} ${LDFLAGS} lsqlite.c	\
 		-o libluasqlite.so ${LIBS}
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/libluasqlite.so ${DESTDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/libluasqlite.so \
+	    ${DESTDIR}${PREFIX}/${LUA_CDIR}
 	${INSTALL_DATA} ${WRKSRC}/readme.txt \
-		${DESTDIR}${PREFIX}/share/doc/lua-sqlite
+		${DESTDIR}${PREFIX}/${LUA_DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/test.lua \
-		${DESTDIR}${PREFIX}/share/examples/lua-sqlite
+		${DESTDIR}${PREFIX}/${LUA_EXAMPLESDIR}
 
 .include "../../databases/sqlite/buildlink3.mk"
 .include "../../lang/lua/module.mk"
diff --git a/databases/lua-sqlite/PLIST b/databases/lua-sqlite/PLIST
index 53351799904..a6b91799d01 100644
--- a/databases/lua-sqlite/PLIST
+++ b/databases/lua-sqlite/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2007/06/04 07:37:58 rillig Exp $
-lib/libluasqlite.so
-share/doc/lua-sqlite/readme.txt
-share/examples/lua-sqlite/test.lua
+@comment $NetBSD: PLIST,v 1.3 2014/05/03 13:01:24 alnsn Exp $
+${LUA_CDIR}/libluasqlite.so
+${LUA_DOCDIR}/readme.txt
+${LUA_EXAMPLESDIR}/test.lua
diff --git a/databases/lua-sqlite3/Makefile b/databases/lua-sqlite3/Makefile
index b26acb524c2..11aec9905db 100644
--- a/databases/lua-sqlite3/Makefile
+++ b/databases/lua-sqlite3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2014/04/09 07:27:04 obache Exp $
+# $NetBSD: Makefile,v 1.5 2014/05/03 13:01:24 alnsn Exp $
 
 DISTNAME=	lua-sqlite3-0.4.1
 PKGNAME=	${LUA_PKGPREFIX}-sqlite3-0.4.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	http://www.mroth.net/lua-sqlite3/
 EXTRACT_SUFX=	.tar.bz2
@@ -13,6 +13,16 @@ COMMENT=	SQLite3 binding for LUA
 LICENSE=	mit
 
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--libdir=${PREFIX}/${LUA_CDIR}
+CONFIGURE_ARGS+=	--with-lua=${LUA_INTERPRETER:Q}
+
+CFLAGS+=		-fPIC
+
+INSTALLATION_DIRS+= 	${LUA_LDIR} ${LUA_CDIR}
+
+post-install:
+	mv ${DESTDIR}${PREFIX}/${LUA_CDIR}/*.lua \
+	   ${DESTDIR}${PREFIX}/${LUA_LDIR}
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../lang/lua/module.mk"
diff --git a/databases/lua-sqlite3/PLIST b/databases/lua-sqlite3/PLIST
index b2d04e09e25..ab4f082b31f 100644
--- a/databases/lua-sqlite3/PLIST
+++ b/databases/lua-sqlite3/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2013/07/04 18:06:24 adam Exp $
-lib/lua/libluasqlite3-loader.lua
-lib/lua/libluasqlite3.so
-lib/lua/luasql-sqlite3.lua
-lib/lua/sqlite3.lua
+@comment $NetBSD: PLIST,v 1.2 2014/05/03 13:01:24 alnsn Exp $
+${LUA_CDIR}/libluasqlite3.so
+${LUA_LDIR}/libluasqlite3-loader.lua
+${LUA_LDIR}/luasql-sqlite3.lua
+${LUA_LDIR}/sqlite3.lua
diff --git a/databases/lua-sqlite3/distinfo b/databases/lua-sqlite3/distinfo
index 7a09b0c9ee8..6f7ee7b950f 100644
--- a/databases/lua-sqlite3/distinfo
+++ b/databases/lua-sqlite3/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.1 2013/07/04 18:06:24 adam Exp $
+$NetBSD: distinfo,v 1.2 2014/05/03 13:01:24 alnsn Exp $
 
 SHA1 (lua-sqlite3-0.4.1.tar.bz2) = cdc1043c1c5a0d5456e5b5e9bfb23ad64644fb99
 RMD160 (lua-sqlite3-0.4.1.tar.bz2) = ab502207f8cdaaf7749500b2f02cf7990da1f87c
 Size (lua-sqlite3-0.4.1.tar.bz2) = 54780 bytes
-SHA1 (patch-configure) = b0e6f7045da2be407b3babe8098aa4d2a87248d8
+SHA1 (patch-Makefile.in) = 6a1482242354c6b1b5c935695fd49154312a9a5d
+SHA1 (patch-configure) = a9950af9c314bf3bc2ab813d3cc7d8e6c410b4dd
+SHA1 (patch-libluasqlite3.c) = 7eccef9ebdbc9e33b6bb52ce0b214a19786aa230
diff --git a/databases/lua-sqlite3/patches/patch-Makefile.in b/databases/lua-sqlite3/patches/patch-Makefile.in
new file mode 100644
index 00000000000..f3cfafd7e53
--- /dev/null
+++ b/databases/lua-sqlite3/patches/patch-Makefile.in
@@ -0,0 +1,30 @@
+$NetBSD: patch-Makefile.in,v 1.1 2014/05/03 13:01:24 alnsn Exp $
+
+--- Makefile.in.orig	2006-05-11 11:07:19.000000000 +0000
++++ Makefile.in
+@@ -9,7 +9,7 @@ libdir			:= @libdir@
+ libexecdir		:= @libexecdir@
+ mandir			:= @mandir@
+ 
+-luadir			:= @libdir@/lua
++luadir			:= @libdir@
+ 
+ install			:= install
+ install-data		:= $(install) -p -m 644
+@@ -27,7 +27,6 @@ LIBS			:= @LIBS@
+ 
+ COMPILE			= $(CC) -c $(CFLAGS) -o $@ $<
+ LINK			= $(CC) $(LDFLAGS) -o $@ $+ $(LIBS)
+-LINKSHARED		= $(CC) -shared  $(LDFLAGS) -o $@ $+ $(LIBS)
+ 
+ DESTDIR			=
+ 
+@@ -127,7 +126,7 @@ libluasqlite3.o:	libluasqlite3.c
+ 			$(COMPILE)
+ 
+ libluasqlite3.so:	libluasqlite3.o
+-			$(LINKSHARED)
++			$(CC) -shared  $(LDFLAGS) libluasqlite3.o -o $@ $(LIBS)
+ 
+ libluasqlite3-loader.lua.install: libluasqlite3-loader.lua.in
+ 			m4 -DSHARED_LIB_PATH=$(luadir)				\
diff --git a/databases/lua-sqlite3/patches/patch-configure b/databases/lua-sqlite3/patches/patch-configure
index e4bbbb50907..01db515a726 100644
--- a/databases/lua-sqlite3/patches/patch-configure
+++ b/databases/lua-sqlite3/patches/patch-configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.1 2013/07/04 18:06:24 adam Exp $
+$NetBSD: patch-configure,v 1.2 2014/05/03 13:01:24 alnsn Exp $
 
 nm -D is not portable, but -llua is needed anyway.
 
---- configure.orig	2013-07-04 17:48:44.000000000 +0000
+--- configure.orig	2006-05-11 11:23:29.000000000 +0000
 +++ configure
 @@ -3513,7 +3513,6 @@ fi
  echo "$as_me:$LINENO: checking if we need -llua" >&5
diff --git a/databases/lua-sqlite3/patches/patch-libluasqlite3.c b/databases/lua-sqlite3/patches/patch-libluasqlite3.c
new file mode 100644
index 00000000000..0a18418fbd9
--- /dev/null
+++ b/databases/lua-sqlite3/patches/patch-libluasqlite3.c
@@ -0,0 +1,122 @@
+$NetBSD: patch-libluasqlite3.c,v 1.1 2014/05/03 13:01:24 alnsn Exp $
+
+--- libluasqlite3.c.orig	2006-05-11 11:06:16.000000000 +0000
++++ libluasqlite3.c
+@@ -302,10 +302,28 @@ static void report_error(lua_State * L, 
+ #define checkint(L, narg)	( (int)		checknumber((L), (narg)) )
+ #define checkdouble(L, narg)	( (double)	checknumber((L), (narg)) )
+ 
++#if LUA_VERSION_NUM >= 502 /* Lua 5.2 */
++#define stringlen(L, narg) lua_rawlen(L, narg)
++#else
++#define stringlen(L, narg) lua_strlen(L, narg)
++#endif
++
++/*
++ * Quote from http://www.lua.org/manual/5.2/manual.html#8.3:
++ * luaL_typerror was removed. Write your own version if you need it. 
++ */
++static int typerror(lua_State *L, int narg, const char *tname)
++{
++  const char *msg;
++
++  msg = lua_pushfstring(L, "%s expected, got %s", tname, luaL_typename(L, narg));
++  return luaL_argerror(L, narg, msg);
++}
++
+ static void * checkudata(lua_State * L, int narg)
+ {
+   if (!lua_isuserdata(L, narg))
+-    luaL_typerror(L, narg, "userdata");
++    typerror(L, narg, "userdata");
+   return lua_touserdata(L, narg);
+ }
+ 
+@@ -330,7 +348,7 @@ static int checknilornoneorfunc(lua_Stat
+     return 0;
+   if (lua_isfunction(L, narg))
+     return 1;
+-  luaL_typerror(L, narg, "nil, none or function");
++  typerror(L, narg, "nil, none or function");
+   return 0; /* never reached, make compiler happy... */
+ }
+ 
+@@ -348,14 +366,14 @@ FUNC( l_sqlite3_bind_null )
+ 
+ FUNC( l_sqlite3_bind_text )
+ {
+-  lua_pushnumber(L, sqlite3_bind_text(checkstmt_stmt(L, 1), checkint(L, 2), checkstr(L, 3), lua_strlen(L, 3), SQLITE_TRANSIENT) );
++  lua_pushnumber(L, sqlite3_bind_text(checkstmt_stmt(L, 1), checkint(L, 2), checkstr(L, 3), stringlen(L, 3), SQLITE_TRANSIENT) );
+   return 1;
+ }
+ 
+ 
+ FUNC( l_sqlite3_bind_blob )
+ {
+-  lua_pushnumber(L, sqlite3_bind_blob(checkstmt_stmt(L, 1), checkint(L, 2), checkstr(L, 3), lua_strlen(L, 3), SQLITE_TRANSIENT) );
++  lua_pushnumber(L, sqlite3_bind_blob(checkstmt_stmt(L, 1), checkint(L, 2), checkstr(L, 3), stringlen(L, 3), SQLITE_TRANSIENT) );
+   return 1;
+ }
+ 
+@@ -420,7 +438,7 @@ FUNC( l_sqlite3_bind )
+       break;
+     
+     case LUA_TSTRING:
+-      lua_pushnumber(L, sqlite3_bind_text(stmt, index, lua_tostring(L, 3), lua_strlen(L, 3), SQLITE_TRANSIENT) );
++      lua_pushnumber(L, sqlite3_bind_text(stmt, index, lua_tostring(L, 3), stringlen(L, 3), SQLITE_TRANSIENT) );
+       break;
+     
+     default:
+@@ -764,7 +782,7 @@ FUNC( l_sqlite3_prepare )
+   
+   DB * db			= checkdb(L, 1);
+   const char * sql		= checkstr(L, 2);
+-  int sql_size			= lua_strlen(L, 2);
++  int sql_size			= stringlen(L, 2);
+   const char * leftover		= 0;
+   sqlite3_stmt * sqlite3_stmt 	= 0;
+   int error, leftover_size;
+@@ -898,7 +916,7 @@ static void func_callback_wrapper(int wh
+   if (lua_pcall(L, values ? 3 : 1, 0, 0))
+   {
+     fprintf(stderr, "libluasqlite3: func_callback_wrapper: Warning: user function error: %s\n", lua_tostring(L, -1));
+-    sqlite3_result_error(ctx, lua_tostring(L, -1), lua_strlen(L, -1));
++    sqlite3_result_error(ctx, lua_tostring(L, -1), stringlen(L, -1));
+     lua_pop(L, 1);
+   }
+ }
+@@ -1077,7 +1095,7 @@ FUNC( l_sqlite3_result_null )
+ 
+ FUNC( l_sqlite3_result_error )
+ {
+-  sqlite3_result_error(checkcontext(L, 1), checkstr(L, 2), lua_strlen(L, 2));
++  sqlite3_result_error(checkcontext(L, 1), checkstr(L, 2), stringlen(L, 2));
+   return 0;
+ }
+ 
+@@ -1111,14 +1129,14 @@ FUNC( l_sqlite3_result_number )
+ 
+ FUNC( l_sqlite3_result_blob )
+ {
+-  sqlite3_result_blob(checkcontext(L, 1), checkstr(L, 2), lua_strlen(L, 2), SQLITE_TRANSIENT);
++  sqlite3_result_blob(checkcontext(L, 1), checkstr(L, 2), stringlen(L, 2), SQLITE_TRANSIENT);
+   return 0;
+ }
+ 
+ 
+ FUNC( l_sqlite3_result_text )
+ {
+-  sqlite3_result_text(checkcontext(L, 1), checkstr(L, 2), lua_strlen(L, 2), SQLITE_TRANSIENT);
++  sqlite3_result_text(checkcontext(L, 1), checkstr(L, 2), stringlen(L, 2), SQLITE_TRANSIENT);
+   return 0;
+ }
+ 
+@@ -1161,7 +1179,7 @@ FUNC( l_sqlite3_result )
+       break;
+     
+     case LUA_TSTRING:
+-      sqlite3_result_text(context, lua_tostring(L, 2), lua_strlen(L, 2), SQLITE_TRANSIENT);
++      sqlite3_result_text(context, lua_tostring(L, 2), stringlen(L, 2), SQLITE_TRANSIENT);
+       break;
+     
+     default:
diff --git a/databases/lua-tokyocabinet/Makefile b/databases/lua-tokyocabinet/Makefile
index c5c489f40c5..0044f192ed8 100644
--- a/databases/lua-tokyocabinet/Makefile
+++ b/databases/lua-tokyocabinet/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2013/10/30 13:27:22 obache Exp $
+# $NetBSD: Makefile,v 1.21 2014/05/03 13:01:24 alnsn Exp $
 #
 
 DISTNAME=	tokyocabinet-lua-1.10
 PKGNAME=	${LUA_PKGPREFIX}-${DISTNAME:S/-lua-/-/}
+PKGREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	${HOMEPAGE:S/luadoc/luapkg/}
 
@@ -20,7 +21,7 @@ TEST_ENV+=	LUA_CDIR=${WRKSRC}
 
 REPLACE_LUA=		*.lua
 
-INSTALLATION_DIRS+=	share/tokyocabinet/doc/lua
+INSTALLATION_DIRS+=	${LUA_DOCDIR} ${LUA_EXAMPLESDIR}
 
 MAKE_ENV+=	INCLUDEDIR=${BUILDLINK_PREFIX.tokyocabinet}/include
 
@@ -29,12 +30,15 @@ post-extract:
 
 post-install:
 	cd ${WRKSRC}/doc && pax -rwpe . \
-		${DESTDIR}${PREFIX}/share/tokyocabinet/doc/lua
+		${DESTDIR}${PREFIX}/${LUA_DOCDIR}
+	mv ${DESTDIR}${PREFIX}/bin/*.lua \
+		${DESTDIR}${PREFIX}/${LUA_EXAMPLESDIR}
 
 BUILDLINK_API_DEPENDS.tokyocabinet+=	tokyocabinet>=1.4.29
 .include "../../databases/tokyocabinet/buildlink3.mk"
 .include "../../lang/lua/application.mk"
 .include "../../lang/lua/module.mk"
+.include "../../lang/lua/tool.mk"
 PTHREAD_AUTO_VARS=	yes
 .include "../../mk/pthread.buildlink3.mk"
 .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "none"
diff --git a/databases/lua-tokyocabinet/PLIST b/databases/lua-tokyocabinet/PLIST
index 56032700a4e..dd5239dc8bb 100644
--- a/databases/lua-tokyocabinet/PLIST
+++ b/databases/lua-tokyocabinet/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:43:18 joerg Exp $
-bin/tcbtest.lua
-bin/tcftest.lua
-bin/tchtest.lua
-bin/tcutest.lua
+@comment $NetBSD: PLIST,v 1.3 2014/05/03 13:01:24 alnsn Exp $
+${LUA_EXAMPLESDIR}/tcbtest.lua
+${LUA_EXAMPLESDIR}/tcftest.lua
+${LUA_EXAMPLESDIR}/tchtest.lua
+${LUA_EXAMPLESDIR}/tcutest.lua
 ${LUA_CDIR}/tokyocabinet.so
-share/tokyocabinet/doc/lua/index.html
-share/tokyocabinet/doc/lua/luadoc.css
-share/tokyocabinet/doc/lua/modules/tokyocabinet.html
+${LUA_DOCDIR}/index.html
+${LUA_DOCDIR}/luadoc.css
+${LUA_DOCDIR}/modules/tokyocabinet.html
diff --git a/databases/tokyotyrant/Makefile b/databases/tokyotyrant/Makefile
index 0d357dcfb7b..0e456584968 100644
--- a/databases/tokyotyrant/Makefile
+++ b/databases/tokyotyrant/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2014/03/13 11:08:50 jperkin Exp $
+# $NetBSD: Makefile,v 1.34 2014/05/03 13:01:24 alnsn Exp $
 #
 
 DISTNAME=	tokyotyrant-1.1.41
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	databases net
 MASTER_SITES=	${HOMEPAGE}
 
diff --git a/databases/tokyotyrant/options.mk b/databases/tokyotyrant/options.mk
index 8bdbe480361..4841fa4697d 100644
--- a/databases/tokyotyrant/options.mk
+++ b/databases/tokyotyrant/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2008/10/13 05:58:31 obache Exp $
+# $NetBSD: options.mk,v 1.2 2014/05/03 13:01:24 alnsn Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.tokyotyrant
 PKG_SUPPORTED_OPTIONS=	lua
@@ -8,6 +8,7 @@ PKG_SUGGESTED_OPTIONS=	lua
 
 .if !empty(PKG_OPTIONS:Mlua)
 CONFIGURE_ARGS+=	--enable-lua
+.include "../../lang/lua/tool.mk"
 .include "../../lang/lua/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-lua