Update icewm and icewm-gnome to 1.0.4. Changes from version 1.0.2:

1.0.4: 2000-06-11
	- minor fix for tcl/tk apps (please report any more tcl/tk again)
	- fix -c option restart (tnx to Diego Zamboni)
	- auto-detect multiByte (by
        - exit Start menu with Alt or Win/...

1.0.3: 2000-03-19
	- empty taskbar window title fix
        - set pointer default for each toplevel window
        - mwm hints tweaking
        - multiple SIGHUP restart fix

8 files changed, 211 insertions, 201 deletions

diff --git a/x11/icewm-gnome/Makefile b/x11/icewm-gnome/Makefile
index eac8ed7ae41..493776a127e 100644
--- a/x11/icewm-gnome/Makefile
+++ b/x11/icewm-gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/07/18 15:21:01 agc Exp $
+# $NetBSD: Makefile,v 1.6 2000/07/31 07:37:01 jlam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-gnome-/}
 
@@ -9,8 +9,8 @@ CONFLICTS+=		icewm-[0-9]*
 USE_X11=		yes
 
 EVAL_PREFIX+=		GNOMEDIR=gnome-libs
-CONFIGURE_ARGS+=	--with-gnome-menus=${GNOMEDIR}/bin/gnome-config \
-			--with-imlib
+CONFIGURE_ARGS+=	--with-gnome-menus="${GNOMEDIR}/bin/gnome-config"
+CONFIGURE_ARGS+=	--with-imlib
 CONFIGURE_ENV+=		LIBS="-lintl"
 
 .include "../../x11/icewm/Makefile.common"
diff --git a/x11/icewm-gnome/pkg/PLIST b/x11/icewm-gnome/pkg/PLIST
index 82e2c75823d..7702fa8b9c6 100644
--- a/x11/icewm-gnome/pkg/PLIST
+++ b/x11/icewm-gnome/pkg/PLIST
@@ -1,12 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/01/23 16:03:36 tron Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/07/31 07:37:01 jlam Exp $
 bin/icewm
 bin/icewmhint
 bin/icewmbg
-lib/X11/icewm/preferences
-lib/X11/icewm/menu
-lib/X11/icewm/toolbar
-lib/X11/icewm/winoptions
-lib/X11/icewm/keys
 lib/X11/icewm/icons/app_16x16.xpm
 lib/X11/icewm/icons/app_32x32.xpm
 lib/X11/icewm/icons/bomb_16x16.xpm
@@ -20,8 +15,8 @@ lib/X11/icewm/icons/communicator-composer_32x32.xpm
 lib/X11/icewm/icons/communicator-discussion_16x16.xpm
 lib/X11/icewm/icons/communicator-discussion_32x32.xpm
 lib/X11/icewm/icons/communicator-mail_16x16.xpm
-lib/X11/icewm/icons/file_16x16.xpm
 lib/X11/icewm/icons/communicator-mail_32x32.xpm
+lib/X11/icewm/icons/file_16x16.xpm
 lib/X11/icewm/icons/file_32x32.xpm
 lib/X11/icewm/icons/folder_16x16.xpm
 lib/X11/icewm/icons/folder_32x32.xpm
@@ -52,7 +47,7 @@ lib/X11/icewm/icons/xterm_16x16.xpm
 lib/X11/icewm/icons/xterm_32x32.xpm
 lib/X11/icewm/icons/xv_16x16.xpm
 lib/X11/icewm/icons/xv_32x32.xpm
-@dirrm lib/X11/icewm/icons
+lib/X11/icewm/keys
 lib/X11/icewm/ledclock/a.xpm
 lib/X11/icewm/ledclock/colon.xpm
 lib/X11/icewm/ledclock/dot.xpm
@@ -70,7 +65,13 @@ lib/X11/icewm/ledclock/n9.xpm
 lib/X11/icewm/ledclock/p.xpm
 lib/X11/icewm/ledclock/slash.xpm
 lib/X11/icewm/ledclock/space.xpm
-@dirrm lib/X11/icewm/ledclock
+lib/X11/icewm/mailbox/errmail.xpm
+lib/X11/icewm/mailbox/mail.xpm
+lib/X11/icewm/mailbox/newmail.xpm
+lib/X11/icewm/mailbox/nomail.xpm
+lib/X11/icewm/mailbox/unreadmail.xpm
+lib/X11/icewm/menu
+lib/X11/icewm/preferences
 lib/X11/icewm/taskbar/debian.xpm
 lib/X11/icewm/taskbar/linux.xpm
 lib/X11/icewm/taskbar/linux1.xpm
@@ -79,54 +80,20 @@ lib/X11/icewm/taskbar/linux20.xpm
 lib/X11/icewm/taskbar/start.xpm
 lib/X11/icewm/taskbar/windows.xpm
 lib/X11/icewm/taskbar/xfreeos2.xpm
-@dirrm lib/X11/icewm/taskbar
-lib/X11/icewm/mailbox/errmail.xpm
-lib/X11/icewm/mailbox/mail.xpm
-lib/X11/icewm/mailbox/newmail.xpm
-lib/X11/icewm/mailbox/nomail.xpm
-lib/X11/icewm/mailbox/unreadmail.xpm
-@dirrm lib/X11/icewm/mailbox
-lib/X11/icewm/themes/nice/close.xpm
-lib/X11/icewm/themes/nice/hide.xpm
-lib/X11/icewm/themes/nice/maximize.xpm
-lib/X11/icewm/themes/nice/minimize.xpm
-lib/X11/icewm/themes/nice/restore.xpm
-lib/X11/icewm/themes/nice/rolldown.xpm
-lib/X11/icewm/themes/nice/rollup.xpm
-lib/X11/icewm/themes/nice/blue.theme
-lib/X11/icewm/themes/nice/default.theme
-@dirrm lib/X11/icewm/themes/nice
-lib/X11/icewm/themes/motif/close.xpm
-lib/X11/icewm/themes/motif/maximize.xpm
-lib/X11/icewm/themes/motif/menu.xpm
-lib/X11/icewm/themes/motif/minimize.xpm
-lib/X11/icewm/themes/motif/restore.xpm
-lib/X11/icewm/themes/motif/default.theme
-@dirrm lib/X11/icewm/themes/motif
-lib/X11/icewm/themes/win95/close.xpm
-lib/X11/icewm/themes/win95/maximize.xpm
-lib/X11/icewm/themes/win95/minimize.xpm
-lib/X11/icewm/themes/win95/restore.xpm
-lib/X11/icewm/themes/win95/default.theme
-@dirrm lib/X11/icewm/themes/win95
-lib/X11/icewm/themes/warp3/close.xpm
-lib/X11/icewm/themes/warp3/hide.xpm
-lib/X11/icewm/themes/warp3/maximize.xpm
-lib/X11/icewm/themes/warp3/minimize.xpm
-lib/X11/icewm/themes/warp3/restore.xpm
-lib/X11/icewm/themes/warp3/rolldown.xpm
-lib/X11/icewm/themes/warp3/rollup.xpm
-lib/X11/icewm/themes/warp3/default.theme
-@dirrm lib/X11/icewm/themes/warp3
-lib/X11/icewm/themes/warp4/close.xpm
-lib/X11/icewm/themes/warp4/hide.xpm
-lib/X11/icewm/themes/warp4/maximize.xpm
-lib/X11/icewm/themes/warp4/minimize.xpm
-lib/X11/icewm/themes/warp4/restore.xpm
-lib/X11/icewm/themes/warp4/default.theme
-@dirrm lib/X11/icewm/themes/warp4
+lib/X11/icewm/themes/gtk2/closeA.xpm
+lib/X11/icewm/themes/gtk2/closeI.xpm
+lib/X11/icewm/themes/gtk2/default.theme
+lib/X11/icewm/themes/gtk2/maximizeA.xpm
+lib/X11/icewm/themes/gtk2/maximizeI.xpm
+lib/X11/icewm/themes/gtk2/menuButtonA.xpm
+lib/X11/icewm/themes/gtk2/menuButtonI.xpm
+lib/X11/icewm/themes/gtk2/minimizeA.xpm
+lib/X11/icewm/themes/gtk2/minimizeI.xpm
+lib/X11/icewm/themes/gtk2/restoreA.xpm
+lib/X11/icewm/themes/gtk2/restoreI.xpm
 lib/X11/icewm/themes/metal2/closeA.xpm
 lib/X11/icewm/themes/metal2/closeI.xpm
+lib/X11/icewm/themes/metal2/default.theme
 lib/X11/icewm/themes/metal2/depthA.xpm
 lib/X11/icewm/themes/metal2/depthI.xpm
 lib/X11/icewm/themes/metal2/dframeAB.xpm
@@ -168,12 +135,12 @@ lib/X11/icewm/themes/metal2/maximizeI.xpm
 lib/X11/icewm/themes/metal2/menuButtonA.xpm
 lib/X11/icewm/themes/metal2/menuButtonI.xpm
 lib/X11/icewm/themes/metal2/minimizeA.xpm
-lib/X11/icewm/themes/metal2/rollupA.xpm
 lib/X11/icewm/themes/metal2/minimizeI.xpm
 lib/X11/icewm/themes/metal2/restoreA.xpm
 lib/X11/icewm/themes/metal2/restoreI.xpm
 lib/X11/icewm/themes/metal2/rolldownA.xpm
 lib/X11/icewm/themes/metal2/rolldownI.xpm
+lib/X11/icewm/themes/metal2/rollupA.xpm
 lib/X11/icewm/themes/metal2/rollupI.xpm
 lib/X11/icewm/themes/metal2/titleAB.xpm
 lib/X11/icewm/themes/metal2/titleAL.xpm
@@ -189,42 +156,76 @@ lib/X11/icewm/themes/metal2/titleIP.xpm
 lib/X11/icewm/themes/metal2/titleIR.xpm
 lib/X11/icewm/themes/metal2/titleIS.xpm
 lib/X11/icewm/themes/metal2/titleIT.xpm
-lib/X11/icewm/themes/metal2/default.theme
-@dirrm lib/X11/icewm/themes/metal2
-lib/X11/icewm/themes/gtk2/closeA.xpm
-lib/X11/icewm/themes/gtk2/closeI.xpm
-lib/X11/icewm/themes/gtk2/maximizeA.xpm
-lib/X11/icewm/themes/gtk2/maximizeI.xpm
-lib/X11/icewm/themes/gtk2/menuButtonA.xpm
-lib/X11/icewm/themes/gtk2/menuButtonI.xpm
-lib/X11/icewm/themes/gtk2/minimizeA.xpm
-lib/X11/icewm/themes/gtk2/minimizeI.xpm
-lib/X11/icewm/themes/gtk2/restoreA.xpm
-lib/X11/icewm/themes/gtk2/restoreI.xpm
-lib/X11/icewm/themes/gtk2/default.theme
-@dirrm lib/X11/icewm/themes/gtk2
-@dirrm lib/X11/icewm/themes
-@dirrm lib/X11/icewm
+lib/X11/icewm/themes/motif/close.xpm
+lib/X11/icewm/themes/motif/default.theme
+lib/X11/icewm/themes/motif/maximize.xpm
+lib/X11/icewm/themes/motif/menu.xpm
+lib/X11/icewm/themes/motif/minimize.xpm
+lib/X11/icewm/themes/motif/restore.xpm
+lib/X11/icewm/themes/nice/blue.theme
+lib/X11/icewm/themes/nice/close.xpm
+lib/X11/icewm/themes/nice/default.theme
+lib/X11/icewm/themes/nice/hide.xpm
+lib/X11/icewm/themes/nice/maximize.xpm
+lib/X11/icewm/themes/nice/minimize.xpm
+lib/X11/icewm/themes/nice/restore.xpm
+lib/X11/icewm/themes/nice/rolldown.xpm
+lib/X11/icewm/themes/nice/rollup.xpm
+lib/X11/icewm/themes/warp3/close.xpm
+lib/X11/icewm/themes/warp3/default.theme
+lib/X11/icewm/themes/warp3/hide.xpm
+lib/X11/icewm/themes/warp3/maximize.xpm
+lib/X11/icewm/themes/warp3/minimize.xpm
+lib/X11/icewm/themes/warp3/restore.xpm
+lib/X11/icewm/themes/warp3/rolldown.xpm
+lib/X11/icewm/themes/warp3/rollup.xpm
+lib/X11/icewm/themes/warp4/close.xpm
+lib/X11/icewm/themes/warp4/default.theme
+lib/X11/icewm/themes/warp4/hide.xpm
+lib/X11/icewm/themes/warp4/maximize.xpm
+lib/X11/icewm/themes/warp4/minimize.xpm
+lib/X11/icewm/themes/warp4/restore.xpm
+lib/X11/icewm/themes/win95/close.xpm
+lib/X11/icewm/themes/win95/default.theme
+lib/X11/icewm/themes/win95/maximize.xpm
+lib/X11/icewm/themes/win95/minimize.xpm
+lib/X11/icewm/themes/win95/restore.xpm
+lib/X11/icewm/toolbar
+lib/X11/icewm/winoptions
+share/doc/html/icewm/icewm-1.html
+share/doc/html/icewm/icewm-10.html
+share/doc/html/icewm/icewm-11.html
+share/doc/html/icewm/icewm-12.html
+share/doc/html/icewm/icewm-13.html
+share/doc/html/icewm/icewm-14.html
+share/doc/html/icewm/icewm-15.html
+share/doc/html/icewm/icewm-2.html
+share/doc/html/icewm/icewm-3.html
+share/doc/html/icewm/icewm-4.html
+share/doc/html/icewm/icewm-5.html
+share/doc/html/icewm/icewm-6.html
+share/doc/html/icewm/icewm-7.html
+share/doc/html/icewm/icewm-8.html
+share/doc/html/icewm/icewm-9.html
+share/doc/html/icewm/icewm.html
 share/doc/icewm/BUGS
 share/doc/icewm/CHANGES
 share/doc/icewm/COPYING
 share/doc/icewm/FAQ
 share/doc/icewm/README
 share/doc/icewm/TODO
-share/doc/icewm/icewm.html
-share/doc/icewm/icewm-1.html
-share/doc/icewm/icewm-2.html
-share/doc/icewm/icewm-3.html
-share/doc/icewm/icewm-4.html
-share/doc/icewm/icewm-5.html
-share/doc/icewm/icewm-6.html
-share/doc/icewm/icewm-7.html
-share/doc/icewm/icewm-8.html
-share/doc/icewm/icewm-9.html
-share/doc/icewm/icewm-10.html
-share/doc/icewm/icewm-11.html
-share/doc/icewm/icewm-12.html
-share/doc/icewm/icewm-13.html
-share/doc/icewm/icewm-14.html
-share/doc/icewm/icewm-15.html
 @dirrm share/doc/icewm
+@dirrm share/doc/html/icewm
+@dirrm lib/X11/icewm/themes/win95
+@dirrm lib/X11/icewm/themes/warp4
+@dirrm lib/X11/icewm/themes/warp3
+@dirrm lib/X11/icewm/themes/nice
+@dirrm lib/X11/icewm/themes/motif
+@dirrm lib/X11/icewm/themes/metal2
+@dirrm lib/X11/icewm/themes/gtk2
+@dirrm lib/X11/icewm/themes
+@dirrm lib/X11/icewm/taskbar
+@dirrm lib/X11/icewm/mailbox
+@dirrm lib/X11/icewm/ledclock
+@dirrm lib/X11/icewm/icons
+@dirrm lib/X11/icewm
diff --git a/x11/icewm/Makefile b/x11/icewm/Makefile
index 562c53a8c4e..f5bf9e0a33f 100644
--- a/x11/icewm/Makefile
+++ b/x11/icewm/Makefile
@@ -1,8 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2000/03/07 17:44:13 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2000/07/31 07:37:00 jlam Exp $
 #
 
-DEPENDS+=	xpm-3.4k:../../graphics/xpm
+DEPENDS+=		xpm-3.4k:../../graphics/xpm
 
-CONFLICTS+=	icewm-gnome-[0-9]*
+CONFLICTS+=		icewm-gnome-[0-9]*
+
+EVAL_PREFIX+=		XPMDIR=xpm
+CONFIGURE_ARGS+=	--with-xpm="${XPMDIR}"
 
 .include "../../x11/icewm/Makefile.common"
diff --git a/x11/icewm/Makefile.common b/x11/icewm/Makefile.common
index fc012e891be..4d06f866e57 100644
--- a/x11/icewm/Makefile.common
+++ b/x11/icewm/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.1 2000/03/07 17:44:13 jlam Exp $
+# $NetBSD: Makefile.common,v 1.2 2000/07/31 07:37:00 jlam Exp $
 #
 
-DISTNAME=	icewm-1.0.2
+DISTNAME=	icewm-1.0.4
 CATEGORIES=	x11
 MASTER_SITES=	http://download.sourceforge.net/icewm/ \
 		ftp://ftp.fu-berlin.de/unix/X11/window-managers/icewm/
@@ -10,8 +10,8 @@ EXTRACT_SUFX=	.src.tar.gz
 MAINTAINER=	wiz@netbsd.org
 HOMEPAGE=	http://icewm.sourceforge.net/
 
-GNU_CONFIGURE=	YES
-USE_X11BASE=	YES
+GNU_CONFIGURE=	# defined
+USE_X11BASE=	# defined
 
 FILESDIR=	${.CURDIR}/../../x11/icewm/files
 PATCHDIR=	${.CURDIR}/../../x11/icewm/patches
@@ -25,13 +25,18 @@ CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 .endif
 .endif
 
+DOCDIR=		${PREFIX}/share/doc/icewm
+HTMLDIR=	${PREFIX}/share/doc/html/icewm
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/icewm
-.for f in BUGS CHANGES COPYING FAQ README TODO doc/icewm.html
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/icewm
-.endfor
-.for f in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
-	${INSTALL_DATA} ${WRKSRC}/doc/icewm-${f}.html ${PREFIX}/share/doc/icewm
-.endfor
+	${INSTALL_DATA_DIR} ${DOCDIR} ${HTMLDIR}
+	for file in BUGS CHANGES COPYING FAQ README TODO; do \
+		${INSTALL_DATA} ${WRKSRC}/$${file} ${DOCDIR}; \
+	done
+	${INSTALL_DATA} ${WRKSRC}/doc/icewm*.html ${HTMLDIR}
+	${MAKE} dynamic-plist
+
+INSTALL_DIRS=	lib/X11/icewm ${DOCDIR} ${HTMLDIR}
 
+.include "../../mk/dynamic.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/icewm/files/md5 b/x11/icewm/files/md5
index 71039fd005e..496b8194699 100644
--- a/x11/icewm/files/md5
+++ b/x11/icewm/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 2000/02/20 17:56:17 wiz Exp $
+$NetBSD: md5,v 1.3 2000/07/31 07:37:00 jlam Exp $
 
-MD5 (icewm-1.0.2.src.tar.gz) = e6fa2311485576e6bf71ba98f3a0200b
+MD5 (icewm-1.0.4.src.tar.gz) = 31d6fd8b94fd1becab0de15d4a8e4eb4
diff --git a/x11/icewm/files/patch-sum b/x11/icewm/files/patch-sum
index 78003fc6862..657d515d9b7 100644
--- a/x11/icewm/files/patch-sum
+++ b/x11/icewm/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.2 2000/03/07 03:35:44 jlam Exp $
+$NetBSD: patch-sum,v 1.3 2000/07/31 07:37:00 jlam Exp $
 
 MD5 (patch-aa) = e14f55369b97e470dba2ec2941124c9a
 MD5 (patch-ab) = c4341b61b19b4a16ac86a85a64f8426e
 MD5 (patch-ac) = 89fa90d5957d5f6fbb50a9de63237741
 MD5 (patch-ad) = 4d5a4ad0a012707a3851a89e1e1d0159
-MD5 (patch-ae) = 3a1818b96e9a2c40fa1c9e05168273a0
+MD5 (patch-ae) = 6f6cd71973024f66c88b089f128e9b2d
diff --git a/x11/icewm/patches/patch-ae b/x11/icewm/patches/patch-ae
index 86cfa70c25e..80d343be82d 100644
--- a/x11/icewm/patches/patch-ae
+++ b/x11/icewm/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2000/03/07 03:35:45 jlam Exp $
+$NetBSD: patch-ae,v 1.2 2000/07/31 07:37:00 jlam Exp $
 
---- src/wmtaskbar.cc.orig	Sun Feb  6 11:15:45 2000
-+++ src/wmtaskbar.cc	Mon Mar  6 22:20:48 2000
-@@ -253,7 +253,11 @@
+--- src/wmtaskbar.cc.orig	Sun Mar 19 08:34:58 2000
++++ src/wmtaskbar.cc	Mon Jul 31 01:47:42 2000
+@@ -254,7 +254,11 @@
      } else
          fClock = 0;
  #ifdef CONFIG_APM
