Update to 20060524:

2006-05-24 16:22 UTC  Tuomo Valkonen
  tagged ion-3ds-20060524

2006-05-20 09:10 UTC  Tuomo Valkonen
  * One more gsub update...

2006-05-19 16:34 UTC  Tuomo Valkonen
  * More Lua 5.1 stuff: use # instead of table.getn.

2006-05-23 06:12 UTC  Tuomo Valkonen
  * An assert had moved to the wrong place.

2006-05-19 06:48 UTC  Tuomo Valkonen
  * Few more backticks.

2006-05-19 07:12 UTC  René van Bevern
  * take ioncore_bindings.lua of ion3 to lua 5.1

2006-05-18 23:06 UTC  Tuomo Valkonen
  tagged ion-3ds-20060519

2006-05-18 23:05 UTC  Tuomo Valkonen
  * Added new release notes.

2006-05-18 23:05 UTC  Tuomo Valkonen
  * Updated README.autoconf.

2006-05-18 23:01 UTC  Tuomo Valkonen
  * Added a few more backticks to RELNOTES and README.

2006-05-19 02:19 UTC  Matthieu.Moy
  * Use -lm and -ldl in the test for -llua

2006-05-18 13:21 UTC  Tuomo Valkonen
  * Markdownized README as well.

2006-05-18 13:04 UTC  Tuomo Valkonen
  * Small changes in RELNOTES for markdown processing for web.

2006-05-17 15:26 UTC  Tuomo Valkonen
  * Updated TODO.riot.

2006-05-17 16:51 UTC  Matthieu.Moy
  * bugfix in lua 5.1 + other usefull checks
  The test for the liblua version was completely buggy. Sorry.

  Tests added for other headers:
  X11/SM/SMlib.h, X11/Xresource.h and libintl.h
  (with error messages pointing to the name of Debian packages)

  Test for xmessage (with a warning only, since ion can probably still
  work without xmessage)



2006-05-17 13:39 UTC  Matthieu.Moy
  * Update configure.ac for lua 5.1

2006-05-16 18:39 UTC  Sergej Pupykin
  * sigusr2

  Allows to create lua hook for SIGUSR2.
  Can be usefull (for example) for status line changing from media player...

  Usage example:
   ioncore.get_hook("ioncore_sigusr2_hook"):add(
       function(reg)
           mod_statusbar.inform("status_name", "SIGUSR2 catched")
           mod_statusbar.update()
       end
   )

2006-05-16 17:32 UTC  Tuomo Valkonen
  * README etc. updates.

2006-05-16 17:24 UTC  Tuomo Valkonen
  * Fixed string.gsub issues with Lua 5.1.

  Lua 5.0:
  "... If the value returned by this function is a string, then it is
  used as the replacement string; otherwise, the replacement string is the
  empty string."

  Lua 5.1:
  "If the value returned by the table query or by the function call is a string
  or a number, then it is used as the replacement string; otherwise, if it is
  false or nil, then there is no replacement (that is, the original match is
  kept in the string)."


2006-05-16 16:20 UTC  Tuomo Valkonen
  * Few more missing table-iteration changes.

2006-03-24 00:19 UTC  Etan Reisner
  * lua5.1 incompatible changes
  The _LOADED variable became package.loaded.
  The contents of lualib were merged into lua itself, so remove -llualib from the build line.
  Debian now uses pkg-config for the lua stuff not lua-config.

2006-03-24 00:09 UTC  Etan Reisner
  * lua5.1 backwards compatible changes
  Whether intentional or not lua 5.1 no longer allows
  tab={}
  for k,v in tab do
      ...
  end
  and requires
  for k,v in pairs(tab) do
      ...
  end
  instead.

2006-05-06 21:18 UTC  Tuomo Valkonen
  * Do not spew out stack traces all the time when warn() is called.

2006-04-26 17:49 UTC  Tuomo Valkonen
  * framed_transients is on by default now.

