pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/defaults Avoid the default PREFER_PKGSRC when using...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/904e0ac5ccf1
branches:  trunk
changeset: 631487:904e0ac5ccf1
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Fri Mar 07 15:10:33 2014 +0000

description:
Avoid the default PREFER_PKGSRC when using native X11_TYPE on Linux.

diffstat:

 mk/defaults/mk.conf |  5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (19 lines):

diff -r d43a34461f0f -r 904e0ac5ccf1 mk/defaults/mk.conf
--- a/mk/defaults/mk.conf       Fri Mar 07 15:07:44 2014 +0000
+++ b/mk/defaults/mk.conf       Fri Mar 07 15:10:33 2014 +0000
@@ -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 @@
 .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?=



Home | Main Index | Thread Index | Old Index