[pkgsrc/trunk]: pkgsrc/wm Fix Xinerama for !native case.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9617b186ed8e
branches:  trunk
changeset: 530053:9617b186ed8e
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Jun 15 17:43:40 2007 +0000

description:
Fix Xinerama for !native case.

diffstat:

 wm/golem/Makefile        |  7 +++++--
 wm/icewm/Makefile.common |  6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diffs (42 lines):

diff -r a40b13d3f462 -r 9617b186ed8e wm/golem/Makefile
--- a/wm/golem/Makefile Fri Jun 15 17:43:13 2007 +0000
+++ b/wm/golem/Makefile Fri Jun 15 17:43:40 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/12/27 13:37:41 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2007/06/15 17:44:45 joerg Exp $
 #
 
 DISTNAME=      golem-0.0.5
@@ -15,8 +15,11 @@
 
 CONFIGURE_ARGS+=       --enable-i18n
 
-.if exists(${X11BASE}/include/X11/extensions/Xinerama.h)
+.include "../../mk/bsd.prefs.mk"
+
+.if ${X11_TYPE} != "native" || exists(${X11BASE}/include/X11/extensions/Xinerama.h)
 CONFIGURE_ARGS+=       --enable-xinerama
+.include "../../x11/libXinerama/buildlink3.mk"
 .endif
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.golem
diff -r a40b13d3f462 -r 9617b186ed8e wm/icewm/Makefile.common
--- a/wm/icewm/Makefile.common  Fri Jun 15 17:43:13 2007 +0000
+++ b/wm/icewm/Makefile.common  Fri Jun 15 17:43:40 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.57 2006/12/15 20:33:02 joerg Exp $
+# $NetBSD: Makefile.common,v 1.58 2007/06/15 17:43:40 joerg Exp $
 
 DISTNAME=              icewm-1.2.27
 CATEGORIES=            x11 wm
@@ -24,7 +24,9 @@
 
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=       --with-cfgdir=${PKG_SYSCONFDIR:Q}
-.if !exists(${X11BASE}/include/X11/extensions/Xinerama.h)
+.if ${X11_TYPE} != "native"
+.include "../../x11/libXinerama/buildlink3.mk"
+.elif !exists(${X11BASE}/include/X11/extensions/Xinerama.h)
 CONFIGURE_ARGS+=       --disable-xinerama
 .endif
 MAKE_FLAGS+=           LOCDIR=${PREFIX}/${PKGLOCALEDIR}/locale