4 files changed, 17 insertions, 35 deletions

diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 6224b250af40..f57473e4cc76 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	icewm
-PORTVERSION=	1.2.28
-PORTREVISION=	1
+PORTVERSION=	1.2.29
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF
 
@@ -81,15 +80,11 @@ CONFIGURE_ARGS+=	--disable-x86-asm
 .endif
 
 .if defined(WITH_BEASTIE)
-STARTUP_PIXMAP=		bsd-daemon.xpm
-THEMES_START_XPM_SFX=	-suppressed
+STARTUP_PIXMAP=		${DATADIR}/lib/taskbar/bsd-daemon.xpm
 .else
-STARTUP_PIXMAP=		icewm-logo.xpm
-THEMES_START_XPM_SFX=
+STARTUP_PIXMAP=		icewm.xpm
 .endif
 
-PLIST_SUB+=	THEMES_START_XPM_SFX=${THEMES_START_XPM_SFX}
-
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls --disable-i18n
 PLIST_SUB+=	NLS="@comment "
@@ -99,13 +94,11 @@ PLIST_SUB+=	NLS=""
 .endif
 
 post-extract:
-	@cd ${WRKSRC}/lib/taskbar && ${MV} start.xpm icewm-logo.xpm
+	@cd ${WRKSRC}/lib/taskbar && ${MV} start.xpm icewm.xpm
+.for dir in Infadel2
+	@cd ${WRKSRC}/lib/themes/${dir}/taskbar && ${MV} start.xpm icewm.xpm
+.endfor
 	@${CP} -f ${FILESDIR}/bsd-daemon.xpm ${WRKSRC}/lib/taskbar
-.if defined(WITH_BEASTIE)
-	@for icon in ${WRKSRC}/lib/themes/*/taskbar/start.xpm ; do \
-		${MV} "$${icon}" "$${icon%.xpm}${THEMES_START_XPM_SFX}.xpm" ; \
-	done
-.endif
 
 post-patch:
 .for file in configure
@@ -120,6 +113,10 @@ post-patch:
 
 post-install:
 	@${LN} -sf ${STARTUP_PIXMAP} ${DATADIR}/taskbar/start.xpm
+.for dir in Infadel2
+	@${LN} -sf ${STARTUP_PIXMAP} \
+		${DATADIR}/themes/${dir}/taskbar/start.xpm
+.endfor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for file in CHANGES INSTALL README TODO
diff --git a/x11-wm/icewm/distinfo b/x11-wm/icewm/distinfo
index 1b62b8707d33..a2ba2624eb45 100644
--- a/x11-wm/icewm/distinfo
+++ b/x11-wm/icewm/distinfo
@@ -1,3 +1,3 @@
-MD5 (icewm-1.2.28.tar.gz) = 357d399235c4efaf8c4b19acc7db37fd
-SHA256 (icewm-1.2.28.tar.gz) = 81fa280588541d221fd5eeffa6a711be88a9285885f65ab989f2ee0e2385117f
-SIZE (icewm-1.2.28.tar.gz) = 1054568
+MD5 (icewm-1.2.29.tar.gz) = 0342359398643c36eff313f680678e28
+SHA256 (icewm-1.2.29.tar.gz) = 2be1b9c96c621cf3cdd56ec84d536ba2a04768098f08547a5ab7195a18a85dc3
+SIZE (icewm-1.2.29.tar.gz) = 1055906
diff --git a/x11-wm/icewm/files/patch-ai b/x11-wm/icewm/files/patch-ai
deleted file mode 100644
index baa4bd8a3369..000000000000
--- a/x11-wm/icewm/files/patch-ai
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/wmtaskbar.cc.orig	Mon Jan 20 00:43:27 2003
-+++ src/wmtaskbar.cc	Wed Jan 22 03:08:53 2003
-@@ -67,10 +67,12 @@
- #endif
- 
- #ifndef START_PIXMAP
--#define START_PIXMAP "linux.xpm"
- /*
-+#define START_PIXMAP "linux.xpm"
- #define START_PIXMAP "debian.xpm"
-+*/
- #define START_PIXMAP "bsd-daemon.xpm"
-+/*
- #define START_PIXMAP "start.xpm"
- #define START_PIXMAP "xfree86os2.xpm"
- */
diff --git a/x11-wm/icewm/pkg-plist b/x11-wm/icewm/pkg-plist
index c0c10b0aa644..34eb25595264 100644
--- a/x11-wm/icewm/pkg-plist
+++ b/x11-wm/icewm/pkg-plist
@@ -81,7 +81,7 @@ bin/icewmtray
 %%DATADIR%%/taskbar/collapse.xpm
 %%DATADIR%%/taskbar/desktop.xpm
 %%DATADIR%%/taskbar/expand.xpm
-%%DATADIR%%/taskbar/icewm-logo.xpm
+%%DATADIR%%/taskbar/icewm.xpm
 %%DATADIR%%/taskbar/start.xpm
 %%DATADIR%%/taskbar/windows.xpm
 %%DATADIR%%/themes/Infadel2/Ergonomic.theme
@@ -126,7 +126,8 @@ bin/icewmtray
 %%DATADIR%%/themes/Infadel2/rollupA.xpm
 %%DATADIR%%/themes/Infadel2/rollupI.xpm
 %%DATADIR%%/themes/Infadel2/snap.pcf
-%%DATADIR%%/themes/Infadel2/taskbar/start%%THEMES_START_XPM_SFX%%.xpm
+%%DATADIR%%/themes/Infadel2/taskbar/icewm.xpm
+%%DATADIR%%/themes/Infadel2/taskbar/start.xpm
 %%DATADIR%%/themes/Infadel2/taskbar/windows.xpm
 %%DATADIR%%/themes/Infadel2/titleAB.xpm
 %%DATADIR%%/themes/Infadel2/titleAJ.xpm