[pkgsrc/trunk]: pkgsrc/wm/ion3-devel Update to ion3-rc-20070708. From Philip ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/86731a59e374
branches:  trunk
changeset: 530854:86731a59e374
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Jul 12 13:54:01 2007 +0000

description:
Update to ion3-rc-20070708. From Philip Paeps, who also wants to
maintain it.

Changes are mostly bugfixes, bugfixes and bug fixes.

diffstat:

 wm/ion3-devel/Makefile         |  26 +++++++++++-------------
 wm/ion3-devel/PLIST            |  34 +++++++++++--------------------
 wm/ion3-devel/distinfo         |  30 +++++++++++++--------------
 wm/ion3-devel/patches/patch-aa |  12 +++++-----
 wm/ion3-devel/patches/patch-ab |   8 +++---
 wm/ion3-devel/patches/patch-ac |  12 ++++------
 wm/ion3-devel/patches/patch-ad |  45 ------------------------------------------
 wm/ion3-devel/patches/patch-ae |  16 +++++---------
 wm/ion3-devel/patches/patch-ag |  18 ++++++----------
 wm/ion3-devel/patches/patch-ah |   8 +++---
 wm/ion3-devel/patches/patch-ai |  36 ---------------------------------
 wm/ion3-devel/patches/patch-aj |   8 +++---
 wm/ion3-devel/patches/patch-ak |  10 +++-----
 wm/ion3-devel/patches/patch-al |  23 ++++++++++++---------
 wm/ion3-devel/patches/patch-am |   6 ++--
 15 files changed, 94 insertions(+), 198 deletions(-)

diffs (truncated from 517 to 300 lines):

diff -r 1cc9c0da7469 -r 86731a59e374 wm/ion3-devel/Makefile
--- a/wm/ion3-devel/Makefile    Thu Jul 12 13:40:33 2007 +0000
+++ b/wm/ion3-devel/Makefile    Thu Jul 12 13:54:01 2007 +0000
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.21 2006/11/06 11:33:52 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2007/07/12 13:54:01 joerg Exp $
 #
 
-DISTNAME=      ion-3ds-20060524
+DISTNAME=      ion-3rc-20070708
 PKGNAME=       ${DISTNAME:S/-3ds-/3-/}
-PKGREVISION=   1
 CATEGORIES=    wm x11
 MASTER_SITES=  http://modeemi.fi/~tuomov/dl/
 
-MAINTAINER=    joerg%NetBSD.org@localhost
+MAINTAINER=    philip%FreeBSD.org@localhost
 HOMEPAGE=      http://modeemi.fi/~tuomov/ion/
 COMMENT=       Keyboard friendly tiling window manager
 
@@ -22,17 +21,17 @@
 
 PKG_SYSCONFSUBDIR=     ion3
 EGDIR=                 ${PREFIX}/share/examples/ion3
-EGFILES=               cfg_dock.lua cfg_floatws.lua cfg_ion.lua        \
-                       cfg_ioncore.lua cfg_ionws.lua cfg_kludges.lua   \
-                       cfg_menu.lua cfg_modules.lua cfg_panews.lua     \
-                       cfg_pwm.lua cfg_query.lua cfg_sp.lua            \
-                       cfg_statusbar.lua                               \
+EGFILES=               cfg_defaults.lua cfg_dock.lua cfg_ioncore.lua   \
+                       cfg_ion.lua cfg_kludges.lua cfg_layouts.lua     \
+                       cfg_menu.lua cfg_pwm.lua cfg_query.lua          \
+                       cfg_sp.lua cfg_statusbar.lua cfg_tiling.lua     \
                        look.lua look_brownsteel.lua                    \
-                       look_clean.lua look_cleanios.lua                \
+                       look_clean.lua look_cleanios.lua                \
                        look_cleanviolet.lua look_dusky.lua             \
-                       look_greyviolet.lua look_ios.lua                \
-                       look_simpleblue.lua                             \
-                       lookcommon_clean.lua lookcommon_emboss.lua
+                       look_greenlight.lua look_greyviolet.lua         \
+                       look_ios.lua look_newviolet.lua                 \
+                       look_simpleblue.lua lookcommon_clean.lua        \
+                       lookcommon_emboss.lua
 .for f in ${EGFILES}
 CONF_FILES+=           ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