2006-04-26 17:45 UTC  Tuomo Valkonen
  * Added WFrame.toplevel and WMPlex.toplevel binding maps.
  - These are not used by frames for transients.
  - Changed the default bindings accordingly.

2006-04-22 16:08 UTC  Tuomo Valkonen
  * Added toggle for showing tab numbers.
  - WFrame:set_numbers with the usual 'set'/'unset'/'toggle' parametrisation.

2006-04-20 19:19 UTC  Tuomo Valkonen
  * Removed obsolete references to -i18n flag.

2006-04-13 22:05 UTC  Tuomo Valkonen
  * The frame_add_last option had been broken.
  - Since switching to use of placeholders for initial management
    setup, the flag was no longer checked.

2006-04-02 19:36 UTC  Tuomo Valkonen
  * Added stuff for accessing regions with activity/urgency bit set.

2006-04-02 19:33 UTC  Tuomo Valkonen
  * Extended Mod1+K K binding.
  - Go to first region demanding attention or previously active region:
    "ioncore.activity_goto() or ioncore.goto_previous()".

2006-04-01 14:38 UTC  Tuomo Valkonen
  * Separated and cleaned up some stacking code from mod_floatws.

2006-03-31 18:14 UTC  Tuomo Valkonen
  * Changes in default_ws_type lookup.

2006-03-28 20:18 UTC  Tuomo Valkonen
  * Use SIZEPOLICY_FULL_BOUNDS for client windows in mplexes.
  - Needed to communicate available area for transients.

2006-03-26 09:37 UTC  Tuomo Valkonen
  tagged ion-3ds-20060326

2006-03-23 16:15 UTC  Tuomo Valkonen
  * Included a TODO list.

  The TODO.riot file has been created with the riot outliner available from
  <http://iki.fi/tuomov/riot/>. The file is, however, just an mbox file, so
  you can read it with your favourite threading mail user agent. For example:
  mutt -f TODO.riot

2006-03-20 23:08 UTC  Tuomo Valkonen
  * Enforce win_gravity=NorthWestGravity for client windows.
  - Fixes issues with OO.org's transients in framed mode.