diff --git a/x11/icewm/pkg/PLIST b/x11/icewm/pkg/PLIST
index b97d747430b..b393e2f898f 100644
--- a/x11/icewm/pkg/PLIST
+++ b/x11/icewm/pkg/PLIST
@@ -1,12 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/01/22 23:52:13 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/07/31 07:37:00 jlam Exp $
 bin/icewm
 bin/icewmhint
 bin/icewmbg
-lib/X11/icewm/preferences
-lib/X11/icewm/menu
-lib/X11/icewm/toolbar
-lib/X11/icewm/winoptions
-lib/X11/icewm/keys
 lib/X11/icewm/icons/app_16x16.xpm
 lib/X11/icewm/icons/app_32x32.xpm
 lib/X11/icewm/icons/bomb_16x16.xpm
@@ -20,8 +15,8 @@ lib/X11/icewm/icons/communicator-composer_32x32.xpm
 lib/X11/icewm/icons/communicator-discussion_16x16.xpm
 lib/X11/icewm/icons/communicator-discussion_32x32.xpm
 lib/X11/icewm/icons/communicator-mail_16x16.xpm
-lib/X11/icewm/icons/file_16x16.xpm
 lib/X11/icewm/icons/communicator-mail_32x32.xpm
+lib/X11/icewm/icons/file_16x16.xpm
 lib/X11/icewm/icons/file_32x32.xpm
 lib/X11/icewm/icons/folder_16x16.xpm
 lib/X11/icewm/icons/folder_32x32.xpm
