Upgrade to 0.9.14.

PR:		ports/8184
Submitted by:	maintainer

6 files changed, 267 insertions, 132 deletions

diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index bbeed6af347a..5a521b6f57cf 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   icewm
-# Version required:    0.9.12
+# Version required:    0.9.14
 # Date created:        10 August 1997
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.16 1998/09/15 11:13:36 asami Exp $
+# $Id: Makefile,v 1.17 1998/09/17 00:32:57 asami Exp $
 #
 
-DISTNAME=	icewm-0.9.12
+DISTNAME=	icewm-0.9.14
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://berta.fri.uni-lj.si/~markom/icewm/devel/
 EXTRACT_SUFX=	.src.tar.gz
@@ -14,16 +14,35 @@ EXTRACT_SUFX=	.src.tar.gz
 MAINTAINER=	Nakai@technologist.com
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
+.if defined(GNOME)
+BUILD_DEPENDS+=	gnome-config:${PORTSDIR}/x11/gnomelibs
+BUILD_DEPENDS+=	imlib-config:${PORTSDIR}/graphics/imlib
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libintl.a:${PORTSDIR}/devel/gettext
+.endif
 
+USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 
+ICEOPTION=	--with-shape
+.if defined(I18N)
+ICEOPTION+=	--with-i18n
+.endif
+.if defined(GNOME)
+ICEOPTION+=	--with-imlib --with-gnome
+.endif
+
 pre-patch:
 .if defined(TITLE_BOTTOM)
 	${CP} ${FILESDIR}/patch-titlebottom ${PATCHDIR}/patch-ac
 .else
 	${CP} ${FILESDIR}/patch-titletop ${PATCHDIR}/patch-ac
 .endif
-	${CP} ${FILESDIR}/MakeConfig.FreeBSD ${WRKSRC}/src
+.if defined(GNOME)
+	${CP} ${FILESDIR}/patch-gnome ${PATCHDIR}
+.endif
+
+do-configure:
+	( cd ${WRKSRC}; ${SH} config ${ICEOPTION} )
 
 post-install:
 	${CP} ${FILESDIR}/bsd-daemon.xpm ${PREFIX}/lib/X11/icewm/taskbar
