[pkgsrc/trunk]: pkgsrc/wm/icewm Un-break start icon patch for non-*BSD platfo...

[hauke <hauke%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/691d7c572042
branches:  trunk
changeset: 543422:691d7c572042
user:      hauke <hauke%pkgsrc.org@localhost>
date:      Tue Jun 17 08:32:41 2008 +0000

description:
Un-break start icon patch for non-*BSD platforms.

diffstat:

 wm/icewm/Makefile.common  |   7 ++-----
 wm/icewm/distinfo         |   4 ++--
 wm/icewm/patches/patch-ak |  10 ++++++----
 3 files changed, 10 insertions(+), 11 deletions(-)

diffs (63 lines):

diff -r 57c11b364b05 -r 691d7c572042 wm/icewm/Makefile.common
--- a/wm/icewm/Makefile.common  Tue Jun 17 00:42:14 2008 +0000
+++ b/wm/icewm/Makefile.common  Tue Jun 17 08:32:41 2008 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.common,v 1.62 2008/06/16 14:55:03 hauke Exp $
+# $NetBSD: Makefile.common,v 1.63 2008/06/17 08:32:41 hauke Exp $
 
 DISTNAME=              icewm-1.2.35
+PKGREVISION=           1
 CATEGORIES=            x11 wm
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=icewm/}
 
@@ -35,10 +36,6 @@
 
 PKG_SYSCONFSUBDIR=     icewm
 
-.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
-CXXFLAGS+=             -DSTART_PIXMAP="\"bsd-daemon.xpm\""
-.endif
-
 .if ${OPSYS} == "NetBSD" && (!exists(/usr/include/machine/apmvar.h) || \
        (${MACHINE_ARCH} == "sparc64" && !exists(/usr/include/sparc/apmvar.h)))
 SUBST_CLASSES+=                apm
diff -r 57c11b364b05 -r 691d7c572042 wm/icewm/distinfo
--- a/wm/icewm/distinfo Tue Jun 17 00:42:14 2008 +0000
+++ b/wm/icewm/distinfo Tue Jun 17 08:32:41 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2008/06/16 14:55:03 hauke Exp $
+$NetBSD: distinfo,v 1.36 2008/06/17 08:32:41 hauke Exp $
 
 SHA1 (icewm-1.2.35.tar.gz) = a0174901ca89aa091a58efedfec1536c5e477210
 RMD160 (icewm-1.2.35.tar.gz) = 19b044d9f88f860d3e25a3f419404e106162f40b
@@ -6,4 +6,4 @@
 SHA1 (patch-aa) = 28202bab4996d320843f811629301df1abd2608e
 SHA1 (patch-ad) = 371c8939bcdcdb6c49cc8db2246370c95c9ff088
 SHA1 (patch-aj) = a6cf8c8daeb54b1e75642dc846c3e6ce4a619fa2
-SHA1 (patch-ak) = 20917a172f8e2b05966109cd7fae62fed29688b6
+SHA1 (patch-ak) = 8f96d98019071522cd8a9196a029842410e4ede1
diff -r 57c11b364b05 -r 691d7c572042 wm/icewm/patches/patch-ak
--- a/wm/icewm/patches/patch-ak Tue Jun 17 00:42:14 2008 +0000
+++ b/wm/icewm/patches/patch-ak Tue Jun 17 08:32:41 2008 +0000
@@ -1,15 +1,17 @@
-$NetBSD: patch-ak,v 1.3 2008/06/16 14:55:03 hauke Exp $
+$NetBSD: patch-ak,v 1.4 2008/06/17 08:32:41 hauke Exp $
 
 --- src/wmtaskbar.cc.orig      2008-01-05 08:34:24.000000000 +0100
 +++ src/wmtaskbar.cc
-@@ -81,7 +81,10 @@ static void initPixmaps() {
+@@ -81,7 +81,12 @@ static void initPixmaps() {
       * filename. This will be unified and be a forced standard in
       * icewm-2
       */
 -    startImage = themedirs.loadImage(base, "start.xpm");
-+    /* pkgsrc *BSD: Try Beastie first */
-+    startImage = subdirs.loadImage(base, START_PIXMAP);
++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)    
++    /* pkgsrc on *BSD: Try Beastie first */
++    startImage = subdirs.loadImage(base, "bsd-daemon.xpm");
 +    if (startImage == null || !startImage->valid())
++#endif
 +        startImage = themedirs.loadImage(base, "start.xpm");
      if (startImage == null || !startImage->valid())
          startImage = themedirs.loadImage(base, "linux.xpm");