summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2006-08-14 22:37:57 +0000
committerwiz <wiz@pkgsrc.org>2006-08-14 22:37:57 +0000
commitcdada5ff7020f243005da59984771c771c86d277 (patch)
tree8be989f963ce7e45346e82ed5da1811e1fddfe8b /wm
parentd11c7101017135f26b845aa883267fbae0f40aa0 (diff)
downloadpkgsrc-cdada5ff7020f243005da59984771c771c86d277.tar.gz
Adapt to lua-5.1.1. Bump PKGREVISION.
Diffstat (limited to 'wm')
-rw-r--r--wm/ion/Makefile6
-rw-r--r--wm/ion/distinfo21
-rw-r--r--wm/ion/patches/patch-aa161
-rw-r--r--wm/ion/patches/patch-ab41
-rw-r--r--wm/ion/patches/patch-ac23
-rw-r--r--wm/ion/patches/patch-ad4
-rw-r--r--wm/ion/patches/patch-ae4
-rw-r--r--wm/ion/patches/patch-af32
-rw-r--r--wm/ion/patches/patch-ag105
-rw-r--r--wm/ion/patches/patch-ah4
-rw-r--r--wm/ion/patches/patch-ai4
-rw-r--r--wm/ion/patches/patch-aj4
-rw-r--r--wm/ion/patches/patch-ak4
-rw-r--r--wm/ion/patches/patch-al23
-rw-r--r--wm/ion/patches/patch-am55
15 files changed, 469 insertions, 22 deletions
diff --git a/wm/ion/Makefile b/wm/ion/Makefile
index 5cf8969025f..0fa30148590 100644
--- a/wm/ion/Makefile
+++ b/wm/ion/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2006/06/08 09:47:14 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2006/08/14 22:40:53 wiz Exp $
#
DISTNAME= ion-2-20040729
PKGNAME= ${DISTNAME:S/-2-/-/}
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= wm x11
MASTER_SITES= http://modeemi.cs.tut.fi/~tuomov/ion/dl/
@@ -33,7 +33,7 @@ EGFILES= floatws.lua ion-bindings.lua ion-menus.lua \
CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
.endfor
-INSTALLATION_DIRS= bin lib/ion libexec/ion man/man1
+INSTALLATION_DIRS= bin lib/ion libexec/ion ${PKGMANDIR}/man1
INSTALLATION_DIRS+= share/doc/ion share/examples/ion share/ion
.include "../../lang/lua/buildlink3.mk"
diff --git a/wm/ion/distinfo b/wm/ion/distinfo
index f2983ab15ed..40a9e337ee0 100644
--- a/wm/ion/distinfo
+++ b/wm/ion/distinfo
@@ -1,11 +1,18 @@
-$NetBSD: distinfo,v 1.16 2005/02/23 18:43:54 wiz Exp $
+$NetBSD: distinfo,v 1.17 2006/08/14 22:40:53 wiz Exp $
SHA1 (ion-2-20040729.tar.gz) = 92329a392de13dfb79ecd236eeb121a7045327e5
RMD160 (ion-2-20040729.tar.gz) = a32053c744cc130d9feb07f64bf3fef6cb4fa0c7
Size (ion-2-20040729.tar.gz) = 399367 bytes
-SHA1 (patch-ad) = 063d68427764a3cdde8ef52d798583d43a3f5dca
-SHA1 (patch-ae) = 69581555a9805360f6c15f338420a16912c2966f
-SHA1 (patch-ah) = 2e123cf133811518de31453a11ba2a1a47df440f
-SHA1 (patch-ai) = 05d9748fdbd04f5af3e89cafb69e1d060641af83
-SHA1 (patch-aj) = 8bd079ca571f058a5fb2c2112215d442d92f0e5f
-SHA1 (patch-ak) = a6236279a8ab91b9a9f0b24996825e590751f8a0
+SHA1 (patch-aa) = c0d85dbd55aee975bfda331ed4d5fa0624c52018
+SHA1 (patch-ab) = 43eadf5e67f579bab2b60075099630cb69f44ef7
+SHA1 (patch-ac) = 7d8ce4c6a5e827a45d8f8c397d783eeda9fd69a1
+SHA1 (patch-ad) = e5c10cf264e1b43144af7dec64c11c588e6384dc
+SHA1 (patch-ae) = 403325bab7298e88232872275287fbde102cd5a3
+SHA1 (patch-af) = aa1871320528f4e3d51686b977e37022cd10c9e5
+SHA1 (patch-ag) = 9dfe4f3b703fc130d4a16a4141b8c815fab0564a
+SHA1 (patch-ah) = 82e21bce3d4bc0456a9f194f9d7e6d09e1418014
+SHA1 (patch-ai) = 0bcc1fd90f3e68fe869458387ab91fdb70393748
+SHA1 (patch-aj) = a0a78f7e3f7e6109db80b6da81293a5abefb09c0
+SHA1 (patch-ak) = f2a8f6cb99e69b539d5f1085c638e5ea20fac6e6
+SHA1 (patch-al) = 19941501d9a51b07e113ae46505800b290d4317b
+SHA1 (patch-am) = 2ada18354c7427fb9f9abbc537030fc7d3d1e2a8
diff --git a/wm/ion/patches/patch-aa b/wm/ion/patches/patch-aa
new file mode 100644
index 00000000000..dbee41503df
--- /dev/null
+++ b/wm/ion/patches/patch-aa
@@ -0,0 +1,161 @@
+$NetBSD: patch-aa,v 1.3 2006/08/14 22:40:53 wiz Exp $
+
+--- configure.orig 2004-07-29 03:10:34.000000000 +0000
++++ configure
+@@ -5254,7 +5254,7 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+-char lua_open ();
++#include <lua.h>
+ int
+ main ()
+ {
+@@ -5437,147 +5437,6 @@ if test $ac_cv_lib_m_exp = yes; then
+ lua_extra_libs="$lua_extra_libs -lm"
+ fi
+
+-as_ac_Lib=`echo "ac_cv_lib_lualib$with_lua_suffix''_luaopen_loadlib" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for luaopen_loadlib in -llualib$with_lua_suffix" >&5
+-echo $ECHO_N "checking for luaopen_loadlib in -llualib$with_lua_suffix... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-llualib$with_lua_suffix $LUA_LIBS $lua_extra_libs $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char luaopen_loadlib ();
+-int
+-main ()
+-{
+-luaopen_loadlib ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- eval "$as_ac_Lib=yes"
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-eval "$as_ac_Lib=no"
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
+-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+- LUA_LIBS="$LUA_LIBS $lua_extra_libs -llualib$with_lua_suffix"
+-else
+- exit 1
+-fi
+-
+-
+-echo "$as_me:$LINENO: checking for liblua version >= 5.0" >&5
+-echo $ECHO_N "checking for liblua version >= 5.0... $ECHO_C" >&6
+-save_CFLAGS="$CFLAGS"
+-save_LIBS="$LIBS"
+-CFLAGS="$CFLAGS $LUA_INCLUDES"
+-LIBS="$LIBS $LUA_LIBS"
+-if test "$cross_compiling" = yes; then
+- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-
+-#include <lua.h>
+-#include <stdlib.h>
+-#include <string.h>
+-
+-int main()
+-{
+- if(strcmp(lua_version(), LUA_VERSION)!=0){
+- printf("Error: lua_version() does not match LUA_VERSION. ");
+- exit(EXIT_FAILURE);
+- }
+- printf("(found %s)... ", lua_version());
+- if(strcmp(lua_version(), "Lua 5.0")<0)
+- exit(EXIT_FAILURE);
+- exit(EXIT_SUCCESS);
+-}
+-
+-
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-else
+- echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+- exit 1
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-CFLAGS="$save_CFLAGS"
+-LIBS="$save_LIBS"
+-
+-
+-
+-
+
+ echo "$as_me:$LINENO: checking for asprintf" >&5
+ echo $ECHO_N "checking for asprintf... $ECHO_C" >&6
diff --git a/wm/ion/patches/patch-ab b/wm/ion/patches/patch-ab
new file mode 100644
index 00000000000..24beb04e2c9
--- /dev/null
+++ b/wm/ion/patches/patch-ab
@@ -0,0 +1,41 @@
+$NetBSD: patch-ab,v 1.7 2006/08/14 22:40:53 wiz Exp $
+
+--- de/delib.lua.orig 2004-01-03 00:27:28.000000000 +0000
++++ de/delib.lua
+@@ -10,10 +10,10 @@
+ -- (at your option) any later version.
+ --
+
+--- This is a slight abuse of the _LOADED variable perhaps, but library-like
++-- This is a slight abuse of the package.loaded variable perhaps, but library-like
+ -- packages should handle checking if they're loaded instead of confusing
+ -- the user with require/include differences.
+-if _LOADED["delib"] then return end
++if package.loaded["delib"] then return end
+
+
+ local stylecache={}
+@@ -35,7 +35,7 @@ local function base_on(name, list)
+ return false
+ end
+
+- for k, v in stylecache[list.based_on] do
++ for k, v in pairs(stylecache[list.based_on]) do
+ if type(k)=="number" then
+ if type(v)=="table" then
+ if v.substyle_pattern then
+@@ -82,7 +82,7 @@ function de_define_style(name, list)
+
+ stylecache[name]=list
+
+- for xscr, rootwin in root_windows() do
++ for xscr, rootwin in pairs(root_windows()) do
+ if not de_do_define_style(rootwin, name, list) then
+ break
+ end
+@@ -118,4 +118,4 @@ end
+
+
+ -- Mark ourselves loaded.
+-_LOADED["delib"]=true
++package.loaded["delib"]=true
diff --git a/wm/ion/patches/patch-ac b/wm/ion/patches/patch-ac
new file mode 100644
index 00000000000..6966ac34c9c
--- /dev/null
+++ b/wm/ion/patches/patch-ac
@@ -0,0 +1,23 @@
+$NetBSD: patch-ac,v 1.3 2006/08/14 22:40:53 wiz Exp $
+
+--- luaextl/luaextl.c.orig 2004-02-19 19:43:32.000000000 +0000
++++ luaextl/luaextl.c
+@@ -509,13 +509,17 @@ bool extl_init()
+ warn("Unable to initialize Lua.\n");
+ return FALSE;
+ }
++#if 0
+
+ luaopen_base(l_st);
+ luaopen_table(l_st);
+ luaopen_io(l_st);
+ luaopen_string(l_st);
+ luaopen_math(l_st);
+- luaopen_loadlib(l_st);
++ luaopen_package(l_st);
++#else
++ luaL_openlibs(l_st);
++#endif
+
+ if(!extl_init_obj_info(l_st)){
+ warn("Failed to initialize WObj metatable\n");
diff --git a/wm/ion/patches/patch-ad b/wm/ion/patches/patch-ad
index 50e68ffa732..f61a9cb8144 100644
--- a/wm/ion/patches/patch-ad
+++ b/wm/ion/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.3 2004/02/23 13:40:21 cube Exp $
+$NetBSD: patch-ad,v 1.4 2006/08/14 22:40:53 wiz Exp $
---- etc/Makefile.orig 2004-02-07 16:37:01.000000000 +0100
+--- etc/Makefile.orig 2004-07-29 03:10:32.000000000 +0000
+++ etc/Makefile
@@ -21,9 +21,9 @@ include $(TOPDIR)/rules.mk
######################################
diff --git a/wm/ion/patches/patch-ae b/wm/ion/patches/patch-ae
index fb0de6f2b16..48dd5cd9e67 100644
--- a/wm/ion/patches/patch-ae
+++ b/wm/ion/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.2 2005/02/05 00:00:11 cube Exp $
+$NetBSD: patch-ae,v 1.3 2006/08/14 22:40:53 wiz Exp $
---- pwm/Makefile.orig 2004-07-29 05:10:32.000000000 +0200
+--- pwm/Makefile.orig 2004-07-29 03:10:32.000000000 +0000
+++ pwm/Makefile
@@ -55,9 +55,9 @@ pwm: $(OBJS) $(EXT_OBJS)
diff --git a/wm/ion/patches/patch-af b/wm/ion/patches/patch-af
new file mode 100644
index 00000000000..05f04780526
--- /dev/null
+++ b/wm/ion/patches/patch-af
@@ -0,0 +1,32 @@
+$NetBSD: patch-af,v 1.3 2006/08/14 22:40:53 wiz Exp $
+
+--- menu/menulib.lua.orig 2004-01-14 22:43:49.000000000 +0000
++++ menu/menulib.lua
+@@ -9,10 +9,10 @@
+ -- (at your option) any later version.
+ --
+
+--- This is a slight abuse of the _LOADED variable perhaps, but library-like
++-- This is a slight abuse of the package.loaded variable perhaps, but library-like
+ -- packages should handle checking if they're loaded instead of confusing
+ -- the user with require/include differences.
+-if _LOADED["menulib"] then return end
++if package.loaded["menulib"] then return end
+
+
+ -- Table to hold defined menus.
+@@ -239,7 +239,7 @@ local function refresh_styles()
+ if table.getn(dirs)==0 then
+ return
+ end
+- for _, s in dirs do
++ for _, s in pairs(dirs) do
+ cmd=cmd.." "..string.shell_safe(s.."/look-")
+ end
+
+@@ -254,4 +254,4 @@ refresh_styles()
+
+
+ -- Mark ourselves loaded.
+-_LOADED["menulib"]=true
++package.loaded["menulib"]=true
diff --git a/wm/ion/patches/patch-ag b/wm/ion/patches/patch-ag
new file mode 100644
index 00000000000..e63ea6b797c
--- /dev/null
+++ b/wm/ion/patches/patch-ag
@@ -0,0 +1,105 @@
+$NetBSD: patch-ag,v 1.3 2006/08/14 22:40:53 wiz Exp $
+
+--- mkexports.lua.orig 2003-07-13 21:10:03.000000000 +0000
++++ mkexports.lua
+@@ -54,7 +54,7 @@ ct2desc={
+ ["uint"] = "i",
+ }
+
+-for d, t in desc2ct do
++for d, t in pairs(desc2ct) do
+ ct2desc[t]=d
+ end
+
+@@ -111,7 +111,7 @@ function sort_classes(cls)
+ end
+ end
+
+- for cls in classes do
++ for cls in pairs(classes) do
+ insert(cls)
+ end
+
+@@ -375,7 +375,7 @@ static bool %s(%s (*fn)(), ExtlL2Param *
+ -- end blockwrite
+
+ -- Generate type checking code
+- for k, t in info.itypes do
++ for k, t in pairs(info.itypes) do
+ if t~="" then
+ fprintf(h, " if(!chko(in, %d, &OBJDESCR(%s))) return FALSE;\n",
+ k-1, t)
+@@ -404,7 +404,7 @@ function write_class_fns(h, cls, data)
+ fprintf(h, "\n\nstatic ExtlExportedFnSpec %s_exports[] = {\n", cls)
+ end
+
+- for fn, info in data.fns do
++ for fn, info in pairs(data.fns) do
+ local ods, ids="NULL", "NULL"
+ if info.odesc~="v" then
+ ods='"' .. info.odesc .. '"'
+@@ -433,7 +433,7 @@ function write_exports(h)
+ -- end blockwrite
+
+ -- Write class infos
+- for c, data in classes do
++ for c, data in pairs(classes) do
+ -- WObj is defined in obj.h which we include.
+ if c~="" then
+ fprintf(h, "INTROBJ(%s);\n", c)
+@@ -460,16 +460,16 @@ static bool chko(ExtlL2Param *in, int nd
+ -- end blockwrite
+
+ -- Write L2 call handlers
+- for name, info in chnds do
++ for name, info in pairs(chnds) do
+ writechnd(h, name, info)
+ end
+
+ fprintf(h, "\n")
+
+- for cls, data in classes do
++ for cls, data in pairs(classes) do
+ if data.fns then
+ -- Write function declarations
+- for fn in data.fns do
++ for fn in pairs(data.fns) do
+ fprintf(h, "extern void %s();\n", fn)
+ end
+ -- Write function table
+@@ -481,7 +481,7 @@ static bool chko(ExtlL2Param *in, int nd
+
+ local sorted_classes=sort_classes()
+
+- for _, cls in sorted_classes do
++ for _, cls in pairs(sorted_classes) do
+ if cls=="" then
+ fprintf(h, " if(!extl_register_functions(exports)) return FALSE;\n");
+ elseif classes[cls].fns then
+@@ -496,7 +496,7 @@ static bool chko(ExtlL2Param *in, int nd
+ fprintf(h, " return TRUE;\n}\n\nvoid %s_unregister_exports()\n{\n",
+ module);
+
+- for _, cls in sorted_classes do
++ for _, cls in pairs(sorted_classes) do
+ if cls=="" then
+ fprintf(h, " extl_unregister_functions(exports);\n");
+ elseif classes[cls].fns then
+@@ -569,7 +569,7 @@ function write_fndoc(h, fn, info)
+ end
+ fprintf(h, "%s(", fn);
+ local comma=""
+- for i, varname in info.ivars do
++ for i, varname in pairs(info.ivars) do
+ fprintf(h, comma .. "%s", tohuman(string.sub(info.idesc, i, i),
+ info.itypes[i]))
+ if varname then
+@@ -676,7 +676,7 @@ if table.getn(inputs)==0 then
+ error("No inputs")
+ end
+
+-for _, ifnam in inputs do
++for _, ifnam in pairs(inputs) do
+ h, err=io.open(ifnam, "r")
+ if not h then
+ errorf("Could not open %s: %s", ifnam, err)
diff --git a/wm/ion/patches/patch-ah b/wm/ion/patches/patch-ah
index 67b1662c9c3..04e6398113e 100644
--- a/wm/ion/patches/patch-ah
+++ b/wm/ion/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.2 2004/05/06 04:38:45 cube Exp $
+$NetBSD: patch-ah,v 1.3 2006/08/14 22:40:53 wiz Exp $
---- system-ac.mk.in.orig 2004-04-02 03:17:08.000000000 -0500
+--- system-ac.mk.in.orig 2004-04-02 08:17:08.000000000 +0000
+++ system-ac.mk.in
@@ -16,11 +16,11 @@ exec_prefix=@exec_prefix@
# Main binaries
diff --git a/wm/ion/patches/patch-ai b/wm/ion/patches/patch-ai
index eb99709f826..fbf22c587dd 100644
--- a/wm/ion/patches/patch-ai
+++ b/wm/ion/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.1 2004/02/23 13:40:21 cube Exp $
+$NetBSD: patch-ai,v 1.2 2006/08/14 22:40:53 wiz Exp $
---- dock/Makefile.orig 2004-02-07 16:37:01.000000000 +0100
+--- dock/Makefile.orig 2004-07-29 03:10:32.000000000 +0000
+++ dock/Makefile
@@ -28,9 +28,9 @@ include $(TOPDIR)/rules.mk
######################################
diff --git a/wm/ion/patches/patch-aj b/wm/ion/patches/patch-aj
index 3f53fd191aa..a41c2900eb5 100644
--- a/wm/ion/patches/patch-aj
+++ b/wm/ion/patches/patch-aj
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.1 2005/02/05 00:00:11 cube Exp $
+$NetBSD: patch-aj,v 1.2 2006/08/14 22:40:53 wiz Exp $
---- man/Makefile.orig 2004-07-29 05:10:32.000000000 +0200
+--- man/Makefile.orig 2004-07-29 03:10:32.000000000 +0000
+++ man/Makefile
@@ -22,7 +22,7 @@ include $(TOPDIR)/rules.mk
_install:
diff --git a/wm/ion/patches/patch-ak b/wm/ion/patches/patch-ak
index c08ee786e00..1202a023b01 100644
--- a/wm/ion/patches/patch-ak
+++ b/wm/ion/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.1 2005/02/05 00:00:11 cube Exp $
+$NetBSD: patch-ak,v 1.2 2006/08/14 22:40:53 wiz Exp $
---- pwm/pwm-bindings.lua.orig 2003-12-29 21:26:52.000000000 +0100
+--- pwm/pwm-bindings.lua.orig 2003-12-29 20:26:52.000000000 +0000
+++ pwm/pwm-bindings.lua
@@ -48,7 +48,7 @@ global_bindings{
-- Display PWM manual page
diff --git a/wm/ion/patches/patch-al b/wm/ion/patches/patch-al
new file mode 100644
index 00000000000..37c88e78d9f
--- /dev/null
+++ b/wm/ion/patches/patch-al
@@ -0,0 +1,23 @@
+$NetBSD: patch-al,v 1.1 2006/08/14 22:40:53 wiz Exp $
+
+--- query/querylib.lua.orig 2004-02-16 17:58:47.000000000 +0000
++++ query/querylib.lua
+@@ -10,10 +10,10 @@
+ --
+
+
+--- This is a slight abuse of the _LOADED variable perhaps, but library-like
++-- This is a slight abuse of the package.loaded variable perhaps, but library-like
+ -- packages should handle checking if they're loaded instead of confusing
+ -- the user with require/include differences.
+-if _LOADED["querylib"] then return end
++if package.loaded["querylib"] then return end
+
+
+ querylib={}
+@@ -732,4 +732,4 @@ end
+
+
+ -- Mark ourselves loaded.
+-_LOADED["querylib"]=true
++package.loaded["querylib"]=true
diff --git a/wm/ion/patches/patch-am b/wm/ion/patches/patch-am
new file mode 100644
index 00000000000..28aa0a23d32
--- /dev/null
+++ b/wm/ion/patches/patch-am
@@ -0,0 +1,55 @@
+$NetBSD: patch-am,v 1.1 2006/08/14 22:40:53 wiz Exp $
+
+--- share/ioncorelib.lua.orig 2004-02-16 17:58:47.000000000 +0000
++++ share/ioncorelib.lua
+@@ -9,10 +9,10 @@
+ -- (at your option) any later version.
+ --
+
+--- This is a slight abuse of the _LOADED variable perhaps, but library-like
++-- This is a slight abuse of the package.loaded variable perhaps, but library-like
+ -- packages should handle checking if they're loaded instead of confusing
+ -- the user with require/include differences.
+-if _LOADED["ioncorelib"] then return end
++if package.loaded["ioncorelib"] then return end
+
+ -- Constants {{{
+
+@@ -162,9 +162,9 @@ local winprops={}
+
+ local function alternative_winprop_idents(id)
+ local function g()
+- for _, c in {id.class, "*"} do
+- for _, r in {id.role, "*"} do
+- for _, i in {id.instance, "*"} do
++ for _, c in pairs({id.class, "*"}) do
++ for _, r in pairs({id.role, "*"}) do
++ for _, i in pairs({id.instance, "*"}) do
+ coroutine.yield(c, r, i)
+ end
+ end
+@@ -183,7 +183,7 @@ function get_winprop(cwin)
+ names={}
+ pcall(function() names=winprops[c][r][i] or {} end)
+ local match, matchl=names[0], 0
+- for name, prop in names do
++ for name, prop in pairs(names) do
+ if type(name)=="string" then
+ local st, en=string.find(nm, name)
+ if st and en then
+@@ -223,7 +223,7 @@ end
+ function winprop(list)
+ local list2, class, role, instance, name = {}, "*", "*", "*", 0
+
+- for k, v in list do
++ for k, v in pairs(list) do
+ if k == "class" then
+ class = v
+ elseif k == "role" then
+@@ -328,5 +328,5 @@ end
+
+
+ -- Mark ourselves loaded.
+-_LOADED["ioncorelib"]=true
++package.loaded["ioncorelib"]=true
+