diff --git a/x11-wm/icewm/distinfo b/x11-wm/icewm/distinfo
index 30d943721023..fa2fd2374f37 100644
--- a/x11-wm/icewm/distinfo
+++ b/x11-wm/icewm/distinfo
@@ -1 +1 @@
-MD5 (icewm-0.9.12.src.tar.gz) = 8bf3be5b5d6364df2af6617cc4a953b9
+MD5 (icewm-0.9.14.src.tar.gz) = fe00f90a666b9538d33b055a8958cb6c
diff --git a/x11-wm/icewm/files/patch-aa b/x11-wm/icewm/files/patch-aa
index 7f1cfec1fa5e..98db2dff790b 100644
--- a/x11-wm/icewm/files/patch-aa
+++ b/x11-wm/icewm/files/patch-aa
@@ -1,31 +1,12 @@
---- Makefile.orig	Mon Jul 20 01:34:31 1998
-+++ Makefile	Fri Jul 24 20:28:53 1998
-@@ -1,13 +1,13 @@
- include ./VERSION
- 
--PREFIX      = /usr/local
-+PREFIX      = $(X11BASE)
- BINDIR      = $(PREFIX)/bin
- LIBDIR      = $(PREFIX)/lib/X11/icewm
--ETCDIR      = /etc/X11/icewm
-+ETCDIR      = $(LIBDIR)
- 
--INSTALL     = install
--INSTALLDIR  = $(INSTALL) -m 755 -d
--INSTALLBIN  = $(INSTALL) -m 555
-+INSTALL     = install -c
-+INSTALLDIR  = mkdir -p
-+INSTALLBIN  = $(INSTALL) $(STRIP) -m 555
- INSTALLLIB  = $(INSTALL) -m 444
- #INSTALLETC  = $(INSTALL) -m 644
- 
-@@ -19,8 +19,7 @@
-               metal-big blueice monte-carlo jaywalk
- 
- all:	config
--	(cd src ; make LIBDIR=$(LIBDIR) ETCDIR=$(ETCDIR))
--	(cd doc ; make)
-+	(cd src ; make LIBDIR=$(LIBDIR) ETCDIR=$(ETCDIR) PREFIX=$(PREFIX))
- 
- config:
- 	(cd src ; ln -sf MakeConfig.`uname` MakeConfig)
+--- Makefile.orig	Sun Oct  4 21:40:46 1998
++++ Makefile	Wed Oct  7 16:36:55 1998
+@@ -9,8 +9,7 @@
+               aesthetech aesthetech-big
+ 
+ all:
+-	cd src ; $(MAKE) LIBDIR=$(LIBDIR) ETCDIR=$(ETCDIR)
+-	cd doc ; $(MAKE)
++	cd src ; $(MAKE) LIBDIR=$(LIBDIR) ETCDIR=$(ETCDIR) PREFIX=$(PREFIX)
+ 
+ doc:
+ 	cd doc ; $(MAKE)
diff --git a/x11-wm/icewm/files/patch-ab b/x11-wm/icewm/files/patch-ab
index e2a3a84fc18d..058efa0f8a64 100644
--- a/x11-wm/icewm/files/patch-ab
+++ b/x11-wm/icewm/files/patch-ab
@@ -1,11 +1,17 @@
---- src/Makefile.orig	Mon Jul 20 03:17:51 1998
-+++ src/Makefile	Fri Jul 24 20:32:54 1998
-@@ -35,7 +35,7 @@
- #OPTIMIZE   = -O -g
- #OPTIMIZE   = -O -g -pg
- #OPTIMIZE   = -O
--OPTIMIZE   = -O2
-+#OPTIMIZE   = -O2
- #OPTIMIZE   = -O2 -g
- #OPTIMIZE   = -O -s
- #OPTIMIZE   = -O2 -s
+--- install.inc.orig	Wed Oct  7 16:35:35 1998
++++ install.inc	Wed Oct  7 16:36:29 1998
+@@ -1,10 +1,10 @@
+-PREFIX      = /usr/local
++PREFIX      = $(X11BASE)
+ BINDIR      = $(PREFIX)/bin
+ LIBDIR      = $(PREFIX)/lib/X11/icewm
+-ETCDIR      = /etc/X11/icewm
++ETCDIR      = $(LIBDIR)
+ 
+ INSTALL     = install -c
+-INSTALLDIR  = $(INSTALL) -m 755 -d
+-INSTALLBIN  = $(INSTALL) -m 555
++INSTALLDIR  = mkdir -p
++INSTALLBIN  = $(INSTALL) $(STRIP) -m 555
+ INSTALLLIB  = $(INSTALL) -m 444
+ #INSTALLETC  = $(INSTALL) -m 644
diff --git a/x11-wm/icewm/pkg-descr b/x11-wm/icewm/pkg-descr
index 2f518267d590..f717db0a5c2d 100644
--- a/x11-wm/icewm/pkg-descr
+++ b/x11-wm/icewm/pkg-descr
@@ -1,6 +1,12 @@
 cool window manager developped in a very hot day in a winter
 
-When you want titlebars to be bottom,
+When you want titlebars to be bottom ( default is top ),
  % make -DTITLE_BOTTOM install
 
+When you want gnome option,
+ % make -DGNOME install
+
+When you want i18n option,
+ % make -DI18N install
+
 'bsd-daemon.xpm' is from Steve Farrell.
diff --git a/x11-wm/icewm/pkg-plist b/x11-wm/icewm/pkg-plist
index 391c6f08b672..834e550e96ae 100644
--- a/x11-wm/icewm/pkg-plist
+++ b/x11-wm/icewm/pkg-plist
@@ -1,4 +1,6 @@
 bin/icewm
+bin/icewmbg
+bin/icewmhint
 lib/X11/icewm/icons/app_16x16.xpm
 lib/X11/icewm/icons/app_32x32.xpm
 lib/X11/icewm/icons/bomb_16x16.xpm
@@ -48,6 +50,151 @@ lib/X11/icewm/taskbar/linux.xpm
 lib/X11/icewm/taskbar/start.xpm
 lib/X11/icewm/taskbar/windows.xpm
 lib/X11/icewm/taskbar/xfreeos2.xpm