@@ -52,7 +47,7 @@ lib/X11/icewm/icons/xterm_16x16.xpm
 lib/X11/icewm/icons/xterm_32x32.xpm
 lib/X11/icewm/icons/xv_16x16.xpm
 lib/X11/icewm/icons/xv_32x32.xpm
-@dirrm lib/X11/icewm/icons
+lib/X11/icewm/keys
 lib/X11/icewm/ledclock/a.xpm
 lib/X11/icewm/ledclock/colon.xpm
 lib/X11/icewm/ledclock/dot.xpm
@@ -70,7 +65,13 @@ lib/X11/icewm/ledclock/n9.xpm
 lib/X11/icewm/ledclock/p.xpm
 lib/X11/icewm/ledclock/slash.xpm
 lib/X11/icewm/ledclock/space.xpm
-@dirrm lib/X11/icewm/ledclock
+lib/X11/icewm/mailbox/errmail.xpm
+lib/X11/icewm/mailbox/mail.xpm
+lib/X11/icewm/mailbox/newmail.xpm
+lib/X11/icewm/mailbox/nomail.xpm
+lib/X11/icewm/mailbox/unreadmail.xpm
+lib/X11/icewm/menu
+lib/X11/icewm/preferences
 lib/X11/icewm/taskbar/debian.xpm
 lib/X11/icewm/taskbar/linux.xpm
 lib/X11/icewm/taskbar/linux1.xpm
