[pkgsrc/trunk]: pkgsrc/wm/ion Update to ion-20040207 (a.k.a ion2). This is t...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6c8f84a17619
branches:  trunk
changeset: 469441:6c8f84a17619
user:      cube <cube%pkgsrc.org@localhost>
date:      Mon Feb 23 13:40:21 2004 +0000

description:
Update to ion-20040207 (a.k.a ion2).  This is the new stable version of
Ion, two years after the last one!

It is actually an update of ion-devel, which will then disappear before
a new development branch is created for Ion.

Most notable changes (since import of ion-devel, see ChangeLog in the
distribution for a full listing):
        * Integration of the dock module
        * Workspace query asks for type of workspace when creating new.
        * Previous frame geometry (for maximize and shade) is saved in the
          workspaces save file.
        * Support changes in X keyboard map.
        * Autoconf script
        * The dock no longer gets focused when the pointer enters it.
        * Fill _NET_SUPPORTED root window property with the supported
          features (_NET_WM_FULLSCREEN, _NET_WM_NAME, _NET_VIRTUAL_ROOTS).
        * Transient size calculation fixed.
        * Creating frame for a transient on a floatws will raise the frame
          containing the transient_for window.
        * Minor memory leak removed: drawing engine colour group name.

diffstat:

 wm/ion/DESCR            |    2 +-
 wm/ion/Makefile         |   35 +-
 wm/ion/PLIST            |   84 ++++-
 wm/ion/distinfo         |   17 +-
 wm/ion/patches/patch-ab |   75 +----
 wm/ion/patches/patch-ad |   27 +-
 wm/ion/patches/patch-ae |   14 +
 wm/ion/patches/patch-af |  105 ++++++
 wm/ion/patches/patch-ag |  727 ++++++++++++++++++++++++++++++++++++++++++++++++
 wm/ion/patches/patch-ah |   30 +
 wm/ion/patches/patch-ai |   16 +
 11 files changed, 1015 insertions(+), 117 deletions(-)

diffs (truncated from 1208 to 300 lines):

diff -r e010c47a0357 -r 6c8f84a17619 wm/ion/DESCR
--- a/wm/ion/DESCR      Mon Feb 23 13:28:21 2004 +0000
+++ b/wm/ion/DESCR      Mon Feb 23 13:40:21 2004 +0000
@@ -1,3 +1,3 @@
 Ion is a window manager dividing the screen into frames rather than having
-overlapping windows, much like the windows in Emacs. Navigation between
+overlapping windows, much like the windows in Emacs.  Navigation between
 clients can be done solely using the keyboard without need for a mouse.
diff -r e010c47a0357 -r 6c8f84a17619 wm/ion/Makefile
--- a/wm/ion/Makefile   Mon Feb 23 13:28:21 2004 +0000
+++ b/wm/ion/Makefile   Mon Feb 23 13:40:21 2004 +0000
@@ -1,32 +1,39 @@
-# $NetBSD: Makefile,v 1.11 2004/01/24 15:18:32 grant Exp $
+# $NetBSD: Makefile,v 1.12 2004/02/23 13:40:21 cube Exp $
 #
 
-DISTNAME=      ion-20020207
-CATEGORIES=    x11 wm
-MASTER_SITES=  http://modeemi.cs.tut.fi/~tuomov/dl/
+DISTNAME=      ion-2-20040207
+PKGNAME=       ${DISTNAME:S/-2-/-/}
+CATEGORIES=    wm x11
+MASTER_SITES=  http://modeemi.fi/~tuomov/dl/
 
-MAINTAINER=    daniel%codefactory.se@localhost,zuntum%NetBSD.org@localhost
-HOMEPAGE=      http://modeemi.cs.tut.fi/~tuomov/ion/
+MAINTAINER=    cube%NetBSD.org@localhost
+HOMEPAGE=      http://iki.fi/~tuomov/ion/
 COMMENT=       Keyboard friendly tiling window manager
 
-USE_BUILDLINK2=        YES
+BUILDLINK_DEPENDS.lua= lua>=5.0.1
+
+USE_BUILDLINK3=        YES
 USE_PKGINSTALL=        YES
 USE_X11=       YES
 USE_GNU_TOOLS+=        make
+GNU_CONFIGURE= YES
 
 PKG_SYSCONFSUBDIR=     ion
 EGDIR=                 ${PREFIX}/share/examples/ion
-EGFILES=               bindings-default.conf bindings-sun.conf kludges.conf \
-                       look-brownsteel.conf look-greyviolet.conf \
-                       look-simpleblue.conf look-wheat.conf sample.conf \
-                       ion.conf
+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
 .undef f
 
