[src/netbsd-8]: src Pull up following revision(s) (requested by snj in ticket...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/961cd0f7a314
branches:  netbsd-8
changeset: 434893:961cd0f7a314
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Apr 12 13:51:40 2018 +0000

description:
Pull up following revision(s) (requested by snj in ticket #742):

        etc/root/dot.profile: revision 1.30
        etc/skel/dot.profile: revision 1.10
        etc/login.conf: revision 1.7
        etc/root/dot.cshrc: revision 1.27
        share/man/man7/hier.7: revision 1.129 (patch)
        etc/man.conf: revision 1.37
        etc/skel/dot.cshrc: revision 1.8

/usr/X11R6 has been empty on most NetBSD installations since 2008,
and the last few straggling ports dumped it in 2015.  It's time to
prune references to /usr/X11R6 from our config files.

remove reference to /usr/X11R6

diffstat:

 etc/login.conf        |  4 ++--
 etc/man.conf          |  5 ++---
 etc/root/dot.cshrc    |  4 ++--
 etc/root/dot.profile  |  4 ++--
 etc/skel/dot.cshrc    |  4 ++--
 etc/skel/dot.profile  |  4 ++--
 share/man/man7/hier.7 |  4 +---
 7 files changed, 13 insertions(+), 16 deletions(-)

diffs (125 lines):

diff -r a8dfbbe8fddc -r 961cd0f7a314 etc/login.conf
--- a/etc/login.conf    Thu Apr 12 13:42:48 2018 +0000
+++ b/etc/login.conf    Thu Apr 12 13:51:40 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: login.conf,v 1.6 2014/09/25 11:33:33 mbalmer Exp $
+# $NetBSD: login.conf,v 1.6.8.1 2018/04/12 13:51:41 martin Exp $
 
 # Based on:
 # OpenBSD: login.conf,v 1.22 2005/08/12 18:48:20 millert Exp 
@@ -12,7 +12,7 @@
 # Any value changed in the daemon class should be reset in the default class.
 #
 #default:\
-#      :path=/usr/bin /bin /usr/sbin /sbin /usr/X11R7/bin /usr/X11R6/bin /usr/pkg/bin /usr/pkg/sbin /usr/local/bin:\
+#      :path=/usr/bin /bin /usr/sbin /sbin /usr/X11R7/bin /usr/pkg/bin /usr/pkg/sbin /usr/local/bin:\
 #      :umask=022:\
 #      :datasize-max=512M:\
 #      :datasize-cur=512M:\
diff -r a8dfbbe8fddc -r 961cd0f7a314 etc/man.conf
--- a/etc/man.conf      Thu Apr 12 13:42:48 2018 +0000
+++ b/etc/man.conf      Thu Apr 12 13:51:40 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: man.conf,v 1.36 2016/12/25 12:10:52 kim Exp $
+#      $NetBSD: man.conf,v 1.36.6.1 2018/04/12 13:51:41 martin Exp $
 
 # Sheer, raging paranoia...
 _version       BSD.2
@@ -40,11 +40,10 @@
 # directory with all of the subdirectories listed for the keyword _subdir.
 
 # default
-_default       /usr/{share,X11R7,X11R6,pkg,local}/man/
+_default       /usr/{share,X11R7,pkg,local}/man/
 
 # Other sections that represent complete man subdirectories.
 X11R7          /usr/X11R7/man/
-X11R6          /usr/X11R6/man/
 packages       /usr/pkg/man/
 local          /usr/local/man/
 
diff -r a8dfbbe8fddc -r 961cd0f7a314 etc/root/dot.cshrc
--- a/etc/root/dot.cshrc        Thu Apr 12 13:42:48 2018 +0000
+++ b/etc/root/dot.cshrc        Thu Apr 12 13:51:40 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: dot.cshrc,v 1.25.8.1 2017/12/08 06:10:46 msaitoh Exp $
+#      $NetBSD: dot.cshrc,v 1.25.8.2 2018/04/12 13:51:40 martin Exp $
 
 alias  h       history
 alias  j       jobs -l
@@ -25,7 +25,7 @@
 #setenv PKG_PATH "http://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/`uname -p`/`uname -r|cut -f '1 2' -d.|cut -f 1 -d_`/All"
 
 set history=1000
-set path=(/sbin /usr/sbin /bin /usr/bin /usr/pkg/sbin /usr/pkg/bin /usr/X11R7/bin /usr/X11R6/bin /usr/local/sbin /usr/local/bin)
+set path=(/sbin /usr/sbin /bin /usr/bin /usr/pkg/sbin /usr/pkg/bin /usr/X11R7/bin /usr/local/sbin /usr/local/bin)
 
 # directory stuff: cdpath/cd/back
 set cdpath=(/usr/src/{sys,bin,sbin,usr.{bin,sbin},lib,libexec,share,local,games,gnu/{usr.{bin,sbin},libexec,lib,games}})
diff -r a8dfbbe8fddc -r 961cd0f7a314 etc/root/dot.profile
--- a/etc/root/dot.profile      Thu Apr 12 13:42:48 2018 +0000
+++ b/etc/root/dot.profile      Thu Apr 12 13:51:40 2018 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: dot.profile,v 1.28.8.1 2017/12/08 06:10:46 msaitoh Exp $
+#      $NetBSD: dot.profile,v 1.28.8.2 2018/04/12 13:51:40 martin Exp $
 
 export PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/pkg/sbin:/usr/pkg/bin
-export PATH=${PATH}:/usr/X11R7/bin:/usr/X11R6/bin:/usr/local/sbin:/usr/local/bin
+export PATH=${PATH}:/usr/X11R7/bin:/usr/local/sbin:/usr/local/bin
 
 # Uncomment the following line(s) to install binary packages
 # from cdn.NetBSD.org via pkg_add.  (See also pkg_install.conf)
diff -r a8dfbbe8fddc -r 961cd0f7a314 etc/skel/dot.cshrc
--- a/etc/skel/dot.cshrc        Thu Apr 12 13:42:48 2018 +0000
+++ b/etc/skel/dot.cshrc        Thu Apr 12 13:51:40 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: dot.cshrc,v 1.7 2011/10/19 14:42:37 christos Exp $
+#      $NetBSD: dot.cshrc,v 1.7.36.1 2018/04/12 13:51:41 martin Exp $
 #
 # This is the default .cshrc file.
 # Users are expected to edit it to meet their own needs.
@@ -32,7 +32,7 @@
 #setenv        PRINTER change-this-to-a-printer
 
 # Set the search path for programs.
-set path = (~/bin /bin /sbin /usr/{bin,sbin,X11R7/bin,X11R6/bin,pkg/{,s}bin,games} \
+set path = (~/bin /bin /sbin /usr/{bin,sbin,X11R7/bin,pkg/{,s}bin,games} \
            /usr/local/{,s}bin)
 
 if ($?prompt) then
diff -r a8dfbbe8fddc -r 961cd0f7a314 etc/skel/dot.profile
--- a/etc/skel/dot.profile      Thu Apr 12 13:42:48 2018 +0000
+++ b/etc/skel/dot.profile      Thu Apr 12 13:51:40 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: dot.profile,v 1.9 2012/04/10 19:02:30 dholland Exp $
+#      $NetBSD: dot.profile,v 1.9.26.1 2018/04/12 13:51:41 martin Exp $
 #
 # This is the default .profile file.
 # Users are expected to edit it to meet their own needs.
@@ -32,7 +32,7 @@
 #export PRINTER=change-this-to-a-printer
 
 # Set the search path for programs.
-PATH=$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R7/bin:/usr/X11R6/bin:/usr/pkg/bin
+PATH=$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R7/bin:/usr/pkg/bin
 PATH=${PATH}:/usr/pkg/sbin:/usr/games:/usr/local/bin:/usr/local/sbin
 export PATH
 
diff -r a8dfbbe8fddc -r 961cd0f7a314 share/man/man7/hier.7
--- a/share/man/man7/hier.7     Thu Apr 12 13:42:48 2018 +0000
+++ b/share/man/man7/hier.7     Thu Apr 12 13:51:40 2018 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: hier.7,v 1.122 2016/08/27 03:57:21 dholland Exp $
+.\"    $NetBSD: hier.7,v 1.122.6.1 2018/04/12 13:51:41 martin Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
 .\"    The Regents of the University of California.  All rights reserved.
@@ -420,8 +420,6 @@
 Contains the majority of the system utilities and files.
 .Pp
 .Bl -tag -width "libdata/" -compact
-.It Sy X11R6/
-X11 files (for X11 revision 6).
 .It Sy X11R7/
 X11 files (for X11 revision 7).
 .Pp