diff options
author | tron <tron> | 2007-12-05 21:38:06 +0000 |
---|---|---|
committer | tron <tron> | 2007-12-05 21:38:06 +0000 |
commit | 6c737cc9eabbd4a235a86a8cefa054ba6f158f5f (patch) | |
tree | 2a35ec7204334f4c9bf4de5dbfee4e2071fdc928 /mk | |
parent | df15c2112763b45690d7efabe21c51af913d2cb9 (diff) | |
download | pkgsrc-6c737cc9eabbd4a235a86a8cefa054ba6f158f5f.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.conf | 7 |
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 |