+lib/X11/icewm/themes/aesthetech-big/closeA.xpm
+lib/X11/icewm/themes/aesthetech-big/closeI.xpm
+lib/X11/icewm/themes/aesthetech-big/default.theme
+lib/X11/icewm/themes/aesthetech-big/dframeAB.xpm
+lib/X11/icewm/themes/aesthetech-big/dframeABL.xpm
+lib/X11/icewm/themes/aesthetech-big/dframeABR.xpm
+lib/X11/icewm/themes/aesthetech-big/dframeAL.xpm
+lib/X11/icewm/themes/aesthetech-big/dframeAR.xpm
+lib/X11/icewm/themes/aesthetech-big/dframeAT.xpm
+lib/X11/icewm/themes/aesthetech-big/dframeATL.xpm
+lib/X11/icewm/themes/aesthetech-big/dframeATR.xpm
+lib/X11/icewm/themes/aesthetech-big/dframeIB.xpm
+lib/X11/icewm/themes/aesthetech-big/dframeIBL.xpm
+lib/X11/icewm/themes/aesthetech-big/dframeIBR.xpm
+lib/X11/icewm/themes/aesthetech-big/dframeIL.xpm
+lib/X11/icewm/themes/aesthetech-big/dframeIR.xpm
+lib/X11/icewm/themes/aesthetech-big/dframeIT.xpm
+lib/X11/icewm/themes/aesthetech-big/dframeITL.xpm
+lib/X11/icewm/themes/aesthetech-big/dframeITR.xpm
+lib/X11/icewm/themes/aesthetech-big/frameAB.xpm
+lib/X11/icewm/themes/aesthetech-big/frameABL.xpm
+lib/X11/icewm/themes/aesthetech-big/frameABR.xpm
+lib/X11/icewm/themes/aesthetech-big/frameAL.xpm
+lib/X11/icewm/themes/aesthetech-big/frameAR.xpm
+lib/X11/icewm/themes/aesthetech-big/frameAT.xpm
+lib/X11/icewm/themes/aesthetech-big/frameATL.xpm
+lib/X11/icewm/themes/aesthetech-big/frameATR.xpm
+lib/X11/icewm/themes/aesthetech-big/frameIB.xpm
+lib/X11/icewm/themes/aesthetech-big/frameIBL.xpm
+lib/X11/icewm/themes/aesthetech-big/frameIBR.xpm
+lib/X11/icewm/themes/aesthetech-big/frameIL.xpm
+lib/X11/icewm/themes/aesthetech-big/frameIR.xpm
+lib/X11/icewm/themes/aesthetech-big/frameIT.xpm
+lib/X11/icewm/themes/aesthetech-big/frameITL.xpm
+lib/X11/icewm/themes/aesthetech-big/frameITR.xpm
+lib/X11/icewm/themes/aesthetech-big/maximizeA.xpm
+lib/X11/icewm/themes/aesthetech-big/maximizeI.xpm
+lib/X11/icewm/themes/aesthetech-big/menuButtonA.xpm
+lib/X11/icewm/themes/aesthetech-big/menuButtonI.xpm
+lib/X11/icewm/themes/aesthetech-big/minimizeA.xpm
+lib/X11/icewm/themes/aesthetech-big/minimizeI.xpm
+lib/X11/icewm/themes/aesthetech-big/restoreA.xpm
+lib/X11/icewm/themes/aesthetech-big/restoreI.xpm
+lib/X11/icewm/themes/aesthetech-big/titleAB.xpm
+lib/X11/icewm/themes/aesthetech-big/titleIB.xpm
+lib/X11/icewm/themes/aesthetech/closeA.xpm
+lib/X11/icewm/themes/aesthetech/closeI.xpm
+lib/X11/icewm/themes/aesthetech/default.theme
+lib/X11/icewm/themes/aesthetech/dframeAB.xpm
+lib/X11/icewm/themes/aesthetech/dframeABL.xpm
+lib/X11/icewm/themes/aesthetech/dframeABR.xpm
+lib/X11/icewm/themes/aesthetech/dframeAL.xpm
+lib/X11/icewm/themes/aesthetech/dframeAR.xpm
+lib/X11/icewm/themes/aesthetech/dframeAT.xpm
+lib/X11/icewm/themes/aesthetech/dframeATL.xpm
+lib/X11/icewm/themes/aesthetech/dframeATR.xpm
+lib/X11/icewm/themes/aesthetech/dframeIB.xpm
+lib/X11/icewm/themes/aesthetech/dframeIBL.xpm
+lib/X11/icewm/themes/aesthetech/dframeIBR.xpm
+lib/X11/icewm/themes/aesthetech/dframeIL.xpm
+lib/X11/icewm/themes/aesthetech/dframeIR.xpm
+lib/X11/icewm/themes/aesthetech/dframeIT.xpm
+lib/X11/icewm/themes/aesthetech/dframeITL.xpm
+lib/X11/icewm/themes/aesthetech/dframeITR.xpm
+lib/X11/icewm/themes/aesthetech/frameAB.xpm
+lib/X11/icewm/themes/aesthetech/frameABL.xpm
+lib/X11/icewm/themes/aesthetech/frameABR.xpm
+lib/X11/icewm/themes/aesthetech/frameAL.xpm
+lib/X11/icewm/themes/aesthetech/frameAR.xpm
+lib/X11/icewm/themes/aesthetech/frameAT.xpm
+lib/X11/icewm/themes/aesthetech/frameATL.xpm
+lib/X11/icewm/themes/aesthetech/frameATR.xpm
+lib/X11/icewm/themes/aesthetech/frameIB.xpm
+lib/X11/icewm/themes/aesthetech/frameIBL.xpm
+lib/X11/icewm/themes/aesthetech/frameIBR.xpm
+lib/X11/icewm/themes/aesthetech/frameIL.xpm
+lib/X11/icewm/themes/aesthetech/frameIR.xpm
+lib/X11/icewm/themes/aesthetech/frameIT.xpm
+lib/X11/icewm/themes/aesthetech/frameITL.xpm
+lib/X11/icewm/themes/aesthetech/frameITR.xpm
+lib/X11/icewm/themes/aesthetech/maximizeA.xpm
+lib/X11/icewm/themes/aesthetech/maximizeI.xpm
+lib/X11/icewm/themes/aesthetech/menuButtonA.xpm
+lib/X11/icewm/themes/aesthetech/menuButtonI.xpm
+lib/X11/icewm/themes/aesthetech/minimizeA.xpm
+lib/X11/icewm/themes/aesthetech/minimizeI.xpm
+lib/X11/icewm/themes/aesthetech/restoreA.xpm
+lib/X11/icewm/themes/aesthetech/restoreI.xpm
+lib/X11/icewm/themes/aesthetech/titleAB.xpm
+lib/X11/icewm/themes/aesthetech/titleIB.xpm
+lib/X11/icewm/themes/bluePlastic/closeA.xpm
+lib/X11/icewm/themes/bluePlastic/closeI.xpm
+lib/X11/icewm/themes/bluePlastic/default.theme
+lib/X11/icewm/themes/bluePlastic/dframeAB.xpm
+lib/X11/icewm/themes/bluePlastic/dframeABL.xpm
+lib/X11/icewm/themes/bluePlastic/dframeABR.xpm
+lib/X11/icewm/themes/bluePlastic/dframeAL.xpm
+lib/X11/icewm/themes/bluePlastic/dframeAR.xpm
+lib/X11/icewm/themes/bluePlastic/dframeAT.xpm
+lib/X11/icewm/themes/bluePlastic/dframeATL.xpm
+lib/X11/icewm/themes/bluePlastic/dframeATR.xpm
+lib/X11/icewm/themes/bluePlastic/dframeIB.xpm
+lib/X11/icewm/themes/bluePlastic/dframeIBL.xpm
+lib/X11/icewm/themes/bluePlastic/dframeIBR.xpm
+lib/X11/icewm/themes/bluePlastic/dframeIL.xpm
+lib/X11/icewm/themes/bluePlastic/dframeIR.xpm
+lib/X11/icewm/themes/bluePlastic/dframeIT.xpm
+lib/X11/icewm/themes/bluePlastic/dframeITL.xpm
+lib/X11/icewm/themes/bluePlastic/dframeITR.xpm
+lib/X11/icewm/themes/bluePlastic/frameAB.xpm
+lib/X11/icewm/themes/bluePlastic/frameABL.xpm
+lib/X11/icewm/themes/bluePlastic/frameABR.xpm
+lib/X11/icewm/themes/bluePlastic/frameAL.xpm
+lib/X11/icewm/themes/bluePlastic/frameAR.xpm
+lib/X11/icewm/themes/bluePlastic/frameAT.xpm
+lib/X11/icewm/themes/bluePlastic/frameATL.xpm
+lib/X11/icewm/themes/bluePlastic/frameATR.xpm
+lib/X11/icewm/themes/bluePlastic/frameIB.xpm
+lib/X11/icewm/themes/bluePlastic/frameIBL.xpm
+lib/X11/icewm/themes/bluePlastic/frameIBR.xpm
+lib/X11/icewm/themes/bluePlastic/frameIL.xpm
+lib/X11/icewm/themes/bluePlastic/frameIR.xpm
+lib/X11/icewm/themes/bluePlastic/frameIT.xpm
+lib/X11/icewm/themes/bluePlastic/frameITL.xpm
+lib/X11/icewm/themes/bluePlastic/frameITR.xpm
+lib/X11/icewm/themes/bluePlastic/maximizeA.xpm
+lib/X11/icewm/themes/bluePlastic/maximizeI.xpm
+lib/X11/icewm/themes/bluePlastic/menuButtonA.xpm
+lib/X11/icewm/themes/bluePlastic/menuButtonAN.xpm
+lib/X11/icewm/themes/bluePlastic/menuButtonAP.xpm
+lib/X11/icewm/themes/bluePlastic/menuButtonI.xpm
+lib/X11/icewm/themes/bluePlastic/minimizeA.xpm
+lib/X11/icewm/themes/bluePlastic/minimizeI.xpm
+lib/X11/icewm/themes/bluePlastic/restoreA.xpm
+lib/X11/icewm/themes/bluePlastic/restoreI.xpm
+lib/X11/icewm/themes/bluePlastic/titleAB.xpm
+lib/X11/icewm/themes/bluePlastic/titleAL.xpm
+lib/X11/icewm/themes/bluePlastic/titleAM.xpm
+lib/X11/icewm/themes/bluePlastic/titleAR.xpm
+lib/X11/icewm/themes/bluePlastic/titleAT.xpm
+lib/X11/icewm/themes/bluePlastic/titleIB.xpm
+lib/X11/icewm/themes/bluePlastic/titleIL.xpm
+lib/X11/icewm/themes/bluePlastic/titleIM.xpm
+lib/X11/icewm/themes/bluePlastic/titleIR.xpm
+lib/X11/icewm/themes/bluePlastic/titleIT.xpm
 lib/X11/icewm/themes/blueice/close.xpm
 lib/X11/icewm/themes/blueice/closeA.xpm
 lib/X11/icewm/themes/blueice/closeI.xpm