@@ -44,6 +43,5 @@
 .include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 1cc9c0da7469 -r 86731a59e374 wm/ion3-devel/PLIST
--- a/wm/ion3-devel/PLIST       Thu Jul 12 13:40:33 2007 +0000
+++ b/wm/ion3-devel/PLIST       Thu Jul 12 13:54:01 2007 +0000
@@ -1,47 +1,39 @@
-@comment $NetBSD: PLIST,v 1.4 2006/08/14 22:42:04 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/07/12 13:54:01 joerg Exp $
 bin/ion3
 bin/pwm3
 lib/ion3/bin/ion-completefile
 lib/ion3/bin/ion-statusd
 lib/ion3/lc/de.lc
-lib/ion3/lc/ext_statusbar.lc
 lib/ion3/lc/ioncore_bindings.lc
 lib/ion3/lc/ioncore_efbb.lc
 lib/ion3/lc/ioncore_ext.lc
 lib/ion3/lc/ioncore_luaext.lc
 lib/ion3/lc/ioncore_menudb.lc
 lib/ion3/lc/ioncore_misc.lc
+lib/ion3/lc/ioncore_tabnum.lc
 lib/ion3/lc/ioncore_wd.lc
 lib/ion3/lc/ioncore_winprops.lc
 lib/ion3/lc/mod_dock.lc
-lib/ion3/lc/mod_floatws.lc
-lib/ion3/lc/mod_ionws.lc
 lib/ion3/lc/mod_menu.lc
-lib/ion3/lc/mod_mgmtmode.lc
-lib/ion3/lc/mod_panews.lc
+lib/ion3/lc/mod_query_chdir.lc
 lib/ion3/lc/mod_query.lc
-lib/ion3/lc/mod_query_chdir.lc
 lib/ion3/lc/mod_sm.lc
 lib/ion3/lc/mod_sp.lc
 lib/ion3/lc/mod_statusbar.lc
+lib/ion3/lc/mod_tiling.lc
 lib/ion3/lc/statusd_date.lc
 lib/ion3/lc/statusd_load.lc
 lib/ion3/lc/statusd_mail.lc
 lib/ion3/mod/de.so
 lib/ion3/mod/mod_dock.so
-lib/ion3/mod/mod_floatws.so
-lib/ion3/mod/mod_ionws.so
 lib/ion3/mod/mod_menu.so
-lib/ion3/mod/mod_mgmtmode.so
-lib/ion3/mod/mod_panews.so
 lib/ion3/mod/mod_query.so
 lib/ion3/mod/mod_sm.so
 lib/ion3/mod/mod_sp.so
 lib/ion3/mod/mod_statusbar.so
+lib/ion3/mod/mod_tiling.so
 man/cs/man1/ion3.1
 man/cs/man1/pwm3.1
-man/de/man1/ion3.1
-man/de/man1/pwm3.1
 man/fi/man1/ion3.1
 man/fi/man1/pwm3.1
 man/man1/ion3.1
@@ -50,44 +42,42 @@
 share/doc/ion3/LICENSE
 share/doc/ion3/README
 share/doc/ion3/RELNOTES
+share/examples/ion3/cfg_defaults.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_ion.lua
 share/examples/ion3/cfg_kludges.lua
+share/examples/ion3/cfg_layouts.lua
 share/examples/ion3/cfg_menu.lua
-share/examples/ion3/cfg_modules.lua
-share/examples/ion3/cfg_panews.lua
 share/examples/ion3/cfg_pwm.lua
 share/examples/ion3/cfg_query.lua
 share/examples/ion3/cfg_sp.lua
 share/examples/ion3/cfg_statusbar.lua
+share/examples/ion3/cfg_tiling.lua
 share/examples/ion3/look.lua
 share/examples/ion3/look_brownsteel.lua
 share/examples/ion3/look_clean.lua
 share/examples/ion3/look_cleanios.lua
 share/examples/ion3/look_cleanviolet.lua
 share/examples/ion3/look_dusky.lua
+share/examples/ion3/look_greenlight.lua
 share/examples/ion3/look_greyviolet.lua
 share/examples/ion3/look_ios.lua
