summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2005-12-29 21:18:11 +0000
committermarkd <markd@pkgsrc.org>2005-12-29 21:18:11 +0000
commitf62733a6ab1c1553ade34a0a2a8f9282f2ca392c (patch)
tree0fe6c3642b4c8073292dd86fd5669945417b7ac4 /mk
parentbe16507857bcc682649a52fce2e324350272fe3f (diff)
downloadpkgsrc-f62733a6ab1c1553ade34a0a2a8f9282f2ca392c.tar.gz
X11BASE defaults to /usr/openwin on Solaris, but only when using the
native X11_TYPE. Allow X11BASE to default correctly on Solaris when X11_TYPE= XFree86 or xorg.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.prefs.mk8
1 files changed, 5 insertions, 3 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 48d991f8e16..6301eb495df 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.216 2005/12/28 01:00:46 abs Exp $
+# $NetBSD: bsd.prefs.mk,v 1.217 2005/12/29 21:18:11 markd Exp $
#
# Make file, included to get the site preferences, if any. Should
# only be included by package Makefiles before any .if defined()
@@ -387,11 +387,13 @@ USE_INET6= NO
.endif
LOCALBASE?= ${DESTDIR}/usr/pkg
-.if ${OPSYS} == "SunOS"
+.if !defined(X11_TYPE) || defined(X11_TYPE) && !empty(X11_TYPE:Mnative)
+. if ${OPSYS} == "SunOS"
# On Solaris, we default to using OpenWindows for X11.
X11BASE?= ${DESTDIR}/usr/openwin
-.elif !defined(X11_TYPE) || defined(X11_TYPE) && !empty(X11_TYPE:Mnative)
+. else
X11BASE?= ${DESTDIR}/usr/X11R6
+. endif
.endif
CROSSBASE?= ${LOCALBASE}/cross