@@ -84,36 +231,7 @@ lib/X11/icewm/themes/blueice/frameIR.xpm
 lib/X11/icewm/themes/blueice/frameIT.xpm
 lib/X11/icewm/themes/blueice/frameITL.xpm
 lib/X11/icewm/themes/blueice/frameITR.xpm
-lib/X11/icewm/themes/blueice/icons/app_16x16.xpm
-lib/X11/icewm/themes/blueice/icons/app_32x32.xpm
-lib/X11/icewm/themes/blueice/icons/brushes_16x16.xpm
-lib/X11/icewm/themes/blueice/icons/brushes_32x32.xpm
-lib/X11/icewm/themes/blueice/icons/dbbrowser_16x16.xpm
-lib/X11/icewm/themes/blueice/icons/dbbrowser_32x32.xpm
-lib/X11/icewm/themes/blueice/icons/gimp_16x16.xpm
-lib/X11/icewm/themes/blueice/icons/gimp_32x32.xpm
-lib/X11/icewm/themes/blueice/icons/gradient_16x16.xpm
-lib/X11/icewm/themes/blueice/icons/gradient_32x32.xpm
-lib/X11/icewm/themes/blueice/icons/layers_16x16.xpm
-lib/X11/icewm/themes/blueice/icons/layers_32x32.xpm
-lib/X11/icewm/themes/blueice/icons/palette_16x16.xpm
-lib/X11/icewm/themes/blueice/icons/palette_32x32.xpm
-lib/X11/icewm/themes/blueice/icons/patterns_16x16.xpm
-lib/X11/icewm/themes/blueice/icons/patterns_32x32.xpm
-lib/X11/icewm/themes/blueice/icons/prefs_16x16.xpm
-lib/X11/icewm/themes/blueice/icons/prefs_32x32.xpm
-lib/X11/icewm/themes/blueice/icons/script-fu_16x16.xpm
-lib/X11/icewm/themes/blueice/icons/script-fu_32x32.xpm
-lib/X11/icewm/themes/blueice/icons/scriptconsole_16x16.xpm
-lib/X11/icewm/themes/blueice/icons/scriptconsole_32x32.xpm
-lib/X11/icewm/themes/blueice/icons/tooloption_16x16.xpm
-lib/X11/icewm/themes/blueice/icons/tooloption_32x32.xpm
-lib/X11/icewm/themes/blueice/icons/work_16x16.xpm
-lib/X11/icewm/themes/blueice/icons/work_32x32.xpm
 lib/X11/icewm/themes/blueice/light.theme
