diff options
| author | jperkin <jperkin> | 2014-03-07 15:10:33 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2014-03-07 15:10:33 +0000 |
| commit | e4c5e42b932565d1a6d0066ab5e0b8397866edf1 (patch) | |
| tree | 960ac6104d18bd2e2d361249d327b805066700b2 /mk | |
| parent | 419e1042f36888446c4b014051127f4b399ac818 (diff) | |
| download | pkgsrc-e4c5e42b932565d1a6d0066ab5e0b8397866edf1.tar.gz | |
Avoid the default PREFER_PKGSRC when using native X11_TYPE on Linux.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/defaults/mk.conf | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index 00c54fbc395..b6f1fabaab1 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.235 2014/01/30 12:37:56 obache Exp $ +# $NetBSD: mk.conf,v 1.236 2014/03/07 15:10:33 jperkin Exp $ # # This file provides default values for variables that may be overridden @@ -204,6 +204,9 @@ PREFER_PKGSRC?= MesaLib Xft2 Xrandr Xrender fontconfig \ .elif (!empty(MACHINE_PLATFORM:MOpenBSD-*-*) && \ exists(/usr/X11R6/lib/X11/config/xorgversion.def)) PREFER_PKGSRC?= +.elif !empty(MACHINE_PLATFORM:MLinux-*-*) && \ + (!defined(X11_TYPE) || ${X11_TYPE} == "native") +PREFER_PKGSRC?= .elif !empty(MACHINE_PLATFORM:MDarwin-??.*-*) && \ (!defined(X11_TYPE) || ${X11_TYPE} == "native") PREFER_PKGSRC?= |