@@ -79,54 +80,20 @@ lib/X11/icewm/taskbar/linux20.xpm
 lib/X11/icewm/taskbar/start.xpm
 lib/X11/icewm/taskbar/windows.xpm
 lib/X11/icewm/taskbar/xfreeos2.xpm
-@dirrm lib/X11/icewm/taskbar
-lib/X11/icewm/mailbox/errmail.xpm
-lib/X11/icewm/mailbox/mail.xpm
-lib/X11/icewm/mailbox/newmail.xpm
-lib/X11/icewm/mailbox/nomail.xpm
-lib/X11/icewm/mailbox/unreadmail.xpm
-@dirrm lib/X11/icewm/mailbox
-lib/X11/icewm/themes/nice/close.xpm
-lib/X11/icewm/themes/nice/hide.xpm
-lib/X11/icewm/themes/nice/maximize.xpm
-lib/X11/icewm/themes/nice/minimize.xpm
-lib/X11/icewm/themes/nice/restore.xpm
-lib/X11/icewm/themes/nice/rolldown.xpm
-lib/X11/icewm/themes/nice/rollup.xpm
-lib/X11/icewm/themes/nice/blue.theme
-lib/X11/icewm/themes/nice/default.theme
-@dirrm lib/X11/icewm/themes/nice
-lib/X11/icewm/themes/motif/close.xpm
-lib/X11/icewm/themes/motif/maximize.xpm
-lib/X11/icewm/themes/motif/menu.xpm
-lib/X11/icewm/themes/motif/minimize.xpm
-lib/X11/icewm/themes/motif/restore.xpm
-lib/X11/icewm/themes/motif/default.theme
-@dirrm lib/X11/icewm/themes/motif
-lib/X11/icewm/themes/win95/close.xpm
-lib/X11/icewm/themes/win95/maximize.xpm
-lib/X11/icewm/themes/win95/minimize.xpm
-lib/X11/icewm/themes/win95/restore.xpm
-lib/X11/icewm/themes/win95/default.theme
-@dirrm lib/X11/icewm/themes/win95
-lib/X11/icewm/themes/warp3/close.xpm
-lib/X11/icewm/themes/warp3/hide.xpm
-lib/X11/icewm/themes/warp3/maximize.xpm
-lib/X11/icewm/themes/warp3/minimize.xpm
-lib/X11/icewm/themes/warp3/restore.xpm
-lib/X11/icewm/themes/warp3/rolldown.xpm
-lib/X11/icewm/themes/warp3/rollup.xpm
-lib/X11/icewm/themes/warp3/default.theme
-@dirrm lib/X11/icewm/themes/warp3
-lib/X11/icewm/themes/warp4/close.xpm
-lib/X11/icewm/themes/warp4/hide.xpm
-lib/X11/icewm/themes/warp4/maximize.xpm
-lib/X11/icewm/themes/warp4/minimize.xpm
-lib/X11/icewm/themes/warp4/restore.xpm
-lib/X11/icewm/themes/warp4/default.theme
-@dirrm lib/X11/icewm/themes/warp4
+lib/X11/icewm/themes/gtk2/closeA.xpm
+lib/X11/icewm/themes/gtk2/closeI.xpm
+lib/X11/icewm/themes/gtk2/default.theme
+lib/X11/icewm/themes/gtk2/maximizeA.xpm
+lib/X11/icewm/themes/gtk2/maximizeI.xpm
+lib/X11/icewm/themes/gtk2/menuButtonA.xpm
+lib/X11/icewm/themes/gtk2/menuButtonI.xpm
+lib/X11/icewm/themes/gtk2/minimizeA.xpm
+lib/X11/icewm/themes/gtk2/minimizeI.xpm
+lib/X11/icewm/themes/gtk2/restoreA.xpm
+lib/X11/icewm/themes/gtk2/restoreI.xpm
 lib/X11/icewm/themes/metal2/closeA.xpm
 lib/X11/icewm/themes/metal2/closeI.xpm
