Sync w/ FreeBSD ports tree. As for deskutils/alexandria, I will do it after

I finish with my day.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7339 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 16 insertions, 44 deletions

diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 675eccaca..caf2bb68e 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	icewm
-PORTVERSION=	1.2.27
+PORTVERSION=	1.2.28
 PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -83,10 +83,14 @@ CONFIGURE_ARGS+=	--disable-x86-asm
 
 .if defined(WITH_BEASTIE)
 STARTUP_PIXMAP=		bsd-daemon.xpm
+THEMES_START_XPM_SFX=	-suppressed
 .else
 STARTUP_PIXMAP=		icewm-logo.xpm
+THEMES_START_XPM_SFX=
 .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 "
@@ -96,8 +100,13 @@ PLIST_SUB+=	NLS=""
 .endif
 
 post-extract:
-	@cd ${WRKSRC}/lib/taskbar && ${MV} icewm.xpm icewm-logo.xpm
+	@cd ${WRKSRC}/lib/taskbar && ${MV} start.xpm icewm-logo.xpm
 	@${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
@@ -111,7 +120,7 @@ post-patch:
 .endfor
 
 post-install:
-	@${LN} -sf ${STARTUP_PIXMAP} ${DATADIR}/taskbar/icewm.xpm
+	@${LN} -sf ${STARTUP_PIXMAP} ${DATADIR}/taskbar/start.xpm
 .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 1253e2e5d..1b62b8707 100644
--- a/x11-wm/icewm/distinfo
+++ b/x11-wm/icewm/distinfo
@@ -1,3 +1,3 @@
-MD5 (icewm-1.2.27.tar.gz) = 777ba54008cba6e9a1efbb051119c511
-SHA256 (icewm-1.2.27.tar.gz) = 4943e90952be2bcb8913c27d8dbbc6bf526d999db9345bc7752330c9eef6bf9a
-SIZE (icewm-1.2.27.tar.gz) = 1065165
+MD5 (icewm-1.2.28.tar.gz) = 357d399235c4efaf8c4b19acc7db37fd
+SHA256 (icewm-1.2.28.tar.gz) = 81fa280588541d221fd5eeffa6a711be88a9285885f65ab989f2ee0e2385117f
+SIZE (icewm-1.2.28.tar.gz) = 1054568
diff --git a/x11-wm/icewm/pkg-plist b/x11-wm/icewm/pkg-plist
index 84df26203..c0c10b0aa 100644
--- a/x11-wm/icewm/pkg-plist
+++ b/x11-wm/icewm/pkg-plist
@@ -36,18 +36,6 @@ bin/icewmtray
 %%GNOMEDESKTOP%%share/gnome/wm-properties/IceWM.desktop
 %%DATADIR%%/icons/app_16x16.xpm
 %%DATADIR%%/icons/app_32x32.xpm
-%%DATADIR%%/icons/bomb_16x16.xpm
-%%DATADIR%%/icons/bomb_32x32.xpm
-%%DATADIR%%/icons/communicator-abook_16x16.xpm
-%%DATADIR%%/icons/communicator-abook_32x32.xpm
-%%DATADIR%%/icons/communicator-browser_16x16.xpm
-%%DATADIR%%/icons/communicator-browser_32x32.xpm
-%%DATADIR%%/icons/communicator-composer_16x16.xpm
-%%DATADIR%%/icons/communicator-composer_32x32.xpm
-%%DATADIR%%/icons/communicator-discussion_16x16.xpm
-%%DATADIR%%/icons/communicator-discussion_32x32.xpm
-%%DATADIR%%/icons/communicator-mail_16x16.xpm
-%%DATADIR%%/icons/communicator-mail_32x32.xpm
 %%DATADIR%%/icons/emacs_16x16.xpm
 %%DATADIR%%/icons/emacs_32x32.xpm
 %%DATADIR%%/icons/file_16x16.xpm
@@ -56,31 +44,13 @@ bin/icewmtray
 %%DATADIR%%/icons/folder_32x32.xpm
 %%DATADIR%%/icons/fte_16x16.xpm
 %%DATADIR%%/icons/fte_32x32.xpm
-%%DATADIR%%/icons/gimp_16x16.xpm
-%%DATADIR%%/icons/gimp_32x32.xpm
-%%DATADIR%%/icons/gnome_16x16.xpm
 %%DATADIR%%/icons/java_16x16.xpm
 %%DATADIR%%/icons/java_32x32.xpm
-%%DATADIR%%/icons/kde_16x16.xpm
-%%DATADIR%%/icons/koules_16x16.xpm
-%%DATADIR%%/icons/koules_32x32.xpm
-%%DATADIR%%/icons/navigator_16x16.xpm
-%%DATADIR%%/icons/navigator_32x32.xpm
-%%DATADIR%%/icons/netscape_16x16.xpm
-%%DATADIR%%/icons/netscape_32x32.xpm
-%%DATADIR%%/icons/pdf_16x16.xpm
-%%DATADIR%%/icons/pdf_32x32.xpm
 %%DATADIR%%/icons/vim_16x16.xpm
 %%DATADIR%%/icons/vim_32x32.xpm
 %%DATADIR%%/icons/vim_48x48.xpm
-%%DATADIR%%/icons/xisp_16x16.xpm
-%%DATADIR%%/icons/xisp_32x32.xpm
-%%DATADIR%%/icons/xload_16x16.xpm
-%%DATADIR%%/icons/xload_32x32.xpm
 %%DATADIR%%/icons/xterm_16x16.xpm
 %%DATADIR%%/icons/xterm_32x32.xpm
-%%DATADIR%%/icons/xv_16x16.xpm
-%%DATADIR%%/icons/xv_32x32.xpm
 %%DATADIR%%/keys
 %%DATADIR%%/ledclock/a.xpm
 %%DATADIR%%/ledclock/colon.xpm
@@ -109,18 +79,11 @@ bin/icewmtray
 %%DATADIR%%/preferences
 %%DATADIR%%/taskbar/bsd-daemon.xpm
 %%DATADIR%%/taskbar/collapse.xpm
-%%DATADIR%%/taskbar/debian.xpm
 %%DATADIR%%/taskbar/desktop.xpm
 %%DATADIR%%/taskbar/expand.xpm
 %%DATADIR%%/taskbar/icewm-logo.xpm
-%%DATADIR%%/taskbar/icewm.xpm
-%%DATADIR%%/taskbar/linux.xpm
-%%DATADIR%%/taskbar/linux1.xpm
-%%DATADIR%%/taskbar/linux2.xpm
-%%DATADIR%%/taskbar/linux20.xpm
 %%DATADIR%%/taskbar/start.xpm
 %%DATADIR%%/taskbar/windows.xpm
-%%DATADIR%%/taskbar/xfreeos2.xpm
 %%DATADIR%%/themes/Infadel2/Ergonomic.theme
 %%DATADIR%%/themes/Infadel2/Overloaded.theme
 %%DATADIR%%/themes/Infadel2/closeA.xpm
@@ -163,7 +126,7 @@ bin/icewmtray
 %%DATADIR%%/themes/Infadel2/rollupA.xpm
 %%DATADIR%%/themes/Infadel2/rollupI.xpm
 %%DATADIR%%/themes/Infadel2/snap.pcf
-%%DATADIR%%/themes/Infadel2/taskbar/linux.xpm
+%%DATADIR%%/themes/Infadel2/taskbar/start%%THEMES_START_XPM_SFX%%.xpm
 %%DATADIR%%/themes/Infadel2/taskbar/windows.xpm
 %%DATADIR%%/themes/Infadel2/titleAB.xpm
 %%DATADIR%%/themes/Infadel2/titleAJ.xpm