From b756e111774133bb139f718203778018d13b90d5 Mon Sep 17 00:00:00 2001 From: tron Date: Sun, 13 Sep 2009 13:31:41 +0000 Subject: Update to "x11-links" package to version 0.44: Detect X.org even if "imake" is not installed. The package now works as expected under Mac OS X Snow Leopard. No regressions under NetBSD/amd64 5.0_STABLE with native X.org. --- pkgtools/x11-links/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgtools/x11-links/Makefile') diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile index 50a0068736e..a53d725534e 100644 --- a/pkgtools/x11-links/Makefile +++ b/pkgtools/x11-links/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.104 2009/06/15 12:42:15 tron Exp $ +# $NetBSD: Makefile,v 1.105 2009/09/13 13:31:41 tron Exp $ # # NOTE: If you update this package, then you'll likely need to also update # the x11-links dependency in buildlink3.mk to the correct version, # usually the most recent. -DISTNAME= x11-links-0.43 +DISTNAME= x11-links-0.44 CATEGORIES= pkgtools x11 MASTER_SITES= # empty DISTFILES= # empty @@ -36,7 +36,8 @@ PKG_FAIL_REASON+= "${PKGNAME} requires X headers to be installed" . include "xdec.mk" .elif !empty(X11BASE:M*openwin) . include "openwin.mk" -.elif exists(${X11BASE}/lib/X11/config/xorgversion.def) +.elif exists(${X11BASE}/lib/X11/config/xorgversion.def) || \ + exists(${X11BASE}/lib/pkgconfig/xorg-server.pc) . include "xorg.mk" .else . include "xfree.mk" -- cgit v1.2.3