summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorkamil <kamil@pkgsrc.org>2020-01-21 10:50:48 +0000
committerkamil <kamil@pkgsrc.org>2020-01-21 10:50:48 +0000
commite8b5221d2a1b2a7f6c71ed5b7c5525089d369dfa (patch)
treed81586079b7bacdc2da5e43f9a927cf5e8c98efe /mk
parent91215ec25e03a0e9085d202454fa76bb89d19c82 (diff)
downloadpkgsrc-e8b5221d2a1b2a7f6c71ed5b7c5525089d369dfa.tar.gz
Set native X11BASE on NetBSD to /usr/X11R7 unconditionally
This is the default option for more than a decade now.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.prefs.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 65dfc2fb6b9..a643ad6ebd1 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.405 2019/11/09 21:24:24 maya Exp $
+# $NetBSD: bsd.prefs.mk,v 1.406 2020/01/21 10:50:48 kamil Exp $
#
# This file includes the mk.conf file, which contains the user settings.
#
@@ -548,7 +548,7 @@ X11BASE?= /usr/X11R6
X11BASE?= /usr/X11
. elif !empty(MACHINE_PLATFORM:MDarwin-??.*-*)
X11BASE?= /opt/X11
-. elif ${OPSYS} == "NetBSD" && ${X11FLAVOUR:U} == "Xorg"
+. elif ${OPSYS} == "NetBSD"
X11BASE?= /usr/X11R7
. elif exists(/usr/X11R7/lib/libX11.so)
X11BASE?= /usr/X11R7