+lib/X11/icewm/themes/metal2/default.theme
 lib/X11/icewm/themes/metal2/depthA.xpm
 lib/X11/icewm/themes/metal2/depthI.xpm
 lib/X11/icewm/themes/metal2/dframeAB.xpm
@@ -168,12 +135,12 @@ lib/X11/icewm/themes/metal2/maximizeI.xpm
 lib/X11/icewm/themes/metal2/menuButtonA.xpm
 lib/X11/icewm/themes/metal2/menuButtonI.xpm
 lib/X11/icewm/themes/metal2/minimizeA.xpm
-lib/X11/icewm/themes/metal2/rollupA.xpm
 lib/X11/icewm/themes/metal2/minimizeI.xpm
 lib/X11/icewm/themes/metal2/restoreA.xpm
 lib/X11/icewm/themes/metal2/restoreI.xpm
 lib/X11/icewm/themes/metal2/rolldownA.xpm
 lib/X11/icewm/themes/metal2/rolldownI.xpm
+lib/X11/icewm/themes/metal2/rollupA.xpm
 lib/X11/icewm/themes/metal2/rollupI.xpm
 lib/X11/icewm/themes/metal2/titleAB.xpm
 lib/X11/icewm/themes/metal2/titleAL.xpm
@@ -189,42 +156,76 @@ lib/X11/icewm/themes/metal2/titleIP.xpm
 lib/X11/icewm/themes/metal2/titleIR.xpm
 lib/X11/icewm/themes/metal2/titleIS.xpm
 lib/X11/icewm/themes/metal2/titleIT.xpm
