CVS commit: pkgsrc/mk

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Tue Jan 21 10:50:48 UTC 2020

Modified Files:
        pkgsrc/mk: bsd.prefs.mk

Log Message:
Set native X11BASE on NetBSD to /usr/X11R7 unconditionally

This is the default option for more than a decade now.


To generate a diff of this commit:
cvs rdiff -u -r1.405 -r1.406 pkgsrc/mk/bsd.prefs.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/bsd.prefs.mk
diff -u pkgsrc/mk/bsd.prefs.mk:1.405 pkgsrc/mk/bsd.prefs.mk:1.406
--- pkgsrc/mk/bsd.prefs.mk:1.405        Sat Nov  9 21:24:24 2019
+++ pkgsrc/mk/bsd.prefs.mk      Tue Jan 21 10:50:48 2020
@@ -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