--xHFwDpU9dbj6ez1V
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Mon, Mar 15, 2004 at 12:53:38AM +0100, Marc Recht wrote:
> 
> Currently gtk2 can't be built with XFree86 <= 4.2.x installed since the 
> versions <= 4.2.x are missing X11/extensions/extutil.h which Xrandr needs.
> As a work-around I'd like to commit the attached diff against Xrandr's 
> builldlinks which skip the pkg if extutil.h doesn't exist.

The patch for Xrandr/buildlink2.mk is fine, though buildlink2 doesn't
use USE_BUILTIN.<pkg> anywhere, so that line can be removed.

For buildlink3, please try the attached patch instead.

I think we would also need a test in x11/Xrandr/Makefile that checks
whether ${X11BASE}/include/X11/extensions/extutil.h exists and
conditionally sets PKG_SKIP_REASON or PKG_FAIL_REASON.

	Cheers,

	-- Johnny Lam <jlam@NetBSD.org>

--xHFwDpU9dbj6ez1V
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=diff

Index: pkgtools/x11-links/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/x11-links/builtin.mk,v
retrieving revision 1.1
diff -u -r1.1 builtin.mk
--- pkgtools/x11-links/builtin.mk	15 Mar 2004 01:07:59 -0000	1.1
+++ pkgtools/x11-links/builtin.mk	15 Mar 2004 01:08:58 -0000
@@ -30,3 +30,11 @@
 .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
+.endif
+

--xHFwDpU9dbj6ez1V--