Tue Jun 17 08:32:41 2008 UTC ()
Un-break start icon patch for non-*BSD platforms.


(hauke)
diff -r1.62 -r1.63 pkgsrc/wm/icewm/Makefile.common
diff -r1.35 -r1.36 pkgsrc/wm/icewm/distinfo
diff -r1.3 -r1.4 pkgsrc/wm/icewm/patches/patch-ak
cvs diff -r1.62 -r1.63 pkgsrc/wm/icewm/Makefile.common (expand / switch to unified diff)

--- pkgsrc/wm/icewm/Makefile.common 2008/06/16 14:55:03 1.62
+++ pkgsrc/wm/icewm/Makefile.common 2008/06/17 08:32:41 1.63
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile.common,v 1.62 2008/06/16 14:55:03 hauke Exp $ 1# $NetBSD: Makefile.common,v 1.63 2008/06/17 08:32:41 hauke Exp $
2 2
3DISTNAME= icewm-1.2.35 3DISTNAME= icewm-1.2.35
 4PKGREVISION= 1
4CATEGORIES= x11 wm 5CATEGORIES= x11 wm
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=icewm/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=icewm/}
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.icewm.org/ 9HOMEPAGE= http://www.icewm.org/
9 10
10GNU_CONFIGURE= yes 11GNU_CONFIGURE= yes
11USE_TOOLS+= gmake msgfmt 12USE_TOOLS+= gmake msgfmt
12USE_PKGLOCALEDIR= yes 13USE_PKGLOCALEDIR= yes
13 14
14DISTINFO_FILE= ${.CURDIR}/../../wm/icewm/distinfo 15DISTINFO_FILE= ${.CURDIR}/../../wm/icewm/distinfo
15FILESDIR= ${.CURDIR}/../../wm/icewm/files 16FILESDIR= ${.CURDIR}/../../wm/icewm/files
16PATCHDIR= ${.CURDIR}/../../wm/icewm/patches 17PATCHDIR= ${.CURDIR}/../../wm/icewm/patches
@@ -25,30 +26,26 @@ PKG_SYSCONFSUBDIR= icewm @@ -25,30 +26,26 @@ PKG_SYSCONFSUBDIR= icewm
25.include "../../mk/bsd.prefs.mk" 26.include "../../mk/bsd.prefs.mk"
26 27
27CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 28CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
28CONFIGURE_ARGS+= --with-cfgdir=${PKG_SYSCONFDIR:Q} 29CONFIGURE_ARGS+= --with-cfgdir=${PKG_SYSCONFDIR:Q}
29.if ${X11_TYPE} != "native" 30.if ${X11_TYPE} != "native"
30.include "../../x11/libXinerama/buildlink3.mk" 31.include "../../x11/libXinerama/buildlink3.mk"
31.elif !exists(${X11BASE}/include/X11/extensions/Xinerama.h) 32.elif !exists(${X11BASE}/include/X11/extensions/Xinerama.h)
32CONFIGURE_ARGS+= --disable-xinerama 33CONFIGURE_ARGS+= --disable-xinerama
33.endif 34.endif
34MAKE_FLAGS+= LOCDIR=${PREFIX}/${PKGLOCALEDIR}/locale 35MAKE_FLAGS+= LOCDIR=${PREFIX}/${PKGLOCALEDIR}/locale
35 36
36PKG_SYSCONFSUBDIR= icewm 37PKG_SYSCONFSUBDIR= icewm
37 38
38.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" 
39CXXFLAGS+= -DSTART_PIXMAP="\"bsd-daemon.xpm\"" 
40.endif 
41 
42.if ${OPSYS} == "NetBSD" && (!exists(/usr/include/machine/apmvar.h) || \ 39.if ${OPSYS} == "NetBSD" && (!exists(/usr/include/machine/apmvar.h) || \
43 (${MACHINE_ARCH} == "sparc64" && !exists(/usr/include/sparc/apmvar.h))) 40 (${MACHINE_ARCH} == "sparc64" && !exists(/usr/include/sparc/apmvar.h)))
44SUBST_CLASSES+= apm 41SUBST_CLASSES+= apm
45SUBST_STAGE.apm= post-configure 42SUBST_STAGE.apm= post-configure
46SUBST_FILES.apm= src/config.h 43SUBST_FILES.apm= src/config.h
47SUBST_SED.apm= -e 's,define CONFIG_APPLET_APM 1,undef CONFIG_APPLET_APM,' 44SUBST_SED.apm= -e 's,define CONFIG_APPLET_APM 1,undef CONFIG_APPLET_APM,'
48SUBST_MESSAGE.apm= Disable APM applet. 45SUBST_MESSAGE.apm= Disable APM applet.
49.endif 46.endif
50 47
51.if ${OPSYS} == "NetBSD" 48.if ${OPSYS} == "NetBSD"
52. if !empty(OS_VERSION:M1.*) 49. if !empty(OS_VERSION:M1.*)
53CONFIGURE_ARGS+= --disable-i18n 50CONFIGURE_ARGS+= --disable-i18n
54. else 51. else
cvs diff -r1.35 -r1.36 pkgsrc/wm/icewm/distinfo (expand / switch to unified diff)