-lib/X11/icewm/themes/blueice/mailbox/mail.xpm
-lib/X11/icewm/themes/blueice/mailbox/newmail.xpm
-lib/X11/icewm/themes/blueice/mailbox/unreadmail.xpm
 lib/X11/icewm/themes/blueice/maximize.xpm
 lib/X11/icewm/themes/blueice/maximizeA.xpm
 lib/X11/icewm/themes/blueice/maximizeI.xpm
@@ -125,8 +243,6 @@ lib/X11/icewm/themes/blueice/minimizeI.xpm
 lib/X11/icewm/themes/blueice/restore.xpm
 lib/X11/icewm/themes/blueice/restoreA.xpm
 lib/X11/icewm/themes/blueice/restoreI.xpm
-lib/X11/icewm/themes/blueice/taskbar/linux.xpm
-lib/X11/icewm/themes/blueice/taskbar/windows.xpm
 lib/X11/icewm/themes/blueice/titleAB.xpm
 lib/X11/icewm/themes/blueice/titleAL.xpm
 lib/X11/icewm/themes/blueice/titleAM.xpm
@@ -195,31 +311,9 @@ lib/X11/icewm/themes/gtk/titleIT.xpm
 lib/X11/icewm/themes/jaywalk/close.xpm
 lib/X11/icewm/themes/jaywalk/default.theme
 lib/X11/icewm/themes/jaywalk/hide.xpm
