Adapt to lua-5.1.1. Bump PKGREVISION.

5 files changed, 69 insertions, 3 deletions

diff --git a/www/elinks/Makefile b/www/elinks/Makefile
index 0878ed8f8b1..9f330c1c088 100644
--- a/www/elinks/Makefile
+++ b/www/elinks/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2006/04/10 16:35:29 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2006/08/14 22:38:23 wiz Exp $
 
 DISTNAME=		elinks-0.11.1
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		www
 MASTER_SITES=		http://elinks.or.cz/download/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/www/elinks/distinfo b/www/elinks/distinfo
index 6eb452ead3b..7b6b766d59f 100644
--- a/www/elinks/distinfo
+++ b/www/elinks/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.13 2006/02/04 00:40:38 wiz Exp $
+$NetBSD: distinfo,v 1.14 2006/08/14 22:38:23 wiz Exp $
 
 SHA1 (elinks-0.11.1.tar.bz2) = dfa18f2745976e34ce3ee27227ce9bce81495a77
 RMD160 (elinks-0.11.1.tar.bz2) = 2c5039a2e3d7ee3fc283d3041cac40f3c7853520
 Size (elinks-0.11.1.tar.bz2) = 2612791 bytes
+SHA1 (patch-aa) = 1912232785a6db8412362a512408c87a75a1ecce
+SHA1 (patch-ab) = 5371f16969050a82dd901ed4ae9000bb3fd15b54
+SHA1 (patch-ac) = f7dc18652782a5ad0768a5693a69bcadc6e5754d
diff --git a/www/elinks/patches/patch-aa b/www/elinks/patches/patch-aa
new file mode 100644
index 00000000000..9fa299d9681
--- /dev/null
+++ b/www/elinks/patches/patch-aa
@@ -0,0 +1,28 @@
+$NetBSD: patch-aa,v 1.4 2006/08/14 22:38:24 wiz Exp $
+
+--- configure.orig	2006-01-29 13:10:47.000000000 +0000
++++ configure
+@@ -17103,7 +17103,7 @@ if test -z "$disable_lua"; then
+ 	for luadir in "$withval" "" /usr /usr/local; do
+ 		for suffix in "" 50 51; do
+ 			if test "$cf_result" = no; then
+-				LUA_LIBS="-llua$suffix -llualib$suffix -lm"
++				LUA_LIBS="-llua$suffix -lm"
+ 
+ 				if test ! -z "$luadir"; then
+ 					LUA_LIBS="-L$luadir/lib $LUA_LIBS"
+@@ -17127,10 +17127,10 @@ int
+ main ()
+ {
+ 	lua_State *L = lua_open();
+-						lua_baselibopen(L);
+-						lua_mathlibopen(L);
+-						lua_strlibopen(L);
+-						lua_tablibopen(L);
++						luaopen_base(L);
++						luaopen_math(L);
++						luaopen_string(L);
++						luaopen_table(L);
+ 						lua_pushboolean(L, 1);
+ 						lua_close(L);
+   ;
diff --git a/www/elinks/patches/patch-ab b/www/elinks/patches/patch-ab
new file mode 100644
index 00000000000..274b36200fa
--- /dev/null
+++ b/www/elinks/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.3 2006/08/14 22:38:24 wiz Exp $
+
+--- src/scripting/lua/core.c.orig	2006-01-29 13:10:39.000000000 +0000
++++ src/scripting/lua/core.c
+@@ -633,7 +633,7 @@ do_hooks_file(LS, unsigned char *prefix,
+ 	if (file_can_read(file)) {
+ 		int oldtop = lua_gettop(S);
+ 
+-		if (lua_dofile(S, file) != 0)
++		if (luaL_dofile(S, file) != 0)
+ 			sleep(3); /* Let some time to see error messages. */
+ 		lua_settop(S, oldtop);
+ 	}
+@@ -755,7 +755,7 @@ handle_ret_eval(struct session *ses)
+ 		int oldtop = lua_gettop(L);
+ 
+ 		if (prepare_lua(ses) == 0) {
+-			lua_dostring(L, expr);
++			luaL_dostring(L, expr);
+ 			lua_settop(L, oldtop);
+ 			finish_lua();
+ 		}
diff --git a/www/elinks/patches/patch-ac b/www/elinks/patches/patch-ac
new file mode 100644
index 00000000000..b79bc89baae
--- /dev/null
+++ b/www/elinks/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.3 2006/08/14 22:38:24 wiz Exp $
+
+--- src/scripting/lua/hooks.c.orig	2006-01-29 13:10:39.000000000 +0000
++++ src/scripting/lua/hooks.c
+@@ -200,7 +200,7 @@ static enum evhook_status
+ script_hook_quit(va_list ap, void *data)
+ {
+ 	if (!prepare_lua(NULL)) {
+-		lua_dostring(lua_state, "if quit_hook then quit_hook() end");
++		luaL_dostring(lua_state, "if quit_hook then quit_hook() end");
+ 		finish_lua();
+ 	}
+