diff options
| author | recht <recht> | 2004-03-15 17:30:18 +0000 |
|---|---|---|
| committer | recht <recht> | 2004-03-15 17:30:18 +0000 |
| commit | fa24eab07185a45e4b52a8a87448bd042d38a3e5 (patch) | |
| tree | cdd83bf67737a8ef660bf982e41c0590c675bd29 /x11/randrext | |
| parent | 7c6c14055b01fd4d46745a2f332d4d48e00b814a (diff) | |
| download | pkgsrc-fa24eab07185a45e4b52a8a87448bd042d38a3e5.tar.gz | |
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 (limited to 'x11/randrext')
| -rw-r--r-- | x11/randrext/Makefile | 12 | ||||
| -rw-r--r-- | x11/randrext/buildlink2.mk | 12 |
2 files changed, 22 insertions, 2 deletions
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 |