Update elinks to 0.11.1nb5

Previous version committed incorrect patch

3 files changed, 35 insertions, 24 deletions

diff --git a/www/elinks/Makefile b/www/elinks/Makefile
index 26baf827198..373bea0266e 100644
--- a/www/elinks/Makefile
+++ b/www/elinks/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2006/09/04 20:23:30 abs Exp $
+# $NetBSD: Makefile,v 1.27 2006/09/06 15:14:34 abs Exp $
 
 DISTNAME=		elinks-0.11.1
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		www
 MASTER_SITES=		http://elinks.or.cz/download/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/www/elinks/distinfo b/www/elinks/distinfo
index 4498890ecbe..f7a70334937 100644
--- a/www/elinks/distinfo
+++ b/www/elinks/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.15 2006/09/04 20:23:30 abs Exp $
+$NetBSD: distinfo,v 1.16 2006/09/06 15:14:34 abs 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) = aa78236b743aad1bfe84516e4c3a0f4da796f77f
+SHA1 (patch-ab) = b08b2c8a9148e69ab18eb8577f95672cd707cdf3
 SHA1 (patch-ac) = f7dc18652782a5ad0768a5693a69bcadc6e5754d
diff --git a/www/elinks/patches/patch-ab b/www/elinks/patches/patch-ab
index 82913f784fe..3b8cd3cace4 100644
--- a/www/elinks/patches/patch-ab
+++ b/www/elinks/patches/patch-ab
@@ -1,20 +1,27 @@
-$NetBSD: patch-ab,v 1.4 2006/09/04 20:23:30 abs Exp $
+$NetBSD: patch-ab,v 1.5 2006/09/06 15:14:34 abs Exp $
 
---- src/scripting/lua/core.c.orig	2006-09-04 21:19:38.000000000 +0100
+--- src/scripting/lua/core.c.orig	2006-01-29 13:10:39.000000000 +0000
 +++ src/scripting/lua/core.c
-@@ -644,23 +644,24 @@ do_hooks_file(LS, unsigned char *prefix,
+@@ -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);
+ 	}
+@@ -644,13 +644,24 @@ do_hooks_file(LS, unsigned char *prefix,
  void
  init_lua(struct module *module)
  {
--        static const luaL_reg lualibs[] = {
--            { "base",       luaopen_base },
--            { "table",      luaopen_table },
--            { "io",         luaopen_io },
--            { "string",     luaopen_string },
--            { "math",       luaopen_math },
--            { NULL,         NULL }
--        };
--        const luaL_reg *lib;
+-	L = lua_open();
+-
+-	luaopen_base(L);
+-	luaopen_table(L);
+-	luaopen_io(L);
+-	luaopen_string(L);
+-	luaopen_math(L);
 +	static const luaL_Reg lualibs[] = {
 +		{"", luaopen_base},
 +		{LUA_TABLIBNAME, luaopen_table},
@@ -25,14 +32,9 @@ $NetBSD: patch-ab,v 1.4 2006/09/04 20:23:30 abs Exp $
 +		{NULL, NULL}
 +	};
 +	const luaL_Reg *lib = lualibs;
- 
- 	L = lua_open();
- 
--        for (lib = lualibs; lib->func != NULL; lib++) {
--                lib->func(l);           /* Open the library */
--                /* Flush stack to ignore any result from the library load */
--                lua_settop(l, 0);
--        }
++  
++  	L = lua_open();
++  
 +	for (; lib->func; lib++) {
 +		lua_pushcfunction(L, lib->func);
 +		lua_pushstring(L, lib->name);
@@ -41,3 +43,12 @@ $NetBSD: patch-ab,v 1.4 2006/09/04 20:23:30 abs Exp $
  
  	lua_register(L, LUA_ALERT, l_alert);
  	lua_register(L, "current_url", l_current_url);
+@@ -755,7 +766,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();
+ 		}