[pkgsrc/trunk]: pkgsrc Xrandr won't build without the X Extension library whi...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dc6291672433
branches:  trunk
changeset: 471018:dc6291672433
user:      recht <recht%pkgsrc.org@localhost>
date:      Mon Mar 15 17:30:18 2004 +0000

description:
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@

diffstat:

 pkgtools/x11-links/builtin.mk      |  11 ++++++++++-
 x11/Xrandr-mixedcase/Makefile      |  11 ++++++++++-
 x11/Xrandr-mixedcase/buildlink2.mk |  11 ++++++++++-
 x11/randrext/Makefile              |  12 +++++++++++-
 x11/randrext/buildlink2.mk         |  12 +++++++++++-
 5 files changed, 52 insertions(+), 5 deletions(-)

diffs (135 lines):

diff -r 460634e46931 -r dc6291672433 pkgtools/x11-links/builtin.mk
--- a/pkgtools/x11-links/builtin.mk     Mon Mar 15 17:17:08 2004 +0000
+++ b/pkgtools/x11-links/builtin.mk     Mon Mar 15 17:30:18 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2004/03/15 10:35:13 tron Exp $
+# $NetBSD: builtin.mk,v 1.3 2004/03/15 17:30:18 recht Exp $
 
 .if !defined(XF86_VERSION)
 _X11_CONFIG_VERSION_DEF=       ${X11BASE}/lib/X11/config/version.def
@@ -30,3 +30,12 @@
 .endif
 
 USE_BUILTIN.x11-links?=        no
+
+# Xrandr won't build without the X Extension library which is only present
+# in XFree86>=4.3; ignore it when checking dependencies or buildlinking.
+#
+.if !exists(${X11BASE}/include/X11/extensions/extutil.h)
+IGNORE_PKG.Xrandr=     yes
+IGNORE_PKG.randrext=   yes
+.endif
+
diff -r 460634e46931 -r dc6291672433 x11/Xrandr-mixedcase/Makefile
--- a/x11/Xrandr-mixedcase/Makefile     Mon Mar 15 17:17:08 2004 +0000
+++ b/x11/Xrandr-mixedcase/Makefile     Mon Mar 15 17:30:18 2004 +0000
@@ -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 @@
 
 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 -r 460634e46931 -r dc6291672433 x11/Xrandr-mixedcase/buildlink2.mk
--- a/x11/Xrandr-mixedcase/buildlink2.mk        Mon Mar 15 17:17:08 2004 +0000
+++ b/x11/Xrandr-mixedcase/buildlink2.mk        Mon Mar 15 17:30:18 2004 +0000
@@ -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+=       lib/libXrandr.*
 
 _IS_BUILTIN_XRANDR=    0
+.  else
+BUILDLINK_PREFIX.Xrandr=       ${X11BASE}
+BUILDLINK_PREFIX.Xrandr_DEFAULT=       ${X11BASE}
+.  endif
 
 USE_X11=       YES
 
diff -r 460634e46931 -r dc6291672433 x11/randrext/Makefile
--- a/x11/randrext/Makefile     Mon Mar 15 17:17:08 2004 +0000
+++ b/x11/randrext/Makefile     Mon Mar 15 17:30:18 2004 +0000
@@ -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 @@
 
 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 -r 460634e46931 -r dc6291672433 x11/randrext/buildlink2.mk
--- a/x11/randrext/buildlink2.mk        Mon Mar 15 17:17:08 2004 +0000
+++ b/x11/randrext/buildlink2.mk        Mon Mar 15 17:30:18 2004 +0000
@@ -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 @@
 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