[pkgsrc/trunk]: pkgsrc/mk Add support for X.org bundled with Mac OS X Snow Le...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b3d81c181b60
branches:  trunk
changeset: 399115:b3d81c181b60
user:      tron <tron%pkgsrc.org@localhost>
date:      Sun Sep 13 13:28:46 2009 +0000

description:
Add support for X.org bundled with Mac OS X Snow Leopard.

diffstat:

 mk/bsd.prefs.mk     |   5 +++--
 mk/defaults/mk.conf |  13 ++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diffs (48 lines):

diff -r bc3b566783c6 -r b3d81c181b60 mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Sun Sep 13 13:11:56 2009 +0000
+++ b/mk/bsd.prefs.mk   Sun Sep 13 13:28:46 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.294 2009/05/23 23:48:44 joerg Exp $
+# $NetBSD: bsd.prefs.mk,v 1.295 2009/09/13 13:28:46 tron Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -501,7 +501,8 @@
 X11BASE?=      /usr/openwin
 .  elif ${OPSYS} == "IRIX" || ${OPSYS} == "OSF1" || ${OPSYS} == "HPUX"
 X11BASE?=      /usr
-.  elif !empty(MACHINE_PLATFORM:MDarwin-9.*-*)
+.  elif !empty(MACHINE_PLATFORM:MDarwin-9.*-*) || \
+        !empty(MACHINE_PLATFORM:MDarwin-??.*-*)
 X11BASE?=      /usr/X11
 .  elif exists(/usr/X11R7/lib/libX11.so)
 X11BASE?=      /usr/X11R7
diff -r bc3b566783c6 -r b3d81c181b60 mk/defaults/mk.conf
--- a/mk/defaults/mk.conf       Sun Sep 13 13:11:56 2009 +0000
+++ b/mk/defaults/mk.conf       Sun Sep 13 13:28:46 2009 +0000
@@ -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 @@
 .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
 #