-# ion's sources will append "ion/" to PKG_SYSCONFBASEDIR, that is, the
-# PKG_SYSCONFSUBDIR we are currently using.
-MAKE_ENV=              PKG_SYSCONFBASEDIR="${PKG_SYSCONFBASEDIR}"
+.include "../../lang/lua/buildlink3.mk"
+.include "../../devel/libtool/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r e010c47a0357 -r 6c8f84a17619 wm/ion/PLIST
--- a/wm/ion/PLIST      Mon Feb 23 13:28:21 2004 +0000
+++ b/wm/ion/PLIST      Mon Feb 23 13:40:21 2004 +0000
@@ -1,24 +1,72 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/22 21:33:14 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/02/23 13:40:21 cube Exp $
 bin/ion
-bin/ion-edit
-bin/ion-man
-bin/ion-runinxterm
-bin/ion-ssh
-bin/ion-view
+bin/pwm
+lib/ion/de.a
+lib/ion/de.la
+lib/ion/de.so
+lib/ion/dock.a
+lib/ion/dock.la
+lib/ion/dock.so
+lib/ion/floatws.a
+lib/ion/floatws.la
+lib/ion/floatws.so
+lib/ion/ionws.a
+lib/ion/ionws.la
+lib/ion/ionws.so
+lib/ion/menu.a
+lib/ion/menu.la
+lib/ion/menu.so
+lib/ion/query.a
+lib/ion/query.la
+lib/ion/query.so
+libexec/ion/ion-completefile
 man/man1/ion.1
+man/man1/pwm.1
 share/doc/ion/ChangeLog
 share/doc/ion/LICENSE
 share/doc/ion/README
-share/doc/ion/config.txt
-share/doc/ion/functions.txt
-share/examples/ion/bindings-default.conf
-share/examples/ion/bindings-sun.conf
-share/examples/ion/ion.conf
-share/examples/ion/kludges.conf
-share/examples/ion/look-brownsteel.conf
-share/examples/ion/look-greyviolet.conf
-share/examples/ion/look-simpleblue.conf
-share/examples/ion/look-wheat.conf
-share/examples/ion/sample.conf
+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.lc
+share/ion/ioncore-efbb.lua
+share/ion/ioncorelib-mplexfns.lc
+share/ion/ioncorelib-mplexfns.lua
+share/ion/ioncorelib.lc
+share/ion/ioncorelib.lua
+share/ion/menulib.lc
+share/ion/menulib.lua
+share/ion/querylib.lc
+share/ion/querylib.lua
+share/ion/welcome_message.txt
+@dirrm lib/ion
+@dirrm share/doc/ion
 @dirrm share/examples/ion
-@dirrm share/doc/ion
+@dirrm share/ion
diff -r e010c47a0357 -r 6c8f84a17619 wm/ion/distinfo
--- a/wm/ion/distinfo   Mon Feb 23 13:28:21 2004 +0000
+++ b/wm/ion/distinfo   Mon Feb 23 13:40:21 2004 +0000
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.8 2004/01/11 19:00:16 jlam Exp $
+$NetBSD: distinfo,v 1.9 2004/02/23 13:40:21 cube Exp $
 
-SHA1 (ion-20020207.tar.gz) = 68c893de4843613138d09579da676c74526b7c4a
-Size (ion-20020207.tar.gz) = 157649 bytes
-SHA1 (patch-aa) = ae5fd844f89bf11d64f1f977219d70e8f868289c
-SHA1 (patch-ab) = fcebbfb40b218442e3ad9788f557c1b71d3a7de6
-SHA1 (patch-ac) = 302f20d54304164612d04636642a88d0565da75d
-SHA1 (patch-ad) = 9367ef939ce5ae3aee6822e3417c24d76ecca1e2
+SHA1 (ion-2-20040207.tar.gz) = 6bbf4706b617c83fc444a244d7ef4f5f735dd8fc
+Size (ion-2-20040207.tar.gz) = 376466 bytes
+SHA1 (patch-ab) = b63395c877957621d76f57fa42e710241d5903c0
+SHA1 (patch-ad) = 063d68427764a3cdde8ef52d798583d43a3f5dca
+SHA1 (patch-ae) = 1f7e6a47280ea9d7ea1bae146ea2ec6e12aa69d6
+SHA1 (patch-af) = 21abbde8e0b2bc48571c0c23999af2abc59a1390
+SHA1 (patch-ag) = fbed3e093048dbeabf444b5dd839f8e2b4118010
+SHA1 (patch-ah) = 223d75bfb6e8980467ee1501e49625a56c21cc82
+SHA1 (patch-ai) = 05d9748fdbd04f5af3e89cafb69e1d060641af83
diff -r e010c47a0357 -r 6c8f84a17619 wm/ion/patches/patch-ab
--- a/wm/ion/patches/patch-ab   Mon Feb 23 13:28:21 2004 +0000
+++ b/wm/ion/patches/patch-ab   Mon Feb 23 13:40:21 2004 +0000
@@ -1,69 +1,12 @@
-$NetBSD: patch-ab,v 1.4 2002/12/22 21:33:15 jmmv Exp $
+$NetBSD: patch-ab,v 1.5 2004/02/23 13:40:21 cube Exp $
 
