summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authortron <tron>2007-12-05 21:38:06 +0000
committertron <tron>2007-12-05 21:38:06 +0000
commit30becb8847f7c38d8ffbdc681bfc4279f839bad6 (patch)
tree2a35ec7204334f4c9bf4de5dbfee4e2071fdc928 /mk
parent21fd2a541dc797dcaa645503aac5164f257b9939 (diff)
downloadpkgsrc-30becb8847f7c38d8ffbdc681bfc4279f839bad6.tar.gz
Don't prefer "pkgsrc" versions of "MesaLib", "Xft2" etc. under
Mac OS X Leopard which ships with an uptodate version of X.org.
Diffstat (limited to 'mk')
-rw-r--r--mk/defaults/mk.conf7
1 files changed, 6 insertions, 1 deletions
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 8b25cda84d8..a9bbbe0c9ce 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -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 @@ PKGSRC_RUN_TEST?= no
# 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