-lib/X11/icewm/themes/metal2/default.theme
-@dirrm lib/X11/icewm/themes/metal2
-lib/X11/icewm/themes/gtk2/closeA.xpm
-lib/X11/icewm/themes/gtk2/closeI.xpm
-lib/X11/icewm/themes/gtk2/maximizeA.xpm
-lib/X11/icewm/themes/gtk2/maximizeI.xpm
-lib/X11/icewm/themes/gtk2/menuButtonA.xpm
-lib/X11/icewm/themes/gtk2/menuButtonI.xpm
-lib/X11/icewm/themes/gtk2/minimizeA.xpm
-lib/X11/icewm/themes/gtk2/minimizeI.xpm
-lib/X11/icewm/themes/gtk2/restoreA.xpm
-lib/X11/icewm/themes/gtk2/restoreI.xpm
-lib/X11/icewm/themes/gtk2/default.theme
-@dirrm lib/X11/icewm/themes/gtk2
-@dirrm lib/X11/icewm/themes
-@dirrm lib/X11/icewm
+lib/X11/icewm/themes/motif/close.xpm
+lib/X11/icewm/themes/motif/default.theme
+lib/X11/icewm/themes/motif/maximize.xpm
+lib/X11/icewm/themes/motif/menu.xpm
+lib/X11/icewm/themes/motif/minimize.xpm
+lib/X11/icewm/themes/motif/restore.xpm
+lib/X11/icewm/themes/nice/blue.theme
+lib/X11/icewm/themes/nice/close.xpm
+lib/X11/icewm/themes/nice/default.theme
+lib/X11/icewm/themes/nice/hide.xpm
+lib/X11/icewm/themes/nice/maximize.xpm
+lib/X11/icewm/themes/nice/minimize.xpm
+lib/X11/icewm/themes/nice/restore.xpm
+lib/X11/icewm/themes/nice/rolldown.xpm
+lib/X11/icewm/themes/nice/rollup.xpm
+lib/X11/icewm/themes/warp3/close.xpm
+lib/X11/icewm/themes/warp3/default.theme
+lib/X11/icewm/themes/warp3/hide.xpm
+lib/X11/icewm/themes/warp3/maximize.xpm
+lib/X11/icewm/themes/warp3/minimize.xpm
+lib/X11/icewm/themes/warp3/restore.xpm
+lib/X11/icewm/themes/warp3/rolldown.xpm
+lib/X11/icewm/themes/warp3/rollup.xpm
+lib/X11/icewm/themes/warp4/close.xpm
+lib/X11/icewm/themes/warp4/default.theme
+lib/X11/icewm/themes/warp4/hide.xpm
+lib/X11/icewm/themes/warp4/maximize.xpm
+lib/X11/icewm/themes/warp4/minimize.xpm
+lib/X11/icewm/themes/warp4/restore.xpm
+lib/X11/icewm/themes/win95/close.xpm
+lib/X11/icewm/themes/win95/default.theme
+lib/X11/icewm/themes/win95/maximize.xpm
+lib/X11/icewm/themes/win95/minimize.xpm
+lib/X11/icewm/themes/win95/restore.xpm
+lib/X11/icewm/toolbar
+lib/X11/icewm/winoptions
+share/doc/html/icewm/icewm-1.html
+share/doc/html/icewm/icewm-10.html
+share/doc/html/icewm/icewm-11.html
+share/doc/html/icewm/icewm-12.html
+share/doc/html/icewm/icewm-13.html
+share/doc/html/icewm/icewm-14.html
+share/doc/html/icewm/icewm-15.html
+share/doc/html/icewm/icewm-2.html
+share/doc/html/icewm/icewm-3.html
+share/doc/html/icewm/icewm-4.html
+share/doc/html/icewm/icewm-5.html
+share/doc/html/icewm/icewm-6.html
+share/doc/html/icewm/icewm-7.html
+share/doc/html/icewm/icewm-8.html
+share/doc/html/icewm/icewm-9.html
+share/doc/html/icewm/icewm.html
 share/doc/icewm/BUGS
 share/doc/icewm/CHANGES
 share/doc/icewm/COPYING
 share/doc/icewm/FAQ
 share/doc/icewm/README
 share/doc/icewm/TODO
