Xrandr won't build without the X Extension library which is only present

in XFree86>=4.3; ignore it when checking dependencies or buildlinking.
Skip also randrext (Xrandr's header files) in this case.

The patch agains x11-links' builtin.mk is a slightly modified version of
the patch jlam@ posted in:
http://mail-index.netbsd.org/tech-pkg/2004/03/15/0001.html

ok'd by jlam@

4 files changed, 42 insertions, 4 deletions

diff --git a/x11/Xrandr-mixedcase/Makefile b/x11/Xrandr-mixedcase/Makefile
index 1bbfb328285..fab5dae4b8c 100644
--- a/x11/Xrandr-mixedcase/Makefile
+++ b/x11/Xrandr-mixedcase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/02/16 22:45:34 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2004/03/15 17:30:18 recht Exp $
 #
 
 DISTNAME=		libXrandr-1.0.1
@@ -19,6 +19,15 @@ PKGCONFIG_OVERRIDE+=    xrandr.pc.in
 
 BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.8
 
+.include "../../mk/bsd.prefs.mk"
+
+# Xrandr won't build without the X Extension library which is only present
+# in XFree86>=4.3.
+.if !exists(${X11BASE}/include/X11/extensions/extutil.h)
+PKG_FAIL_REASON=	"${PKGNAME} won't build without the X Extension"
+PKG_FAIL_REASON+=	"library which is only present in XFree86>=4.3."
+.endif
+
 .include "../../x11/randrext/buildlink3.mk"
 .include "../../x11/Xrender/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/x11/Xrandr-mixedcase/buildlink2.mk b/x11/Xrandr-mixedcase/buildlink2.mk
index ddcc02d5227..d2b143baef9 100644
--- a/x11/Xrandr-mixedcase/buildlink2.mk
+++ b/x11/Xrandr-mixedcase/buildlink2.mk
@@ -1,9 +1,14 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/12/04 14:40:40 recht Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2004/03/15 17:30:18 recht Exp $
 
 .if !defined(XRANDR_BUILDLINK2_MK)
 XRANDR_BUILDLINK2_MK=	# defined
 
+.include "../../mk/bsd.prefs.mk"
+
 BUILDLINK_PACKAGES+=			Xrandr
+# Xrandr won't build without the X Extension library which is only present
+# in XFree86>=4.3.
+.  if exists(${X11BASE}/include/X11/extensions/extutil.h)
 BUILDLINK_DEPENDS.Xrandr?=		Xrandr>=1.0.1
 BUILDLINK_PKGSRCDIR.Xrandr?=		../../x11/Xrandr
 
@@ -13,6 +18,10 @@ BUILDLINK_FILES.Xrandr+=	include/X11/extensions/Xrandr.h
 BUILDLINK_FILES.Xrandr+=	lib/libXrandr.*
 
 _IS_BUILTIN_XRANDR=	0
+.  else
+BUILDLINK_PREFIX.Xrandr=	${X11BASE}
+BUILDLINK_PREFIX.Xrandr_DEFAULT=	${X11BASE}
+.  endif
 
 USE_X11=	YES
 
diff --git a/x11/randrext/Makefile b/x11/randrext/Makefile
index c2a96cce40c..a1f43f61b8b 100644
--- a/x11/randrext/Makefile
+++ b/x11/randrext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/02/16 21:37:49 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2004/03/15 17:30:18 recht Exp $
 
 DISTNAME=		randrext-1.0
 CATEGORIES=		x11 devel
@@ -14,4 +14,14 @@ GNU_CONFIGURE=		yes
 
 PKGCONFIG_OVERRIDE+=    randr.pc.in
 
+.include "../../mk/bsd.prefs.mk"
+
+# Xrandr won't build without the X Extension library which is only present
+# in XFree86>=4.3. For this reason we don't need the header files.
+.if !exists(${X11BASE}/include/X11/extensions/extutil.h)
+PKG_SKIP_REASON=	"Xrandr won't build without the X Extension"
+PKG_SKIP_REASON+=	"library which is only present in XFree86>=4.3."
+PKG_SKIP_REASON+=	"For this reason we don't need the header files."
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/randrext/buildlink2.mk b/x11/randrext/buildlink2.mk
index 5c3b4cdee9a..6ff11f7a6ce 100644
--- a/x11/randrext/buildlink2.mk
+++ b/x11/randrext/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/12/30 23:00:51 cjep Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/03/15 17:30:18 recht Exp $
 #
 # This Makefile fragment is included by packages that use randrext.
 #
@@ -8,7 +8,13 @@
 .if !defined(RANDREXT_BUILDLINK2_MK)
 RANDREXT_BUILDLINK2_MK=	# defined
 
+.include "../../mk/bsd.prefs.mk"
+
 BUILDLINK_PACKAGES+=			randrext
+# Xrandr won't build without the X Extension library which is only present
+# in XFree86>=4.3.
+# For this reason we don't need the header files.
+.  if exists(${X11BASE}/include/X11/extensions/extutil.h)
 BUILDLINK_DEPENDS.randrext?=		randrext>=1.0
 BUILDLINK_PKGSRCDIR.randrext?=		../../x11/randrext
 
@@ -16,6 +22,10 @@ EVAL_PREFIX+=	BUILDLINK_PREFIX.randrext=randrext
 BUILDLINK_PREFIX.randrext_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.randrext+=	include/X11/extensions/randr.h
 BUILDLINK_FILES.randrext+=	include/X11/extensions/randrproto.h
+. else
+BUILDLINK_PREFIX.randrext=	${X11BASE}
+BUILDLINK_PREFIX.randrext_DEFAULT=	${X11BASE}
+. endif
 
 BUILDLINK_TARGETS+=	randrext-buildlink