2006-03-18 22:19 UTC  Tuomo Valkonen
  * Changes in default appmenu.
  - Removed firefox (won't promote gtk shit).
  - Added opera, konqueror, dillo, w3m, links, rxvt.

2006-03-18 12:58 UTC  Tuomo Valkonen
  * Ah, -Wl,-whole-archive is a better hack.

2006-03-18 12:48 UTC  Tuomo Valkonen
  * Link PWM also with the -u ptrlist_iter gcc lameness hack.

2006-03-17 20:49 UTC  Tuomo Valkonen
  * Some more winprop/sizepolicy changes.

2006-03-17 19:42 UTC  Tuomo Valkonen
  tagged ion-3ds-20060317

2006-03-17 10:22 UTC  Tuomo Valkonen
  * Oops. Previous change incomplete.

2006-03-17 10:07 UTC  Tuomo Valkonen
  * default_ws_type is no longer set by config files and could confuse things. Fixed.

2006-03-15 23:00 UTC  Tuomo Valkonen
  * Changes in look file fonts.
  - Refer directly to -*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-* as
    the 'fixed' alias has problems with encodings.

2006-03-15 18:59 UTC  Tuomo Valkonen
  * Timer signal object passing to Lua side was broken.
  (Weak typing...)

2006-03-15 18:23 UTC  Tuomo Valkonen
  * Changes in the set of configuration files.
  - cfg_ion.lua now simply load cfg_ioncore.lua and cfg_modules.lua
    with the default set of modules, and includes some of the most
    commonly changed options commented-out. This deprecates cfg_user.lua
  - cfg_menus.lua and cfg_bindings.lua are now cfg_ioncore.lua. This
    better matches how things for different modules are in their own
    files.

2006-03-12 12:29 UTC  Tuomo Valkonen
  * Embedded dock initilisation code had been broken. Fixed.

2006-03-11 09:05 UTC  Tuomo Valkonen
  * Oops. The stretch size policy used wrong variables.

2006-03-11 08:58 UTC  Tuomo Valkonen
  * Different query-menus use different history context.

2006-03-08 20:03 UTC  Tuomo Valkonen
  * Oops. The new client window code used wrong "llist" iterator.
  This could cause segfaults.

2006-03-08 19:46 UTC  Tuomo Valkonen
  * Oops. Closing a transient had started warping to remaining transient(s).

2006-03-07 10:32 UTC  Tuomo Valkonen
  * Fixed binding lookup code to be able to deal with zero keycodes.
  - This may happen if X keycode to keysym mapping is changed
    while Ion is running.

2006-03-06 23:20 UTC  Tuomo Valkonen
  * Oops. If there were winprops set, SIZEPOLICY_DEFAULT was used for transients.

2006-03-05 13:44 UTC  Tuomo Valkonen
  tagged ion-3ds-20060305

2006-03-05 13:42 UTC  Tuomo Valkonen
  * 'ru' was missing from list of translations in po/Makefile.

2006-03-05 13:39 UTC  Tuomo Valkonen
  * frame_rqgeom_clientwin passes rqflags as-is.

2006-03-05 13:30 UTC  Tuomo Valkonen
  * SIZE_POLICY_FREE_GLUE is now properly used for transients.

2006-03-05 13:28 UTC  Tuomo Valkonen
  * Added -u ptrlist_iter linking hack to gcc/ld.
  - Otherwise ptrlist.o from libtu won't get linked as it will no longer
    used by the main binary, and thus the modules won't have access to it.

2006-03-05 10:59 UTC  Tuomo Valkonen
  * Improved free_glue and stretch size policies.

2006-03-02 18:49 UTC  Tuomo Valkonen
  * Added SIZEPOLICY_FREE_GLUE and other size policy code changes.
  (TODO: client windows need to store state for this for transients.)

2006-02-26 16:25 UTC  Tuomo Valkonen
  * Client windows use the same (mplex) size policies for transients now.

2006-02-26 00:17 UTC  Tuomo Valkonen
  * Oops. MPlex attach code changes had broken mgd. region ordering on load.

2006-02-25 17:31 UTC  Tuomo Valkonen
  * Added some size policies with gravity.

2006-02-24 19:23 UTC  Tuomo Valkonen
  * Separated mplex size policy in new file, and independent of mplex.

2006-02-22 13:34 UTC  Tuomo Valkonen
  * Append '/' to submenu entries in query_menu.

2006-02-19 16:37 UTC  Tuomo Valkonen
  * Some mplex attach code cleanup.

2006-02-19 16:07 UTC  Tuomo Valkonen
  * Reduced usage of REGION_FIT_BOUNDS a little.

2006-02-19 00:41 UTC  Tuomo Valkonen
  * Updated dock to reflect previous mplex size policy changes.

2006-02-18 20:39 UTC  Tuomo Valkonen
  * Removed the WScratchpad class.
  - Scratchpads are now simply normal WFrames with MPLEX_SIZEPOLICY_FREE.

2006-02-18 20:31 UTC  Tuomo Valkonen
  * Added WMPlex managed region size policy support.

2006-02-18 18:53 UTC  Tuomo Valkonen
  * Fixed "./" being included in completed file name in query_exec.
  - Also brought mod_query.popen_completions documentation up-to-date.

2006-02-15 07:29 UTC  Tuomo Valkonen
  * Fixed load_hint.
  - Stupid unsafe dynamically-typed languages...

2006-02-12 16:03 UTC  Tuomo Valkonen
  * Let's call it statusbar_ instead of status_ after all...

2006-02-12 15:59 UTC  Tuomo Valkonen
  * Oops. Should check for sb meter value being null when shortening it.

2006-02-12 15:30 UTC  Tuomo Valkonen
  * mod_statusbar tries to load scripts before falling back to statusd.
  - If status_foobar(.lua|.lc) is found on the search path, -m foobar
    is not passed to ion-statusd.

2006-02-12 15:19 UTC  Tuomo Valkonen
  * Added region_activity_hook.
  - Called when the activity flag of a region is changed with the
    region as parameter.

2006-02-12 15:07 UTC  Tuomo Valkonen
  * Framed transients' size requests get handled now.

2006-02-11 15:35 UTC  dev at triphoenix.de
  * completefile-groupexec

  Although ion-completefile does check if any matching executable is
  world-executable or user-executable, it doesn't check for
  group-executable. This is problematic for example on systems, where
  games are installed with r-xr-x--- and root:games (which seems to be a
  common method). This introduces a check for the group id, basically it
  gets all groups for the current user and checks if any of them is
  applicable. This is only done when the user and world checks already
  have failed and the group-executable bit is set.


2006-02-08 07:42 UTC  Tuomo Valkonen
  * ion-statusd catches SIGCHLD.

2006-02-07 21:37 UTC  Tuomo Valkonen
  * Improved comments in cfg_statusbar.lua.

2006-02-06 20:56 UTC  Tuomo Valkonen
  * Changed query_menu title transformation.
  * Lua's regexp routines don't understand utf-8 or other multibyte encodings.
  * TODO: conversion to lower case of non-ascii letters.

2006-02-01 18:05 UTC  Vassily Leushin
  * russian_locale

2006-01-29 15:27 UTC  Tuomo Valkonen
  * Statusbar meter template is respected as maximum size for meter.

2006-01-25 23:57 UTC  Tuomo Valkonen
  * Added dummy gettext hack for those labels.

2006-01-25 23:54 UTC  Tuomo Valkonen
  * Added context menu label support.

2006-01-25 16:30 UTC  Tuomo Valkonen
  * Do not try to resize the statusbar unnecessarily.

2006-01-21 23:47 UTC  ludal at logilab.fr
  * fixes random segfaults
  With ion-3ds-20060107 I see random segfaults I can reproduce navigating
  some website with galeon. This patch seems to fix the problem (and the
  original code looked wrong)

2006-01-21 21:35 UTC  Tuomo Valkonen
  * Oops. A function wasn't marked local.

2006-01-21 20:57 UTC  Tuomo Valkonen
  * Oops. Counter wasn't incremented in statusbar list building.

2006-01-20 21:16 UTC  Tuomo Valkonen
  * Updated/fixed PWM bindings configuration.

2006-01-20 17:36 UTC  Tuomo Valkonen
  * Statusbar uses PtrLists instead of ObjLists.
  (Stuff gets removed from ObjLists before the manager's removal handler
  is called.)

2006-01-19 19:24 UTC  Etan Reisner
  * Use the table values we are iterating over.

2006-01-14 20:10 UTC  Tuomo Valkonen
  * Previous completion behaviour change broke something..

2006-01-11 17:12 UTC  Tuomo Valkonen
  * Fixed a problem in statusbar winprop usage.

9 files changed, 36 insertions, 37 deletions

diff --git a/wm/ion3-devel/Makefile b/wm/ion3-devel/Makefile
index 1df45aea1af..9e6c1743716 100644
--- a/wm/ion3-devel/Makefile
+++ b/wm/ion3-devel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2006/04/27 21:14:51 rpaulo Exp $
+# $NetBSD: Makefile,v 1.14 2006/08/14 22:42:04 wiz Exp $
 #
 
-DISTNAME=	ion-3ds-20060107
+DISTNAME=	ion-3ds-20060524
 PKGNAME=	${DISTNAME:S/-3ds-/3-/}
 CATEGORIES=	wm x11
 MASTER_SITES=	http://modeemi.cs.tut.fi/~tuomov/ion/dl/
diff --git a/wm/ion3-devel/PLIST b/wm/ion3-devel/PLIST
index 1cd502044ac..55a827ffec6 100644
--- a/wm/ion3-devel/PLIST
+++ b/wm/ion3-devel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/04/17 07:07:36 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/08/14 22:42:04 wiz Exp $
 bin/ion3
 bin/pwm3
 lib/ion3/bin/ion-completefile
@@ -50,18 +50,16 @@ share/doc/ion3/ChangeLog
 share/doc/ion3/LICENSE
 share/doc/ion3/README
 share/doc/ion3/RELNOTES
-share/examples/ion3/cfg_bindings.lua
 share/examples/ion3/cfg_dock.lua
 share/examples/ion3/cfg_floatws.lua
 share/examples/ion3/cfg_ion.lua
+share/examples/ion3/cfg_ioncore.lua
 share/examples/ion3/cfg_ionws.lua
 share/examples/ion3/cfg_kludges.lua
 share/examples/ion3/cfg_menu.lua
-share/examples/ion3/cfg_menus.lua
+share/examples/ion3/cfg_modules.lua
 share/examples/ion3/cfg_panews.lua
 share/examples/ion3/cfg_pwm.lua
-share/examples/ion3/cfg_pwm_bindings.lua
-share/examples/ion3/cfg_pwm_menus.lua
 share/examples/ion3/cfg_query.lua
 share/examples/ion3/cfg_sp.lua
 share/examples/ion3/cfg_statusbar.lua
@@ -85,6 +83,7 @@ share/ion3/welcome.txt
 share/locale/cs/LC_MESSAGES/ion3.mo
 share/locale/de/LC_MESSAGES/ion3.mo
 share/locale/fi/LC_MESSAGES/ion3.mo
+share/locale/ru/LC_MESSAGES/ion3.mo
 @dirrm share/ion3
 @dirrm share/examples/ion3
 @dirrm share/doc/ion3
diff --git a/wm/ion3-devel/distinfo b/wm/ion3-devel/distinfo
index b5be176cb55..e949e2342bc 100644
--- a/wm/ion3-devel/distinfo
+++ b/wm/ion3-devel/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.4 2006/07/27 23:11:04 joerg Exp $
+$NetBSD: distinfo,v 1.5 2006/08/14 22:42:04 wiz Exp $
 
-SHA1 (ion-3ds-20060107.tar.gz) = 9ad795bbcd29281a62f932a30292182bc8506e54
-RMD160 (ion-3ds-20060107.tar.gz) = a486e3065951349c971368f8e8abc847aa23a746
-Size (ion-3ds-20060107.tar.gz) = 597794 bytes
-SHA1 (patch-ac) = db04fbd865a61104ebb6f023424f22ecbc763ae3
-SHA1 (patch-ad) = 2cb205aa3836605f22f5672f5eb5484150e4a558
-SHA1 (patch-ae) = f2756a978abbe37338a056395e7c94eca4ff6295
-SHA1 (patch-ag) = fb13e4056072fc0fbba8c9da3a2c4c06652a8e17
-SHA1 (patch-ah) = 15efb122f2a54919d0dc4db3d95c4f89c02db361
+SHA1 (ion-3ds-20060524.tar.gz) = 65b6bb55205e9c16f02438e3586876416222999e
+RMD160 (ion-3ds-20060524.tar.gz) = 97a86785437fce3ba91e8edfbd412e199415f545
+Size (ion-3ds-20060524.tar.gz) = 620416 bytes
+SHA1 (patch-ac) = 7f10320ad611bcc92c7db37e475e086be7e14074
+SHA1 (patch-ad) = 75883f474d16cda265c58784ad60c61a5eed98c7
+SHA1 (patch-ae) = 763c5b24fa8f4ba3c6f09d547714a95e87a864ac
+SHA1 (patch-ag) = 0a4e7a5b0afc8393e5085898cc3ec782fb07d005
+SHA1 (patch-ah) = 185eb5a98967976ef2a1532bd515af52f145984d
 SHA1 (patch-ai) = 0d2e440163caceb8e5dd7a88548569083cd16653
 SHA1 (patch-aj) = d9a2f02f7b560bd950290758a980d72780fdfca0
 SHA1 (patch-ak) = 4f7a8dffb06aa03aaebcf645b22b93ef4e0fe2bc
-SHA1 (patch-al) = 20dc2631feb7b3efa1a19bf706ce5702967fab92
+SHA1 (patch-al) = acdcc9f1c269301e630a84b35a81dae3b8af0dcb
 SHA1 (patch-am) = 0ff629d6b9f60760e10fa30c23ccbe24dac284b1
diff --git a/wm/ion3-devel/patches/patch-ac b/wm/ion3-devel/patches/patch-ac
index d05a992db74..299393868b8 100644
--- a/wm/ion3-devel/patches/patch-ac
+++ b/wm/ion3-devel/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/10/04 20:50:58 cube Exp $
+$NetBSD: patch-ac,v 1.2 2006/08/14 22:42:04 wiz Exp $
 
---- etc/Makefile.orig	2004-09-06 20:28:36.000000000 +0200
+--- etc/Makefile.orig	2006-05-24 16:23:26.000000000 +0000
 +++ etc/Makefile
-@@ -22,5 +22,5 @@ include $(TOPDIR)/rules.mk
+@@ -23,5 +23,5 @@ include $(TOPDIR)/rules.mk
  ######################################
  
  _install: etc_install
diff --git a/wm/ion3-devel/patches/patch-ad b/wm/ion3-devel/patches/patch-ad
index 9f996139298..dd72069b195 100644
--- a/wm/ion3-devel/patches/patch-ad
+++ b/wm/ion3-devel/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2006/02/11 10:03:48 cube Exp $
+$NetBSD: patch-ad,v 1.3 2006/08/14 22:42:04 wiz Exp $
 
---- mod_statusbar/ion-statusd/statusd_load.lua.orig	2005-05-02 16:55:27.000000000 +0200
+--- mod_statusbar/ion-statusd/statusd_load.lua.orig	2006-05-24 16:23:26.000000000 +0000
 +++ mod_statusbar/ion-statusd/statusd_load.lua
-@@ -39,7 +39,7 @@ end
+@@ -42,7 +42,7 @@ end
  local function get_load_uptime()
      local f=io.popen('uptime', 'r')
      if not f then
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.2 2006/02/11 10:03:48 cube Exp $
      end
      local s=f:read('*l')
      f:close()
-@@ -47,11 +47,30 @@ local function get_load_uptime()
+@@ -50,11 +50,30 @@ local function get_load_uptime()
      return (load or "")
  end
  
diff --git a/wm/ion3-devel/patches/patch-ae b/wm/ion3-devel/patches/patch-ae
index e1babd5036a..87429a8afeb 100644
--- a/wm/ion3-devel/patches/patch-ae
+++ b/wm/ion3-devel/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.3 2006/07/27 23:11:04 joerg Exp $
+$NetBSD: patch-ae,v 1.4 2006/08/14 22:42:04 wiz Exp $
 
---- ion/Makefile.orig	2006-01-07 22:04:12.000000000 +0100
+--- ion/Makefile.orig	2006-05-24 16:23:26.000000000 +0000
 +++ ion/Makefile
 @@ -15,9 +15,10 @@ INCLUDES += $(X11_INCLUDES) 
  INCLUDES += $(LIBMAINLOOP_INCLUDES) $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES)
