diff options
| author | Vasil Dimov <vd@FreeBSD.org> | 2006-09-14 16:20:28 +0000 |
|---|---|---|
| committer | Vasil Dimov <vd@FreeBSD.org> | 2006-09-14 16:20:28 +0000 |
| commit | 16342c4af2198739b8b4a3e489e9e895c82e168f (patch) | |
| tree | 7cb42356933bfdcd70a0186bff94280edc587a8f /x11-wm | |
| parent | 9f7206f83bf29052db1fec744a1b04c915c2e49a (diff) | |
| download | ports-16342c4af2198739b8b4a3e489e9e895c82e168f.tar.gz ports-16342c4af2198739b8b4a3e489e9e895c82e168f.zip | |
Since some of the latest updates the option for the "beastie" start button
stopped working. E.g. the default start button appeared even though the
option for the beastiefied start button was turned on.
This affected only the Infadel2 theme because it appeared to provide
it's own start button icon and thus not using the default one which has
been replaced with the beastie one by our port.
The solution I introduce installs (only if beastie is turned on) themes'
specific start button icons under different name so that IceWM does not
find them and thus falls back to the default one (almost the same as
not installing them at all).
Notes
Notes:
svn path=/head/; revision=173057
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/icewm/Makefile | 9 | ||||
| -rw-r--r-- | x11-wm/icewm/pkg-plist | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile index fc3a36f2865f..3773751be988 100644 --- a/x11-wm/icewm/Makefile +++ b/x11-wm/icewm/Makefile @@ -82,10 +82,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 " @@ -97,6 +101,11 @@ PLIST_SUB+= NLS="" post-extract: @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 diff --git a/x11-wm/icewm/pkg-plist b/x11-wm/icewm/pkg-plist index 7ad7824c9a9b..c0c10b0aa644 100644 --- a/x11-wm/icewm/pkg-plist +++ b/x11-wm/icewm/pkg-plist @@ -126,7 +126,7 @@ bin/icewmtray %%DATADIR%%/themes/Infadel2/rollupA.xpm %%DATADIR%%/themes/Infadel2/rollupI.xpm %%DATADIR%%/themes/Infadel2/snap.pcf -%%DATADIR%%/themes/Infadel2/taskbar/start.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 |