[pkgsrc/trunk]: pkgsrc/mk Only assign X11BASE=/usr/X11R6 if X11_TYPE was not ...

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d58ab6f7d30c
branches:  trunk
changeset: 478785:d58ab6f7d30c
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Fri Jul 30 07:38:01 2004 +0000

description:
Only assign X11BASE=/usr/X11R6 if X11_TYPE was not defined, or
if X11_TYPE == native (by default).

diffstat:

 mk/bsd.prefs.mk |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (25 lines):

diff -r 74d77c691d9c -r d58ab6f7d30c mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Fri Jul 30 07:22:19 2004 +0000
+++ b/mk/bsd.prefs.mk   Fri Jul 30 07:38:01 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.162 2004/07/06 22:49:16 wiz Exp $
+# $NetBSD: bsd.prefs.mk,v 1.163 2004/07/30 07:38:01 xtraeme Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -309,11 +309,11 @@
 LOCALBASE?=            ${DESTDIR}/usr/pkg
 .if ${OPSYS} == "SunOS"
 # On Solaris, we default to using OpenWindows for X11.
-X11BASE?=               ${DESTDIR}/usr/openwin
-.else
-X11BASE?=              ${DESTDIR}/usr/X11R6
+X11BASE?=      ${DESTDIR}/usr/openwin
+.elif !defined(X11_TYPE) || defined(X11_TYPE) && !empty(X11_TYPE:Mnative)
+X11BASE?=      ${DESTDIR}/usr/X11R6
 .endif
-CROSSBASE?=            ${LOCALBASE}/cross
+CROSSBASE?=    ${LOCALBASE}/cross
 
 # If xpkgwedge.def is found, then clearly we're using xpkgwedge.
 .if exists(${LOCALBASE}/lib/X11/config/xpkgwedge.def) || \