Update icewm to 1.2.20

# 1.2.20: 2005-01-09

    * fix+revert default binding for MouseWinMove an MouseWinSize
    * fix 1 pixel border when taskbar at top of screen
    * fix themes not loading from user directory

# 1.2.19: 2004-12-26

    * fix crash/build failure when taskbar disabled
    * fix build/link with some gcc/g++ versions

# 1.2.18: 2004-12-18

    * changed icedesert colors (Hanspeter Roth)

# 1.2.18pre1: 2004-12-05

    * disable SupportsSemitransparency by default, this makes
      icewmbg exit after setting the image and reduces memory usage
    * fix Meta key handling typo
    * fix CPU waste in icewm-session and icewmtray
    * fix some Win+x key combinations
    * new settings MouseWinMove (=Alt+Ctrl+Pointer_Button1) and
      MouseWinSize (=Alt+Ctrl+PointerButton3). The default bindings have
      changed from Alt+button drag to Ctrl+Alt (or Super).

# 1.2.17: 2004-11-07

    * fix: windows were not expanding when taskbar was hidden
    * fix: reused (hidden) application windows popped up on original
      workspace
    * fix: build with --disable-taskbar
    * fix: maximize/restore for rxvt
    * fix: reboot/shutdown functionality (default configuration
      changed to use 'sudo')

# 1.2.17pre2: 2004-10-31

    * fix crash on startup when mailbox or net status disabled
    * fix build with gcc > 3.3
    * fix gray lines on taskbar bottom
    * major changes in window geometry/layout handling
    * fix "tray icon"

# 1.2.17pre1: 2004-10-24

    * fix \ quoting in configuration files (Eduard Bloch)
    * fix "win" key when NumLock active
    * more weird modifier map fixesa
    * updated Slovenian translation (Jernej Kovacic)
    * add the button to collapse the task bar
    * rewrite of taskbar layout code
    * force Imlib to use default visual (fix xorg visual mess)
    * vertical layout for Alt+Tab (Eduard Bloch)

6 files changed, 12 insertions, 37 deletions

diff --git a/wm/icewm-gnome/Makefile b/wm/icewm-gnome/Makefile
index 184baa57836..07d70cc0758 100644
--- a/wm/icewm-gnome/Makefile
+++ b/wm/icewm-gnome/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2005/01/13 10:14:45 xtraeme Exp $
+# $NetBSD: Makefile,v 1.32 2005/01/20 04:27:48 xtraeme Exp $
 
 PKGNAME=	${DISTNAME:S/-/-gnome-/}
-PKGREVISION=	2
 COMMENT=	Small, fast and light-weight window manager (GNOME version)
 
 CONFLICTS+=	icewm-[0-9]* icewm-imlib-[0-9]*
diff --git a/wm/icewm-imlib/Makefile b/wm/icewm-imlib/Makefile
index 0b93597d928..38a71fab10b 100644
--- a/wm/icewm-imlib/Makefile
+++ b/wm/icewm-imlib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2005/01/13 10:14:45 xtraeme Exp $
+# $NetBSD: Makefile,v 1.17 2005/01/20 04:27:48 xtraeme Exp $
 
 PKGNAME=	${DISTNAME:S/-/-imlib-/}
-PKGREVISION=	2
 COMMENT=	Small, fast and light-weight window manager (imlib version)
 
 CONFLICTS+=	icewm-[0-9]* icewm-gnome-[0-9]*
diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common
index b0254e283f1..4256ff35a89 100644
--- a/wm/icewm/Makefile.common
+++ b/wm/icewm/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.39 2004/11/09 07:58:14 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.40 2005/01/20 04:27:48 xtraeme Exp $
 
-DISTNAME=		icewm-1.2.16
+DISTNAME=		icewm-1.2.20
 CATEGORIES=		x11 wm
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=icewm/}
 
diff --git a/wm/icewm/distinfo b/wm/icewm/distinfo
index a704471cb92..e1addd63853 100644
--- a/wm/icewm/distinfo
+++ b/wm/icewm/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.21 2005/01/13 01:31:53 xtraeme Exp $
+$NetBSD: distinfo,v 1.22 2005/01/20 04:27:49 xtraeme Exp $
 
-SHA1 (icewm-1.2.16.tar.gz) = 79f8e011fa601943714c034c06ae1654bb834c9e
-Size (icewm-1.2.16.tar.gz) = 947114 bytes
+SHA1 (icewm-1.2.20.tar.gz) = 35ec8499d2f550d20b539d1af040decc1f43306d
+Size (icewm-1.2.20.tar.gz) = 948530 bytes
 SHA1 (patch-ac) = 2f04935c54e8ea8f6dccfe2c9b37c9c16df88bc6
 SHA1 (patch-ad) = 8efab7cb50ce5bdb7d218caa232ae501dd064424
-SHA1 (patch-ae) = 2b0fd5802595021440ac97c29de13f66e08e1190
-SHA1 (patch-af) = f73e8b5b0ab49de018a7a90ec0e394ee10b44965
+SHA1 (patch-af) = c2a2a4e87ffc2c03959ca32a185b997db5a02616
diff --git a/wm/icewm/patches/patch-ae b/wm/icewm/patches/patch-ae
deleted file mode 100644
index 5d6b6e6315c..00000000000
--- a/wm/icewm/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.9 2004/11/09 07:58:14 xtraeme Exp $
-
---- src/wmmgr.cc.orig	2004-11-09 08:54:16.000000000 +0100
-+++ src/wmmgr.cc	2004-11-09 08:55:05.000000000 +0100
-@@ -203,7 +203,7 @@
-     if (xapp->WinMask && win95keys) {
-         ///  !!! fix -- allow apps to use remaining key combos (except single press)
-         if (xapp->Win_L) {
--#if 0
-+#if 1
-             grabKey(xapp->Win_L, 0);
- #else
- 
-@@ -214,7 +214,7 @@
- #endif
-         }
-         if (xapp->Win_R) {
--#if 0
-+#if 1
-             grabKey(xapp->Win_R, 0);
- #else
-             KeyCode keycode = XKeysymToKeycode(xapp->display(), xapp->Win_R);
diff --git a/wm/icewm/patches/patch-af b/wm/icewm/patches/patch-af
index 5720d0a3851..f1c0ce49311 100644
--- a/wm/icewm/patches/patch-af
+++ b/wm/icewm/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.11 2005/01/13 01:31:53 xtraeme Exp $
+$NetBSD: patch-af,v 1.12 2005/01/20 04:27:49 xtraeme Exp $
 
---- src/ylocale.cc.orig	2004-08-16 06:58:31.000000000 +0200
-+++ src/ylocale.cc	2005-01-13 02:25:55.000000000 +0100
+--- src/ylocale.cc.orig	2005-01-20 05:16:50.000000000 +0100
++++ src/ylocale.cc	2005-01-20 05:18:15.000000000 +0100
 @@ -15,6 +15,7 @@
  
  #include "intl.h"
@@ -19,6 +19,6 @@ $NetBSD: patch-af,v 1.11 2005/01/13 01:31:53 xtraeme Exp $
 +#else
      if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen))
 +#endif
- 	warn(_("Invalid multibyte string \"%s\": %s"), lStr, strerror(errno));
+         warn(_("Invalid multibyte string \"%s\": %s"), lStr, strerror(errno));
  
      *((YUChar *) outbuf) = 0;