@@ -8,7 +8,7 @@ $NetBSD: patch-ae,v 1.3 2006/07/27 23:11:04 joerg Exp $
  
 -LIBS += $(X11_LIBS) $(XINERAMA_LIBS)
 +LIBS += $(XINERAMA_LIBS) $(X11_LIBS)
- LIBS += $(LIBMAINLOOP_LIBS) $(LIBEXTL_LIBS) $(LIBTU_LIBS)
+ LIBS += $(WHOLEA) $(LIBMAINLOOP_LIBS) $(LIBEXTL_LIBS) $(LIBTU_LIBS) $(NO_WHOLEA)
  LIBS += $(LUA_LIBS) $(DL_LIBS)
 +LIBS += $(INTL_LIBS)
  LIBS += -lm
diff --git a/wm/ion3-devel/patches/patch-ag b/wm/ion3-devel/patches/patch-ag
index 5ebad4ea212..d60bddea38b 100644
--- a/wm/ion3-devel/patches/patch-ag
+++ b/wm/ion3-devel/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.3 2006/07/27 23:11:04 joerg Exp $
+$NetBSD: patch-ag,v 1.4 2006/08/14 22:42:04 wiz Exp $
 
---- pwm/Makefile.orig	2006-01-07 22:04:12.000000000 +0100
+--- pwm/Makefile.orig	2006-05-24 16:23:26.000000000 +0000
 +++ pwm/Makefile
 @@ -15,9 +15,10 @@ INCLUDES += $(X11_INCLUDES) 
  INCLUDES += $(LIBMAINLOOP_INCLUDES) $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES)
