Updated icewm to 1.2.0

- translation updates
- bug fixes
- new features
  - HorizontalEdgeSwitch and VerticalEdgeSwitch
  - LowerOnClickWhenRaised lower the active window when clicked again
  - added icesh - a command line window manager
  - TitleBarHorzOffset/TitleBarVertOffset
  - allow transparent menu selection
  - gradient support
  - transparent applets
  ...

5 files changed, 17 insertions, 17 deletions

diff --git a/wm/icewm/Makefile b/wm/icewm/Makefile
index 2463cbd2573..004b2b1afad 100644
--- a/wm/icewm/Makefile
+++ b/wm/icewm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2002/02/28 12:53:29 martti Exp $
+# $NetBSD: Makefile,v 1.12 2002/08/22 10:58:34 martti Exp $
 
-PKGNAME=		${DISTNAME:S/-2/.2/}
+PKGNAME=		${DISTNAME}
 COMMENT=		Small, fast and light-weight window manager
 
 CONFLICTS+=		icewm-gnome-[0-9]*
diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common
index a871392571c..de57416b4f9 100644
--- a/wm/icewm/Makefile.common
+++ b/wm/icewm/Makefile.common
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile.common,v 1.13 2002/03/10 22:11:36 wiz Exp $
+# $NetBSD: Makefile.common,v 1.14 2002/08/22 10:58:34 martti Exp $
 
-DISTNAME=		icewm-1.0.9-2
+DISTNAME=		icewm-1.2.0
 CATEGORIES=		x11 wm
 MASTER_SITES=		http://download.sourceforge.net/icewm/
-EXTRACT_SUFX=		.tar.bz2
-PKGREVISION=		1
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://icewm.sourceforge.net/
@@ -17,7 +15,6 @@ BUILD_USES_MSGFMT=	# defined
 DISTINFO_FILE=		${.CURDIR}/../../wm/icewm/distinfo
 FILESDIR=		${.CURDIR}/../../wm/icewm/files
 PATCHDIR=		${.CURDIR}/../../wm/icewm/patches
-WRKSRC=			${WRKDIR}/icewm-1.0.9
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/wm/icewm/PLIST b/wm/icewm/PLIST
index aaf17617f10..2a4fc5f1997 100644
--- a/wm/icewm/PLIST
+++ b/wm/icewm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/26 09:41:39 martti Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/22 10:58:34 martti Exp $
 bin/genpref
 bin/icehelp
 bin/icesh
@@ -283,6 +283,7 @@ share/doc/icewm/FAQ
 share/doc/icewm/README
 share/doc/icewm/TODO
 share/locale/ca/LC_MESSAGES/icewm.mo
+share/locale/cs/LC_MESSAGES/icewm.mo
 share/locale/de/LC_MESSAGES/icewm.mo
 share/locale/en/LC_MESSAGES/icewm.mo
 share/locale/es/LC_MESSAGES/icewm.mo
@@ -297,6 +298,8 @@ share/locale/pl/LC_MESSAGES/icewm.mo
 share/locale/pt_BR/LC_MESSAGES/icewm.mo
 share/locale/ro/LC_MESSAGES/icewm.mo
 share/locale/ru/LC_MESSAGES/icewm.mo
+share/locale/sv/LC_MESSAGES/icewm.mo
+share/locale/zh_CN.gb2312/LC_MESSAGES/icewm.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/icewm.mo
 @dirrm etc/X11/icewm
 @dirrm lib/X11/icewm/icons
diff --git a/wm/icewm/distinfo b/wm/icewm/distinfo
index b05c221224e..c271f612531 100644
--- a/wm/icewm/distinfo
+++ b/wm/icewm/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.6 2002/05/03 10:56:38 wiz Exp $
+$NetBSD: distinfo,v 1.7 2002/08/22 10:58:34 martti Exp $
 
-SHA1 (icewm-1.0.9-2.tar.bz2) = f42d64996cde40f790247eb5428fb56dc2bfdb2f
-Size (icewm-1.0.9-2.tar.bz2) = 484612 bytes
+SHA1 (icewm-1.2.0.tar.gz) = bef4daba4bb94120f08f90755a9bc3518c254c21
+Size (icewm-1.2.0.tar.gz) = 684306 bytes
 SHA1 (patch-aa) = 8dc74038552f8c9783622229981a9a83b3464512
 SHA1 (patch-ab) = bd8501ef2606efecb8f603578e1e2f978e586923
 SHA1 (patch-ac) = 5275f5e9b5dae569d8d01a1209c00f40490edcbc
-SHA1 (patch-ae) = edc66c096499df9a8b76d43376b3e40c408c99d3
+SHA1 (patch-ae) = e577de295c2024e51b0b571dc8eaaf5169ad57e4
 SHA1 (patch-af) = 61a5060c95f9110b536c3312c1afc8d722af5226
 SHA1 (patch-ag) = b6fb34262124dff0c33efe6f9c3261068af71c7d
diff --git a/wm/icewm/patches/patch-ae b/wm/icewm/patches/patch-ae
index 506b2f05f47..03da865c289 100644
--- a/wm/icewm/patches/patch-ae
+++ b/wm/icewm/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2002/02/26 09:41:40 martti Exp $
+$NetBSD: patch-ae,v 1.3 2002/08/22 10:58:35 martti Exp $
 
---- src/wmtaskbar.cc.orig	Tue Oct  9 16:54:04 2001
-+++ src/wmtaskbar.cc	Tue Feb 26 08:48:08 2002
-@@ -287,7 +287,11 @@
+--- src/wmtaskbar.cc.orig	Thu May 16 05:00:02 2002
++++ src/wmtaskbar.cc	Sat May 25 09:41:09 2002
+@@ -288,7 +288,11 @@
      } else
          fClock = 0;
  #ifdef CONFIG_APPLET_APM
@@ -12,5 +12,5 @@ $NetBSD: patch-ae,v 1.2 2002/02/26 09:41:40 martti Exp $
 +    if (taskBarShowApm && access(APMDEV, 0) == 0) {
 +#endif
          fApm = new YApm(this);
-         if (fApm->height() + ADD1 > ht) ht = fApm->height() + ADD1;
+         if (fApm->height() > ht) ht = fApm->height();
      } else