---- system.mk.orig     Mon Mar  5 17:16:01 2001
-+++ system.mk
-@@ -7,13 +7,13 @@
- ## Installation paths
- ##
- 
--PREFIX=/usr/local
-+#PREFIX=/usr/local
- 
- # No need to modify these usually
- BINDIR=$(PREFIX)/bin
--ETCDIR=$(PREFIX)/etc
-+ETCDIR=$(PREFIX)/share/examples
- MANDIR=$(PREFIX)/man
--DOCDIR=$(PREFIX)/doc
-+DOCDIR=$(PREFIX)/share/doc
- # Not used
- INCDIR=$(PREFIX)/include
- LIBDIR=$(PREFIX)/lib
-@@ -24,14 +24,14 @@ LIBDIR=$(PREFIX)/lib
- ##
- 
- #MODULE_SUPPORT=-DCF_NO_MODULE_SUPPORT
--MODULE_SUPPORT_LDFLAGS=-export-dynamic -ldl
-+MODULE_SUPPORT_LDFLAGS=-export-dynamic
- 
- 
- ##
- ## X libraries, includes and options
- ##
+--- ioncore/event.c.orig       2003-03-09 12:17:40.000000000 +0100
++++ ioncore/event.c
+@@ -15,6 +15,7 @@
+ #include "readfds.h"
  
--X11_PREFIX=/usr/X11R6
-+X11_PREFIX=${BUILDLINK_X11_DIR}
- 
- # SunOS/Solaris
- #X11_PREFIX=/usr/openwin
-@@ -59,7 +59,6 @@ X11_DEFINES=
- ## C compiler
- ##
- 
--CC=gcc
- 
- # The POSIX_SOURCE, XOPEN_SOURCE and WARN options should not be necessary,
- # they're mainly for development use. So, if they cause trouble (not
-@@ -86,8 +85,8 @@ WARN=        -W -Wimplicit -Wreturn-type -Wswit
-       -Wparentheses -pedantic-errors -Wuninitialized
- 
+ #include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ #include <sys/time.h>
  
--CFLAGS=-g -O2 $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
--LDFLAGS=-g $(LIBS) $(EXTRA_LIBS)
-+CFLAGS+=$(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
-+LDFLAGS+=$(LIBS) $(EXTRA_LIBS)
- 
- 
- ##
-@@ -112,9 +111,9 @@ RANLIB=ranlib
- ##
- 
- # Should work almost everywhere
--INSTALL=install
-+#INSTALL=install
- # On a system with pure BSD install, -c might be preferred
--#INSTALL=install -c
-+INSTALL=install -c
- 
- INSTALLDIR=mkdir -p
- 
diff -r e010c47a0357 -r 6c8f84a17619 wm/ion/patches/patch-ad
--- a/wm/ion/patches/patch-ad   Mon Feb 23 13:28:21 2004 +0000
+++ b/wm/ion/patches/patch-ad   Mon Feb 23 13:40:21 2004 +0000
@@ -1,13 +1,18 @@
-$NetBSD: patch-ad,v 1.2 2004/01/11 19:00:16 jlam Exp $
+$NetBSD: patch-ad,v 1.3 2004/02/23 13:40:21 cube Exp $
 
---- src/Makefile.orig  Wed May 23 23:58:05 2001
-+++ src/Makefile
-@@ -10,7 +10,7 @@ include ../system.mk
- LIBS += -L../libtu -ltu -lm $(X11_LIBS) -lX11
- #-lefence
- INCLUDES += -I../libtu/include $(X11_INCLUDES)
--DEFINES += -DETCDIR=\"$(ETCDIR)\"
-+DEFINES += -DETCDIR=\"$(PKG_SYSCONFBASEDIR)\"
+--- etc/Makefile.orig  2004-02-07 16:37:01.000000000 +0100
++++ etc/Makefile
+@@ -21,9 +21,9 @@ include $(TOPDIR)/rules.mk
+ ######################################
  
- CFLAGS += $(XOPEN_SOURCE) $(MODULE_SUPPORT)
- LDFLAGS += $(MODULE_SUPPORT_LDFLAGS)
+ _install:
+-      $(INSTALLDIR) $(ETCDIR)
++      $(INSTALLDIR) $(EXDIR)
+       for i in $(ETC); do \
+-              $(INSTALL) -m $(DATA_MODE) $$i $(ETCDIR); \
++              $(INSTALL) -m $(DATA_MODE) $$i $(EXDIR); \
+       done
+-      rm -f $(ETCDIR)/draw.lua
+-      ln -s look-cleanviolet.lua $(ETCDIR)/draw.lua
++      rm -f $(EXDIR)/draw.lua
++      ln -s look-cleanviolet.lua $(EXDIR)/draw.lua
diff -r e010c47a0357 -r 6c8f84a17619 wm/ion/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/ion/patches/patch-ae   Mon Feb 23 13:40:21 2004 +0000
@@ -0,0 +1,14 @@