ports/75402: Update port: x11-wm/icewm

[KATO Tsuguru]

>Number:         75402
>Category:       ports
>Synopsis:       Update port: x11-wm/icewm
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 22 17:10:31 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.10-RELEASE-p5 i386
>Organization:
>Environment:
>Description:
- Add knob to switch default image for starup button to BSD daemon's picture

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/x11-wm/icewm/Makefile x11-wm/icewm/Makefile
--- /usr/ports/x11-wm/icewm/Makefile	Mon Dec 20 21:21:42 2004
+++ x11-wm/icewm/Makefile	Wed Dec 22 18:44:26 2004
@@ -7,6 +7,7 @@
 
 PORTNAME=	icewm
 PORTVERSION=	1.2.18
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -72,6 +73,12 @@
 CONFIGURE_ARGS+=	--disable-x86-asm
 .endif
 
+.if defined(WITH_BEASTIE_STARTUP_PIXMAP)
+STARTUP_PIXMAP=		bsd-daemon.xpm
+.else
+STARTUP_PIXMAP=		icewm-logo.xpm
+.endif
+
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
@@ -80,6 +87,10 @@
 PLIST_SUB+=	NLS=""
 .endif
 
+post-extract:
+	@cd ${WRKSRC}/lib/taskbar && ${MV} icewm.xpm icewm-logo.xpm
+	@${CP} -f ${FILESDIR}/bsd-daemon.xpm ${WRKSRC}/lib/taskbar
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|CXX_LINK=$${CC}|CXX_LINK=$${CXX}|g' ${WRKSRC}/configure
@@ -91,7 +102,7 @@
 .endfor
 
 post-install:
-	${INSTALL_DATA} ${FILESDIR}/bsd-daemon.xpm ${DATADIR}/taskbar
+	@${LN} -sf ${STARTUP_PIXMAP} ${DATADIR}/taskbar/icewm.xpm
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for file in CHANGES INSTALL README TODO
diff -urN /usr/ports/x11-wm/icewm/pkg-plist x11-wm/icewm/pkg-plist
--- /usr/ports/x11-wm/icewm/pkg-plist	Tue Aug 17 13:53:05 2004
+++ x11-wm/icewm/pkg-plist	Wed Dec 22 18:42:41 2004
@@ -111,6 +111,7 @@
 %%DATADIR%%/taskbar/debian.xpm
 %%DATADIR%%/taskbar/desktop.xpm
 %%DATADIR%%/taskbar/icewm.xpm
+%%DATADIR%%/taskbar/icewm-logo.xpm
 %%DATADIR%%/taskbar/linux.xpm
 %%DATADIR%%/taskbar/linux1.xpm
 %%DATADIR%%/taskbar/linux2.xpm
>Release-Note:
>Audit-Trail:
>Unformatted: