diff options
Diffstat (limited to 'mk/defaults/mk.conf')
-rw-r--r-- | mk/defaults/mk.conf | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index 64ea96d339e..43deabef3c0 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.176.6.2 2008/09/21 09:59:09 rtr Exp $ +# $NetBSD: mk.conf,v 1.176.6.3 2008/09/26 18:11:34 cube Exp $ # # This file provides default values for variables that may be overridden @@ -203,17 +203,15 @@ PKGSRC_RUN_TEST?= no # Possible: yes, no # Default: no -.if (!empty(MACHINE_PLATFORM:MDarwin-*-*) && \ - empty(MACHINE_PLATFORM:MDarwin-9.*-*)) || \ - (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \ - defined(X11BASE) && empty(X11BASE:M/usr/X11R7)) || \ - (defined(X11_TYPE) && ${X11_TYPE} != "native") +.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") PREFER_PKGSRC?= MesaLib Xft2 Xrandr Xrender expat fontconfig \ freetype2 glu randrproto renderproto xcursor -.elif !empty(MACHINE_PLATFORM:MDarwin-*-*) -PREFER_PKGSRC?= Xft2 fontconfig .else -PREFER_PKGSRC?= +PREFER_PKGSRC?= Xft2 fontconfig .endif PREFER_NATIVE?= yes # |