-lib/X11/icewm/themes/jaywalk/ledclock/a.xpm
-lib/X11/icewm/themes/jaywalk/ledclock/colon.xpm
-lib/X11/icewm/themes/jaywalk/ledclock/dot.xpm
-lib/X11/icewm/themes/jaywalk/ledclock/m.xpm
-lib/X11/icewm/themes/jaywalk/ledclock/n0.xpm
-lib/X11/icewm/themes/jaywalk/ledclock/n1.xpm
-lib/X11/icewm/themes/jaywalk/ledclock/n2.xpm
-lib/X11/icewm/themes/jaywalk/ledclock/n3.xpm
-lib/X11/icewm/themes/jaywalk/ledclock/n4.xpm
-lib/X11/icewm/themes/jaywalk/ledclock/n5.xpm
-lib/X11/icewm/themes/jaywalk/ledclock/n6.xpm
-lib/X11/icewm/themes/jaywalk/ledclock/n7.xpm
-lib/X11/icewm/themes/jaywalk/ledclock/n8.xpm
-lib/X11/icewm/themes/jaywalk/ledclock/n9.xpm
-lib/X11/icewm/themes/jaywalk/ledclock/p.xpm
-lib/X11/icewm/themes/jaywalk/ledclock/slash.xpm
-lib/X11/icewm/themes/jaywalk/ledclock/space.xpm
-lib/X11/icewm/themes/jaywalk/mailbox/mail.xpm
-lib/X11/icewm/themes/jaywalk/mailbox/newmail.xpm
-lib/X11/icewm/themes/jaywalk/mailbox/unreadmail.xpm
 lib/X11/icewm/themes/jaywalk/maximize.xpm
 lib/X11/icewm/themes/jaywalk/minimize.xpm
 lib/X11/icewm/themes/jaywalk/restore.xpm
