From e8b5221d2a1b2a7f6c71ed5b7c5525089d369dfa Mon Sep 17 00:00:00 2001 From: kamil Date: Tue, 21 Jan 2020 10:50:48 +0000 Subject: Set native X11BASE on NetBSD to /usr/X11R7 unconditionally This is the default option for more than a decade now. --- mk/bsd.prefs.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mk') 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 -- cgit v1.2.3