@@ -8,7 +8,7 @@ $NetBSD: patch-ag,v 1.3 2006/07/27 23:11:04 joerg Exp $
  
 -LIBS += $(X11_LIBS) $(XINERAMA_LIBS)
 +LIBS += $(XINERAMA_LIBS) $(X11_LIBS)
- LIBS += $(LIBMAINLOOP_LIBS) $(LIBEXTL_LIBS) $(LIBTU_LIBS)
+ LIBS += $(WHOLEA) $(LIBMAINLOOP_LIBS) $(LIBEXTL_LIBS) $(LIBTU_LIBS) $(NO_WHOLEA)
  LIBS += $(LUA_LIBS) $(DL_LIBS)
 +LIBS += $(INTL_LIBS)
  LIBS += -lm
diff --git a/wm/ion3-devel/patches/patch-ah b/wm/ion3-devel/patches/patch-ah
index b5ccdfaac22..99c499584e3 100644
--- a/wm/ion3-devel/patches/patch-ah
+++ b/wm/ion3-devel/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1.1.1 2004/10/04 20:50:58 cube Exp $
+$NetBSD: patch-ah,v 1.2 2006/08/14 22:42:04 wiz Exp $
 
---- rules.mk.orig	2004-09-06 20:28:36.000000000 +0200
+--- rules.mk.orig	2006-05-24 16:23:26.000000000 +0000
 +++ rules.mk