-lib/X11/icewm/themes/jaywalk/taskbar/linux.xpm
-lib/X11/icewm/themes/jaywalk/taskbar/windows.xpm
 lib/X11/icewm/themes/metal-big/black.theme
 lib/X11/icewm/themes/metal-big/closeA.xpm
 lib/X11/icewm/themes/metal-big/closeI.xpm
@@ -331,34 +425,67 @@ lib/X11/icewm/themes/metal/titleIL.xpm
 lib/X11/icewm/themes/metal/titleIM.xpm
 lib/X11/icewm/themes/metal/titleIR.xpm
 lib/X11/icewm/themes/metal/titleIT.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/dframeAB.xpm
+lib/X11/icewm/themes/metal2/dframeABL.xpm
+lib/X11/icewm/themes/metal2/dframeABR.xpm
+lib/X11/icewm/themes/metal2/dframeAL.xpm
+lib/X11/icewm/themes/metal2/dframeAR.xpm
+lib/X11/icewm/themes/metal2/dframeAT.xpm
+lib/X11/icewm/themes/metal2/dframeATL.xpm
+lib/X11/icewm/themes/metal2/dframeATR.xpm
+lib/X11/icewm/themes/metal2/dframeIB.xpm
+lib/X11/icewm/themes/metal2/dframeIBL.xpm
+lib/X11/icewm/themes/metal2/dframeIBR.xpm
+lib/X11/icewm/themes/metal2/dframeIL.xpm
+lib/X11/icewm/themes/metal2/dframeIR.xpm
+lib/X11/icewm/themes/metal2/dframeIT.xpm
+lib/X11/icewm/themes/metal2/dframeITL.xpm
+lib/X11/icewm/themes/metal2/dframeITR.xpm
+lib/X11/icewm/themes/metal2/frameAB.xpm
+lib/X11/icewm/themes/metal2/frameABL.xpm
+lib/X11/icewm/themes/metal2/frameABR.xpm
+lib/X11/icewm/themes/metal2/frameAL.xpm
+lib/X11/icewm/themes/metal2/frameAR.xpm
+lib/X11/icewm/themes/metal2/frameAT.xpm
+lib/X11/icewm/themes/metal2/frameATL.xpm
+lib/X11/icewm/themes/metal2/frameATR.xpm
+lib/X11/icewm/themes/metal2/frameIB.xpm
+lib/X11/icewm/themes/metal2/frameIBL.xpm
+lib/X11/icewm/themes/metal2/frameIBR.xpm
+lib/X11/icewm/themes/metal2/frameIL.xpm
+lib/X11/icewm/themes/metal2/frameIR.xpm
+lib/X11/icewm/themes/metal2/frameIT.xpm
+lib/X11/icewm/themes/metal2/frameITL.xpm
+lib/X11/icewm/themes/metal2/frameITR.xpm
+lib/X11/icewm/themes/metal2/maximizeA.xpm
+lib/X11/icewm/themes/metal2/maximizeI.xpm
+lib/X11/icewm/themes/metal2/menuButtonA.xpm
+lib/X11/icewm/themes/metal2/menuButtonAN.xpm
+lib/X11/icewm/themes/metal2/menuButtonAP.xpm
+lib/X11/icewm/themes/metal2/menuButtonI.xpm
+lib/X11/icewm/themes/metal2/minimizeA.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/titleAB.xpm
+lib/X11/icewm/themes/metal2/titleAL.xpm
+lib/X11/icewm/themes/metal2/titleAM.xpm
+lib/X11/icewm/themes/metal2/titleAR.xpm
+lib/X11/icewm/themes/metal2/titleAT.xpm
+lib/X11/icewm/themes/metal2/titleIB.xpm
+lib/X11/icewm/themes/metal2/titleIL.xpm
+lib/X11/icewm/themes/metal2/titleIM.xpm
+lib/X11/icewm/themes/metal2/titleIR.xpm
+lib/X11/icewm/themes/metal2/titleIT.xpm
 lib/X11/icewm/themes/monte-carlo/close.xpm
 lib/X11/icewm/themes/monte-carlo/default.theme
 lib/X11/icewm/themes/monte-carlo/hide.xpm
