summaryrefslogtreecommitdiff
path: root/wm/icewm
diff options
context:
space:
mode:
authorhauke <hauke@pkgsrc.org>2008-06-17 08:32:41 +0000
committerhauke <hauke@pkgsrc.org>2008-06-17 08:32:41 +0000
commit7518e13839f57db7a473ce7691c55c4815d5fa6a (patch)
tree495e53d864b53fd23f0e3998adb4bb19d31a2420 /wm/icewm
parent15eea55fff326e01d6d84c6ace0f09790aa98521 (diff)
downloadpkgsrc-7518e13839f57db7a473ce7691c55c4815d5fa6a.tar.gz
Un-break start icon patch for non-*BSD platforms.
Diffstat (limited to 'wm/icewm')
-rw-r--r--wm/icewm/Makefile.common7
-rw-r--r--wm/icewm/distinfo4
-rw-r--r--wm/icewm/patches/patch-ak10
3 files changed, 10 insertions, 11 deletions
diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common
index 84a44049041..f82d72cb1fa 100644
--- a/wm/icewm/Makefile.common
+++ b/wm/icewm/Makefile.common
@@ -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 @@ MAKE_FLAGS+= LOCDIR=${PREFIX}/${PKGLOCALEDIR}/locale
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 --git a/wm/icewm/distinfo b/wm/icewm/distinfo
index 39bf9680315..8c811cb02d8 100644
--- a/wm/icewm/distinfo
+++ b/wm/icewm/distinfo
@@ -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 @@ Size (icewm-1.2.35.tar.gz) = 831087 bytes
SHA1 (patch-aa) = 28202bab4996d320843f811629301df1abd2608e
SHA1 (patch-ad) = 371c8939bcdcdb6c49cc8db2246370c95c9ff088
SHA1 (patch-aj) = a6cf8c8daeb54b1e75642dc846c3e6ce4a619fa2
-SHA1 (patch-ak) = 20917a172f8e2b05966109cd7fae62fed29688b6
+SHA1 (patch-ak) = 8f96d98019071522cd8a9196a029842410e4ede1
diff --git a/wm/icewm/patches/patch-ak b/wm/icewm/patches/patch-ak
index 3a9fae03a89..d29f60ab6f7 100644
--- a/wm/icewm/patches/patch-ak
+++ b/wm/icewm/patches/patch-ak
@@ -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");