[pkgsrc/trunk]: pkgsrc/wm/ion3-devel Update to 20060107. Patch from Joerg So...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1c45cf219f82
branches:  trunk
changeset: 507901:1c45cf219f82
user:      cube <cube%pkgsrc.org@localhost>
date:      Sat Feb 11 10:03:48 2006 +0000

description:
Update to 20060107.  Patch from Joerg Sonnenberger and minor fixes.

Most noticeable changes (there's more than one year worth of them,
anyway):

 * Potentially blocking status meters are now in a separate ion-statusd
   program. Please write your additional status meters that do not monitor
   the state of Ion itself for ion-statusd (and contribute them in the
   Ion3 scripts repository at http://iki.fi/tuomov/repos/ion-scripts-3/).
   For help on writing such status meters, see e.g. source for statusd_load
   in ext_statusbar/ion-statusd.

 * Line editor now supports history search; Control+Up/Down only scrolls
   through history entries with matching initial part.

 * Arbitrary winprop matching criteria is supported. Lua scripts have
   access to X properties.

 * So-called "placeholders". With the help of these the positions of
   full-screen windows are remembered in their original frames, and don't
   just get inserted after currently active window when returning from
   full-screen mode. Under a session manager placeholders are also used
   to remember the original order of windows.

 * Experimental auto-show-completions support, which is also on by default
   now. In this mode the Tab key can be used to cycle forward through the
   completions, and Shift+Tab backwards. Modify the settings seen in the
   new mod_query.lua to get normal Tab-completion, or change the completion
   delay.

diffstat:

 wm/ion3-devel/Makefile         |   15 +-
 wm/ion3-devel/PLIST            |   42 +-
 wm/ion3-devel/distinfo         |   21 +-
 wm/ion3-devel/patches/patch-aa |   48 --
 wm/ion3-devel/patches/patch-ab |  931 -----------------------------------------
 wm/ion3-devel/patches/patch-ad |   12 +-
 wm/ion3-devel/patches/patch-ae |   14 +-
 wm/ion3-devel/patches/patch-af |   16 -
 wm/ion3-devel/patches/patch-ag |   16 +-
 wm/ion3-devel/patches/patch-aj |   12 +
 wm/ion3-devel/patches/patch-ak |   13 +
 wm/ion3-devel/patches/patch-al |   61 ++
 wm/ion3-devel/patches/patch-am |   13 +
 13 files changed, 161 insertions(+), 1053 deletions(-)

diffs (truncated from 1375 to 300 lines):

diff -r 3ab655db3b68 -r 1c45cf219f82 wm/ion3-devel/Makefile
--- a/wm/ion3-devel/Makefile    Sat Feb 11 03:00:11 2006 +0000
+++ b/wm/ion3-devel/Makefile    Sat Feb 11 10:03:48 2006 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:11:13 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/11 10:03:48 cube Exp $
 #
 
-DISTNAME=      ion-3ds-20040906
+DISTNAME=      ion-3ds-20060107
 PKGNAME=       ${DISTNAME:S/-3ds-/3-/}
-PKGREVISION=   2
 CATEGORIES=    wm x11
 MASTER_SITES=  http://modeemi.cs.tut.fi/~tuomov/ion/dl/
 
@@ -14,7 +13,6 @@
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
 USE_TOOLS+=    gmake
-GNU_CONFIGURE= YES
 USE_PKGLOCALEDIR=      YES
 BUILD_USES_MSGFMT=     YES
 
@@ -33,7 +31,8 @@
                        look_clean.lua look_cleanios.lua                \
                        look_cleanviolet.lua look_dusky.lua             \
                        look_greyviolet.lua look_ios.lua                \
-                       look_simpleblue.lua look_wheat2.lua
+                       look_simpleblue.lua look_wheat2.lua             \
+                       lookcommon_clean.lua lookcommon_emboss.lua
 .for f in ${EGFILES}
 CONF_FILES+=           ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
@@ -42,9 +41,3 @@
 .include "../../lang/lua/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
-
-# This is necessary because gettext's builtin.mk add stuff there,
-# and ion3's autoconf is rather broken in the way it auto-configures
-# itself for gettext.  Eventually ion3 should be fixed, but right now
-# it is not really possible.
-LIBS=                  # none
diff -r 3ab655db3b68 -r 1c45cf219f82 wm/ion3-devel/PLIST
--- a/wm/ion3-devel/PLIST       Sat Feb 11 03:00:11 2006 +0000
+++ b/wm/ion3-devel/PLIST       Sat Feb 11 10:03:48 2006 +0000
@@ -1,34 +1,47 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/10/04 20:50:57 cube Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/02/11 10:03:48 cube 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-misc.lc
-lib/ion3/lc/ioncore-winprops.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_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.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/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
-libexec/ion3/bin/ion-completefile
+lib/ion3/mod/mod_statusbar.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
@@ -52,7 +65,6 @@
 share/examples/ion3/cfg_query.lua
 share/examples/ion3/cfg_sp.lua
 share/examples/ion3/cfg_statusbar.lua
-share/examples/ion3/dock-draw.lua
 share/examples/ion3/look.lua
 share/examples/ion3/look_brownsteel.lua
 share/examples/ion3/look_clean.lua
@@ -62,23 +74,21 @@
 share/examples/ion3/look_greyviolet.lua
 share/examples/ion3/look_ios.lua
 share/examples/ion3/look_simpleblue.lua
-share/examples/ion3/look_wheat2.lua
+share/examples/ion3/lookcommon_clean.lua
+share/examples/ion3/lookcommon_emboss.lua
 share/ion3/ion-completeman
-share/ion3/ion-edit
-share/ion3/ion-man
 share/ion3/ion-runinxterm
-share/ion3/ion-ssh
-share/ion3/ion-view
 share/ion3/welcome.cs.txt
+share/ion3/welcome.de.txt
 share/ion3/welcome.fi.txt
 share/ion3/welcome.txt
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/ion3.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/ion3.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/ion3.mo
 @dirrm share/ion3
 @dirrm share/examples/ion3
 @dirrm share/doc/ion3
-@dirrm libexec/ion3/bin
-@dirrm libexec/ion3
+@dirrm lib/ion3/bin
 @dirrm lib/ion3/mod
 @dirrm lib/ion3/lc
 @dirrm lib/ion3
diff -r 3ab655db3b68 -r 1c45cf219f82 wm/ion3-devel/distinfo
--- a/wm/ion3-devel/distinfo    Sat Feb 11 03:00:11 2006 +0000
+++ b/wm/ion3-devel/distinfo    Sat Feb 11 10:03:48 2006 +0000
@@ -1,14 +1,15 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 18:43:54 wiz Exp $
+$NetBSD: distinfo,v 1.3 2006/02/11 10:03:48 cube Exp $
 
-SHA1 (ion-3ds-20040906.tar.gz) = 56f74e8bec7861488b3339183cf20f9bb15e5691
-RMD160 (ion-3ds-20040906.tar.gz) = 506dbb47e6a4abd8f5abcd0b4bc6af4098a97e83
-Size (ion-3ds-20040906.tar.gz) = 515278 bytes
-SHA1 (patch-aa) = ad7d6038f48953d1bc1243a056e60aae37943233
-SHA1 (patch-ab) = ecd1804c8fb4c1b7591b004e941e36c94777852f
+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) = 059a97ed0fedc47a58a3998a358f8fe117cd8255
-SHA1 (patch-ae) = f31da4c0c6e15ea32e2c70a0f9293ec25bd521b0
-SHA1 (patch-af) = 0189a36cb5baa3c5c6468103c80df25cd7936903
-SHA1 (patch-ag) = 6ee3eba8031e7b3ee674b52a171feeb595fad04d
+SHA1 (patch-ad) = 2cb205aa3836605f22f5672f5eb5484150e4a558
+SHA1 (patch-ae) = 8ca9322451de10b3f5810c3656ac7494eb763dd4
+SHA1 (patch-ag) = 8157ab643fa1d0902757e99833b22e916b6f8de6
 SHA1 (patch-ah) = 15efb122f2a54919d0dc4db3d95c4f89c02db361
 SHA1 (patch-ai) = 0d2e440163caceb8e5dd7a88548569083cd16653
