pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/defaults Don't prefer "pkgsrc" versions of "MesaLib...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b3f22a5ab916
branches:  trunk
changeset: 536199:b3f22a5ab916
user:      tron <tron%pkgsrc.org@localhost>
date:      Wed Dec 05 21:38:06 2007 +0000

description:
Don't prefer "pkgsrc" versions of "MesaLib", "Xft2" etc. under
Mac OS X Leopard which ships with an uptodate version of X.org.

diffstat:

 mk/defaults/mk.conf |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (23 lines):

diff -r 41765cb5a676 -r b3f22a5ab916 mk/defaults/mk.conf
--- a/mk/defaults/mk.conf       Wed Dec 05 21:36:43 2007 +0000
+++ b/mk/defaults/mk.conf       Wed Dec 05 21:38:06 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.166 2007/11/26 22:14:13 seb Exp $
+# $NetBSD: mk.conf,v 1.167 2007/12/05 21:38:06 tron Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -205,8 +205,13 @@
 # Possible: yes, no
 # Default: no
 
+.if empty(MACHINE_PLATFORM:MDarwin-[9].*-*) || \
+    (defined(X11_TYPE) && ${X11_TYPE} != "native")
 PREFER_PKGSRC?=                MesaLib Xft2 Xrandr Xrender expat fontconfig    \
                        freetype2 glu randrproto renderproto xcursor
+.else
+PREFER_PKGSRC?=
+.endif
 PREFER_NATIVE?=                yes
 #
 # When building packages, whether to prefer the pkgsrc or native



Home | Main Index | Thread Index | Old Index