Attachment 73868 Details for Bug 106987 – file.diff

[patch] file.diff

file.diff (text/plain), 3.62 KB, created by tkato432 on 2006-12-20 16:20:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2006-12-20 16:20:19 UTC

Size: 3.62 KB

patch

obsolete

>diff -urN /usr/ports/x11-wm/icewm/Makefile x11-wm/icewm/Makefile
>--- /usr/ports/x11-wm/icewm/Makefile	Sun Oct 15 03:58:20 2006
>+++ x11-wm/icewm/Makefile	Sun Dec 10 02:57:55 2006
>@@ -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 @@
> .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 @@
> .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-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 -urN /usr/ports/x11-wm/icewm/distinfo x11-wm/icewm/distinfo
>--- /usr/ports/x11-wm/icewm/distinfo	Tue Sep 12 13:33:24 2006
>+++ x11-wm/icewm/distinfo	Sun Dec 10 03:03:34 2006
>@@ -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 -urN /usr/ports/x11-wm/icewm/files/patch-ai x11-wm/icewm/files/patch-ai
>--- /usr/ports/x11-wm/icewm/files/patch-ai	Mon Apr 21 12:28:18 2003
>+++ x11-wm/icewm/files/patch-ai	Thu Jan  1 09:00:00 1970
>@@ -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 -urN /usr/ports/x11-wm/icewm/pkg-plist x11-wm/icewm/pkg-plist
>--- /usr/ports/x11-wm/icewm/pkg-plist	Sun Oct 15 03:58:20 2006
>+++ x11-wm/icewm/pkg-plist	Sun Dec 10 02:58:17 2006
>@@ -81,7 +81,7 @@
> %%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 @@
> %%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

Actions: View | Diff

Attachments on bug 106987: 73868