+share/examples/ion3/look_newviolet.lua
 share/examples/ion3/look_simpleblue.lua
 share/examples/ion3/lookcommon_clean.lua
 share/examples/ion3/lookcommon_emboss.lua
 share/ion3/ion-completeman
 share/ion3/ion-runinxterm
 share/ion3/welcome.cs.txt
-share/ion3/welcome.de.txt
 share/ion3/welcome.fi.txt
 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
-@dirrm lib/ion3/bin
 @dirrm lib/ion3/mod
 @dirrm lib/ion3/lc
+@dirrm lib/ion3/bin
 @dirrm lib/ion3
diff -r 1cc9c0da7469 -r 86731a59e374 wm/ion3-devel/distinfo
--- a/wm/ion3-devel/distinfo    Thu Jul 12 13:40:33 2007 +0000
+++ b/wm/ion3-devel/distinfo    Thu Jul 12 13:54:01 2007 +0000
@@ -1,17 +1,15 @@
-$NetBSD: distinfo,v 1.7 2006/11/03 07:02:23 wiz Exp $
+$NetBSD: distinfo,v 1.8 2007/07/12 13:54:01 joerg Exp $
 
-SHA1 (ion-3ds-20060524.tar.gz) = 65b6bb55205e9c16f02438e3586876416222999e
-RMD160 (ion-3ds-20060524.tar.gz) = 97a86785437fce3ba91e8edfbd412e199415f545
-Size (ion-3ds-20060524.tar.gz) = 620416 bytes
-SHA1 (patch-aa) = 2d818efecf435904ac61dd6396d841db438dc2bf
-SHA1 (patch-ab) = 80a2649065db9e8a6ac59c6d7bf589175b63332c
-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) = ee48b28578c8c5168f7b40e6b9bdfe8cf38facb3
-SHA1 (patch-am) = 0ff629d6b9f60760e10fa30c23ccbe24dac284b1
+SHA1 (ion-3rc-20070708.tar.gz) = 84bc9871d9f3c6f37d614d7e9eb54021d3e866e5
+RMD160 (ion-3rc-20070708.tar.gz) = 85947dc1b1dd7abd4304a42e2e946a7641cda8c4
+Size (ion-3rc-20070708.tar.gz) = 655000 bytes
+SHA1 (patch-aa) = 16c548331f747c1cfbfa94b6241128afffdb10fb
+SHA1 (patch-ab) = f16cb96af26a779398fc791b1381b34ec4526794
+SHA1 (patch-ac) = cf0194f39d4823ea890e7afa66485565acb30684
+SHA1 (patch-ae) = 7a81f82b6d7f1aebd5f4d07cb778392cb61c4f19
+SHA1 (patch-ag) = 9db03d4511e77390f51c917ebcc2f403773ca649
+SHA1 (patch-ah) = b30b29fb383838c9008920dfc0435f7a815f963f
+SHA1 (patch-aj) = 08e04586bd0432ea1242ea16d3ab3edf72e34ec1
+SHA1 (patch-ak) = e3951c02a5b70e9ff8ec00567f27bc5a96575e25
+SHA1 (patch-al) = d80745093f26a94d900e4bdddbb5a4c9d9e07191
+SHA1 (patch-am) = 6a55713477b0408ce4700762558116f53da0084e
diff -r 1cc9c0da7469 -r 86731a59e374 wm/ion3-devel/patches/patch-aa
--- a/wm/ion3-devel/patches/patch-aa    Thu Jul 12 13:40:33 2007 +0000
+++ b/wm/ion3-devel/patches/patch-aa    Thu Jul 12 13:54:01 2007 +0000
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.3 2006/09/20 13:25:25 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2007/07/12 13:54:02 joerg Exp $
 
---- mod_ionws/Makefile.orig    2006-09-20 13:50:46.000000000 +0200
-+++ mod_ionws/Makefile
-@@ -10,6 +10,7 @@ include $(TOPDIR)/system-inc.mk
+--- mod_tiling/Makefile.orig   2007-03-30 12:00:17.325708691 +0200
++++ mod_tiling/Makefile        2007-03-30 12:01:07.915538829 +0200
+@@ -10,6 +10,7 @@
  
  INCLUDES += $(X11_INCLUDES) $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES) -I..
  CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE)
 +LIBS += $(LIBTU_LIBS)
  
- SOURCES=main.c ionws.c placement.c split.c split-stdisp.c \
-       splitfloat.c panehandle.c
+ SOURCES=main.c tiling.c placement.c split.c split-stdisp.c \
+       splitfloat.c panehandle.c ops.c
diff -r 1cc9c0da7469 -r 86731a59e374 wm/ion3-devel/patches/patch-ab
--- a/wm/ion3-devel/patches/patch-ab    Thu Jul 12 13:40:33 2007 +0000
+++ b/wm/ion3-devel/patches/patch-ab    Thu Jul 12 13:54:01 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2006/09/20 13:25:25 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2007/07/12 13:54:02 joerg Exp $
 
---- mod_statusbar/Makefile.orig        2006-09-20 13:50:29.000000000 +0200
-+++ mod_statusbar/Makefile
-@@ -10,6 +10,7 @@ include $(TOPDIR)/system-inc.mk
+--- mod_statusbar/Makefile.orig        2007-03-30 12:01:40.796229869 +0200
++++ mod_statusbar/Makefile     2007-03-30 12:01:59.324238660 +0200
+@@ -10,6 +10,7 @@
  
  INCLUDES += $(X11_INCLUDES) $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES) -I..
  CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE)
diff -r 1cc9c0da7469 -r 86731a59e374 wm/ion3-devel/patches/patch-ac
--- a/wm/ion3-devel/patches/patch-ac    Thu Jul 12 13:40:33 2007 +0000
+++ b/wm/ion3-devel/patches/patch-ac    Thu Jul 12 13:54:01 2007 +0000
@@ -1,12 +1,10 @@
-$NetBSD: patch-ac,v 1.2 2006/08/14 22:42:04 wiz Exp $
-
---- etc/Makefile.orig  2006-05-24 16:23:26.000000000 +0000
-+++ etc/Makefile
-@@ -23,5 +23,5 @@ include $(TOPDIR)/rules.mk
+--- etc/Makefile.orig  2007-06-04 09:17:40.000000000 +0200
++++ etc/Makefile       2007-06-04 09:17:59.000000000 +0200
+@@ -26,5 +26,5 @@
  ######################################
  
  _install: etc_install
 -      rm -f $(ETCDIR)/look.lua
--      ln -s look_cleanviolet.lua $(ETCDIR)/look.lua
+-      ln -s look_newviolet.lua $(ETCDIR)/look.lua
 +      rm -f $(EXDIR)/look.lua
-+      ln -s look_cleanviolet.lua $(EXDIR)/look.lua
++      ln -s look_newviolet.lua $(EXDIR)/look.lua
diff -r 1cc9c0da7469 -r 86731a59e374 wm/ion3-devel/patches/patch-ad
--- a/wm/ion3-devel/patches/patch-ad    Thu Jul 12 13:40:33 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2006/08/14 22:42:04 wiz Exp $
-
---- mod_statusbar/ion-statusd/statusd_load.lua.orig    2006-05-24 16:23:26.000000000 +0000
-+++ mod_statusbar/ion-statusd/statusd_load.lua
-@@ -42,7 +42,7 @@ end
- local function get_load_uptime()
-     local f=io.popen('uptime', 'r')
-     if not f then
--        return "??"
-+        return ""
-     end
-     local s=f:read('*l')
-     f:close()
-@@ -50,11 +50,30 @@ local function get_load_uptime()
-     return (load or "")
- end
- 
-+local function get_load_sysctl()
-+    local f=io.popen('sysctl -n vm.loadavg', 'r')
-+    if not f then
-+        return ""
-+    end
-+    local s=f:read('*l')
-+    f:close()
-+    local st, en, load=string.find(s, '^\{? ?(%d+%.%d+) %d+%.%d+ %d+%.%d+ ?\}?$')
-+    return (load or "")
-+end
-+
-+local function get_load_na()
-+    return "(n/a)"
-+end
-+
- local function detect_load_fn()
-     if get_load_proc()~="" then
-         return get_load_proc
--    else
-+    elseif get_load_uptime()~="" then
-         return get_load_uptime
-+    elseif get_load_sysctl()~="" then
-+        return get_load_sysctl