[pkgsrc/trunk]: pkgsrc/wm/waimea Modular Xorg support. XXX The conditionals f...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/69bce8ea5580
branches:  trunk
changeset: 523838:69bce8ea5580
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Jan 14 09:10:45 2007 +0000

description:
Modular Xorg support. XXX The conditionals for the native case are nasty.

diffstat:

 wm/waimea/Makefile |  28 ++++++++++++++++++++--------
 1 files changed, 20 insertions(+), 8 deletions(-)

diffs (45 lines):

diff -r 3b01672c92cf -r 69bce8ea5580 wm/waimea/Makefile
--- a/wm/waimea/Makefile        Sun Jan 14 09:03:09 2007 +0000
+++ b/wm/waimea/Makefile        Sun Jan 14 09:10:45 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/12/15 20:33:02 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2007/01/14 09:10:45 joerg Exp $
 #
 
 DISTNAME=      waimea-0.4.0
@@ -16,16 +16,28 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !exists(${X11BASE}/include/X11/extensions/Xinerama.h)
-CONFIGURE_ARGS+=       --disable-xinerama
-.endif
+BUILDLINK_DEPMETHOD.libXt?=    build
+
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 
-.if !exists(${X11BASE}/include/X11/extensions/Xrender.h)
+.if ${X11_TYPE} != "native"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
+.else
+.  if !exists(${X11BASE}/include/X11/extensions/Xinerama.h)
+CONFIGURE_ARGS+=       --disable-xinerama
+.  endif
+.  if !exists(${X11BASE}/include/X11/extensions/Xrender.h)
 CONFIGURE_ARGS+=       --disable-render
-.endif
-
-.if !exists(${X11BASE}/include/X11/extensions/shape.h)
+.  endif
+.  if !exists(${X11BASE}/include/X11/extensions/shape.h)
 CONFIGURE_ARGS+=       --disable-shape
+.  endif
 .endif
 
 CONFIGURE_ARGS+=       --disable-randr