From 7b46cd14eecddd5d1bb122b233ac6ef1e088df08 Mon Sep 17 00:00:00 2001
From: tron <tron>
Date: Sun, 13 Sep 2009 13:28:46 +0000
Subject: Add support for X.org bundled with Mac OS X Snow Leopard.

---
 mk/defaults/mk.conf | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'mk/defaults')

diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 6999d267467..9dfc783c483 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.185 2009/08/05 22:14:28 minskim Exp $
+# $NetBSD: mk.conf,v 1.186 2009/09/13 13:28:46 tron Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -206,12 +206,15 @@ PKGSRC_RUN_TEST?=	no
 .if (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \
      exists(/usr/X11R7/lib/libX11.so))
 PREFER_PKGSRC?=
-.elif empty(MACHINE_PLATFORM:MDarwin-9.*-*) || \
-      (defined(X11_TYPE) && ${X11_TYPE} != "native")
+.elif !empty(MACHINE_PLATFORM:MDarwin-??.*-*) && \
+      (!defined(X11_TYPE) || ${X11_TYPE} == "native")
+PREFER_PKGSRC?=
+.elif !empty(MACHINE_PLATFORM:MDarwin-9.*-*) && \
+      (!defined(X11_TYPE) || ${X11_TYPE} == "native")
+PREFER_PKGSRC?=		fontconfig pixman Xft2
+.else
 PREFER_PKGSRC?=		MesaLib Xft2 Xrandr Xrender expat fontconfig	\
 			freetype2 glu randrproto renderproto xcursor
-.else
-PREFER_PKGSRC?=		fontconfig pixman Xft2
 .endif
 PREFER_NATIVE?=		yes
 #
-- 
cgit v1.2.3