-share/doc/icewm/icewm.html
-share/doc/icewm/icewm-1.html
-share/doc/icewm/icewm-2.html
-share/doc/icewm/icewm-3.html
-share/doc/icewm/icewm-4.html
-share/doc/icewm/icewm-5.html
-share/doc/icewm/icewm-6.html
-share/doc/icewm/icewm-7.html
-share/doc/icewm/icewm-8.html
-share/doc/icewm/icewm-9.html
-share/doc/icewm/icewm-10.html
-share/doc/icewm/icewm-11.html
-share/doc/icewm/icewm-12.html
-share/doc/icewm/icewm-13.html
-share/doc/icewm/icewm-14.html
-share/doc/icewm/icewm-15.html
 @dirrm share/doc/icewm
+@dirrm share/doc/html/icewm
+@dirrm lib/X11/icewm/themes/win95
+@dirrm lib/X11/icewm/themes/warp4
+@dirrm lib/X11/icewm/themes/warp3
+@dirrm lib/X11/icewm/themes/nice
+@dirrm lib/X11/icewm/themes/motif
+@dirrm lib/X11/icewm/themes/metal2
+@dirrm lib/X11/icewm/themes/gtk2
+@dirrm lib/X11/icewm/themes
+@dirrm lib/X11/icewm/taskbar
+@dirrm lib/X11/icewm/mailbox
+@dirrm lib/X11/icewm/ledclock
+@dirrm lib/X11/icewm/icons
+@dirrm lib/X11/icewm