-@@ -144,9 +144,9 @@ lc_install:
+@@ -153,9 +153,9 @@ lc_install:
  	done
  
  etc_install:
diff --git a/wm/ion3-devel/patches/patch-al b/wm/ion3-devel/patches/patch-al
index 25f04c484c4..1b3b02f3692 100644
--- a/wm/ion3-devel/patches/patch-al
+++ b/wm/ion3-devel/patches/patch-al
@@ -1,6 +1,6 @@
-$NetBSD: patch-al,v 1.1 2006/02/11 10:03:48 cube Exp $
+$NetBSD: patch-al,v 1.2 2006/08/14 22:42:04 wiz Exp $
 
---- system.mk.orig	2005-08-20 13:33:57.000000000 +0200
+--- system.mk.orig	2006-05-24 16:23:51.000000000 +0000
 +++ system.mk
 @@ -7,7 +7,7 @@
  ## Installation paths
@@ -31,11 +31,11 @@ $NetBSD: patch-al,v 1.1 2006/02/11 10:03:48 cube Exp $
  ##
 @@ -56,7 +56,7 @@ DL_LIBS=-ldl
  
- # If you have installed Lua 5.0 from the official tarball without changing
+ # If you have installed Lua 5.1 from the official tarball without changing
  # paths, this should do it.
 -LUA_DIR=/usr/local
 +LUA_DIR=${PREFIX}
- LUA_LIBS = -L$(LUA_DIR)/lib -llua -llualib
+ LUA_LIBS = -L$(LUA_DIR)/lib -llua
  LUA_INCLUDES = -I$(LUA_DIR)/include
  LUA=$(LUA_DIR)/bin/lua
 @@ -116,8 +116,7 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WOR