-lib/X11/icewm/themes/monte-carlo/ledclock/a.xpm
-lib/X11/icewm/themes/monte-carlo/ledclock/colon.xpm
-lib/X11/icewm/themes/monte-carlo/ledclock/dot.xpm
-lib/X11/icewm/themes/monte-carlo/ledclock/m.xpm
-lib/X11/icewm/themes/monte-carlo/ledclock/n0.xpm
-lib/X11/icewm/themes/monte-carlo/ledclock/n1.xpm
-lib/X11/icewm/themes/monte-carlo/ledclock/n2.xpm
-lib/X11/icewm/themes/monte-carlo/ledclock/n3.xpm
-lib/X11/icewm/themes/monte-carlo/ledclock/n4.xpm
-lib/X11/icewm/themes/monte-carlo/ledclock/n5.xpm
-lib/X11/icewm/themes/monte-carlo/ledclock/n6.xpm
-lib/X11/icewm/themes/monte-carlo/ledclock/n7.xpm
-lib/X11/icewm/themes/monte-carlo/ledclock/n8.xpm
-lib/X11/icewm/themes/monte-carlo/ledclock/n9.xpm
-lib/X11/icewm/themes/monte-carlo/ledclock/p.xpm
-lib/X11/icewm/themes/monte-carlo/ledclock/slash.xpm
-lib/X11/icewm/themes/monte-carlo/ledclock/space.xpm
-lib/X11/icewm/themes/monte-carlo/mailbox/mail.xpm
-lib/X11/icewm/themes/monte-carlo/mailbox/newmail.xpm
-lib/X11/icewm/themes/monte-carlo/mailbox/unreadmail.xpm
 lib/X11/icewm/themes/monte-carlo/maximize.xpm
 lib/X11/icewm/themes/monte-carlo/minimize.xpm
 lib/X11/icewm/themes/monte-carlo/restore.xpm
-lib/X11/icewm/themes/monte-carlo/taskbar/linux.xpm
-lib/X11/icewm/themes/monte-carlo/taskbar/windows.xpm
 lib/X11/icewm/themes/motif/close.xpm
 lib/X11/icewm/themes/motif/default.theme
 lib/X11/icewm/themes/motif/maximize.xpm
@@ -439,25 +566,21 @@ 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
 @dirrm lib/X11/icewm/icons
 @dirrm lib/X11/icewm/ledclock
 @dirrm lib/X11/icewm/mailbox
 @dirrm lib/X11/icewm/taskbar
-@dirrm lib/X11/icewm/themes/blueice/icons
-@dirrm lib/X11/icewm/themes/blueice/mailbox
-@dirrm lib/X11/icewm/themes/blueice/taskbar
+@dirrm lib/X11/icewm/themes/aesthetech
+@dirrm lib/X11/icewm/themes/aesthetech-big
+@dirrm lib/X11/icewm/themes/bluePlastic
 @dirrm lib/X11/icewm/themes/blueice
 @dirrm lib/X11/icewm/themes/gtk
-@dirrm lib/X11/icewm/themes/jaywalk/ledclock
-@dirrm lib/X11/icewm/themes/jaywalk/mailbox
-@dirrm lib/X11/icewm/themes/jaywalk/taskbar
 @dirrm lib/X11/icewm/themes/jaywalk
 @dirrm lib/X11/icewm/themes/metal
 @dirrm lib/X11/icewm/themes/metal-big
-@dirrm lib/X11/icewm/themes/monte-carlo/ledclock
-@dirrm lib/X11/icewm/themes/monte-carlo/mailbox
-@dirrm lib/X11/icewm/themes/monte-carlo/taskbar
+@dirrm lib/X11/icewm/themes/metal2
 @dirrm lib/X11/icewm/themes/monte-carlo
 @dirrm lib/X11/icewm/themes/motif
 @dirrm lib/X11/icewm/themes/nice