--- pkgsrc/wm/icewm/distinfo 2008/06/16 14:55:03 1.35
+++ pkgsrc/wm/icewm/distinfo 2008/06/17 08:32:41 1.36
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.35 2008/06/16 14:55:03 hauke Exp $ 1$NetBSD: distinfo,v 1.36 2008/06/17 08:32:41 hauke Exp $
2 2
3SHA1 (icewm-1.2.35.tar.gz) = a0174901ca89aa091a58efedfec1536c5e477210 3SHA1 (icewm-1.2.35.tar.gz) = a0174901ca89aa091a58efedfec1536c5e477210
4RMD160 (icewm-1.2.35.tar.gz) = 19b044d9f88f860d3e25a3f419404e106162f40b 4RMD160 (icewm-1.2.35.tar.gz) = 19b044d9f88f860d3e25a3f419404e106162f40b
5Size (icewm-1.2.35.tar.gz) = 831087 bytes 5Size (icewm-1.2.35.tar.gz) = 831087 bytes
6SHA1 (patch-aa) = 28202bab4996d320843f811629301df1abd2608e 6SHA1 (patch-aa) = 28202bab4996d320843f811629301df1abd2608e
7SHA1 (patch-ad) = 371c8939bcdcdb6c49cc8db2246370c95c9ff088 7SHA1 (patch-ad) = 371c8939bcdcdb6c49cc8db2246370c95c9ff088
8SHA1 (patch-aj) = a6cf8c8daeb54b1e75642dc846c3e6ce4a619fa2 8SHA1 (patch-aj) = a6cf8c8daeb54b1e75642dc846c3e6ce4a619fa2
9SHA1 (patch-ak) = 20917a172f8e2b05966109cd7fae62fed29688b6 9SHA1 (patch-ak) = 8f96d98019071522cd8a9196a029842410e4ede1
cvs diff -r1.3 -r1.4 pkgsrc/wm/icewm/patches/patch-ak (expand / switch to unified diff)

--- pkgsrc/wm/icewm/patches/patch-ak 2008/06/16 14:55:03 1.3
+++ pkgsrc/wm/icewm/patches/patch-ak 2008/06/17 08:32:41 1.4
@@ -1,16 +1,18 @@ @@ -1,16 +1,18 @@
1$NetBSD: patch-ak,v 1.3 2008/06/16 14:55:03 hauke Exp $ 1$NetBSD: patch-ak,v 1.4 2008/06/17 08:32:41 hauke Exp $
2 2
3--- src/wmtaskbar.cc.orig 2008-01-05 08:34:24.000000000 +0100 3--- src/wmtaskbar.cc.orig 2008-01-05 08:34:24.000000000 +0100
4+++ src/wmtaskbar.cc 4+++ src/wmtaskbar.cc
5@@ -81,7 +81,10 @@ static void initPixmaps() { 5@@ -81,7 +81,12 @@ static void initPixmaps() {
6 * filename. This will be unified and be a forced standard in 6 * filename. This will be unified and be a forced standard in
7 * icewm-2 7 * icewm-2
8 */ 8 */
9- startImage = themedirs.loadImage(base, "start.xpm"); 9- startImage = themedirs.loadImage(base, "start.xpm");
10+ /* pkgsrc *BSD: Try Beastie first */ 10+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
11+ startImage = subdirs.loadImage(base, START_PIXMAP); 11+ /* pkgsrc on *BSD: Try Beastie first */
 12+ startImage = subdirs.loadImage(base, "bsd-daemon.xpm");
12+ if (startImage == null || !startImage->valid()) 13+ if (startImage == null || !startImage->valid())
 14+#endif
13+ startImage = themedirs.loadImage(base, "start.xpm"); 15+ startImage = themedirs.loadImage(base, "start.xpm");
14 if (startImage == null || !startImage->valid()) 16 if (startImage == null || !startImage->valid())
15 startImage = themedirs.loadImage(base, "linux.xpm"); 17 startImage = themedirs.loadImage(base, "linux.xpm");
16 if (startImage == null || !startImage->valid()) 18 if (startImage == null || !startImage->valid())