diff options
| author | cube <cube> | 2008-09-21 02:17:31 +0000 |
|---|---|---|
| committer | cube <cube> | 2008-09-21 02:17:31 +0000 |
| commit | ade50a5a93970a6596a518ee33807c678a75cc23 (patch) | |
| tree | 8debd57b368ed6b283b3cb7955ec54167e854ea1 | |
| parent | 68a3e9c9e44b57edaa36dbf737ffe3a703bb4362 (diff) | |
| download | pkgsrc-ade50a5a93970a6596a518ee33807c678a75cc23.tar.gz | |
Change the logic of the default setting of PREFER_PKGSRC so that native
X.Org on NetBSD never prefers pkgsrc by default.
| -rw-r--r-- | mk/defaults/mk.conf | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index b9d8b7d382d..2795917f0a6 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.176 2008/05/22 20:11:55 joerg Exp $ +# $NetBSD: mk.conf,v 1.176.6.1 2008/09/21 02:17:31 cube Exp $ # # This file provides default values for variables that may be overridden @@ -203,12 +203,16 @@ PKGSRC_RUN_TEST?= no # Possible: yes, no # Default: no -.if empty(MACHINE_PLATFORM:MDarwin-9.*-*) || \ +.if (!empty(MACHINE_PLATFORM:MDarwin-*-*) && + empty(MACHINE_PLATFORM:MDarwin-9.*-*)) || \ + (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && empty(X11BASE:M/usr/X11R7)) || \ (defined(X11_TYPE) && ${X11_TYPE} != "native") PREFER_PKGSRC?= MesaLib Xft2 Xrandr Xrender expat fontconfig \ freetype2 glu randrproto renderproto xcursor -.else +.elif !empty(MACHINE_PLATFORM:MDarwin-*-*) PREFER_PKGSRC?= Xft2 fontconfig +.else +PREFER_PKGSRC?= .endif PREFER_NATIVE?= yes # |