Remove packages that were either BROKEN for more than a year or

BROKEN and explicitly scheduled to be removed after 2013Q4.

19 files changed, 1 insertions, 742 deletions

diff --git a/wm/Makefile b/wm/Makefile
index b1d5da16f5b..ca53f4f28b0 100644
--- a/wm/Makefile
+++ b/wm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.120 2013/12/08 08:00:26 obache Exp $
+# $NetBSD: Makefile,v 1.121 2013/12/31 17:08:08 wiz Exp $
 #
 
 COMMENT=	X11 window managers, configuration tools, and themes
@@ -46,7 +46,6 @@ SUBDIR+=	icecc
 SUBDIR+=	icewm
 SUBDIR+=	icewm-imlib
 SUBDIR+=	icewmconf
-SUBDIR+=	ion
 SUBDIR+=	jwm
 SUBDIR+=	larswm
 SUBDIR+=	libAppleWM
diff --git a/wm/ion/DESCR b/wm/ion/DESCR
deleted file mode 100644
index 0653e86618f..00000000000
--- a/wm/ion/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Ion is a window manager dividing the screen into frames rather than having
-overlapping windows, much like the windows in Emacs.  Navigation between
-clients can be done solely using the keyboard without need for a mouse.
diff --git a/wm/ion/Makefile b/wm/ion/Makefile
deleted file mode 100644
index 293f6a859af..00000000000
--- a/wm/ion/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# $NetBSD: Makefile,v 1.42 2013/10/30 06:49:55 dholland Exp $
-#
-
-DISTNAME=	ion-2-20040729
-PKGNAME=	${DISTNAME:S/-2-/-/}
-PKGREVISION=	10
-CATEGORIES=	wm x11
-MASTER_SITES=	http://iki.fi/tuomov/dl/archives/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://modeemi.fi/~tuomov/ion/
-COMMENT=	Keyboard friendly tiling window manager
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-BROKEN=		Doesn't work with libtool 2.x
-
-USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake
-GNU_CONFIGURE=		yes
-INSTALL_MAKE_FLAGS=	INST_ETCDIR=${EGDIR:Q}
-
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-
-PKG_SYSCONFSUBDIR=	ion
-EGDIR=			${PREFIX}/share/examples/ion
-EGFILES=		floatws.lua ion-bindings.lua ion-menus.lua	\
-			ion.lua ionws.lua kludges.lua			\
-			look-clean.lua look-cleanios.lua		\
-			look-cleanviolet.lua look-dusky.lua		\
-			look-greyviolet.lua look-ios.lua		\
-			look-simpleblue.lua look-wheat2.lua menu.lua	\
-			query.lua draw.lua pwm.lua pwm-bindings.lua	\
-			pwm-menus.lua dock.lua dock-draw.lua
-.for f in ${EGFILES}
-CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
-.endfor
-
-INSTALLATION_DIRS=	bin lib/ion libexec/ion ${PKGMANDIR}/man1
-INSTALLATION_DIRS+=	share/doc/ion share/examples/ion share/ion
-
-.include "../../devel/libltdl/buildlink3.mk"
-.include "../../lang/lua/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/wm/ion/PLIST b/wm/ion/PLIST
deleted file mode 100644
index 4d40eca78d5..00000000000
--- a/wm/ion/PLIST
+++ /dev/null
@@ -1,56 +0,0 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:18:59 joerg Exp $
-bin/ion
-bin/pwm2
-lib/ion/de.la
-lib/ion/dock.la
-lib/ion/floatws.la
-lib/ion/ionws.la
-lib/ion/lc/ioncore-efbb.lc
-lib/ion/lc/ioncorelib-mplexfns.lc
-lib/ion/lc/ioncorelib.lc
-lib/ion/lc/menulib.lc
-lib/ion/lc/querylib.lc
-lib/ion/menu.la
-lib/ion/query.la
-libexec/ion/ion-completefile
-man/man1/ion.1
-man/man1/pwm2.1
-share/doc/ion/ChangeLog
-share/doc/ion/LICENSE
-share/doc/ion/README
-share/examples/ion/dock.lua
-share/examples/ion/dock-draw.lua
-share/examples/ion/draw.lua
-share/examples/ion/floatws.lua
-share/examples/ion/ion-bindings.lua
-share/examples/ion/ion-menus.lua
-share/examples/ion/ion.lua
-share/examples/ion/ionws.lua
-share/examples/ion/kludges.lua
-share/examples/ion/look-brownsteel.lua
-share/examples/ion/look-clean.lua
-share/examples/ion/look-cleanios.lua
-share/examples/ion/look-cleanviolet.lua
-share/examples/ion/look-dusky.lua
-share/examples/ion/look-greyviolet.lua
-share/examples/ion/look-ios.lua
-share/examples/ion/look-simpleblue.lua
-share/examples/ion/look-wheat2.lua
-share/examples/ion/menu.lua
-share/examples/ion/pwm-bindings.lua
-share/examples/ion/pwm-menus.lua
-share/examples/ion/pwm.lua
-share/examples/ion/query.lua
-share/ion/delib.lc
-share/ion/delib.lua
-share/ion/ion-edit
-share/ion/ion-man
-share/ion/ion-runinxterm
-share/ion/ion-ssh
-share/ion/ion-view
-share/ion/ioncore-efbb.lua
-share/ion/ioncorelib-mplexfns.lua
-share/ion/ioncorelib.lua
-share/ion/menulib.lua
-share/ion/querylib.lua
-share/ion/welcome_message.txt
diff --git a/wm/ion/distinfo b/wm/ion/distinfo
deleted file mode 100644
index a1b33f946c9..00000000000
--- a/wm/ion/distinfo
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: distinfo,v 1.19 2008/02/27 22:31:52 jlam 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-aa) = c0d85dbd55aee975bfda331ed4d5fa0624c52018
-SHA1 (patch-ab) = 43eadf5e67f579bab2b60075099630cb69f44ef7
-SHA1 (patch-ac) = 7d8ce4c6a5e827a45d8f8c397d783eeda9fd69a1
-SHA1 (patch-ae) = 42fafe3bfac516930f6aaacc20b833dfe614abfb
-SHA1 (patch-af) = aa1871320528f4e3d51686b977e37022cd10c9e5
-SHA1 (patch-ag) = 9dfe4f3b703fc130d4a16a4141b8c815fab0564a
-SHA1 (patch-ah) = 67af22b330f0458848cd2bdf7333b3e642e56eed
-SHA1 (patch-aj) = 82cda84b64bb96487fdec303b012d62d70b1344a
-SHA1 (patch-ak) = f2a8f6cb99e69b539d5f1085c638e5ea20fac6e6
-SHA1 (patch-al) = 19941501d9a51b07e113ae46505800b290d4317b
-SHA1 (patch-am) = 2ada18354c7427fb9f9abbc537030fc7d3d1e2a8
-SHA1 (patch-an) = 21e1a01c1b50995b1e84d3de45931443923b9802
-SHA1 (patch-ao) = 5d86031369101887309d79641318cfdf8e0aa0a4
-SHA1 (patch-ap) = 84ec9a39e7f654986b2fb918607f79af03b6c9a9
diff --git a/wm/ion/patches/patch-aa b/wm/ion/patches/patch-aa
deleted file mode 100644
index dbee41503df..00000000000
--- a/wm/ion/patches/patch-aa
+++ /dev/null
@@ -1,161 +0,0 @@
-$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
deleted file mode 100644
index 24beb04e2c9..00000000000
--- a/wm/ion/patches/patch-ab
+++ /dev/null
@@ -1,41 +0,0 @@
-$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
deleted file mode 100644
index 6966ac34c9c..00000000000
--- a/wm/ion/patches/patch-ac
+++ /dev/null
@@ -1,23 +0,0 @@
-$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-ae b/wm/ion/patches/patch-ae
deleted file mode 100644
index 281810c1938..00000000000
--- a/wm/ion/patches/patch-ae
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2008/02/27 22:31:52 jlam Exp $
-
---- pwm/Makefile.orig	2004-07-28 23:10:32.000000000 -0400
-+++ pwm/Makefile
-@@ -21,23 +21,24 @@ LIBS += $(LTDL_LIBS)
- EXT_OBJS += ../ioncore/ioncore.a ../luaextl/luaextl.a
- EXT_OBJS += ../libtu/libtu.a
- 
--DEFINES += -DETCDIR=\"$(ETCDIR)\" -DSHAREDIR=\"$(SHAREDIR)\" \
--	   -DEXTRABINDIR=\"$(EXTRABINDIR)\" -DMODULEDIR=\"$(MODULEDIR)\" \
--	   -DLCDIR=\"$(LCDIR)\"
-+DEFINES += -DETCDIR=\"$(INST_ETCDIR)\" -DSHAREDIR=\"$(INST_SHAREDIR)\" \
-+	   -DEXTRABINDIR=\"$(INST_EXTRABINDIR)\" -DMODULEDIR=\"$(INST_MODULEDIR)\" \
-+	   -DLCDIR=\"$(INST_LCDIR)\"
- 
- ifndef PWM_ETCDIR
--PWM_ETCDIR = $(ETCDIR)
-+INST_PWM_ETCDIR = $(INST_ETCDIR)
-+PWM_ETCDIR = $(DESTDIR)$(INST_PWM_ETCDIR)
- else
--DEFINES += -DPWM_ETCDIR=\"$(PWM_ETCDIR)\"
-+DEFINES += -DPWM_ETCDIR=\"$(INST_PWM_ETCDIR)\"
- endif
- 
- CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE)
- 
- ifeq ($(PRELOAD_MODULES),1)
- LDFLAGS += $(foreach mod, $(PWM_MODULE_LIST), -dlpreopen ../$(mod)/$(mod).la)
--LINKOPTS = -R$(MODULEDIR)
-+LINKOPTS = -R$(INST_MODULEDIR)
- else
--LINKOPTS = -export-dynamic -R$(MODULEDIR)
-+LINKOPTS = -export-dynamic -R$(INST_MODULEDIR)
- endif
- 
- SOURCES = pwm.c
-@@ -55,8 +56,8 @@ pwm: $(OBJS) $(EXT_OBJS)
- 
- _install:
- 	$(INSTALLDIR) $(BINDIR)
--	$(INSTALL) -s -m $(BIN_MODE) pwm $(BINDIR)
--	# $(STRIP) $(BINDIR)/pwm
-+	$(INSTALL) -s -m $(BIN_MODE) pwm $(BINDIR)/pwm2
-+	# $(STRIP) $(BINDIR)/pwm2
- 	$(INSTALLDIR) $(PWM_ETCDIR)
- 	for i in $(ETC); do \
- 		$(INSTALL) -m $(DATA_MODE) $$i $(PWM_ETCDIR); \
diff --git a/wm/ion/patches/patch-af b/wm/ion/patches/patch-af
deleted file mode 100644
index 05f04780526..00000000000
--- a/wm/ion/patches/patch-af
+++ /dev/null
@@ -1,32 +0,0 @@
-$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
deleted file mode 100644
index e63ea6b797c..00000000000
--- a/wm/ion/patches/patch-ag
+++ /dev/null
@@ -1,105 +0,0 @@
-$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
deleted file mode 100644
index f203b4daa70..00000000000
--- a/wm/ion/patches/patch-ah
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-ah,v 1.5 2008/02/27 22:31:52 jlam Exp $
-
---- system-ac.mk.in.orig	2004-04-02 03:17:08.000000000 -0500
-+++ system-ac.mk.in
-@@ -14,25 +14,35 @@ exec_prefix=@exec_prefix@
- # probably do not want to modify the following directories:
- 
- # Main binaries
--BINDIR=@bindir@
-+INST_BINDIR=@bindir@
-+BINDIR=$(DESTDIR)$(INST_BINDIR)
- # Configuration .lua files
--ETCDIR=@sysconfdir@/@PACKAGE_TARNAME@
-+INST_ETCDIR=@sysconfdir@
-+ETCDIR=$(DESTDIR)$(INST_ETCDIR)
- # Some .lua files and ion-* shell scripts
--SHAREDIR=@datadir@/@PACKAGE_TARNAME@
-+INST_SHAREDIR=@datadir@/@PACKAGE_TARNAME@
-+SHAREDIR=$(DESTDIR)$(INST_SHAREDIR)
- # Manual pages
--MANDIR=@datadir@/man
-+INST_MANDIR=@mandir@
-+MANDIR=$(DESTDIR)$(INST_MANDIR)
- # Some documents
--DOCDIR=@datadir@/doc/@PACKAGE_TARNAME@
-+INST_DOCDIR=@datadir@/doc/@PACKAGE_TARNAME@
-+DOCDIR=$(DESTDIR)$(INST_DOCDIR)
- # Nothing at the moment
--INCDIR=@includedir@
-+INST_INCDIR=@includedir@
-+INCDIR=$(DESTDIR)$(INST_INCDIR)
- # Nothing at the moment
--LIBDIR=@libdir@
-+INST_LIBDIR=@libdir@
-+LIBDIR=$(DESTDIR)$(INST_LIBDIR)
- # Modules
--MODULEDIR=@libdir@/@PACKAGE_TARNAME@
-+INST_MODULEDIR=@libdir@/@PACKAGE_TARNAME@
-+MODULEDIR=$(DESTDIR)$(INST_MODULEDIR)
- # Compiled Lua source code
--LCDIR=@libdir@/@PACKAGE_TARNAME@/lc
-+INST_LCDIR=@libdir@/@PACKAGE_TARNAME@/lc
-+LCDIR=$(DESTDIR)$(INST_LCDIR)
- # ion-completefile (does not belong in SHAREDIR being a binary file)
--EXTRABINDIR=@libexecdir@/@PACKAGE_TARNAME@
-+INST_EXTRABINDIR=@libexecdir@/@PACKAGE_TARNAME@
-+EXTRABINDIR=$(DESTDIR)$(INST_EXTRABINDIR)
- 
- ##
- ## Modules
diff --git a/wm/ion/patches/patch-aj b/wm/ion/patches/patch-aj
deleted file mode 100644
index f2286c661ff..00000000000
--- a/wm/ion/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2008/02/27 22:31:52 jlam Exp $
-
---- man/Makefile.orig	2004-07-28 23:10:32.000000000 -0400
-+++ man/Makefile
-@@ -22,7 +22,7 @@ include $(TOPDIR)/rules.mk
- _install:
- 	$(INSTALLDIR) $(MANDIR)/man1
- 	$(INSTALL) -m $(DATA_MODE) ion.1 $(MANDIR)/man1
--	$(INSTALL) -m $(DATA_MODE) pwm.1 $(MANDIR)/man1
-+	$(INSTALL) -m $(DATA_MODE) pwm.1 $(MANDIR)/man1/pwm2.1
- 
- #
- # Awful hack that may not work on the user's system. This is rule is
diff --git a/wm/ion/patches/patch-ak b/wm/ion/patches/patch-ak
deleted file mode 100644
index 1202a023b01..00000000000
--- a/wm/ion/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2006/08/14 22:40:53 wiz Exp $
-
---- 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
-                                   local m=lookup_script("ion-man")
-                                   if m then
--                                      exec_in(scr, m.." pwm")
-+                                      exec_in(scr, m.." pwm2")
-                                   end
-                               end),
-     kpress("F2", make_exec_fn("xterm")),
diff --git a/wm/ion/patches/patch-al b/wm/ion/patches/patch-al
deleted file mode 100644
index 37c88e78d9f..00000000000
--- a/wm/ion/patches/patch-al
+++ /dev/null
@@ -1,23 +0,0 @@
-$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
deleted file mode 100644
index 28aa0a23d32..00000000000
--- a/wm/ion/patches/patch-am
+++ /dev/null
@@ -1,55 +0,0 @@
-$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
- 
diff --git a/wm/ion/patches/patch-an b/wm/ion/patches/patch-an
deleted file mode 100644
index 6a4a335341a..00000000000
--- a/wm/ion/patches/patch-an
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-an,v 1.1 2008/02/27 22:31:52 jlam Exp $
-
---- ion/Makefile.orig	2004-07-28 23:10:32.000000000 -0400
-+++ ion/Makefile
-@@ -21,17 +21,17 @@ LIBS += $(LTDL_LIBS)
- EXT_OBJS += ../ioncore/ioncore.a ../luaextl/luaextl.a
- EXT_OBJS += ../libtu/libtu.a
- 
--DEFINES += -DETCDIR=\"$(ETCDIR)\" -DSHAREDIR=\"$(SHAREDIR)\" \
--           -DEXTRABINDIR=\"$(EXTRABINDIR)\" -DMODULEDIR=\"$(MODULEDIR)\" \
--	   -DLCDIR=\"$(LCDIR)\"
-+DEFINES += -DETCDIR=\"$(INST_ETCDIR)\" -DSHAREDIR=\"$(INST_SHAREDIR)\" \
-+           -DEXTRABINDIR=\"$(INST_EXTRABINDIR)\" -DMODULEDIR=\"$(INST_MODULEDIR)\" \
-+	   -DLCDIR=\"$(INST_LCDIR)\"
- 
- CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE)
- 
- ifeq ($(PRELOAD_MODULES),1)
- LDFLAGS += $(foreach mod, $(MODULE_LIST), -dlpreopen ../$(mod)/$(mod).la)
--LINKOPTS = -R$(MODULEDIR)
-+LINKOPTS = -R$(INST_MODULEDIR)
- else
--LINKOPTS = -export-dynamic -R$(MODULEDIR)
-+LINKOPTS = -export-dynamic -R$(INST_MODULEDIR)
- endif
- 
- SOURCES=ion.c
diff --git a/wm/ion/patches/patch-ao b/wm/ion/patches/patch-ao
deleted file mode 100644
index 6f99aedf40d..00000000000
--- a/wm/ion/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2008/02/27 22:31:52 jlam Exp $
-
---- libtu/rules.mk.orig	2004-07-28 23:10:32.000000000 -0400
-+++ libtu/rules.mk
-@@ -86,7 +86,7 @@ endif
- 
- $(MODULE).la: $(OBJS) $(EXT_OBJS)
- 	$(LIBTOOL) --mode=link $(CC) $(LINKOPT) $(LDFLAGS) \
-- 	-rpath $(MODULEDIR) $(OBJS) $(EXT_OBJS) -o $@
-+ 	-rpath $(INST_MODULEDIR) $(OBJS) $(EXT_OBJS) -o $@
- 
- module_install:
- 	$(INSTALLDIR) $(MODULEDIR)
diff --git a/wm/ion/patches/patch-ap b/wm/ion/patches/patch-ap
deleted file mode 100644
index 6e19a66ead1..00000000000
--- a/wm/ion/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2008/02/27 22:31:52 jlam Exp $
-
---- rules.mk.orig	2004-07-28 23:10:32.000000000 -0400
-+++ rules.mk
-@@ -86,7 +86,7 @@ endif
- 
- $(MODULE).la: $(OBJS) $(EXT_OBJS)
- 	$(LIBTOOL) --mode=link $(CC) $(LINKOPT) $(LDFLAGS) \
-- 	-rpath $(MODULEDIR) $(OBJS) $(EXT_OBJS) -o $@
-+ 	-rpath $(INST_MODULEDIR) $(OBJS) $(EXT_OBJS) -o $@
- 
- module_install:
- 	$(INSTALLDIR) $(MODULEDIR)