[pkgsrc/trunk]: pkgsrc/devel/swig Fix for lua-5.2. Bump PKGREVISION.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d4c7fd53c0f5
branches:  trunk
changeset: 621270:d4c7fd53c0f5
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Jul 06 23:11:51 2013 +0000

description:
Fix for lua-5.2. Bump PKGREVISION.

diffstat:

 devel/swig/Makefile                             |   4 ++--
 devel/swig/distinfo                             |   8 +++++---
 devel/swig/patches/patch-Lib_lua_luaruntime.swg |  18 ++++++++++++++++++
 devel/swig/patches/patch-Source_Modules_lua.cxx |  15 +++++++++++++++
 devel/swig/patches/patch-aa                     |   4 ++--
 devel/swig/patches/patch-ab                     |   6 +++---
 6 files changed, 45 insertions(+), 10 deletions(-)

diffs (99 lines):

diff -r 4c83b7a2308b -r d4c7fd53c0f5 devel/swig/Makefile
--- a/devel/swig/Makefile       Sat Jul 06 22:33:11 2013 +0000
+++ b/devel/swig/Makefile       Sat Jul 06 23:11:51 2013 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2013/05/11 21:30:09 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2013/07/06 23:11:51 wiz Exp $
 
 DISTNAME=      swig-1.3.36
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=swig/}
 
diff -r 4c83b7a2308b -r d4c7fd53c0f5 devel/swig/distinfo
--- a/devel/swig/distinfo       Sat Jul 06 22:33:11 2013 +0000
+++ b/devel/swig/distinfo       Sat Jul 06 23:11:51 2013 +0000
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.12 2013/05/11 21:30:09 joerg Exp $
+$NetBSD: distinfo,v 1.13 2013/07/06 23:11:51 wiz Exp $
 
 SHA1 (swig-1.3.36.tar.gz) = eed715da3200f45cfe688a64ab6630eadf118ae4
 RMD160 (swig-1.3.36.tar.gz) = bd57f6837de1dc3aebefd9ad23a52235deefcd33
 Size (swig-1.3.36.tar.gz) = 4604982 bytes
+SHA1 (patch-Lib_lua_luaruntime.swg) = 0ba6aa9a053522bea896bf27dee7ffb55ed4a2be
 SHA1 (patch-Lib_std_std__container.i) = e4bb2b51b88651adfcec63318d8a228e7f3f8971
-SHA1 (patch-aa) = 66374c0708cfda23810bd5744e0c4bb0abc605f5
-SHA1 (patch-ab) = c690480ad10256c7198fc19699557e0b3f46b087
+SHA1 (patch-Source_Modules_lua.cxx) = 946c2475f3fefa2f15a629d965c620c5de8a2002
+SHA1 (patch-aa) = 23ab2782b586bc550e97eb0e599e182c58fc57f2
+SHA1 (patch-ab) = dce47bdffbd0d600aff8ca2486e4d9458c739549
 SHA1 (patch-ad) = f5787be95bb896cdba0f42587c4f586caed9b7a2
diff -r 4c83b7a2308b -r d4c7fd53c0f5 devel/swig/patches/patch-Lib_lua_luaruntime.swg
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/swig/patches/patch-Lib_lua_luaruntime.swg   Sat Jul 06 23:11:51 2013 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-Lib_lua_luaruntime.swg,v 1.1 2013/07/06 23:11:51 wiz Exp $
+
+Fix for lua-5.2.
+
+--- Lib/lua/luaruntime.swg.orig        2008-03-17 08:50:59.000000000 +0000
++++ Lib/lua/luaruntime.swg
+@@ -28,7 +28,11 @@ SWIGEXPORT int SWIG_init(lua_State* L)
+ {
+   int i;
+   /* start with global table */
++#ifdef LUA_RIDX_GLOBALS
++  lua_rawgeti(L, LUA_REGISTRYINDEX, LUA_RIDX_GLOBALS);
++#else
+   lua_pushvalue(L,LUA_GLOBALSINDEX);
++#endif
+   /* SWIG's internal initalisation */
+   SWIG_InitializeModule((void*)L);
+   SWIG_PropagateClientData();
diff -r 4c83b7a2308b -r d4c7fd53c0f5 devel/swig/patches/patch-Source_Modules_lua.cxx
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/swig/patches/patch-Source_Modules_lua.cxx   Sat Jul 06 23:11:51 2013 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-Source_Modules_lua.cxx,v 1.1 2013/07/06 23:11:51 wiz Exp $
+
+Fix for lua-5.2.
+
+--- Source/Modules/lua.cxx.orig        2008-06-21 15:23:02.000000000 +0000
++++ Source/Modules/lua.cxx
+@@ -264,7 +264,7 @@ public:
+     Printf(f_header, "#define SWIG_init_user luaopen_%s_user\n\n", module);
+     Printf(f_header, "#define SWIG_LUACODE   luaopen_%s_luacode\n\n", module);
+ 
+-    Printf(s_cmd_tab, "\nstatic const struct luaL_reg swig_commands[] = {\n");
++    Printf(s_cmd_tab, "\nstatic const struct luaL_Reg swig_commands[] = {\n");
+     Printf(s_var_tab, "\nstatic swig_lua_var_info swig_variables[] = {\n");
+     Printf(s_const_tab, "\nstatic swig_lua_const_info swig_constants[] = {\n");
+     Printf(f_wrappers, "#ifdef __cplusplus\nextern \"C\" {\n#endif\n");
diff -r 4c83b7a2308b -r d4c7fd53c0f5 devel/swig/patches/patch-aa
--- a/devel/swig/patches/patch-aa       Sat Jul 06 22:33:11 2013 +0000
+++ b/devel/swig/patches/patch-aa       Sat Jul 06 23:11:51 2013 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2010/02/04 15:39:39 taca Exp $
+$NetBSD: patch-aa,v 1.5 2013/07/06 23:11:51 wiz Exp $
 
---- Source/Makefile.in.orig    2008-06-25 08:26:52.000000000 +0900
+--- Source/Makefile.in.orig    2008-06-24 23:26:52.000000000 +0000
 +++ Source/Makefile.in
 @@ -437,47 +437,7 @@ all: $(BUILT_SOURCES)
  
diff -r 4c83b7a2308b -r d4c7fd53c0f5 devel/swig/patches/patch-ab
--- a/devel/swig/patches/patch-ab       Sat Jul 06 22:33:11 2013 +0000
+++ b/devel/swig/patches/patch-ab       Sat Jul 06 23:11:51 2013 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2006/12/03 23:55:14 obache Exp $
+$NetBSD: patch-ab,v 1.5 2013/07/06 23:11:51 wiz Exp $
 
---- configure.orig     2006-11-21 07:31:44.000000000 +0900
+--- configure.orig     2008-06-24 23:26:52.000000000 +0000
 +++ configure
-@@ -8010,19 +8010,19 @@ echo $ECHO_N "checking for Ocaml version
+@@ -8805,19 +8805,19 @@ echo $ECHO_N "checking for Ocaml version
        isolate_b_regex='\([0-9]\+\).*'
        for ver_part in $nodots_a ; do
                b_ver_part=`echo "$ver_b" | sed -e 's/'"$isolate_b_regex"'/\1/'`