+SHA1 (patch-aj) = d9a2f02f7b560bd950290758a980d72780fdfca0
+SHA1 (patch-ak) = 4f7a8dffb06aa03aaebcf645b22b93ef4e0fe2bc
+SHA1 (patch-al) = 20dc2631feb7b3efa1a19bf706ce5702967fab92
+SHA1 (patch-am) = 0ff629d6b9f60760e10fa30c23ccbe24dac284b1
diff -r 3ab655db3b68 -r 1c45cf219f82 wm/ion3-devel/patches/patch-aa
--- a/wm/ion3-devel/patches/patch-aa    Sat Feb 11 03:00:11 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/10/04 20:50:57 cube Exp $
-
---- configure.ac.orig  2004-09-06 20:28:34.000000000 +0200
-+++ configure.ac
-@@ -106,7 +106,7 @@ AC_ARG_ENABLE([sun-f1x-remap],
-                         [AS_HELP_STRING([--enable-sun-f1x-remap],
-                                                         [Remap F11 key to SunF36 and F12 to SunF37])])
- 
--if test "x$enable_sun_f1x_remap" == xyes; then
-+if test "x$enable_sun_f1x_remap" = xyes; then
-       _DCF_SUN_F1X_REMAP="1"
- fi
- 
-@@ -117,7 +117,18 @@ dnl DL_LIBS {{{
- AC_SUBST([DL_LIBS])
- 
- AC_CHECK_HEADER([dlfcn.h], [], [exit 1])
--AC_CHECK_LIB([dl], [dlopen], [DL_LIBS="-ldl"], [exit 1])
-+AC_CHECK_FUNCS([dlopen], [], [
-+      AC_CHECK_LIB([dl], [dlopen], [DL_LIBS="-ldl"], [exit 1])])
-+
-+dnl }}}
-+
-+dnl INTL_LIBS {{{
-+
-+AC_SUBST([INTL_LIBS])
-+
-+AC_CHECK_HEADER([libintl.h], [], [exit 1])
-+AC_CHECK_FUNCS([gettext], [], [
-+      AC_CHECK_LIB([intl], [gettext], [INTL_LIBS="-lintl"], [exit 1])])
- 
- dnl }}}
- 
-@@ -406,12 +417,13 @@ AC_ARG_ENABLE([locale],
-                         [AS_HELP_STRING([--disable-locale],
-                                                         [Disable locale support])])
- 
--if test "x$enable_locale" == xno; then
-+if test "x$enable_locale" = xno; then
-       _DCF_NO_LOCALE="-DCF_NO_LOCALE"
- fi
- 
- dnl }}}
- 
-+AC_SUBST(PKGLOCALEDIR)
- 
- AC_OUTPUT([system-ac.mk])
- 
diff -r 3ab655db3b68 -r 1c45cf219f82 wm/ion3-devel/patches/patch-ab
--- a/wm/ion3-devel/patches/patch-ab    Sat Feb 11 03:00:11 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,931 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/10/04 20:50:58 cube Exp $
-
---- configure.orig     2004-09-06 20:28:37.000000000 +0200
-+++ configure
-@@ -311,7 +311,7 @@ ac_includes_default="\
- # include <unistd.h>
- #endif"
- 
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir 
sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT 
OBJEXT EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP AR ac_ct_AR CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINERAMA_LIBS _DCF_NO_XINERAMA 
_DCF_XFREE86_TEXTPROP_BUG_WORKAROUND _DCF_DE_USE_XUTF8 _DCF_SUN_F1X_REMAP DL_LIBS PRELOAD_MODULES LUA LUAC LUA_INCLUDES LUA_LIBS HAS_SYSTEM_ASPRINTF XOPEN_SOURCE C99_SOURCE _DCF_HAS_VA_COPY 
_DCF_NO_LOCALE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir 
sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT 
OBJEXT EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP AR ac_ct_AR CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINERAMA_LIBS _DCF_NO_XINERAMA 
_DCF_XFREE86_TEXTPROP_BUG_WORKAROUND _DCF_DE_USE_XUTF8 _DCF_SUN_F1X_REMAP DL_LIBS INTL_LIBS PRELOAD_MODULES LUA LUAC LUA_INCLUDES LUA_LIBS HAS_SYSTEM_ASPRINTF XOPEN_SOURCE C99_SOURCE _DCF_HAS_VA_COPY 
_DCF_NO_LOCALE PKGLOCALEDIR LIBOBJS LTLIBOBJS'
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -972,7 +972,7 @@ esac
-     else
-       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-     fi
--    cd "$ac_popdir"
-+    cd $ac_popdir
-   done
- fi
- 
-@@ -1900,7 +1900,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   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'
-+       { 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=$?
-@@ -1958,7 +1959,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   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'
-+       { 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=$?
-@@ -2074,7 +2076,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   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'
-+       { 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=$?
-@@ -2128,7 +2131,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   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'
-+       { 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=$?
-@@ -2173,7 +2177,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   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'
-+       { 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=$?
-@@ -2217,7 +2222,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&