Module Name: src
Committed By: snj
Date: Thu Mar 1 06:12:09 UTC 2018
Modified Files:
src/etc: login.conf man.conf
src/etc/root: dot.cshrc dot.profile
src/etc/skel: dot.cshrc dot.profile
Log Message:
/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.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/etc/login.conf
cvs rdiff -u -r1.36 -r1.37 src/etc/man.conf
cvs rdiff -u -r1.26 -r1.27 src/etc/root/dot.cshrc
cvs rdiff -u -r1.29 -r1.30 src/etc/root/dot.profile
cvs rdiff -u -r1.7 -r1.8 src/etc/skel/dot.cshrc
cvs rdiff -u -r1.9 -r1.10 src/etc/skel/dot.profile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/login.conf
diff -u src/etc/login.conf:1.6 src/etc/login.conf:1.7
--- src/etc/login.conf:1.6 Thu Sep 25 11:33:33 2014
+++ src/etc/login.conf Thu Mar 1 06:12:09 2018
@@ -1,4 +1,4 @@
-# $NetBSD: login.conf,v 1.6 2014/09/25 11:33:33 mbalmer Exp $
+# $NetBSD: login.conf,v 1.7 2018/03/01 06:12:09 snj 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:\
Index: src/etc/man.conf
diff -u src/etc/man.conf:1.36 src/etc/man.conf:1.37
--- src/etc/man.conf:1.36 Sun Dec 25 12:10:52 2016
+++ src/etc/man.conf Thu Mar 1 06:12:09 2018
@@ -1,4 +1,4 @@
-# $NetBSD: man.conf,v 1.36 2016/12/25 12:10:52 kim Exp $
+# $NetBSD: man.conf,v 1.37 2018/03/01 06:12:09 snj Exp $
# Sheer, raging paranoia...
_version BSD.2
@@ -40,11 +40,10 @@ _crunch .xz /usr/bin/xz -c > %s
# 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/
Index: src/etc/root/dot.cshrc
diff -u src/etc/root/dot.cshrc:1.26 src/etc/root/dot.cshrc:1.27
--- src/etc/root/dot.cshrc:1.26 Thu Dec 7 18:26:51 2017
+++ src/etc/root/dot.cshrc Thu Mar 1 06:12:09 2018
@@ -1,4 +1,4 @@
-# $NetBSD: dot.cshrc,v 1.26 2017/12/07 18:26:51 jmcneill Exp $
+# $NetBSD: dot.cshrc,v 1.27 2018/03/01 06:12:09 snj Exp $
alias h history
alias j jobs -l
@@ -25,7 +25,7 @@ setenv BLOCKSIZE 1k
#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}})
Index: src/etc/root/dot.profile
diff -u src/etc/root/dot.profile:1.29 src/etc/root/dot.profile:1.30
--- src/etc/root/dot.profile:1.29 Thu Dec 7 18:26:51 2017
+++ src/etc/root/dot.profile Thu Mar 1 06:12:09 2018
@@ -1,7 +1,7 @@
-# $NetBSD: dot.profile,v 1.29 2017/12/07 18:26:51 jmcneill Exp $
+# $NetBSD: dot.profile,v 1.30 2018/03/01 06:12:09 snj 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)
Index: src/etc/skel/dot.cshrc
diff -u src/etc/skel/dot.cshrc:1.7 src/etc/skel/dot.cshrc:1.8
--- src/etc/skel/dot.cshrc:1.7 Wed Oct 19 14:42:37 2011
+++ src/etc/skel/dot.cshrc Thu Mar 1 06:12:09 2018
@@ -1,4 +1,4 @@
-# $NetBSD: dot.cshrc,v 1.7 2011/10/19 14:42:37 christos Exp $
+# $NetBSD: dot.cshrc,v 1.8 2018/03/01 06:12:09 snj Exp $
#
# This is the default .cshrc file.
# Users are expected to edit it to meet their own needs.
@@ -32,7 +32,7 @@ setenv EDITOR vi
#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
Index: src/etc/skel/dot.profile
diff -u src/etc/skel/dot.profile:1.9 src/etc/skel/dot.profile:1.10
--- src/etc/skel/dot.profile:1.9 Tue Apr 10 19:02:30 2012
+++ src/etc/skel/dot.profile Thu Mar 1 06:12:09 2018
@@ -1,4 +1,4 @@
-# $NetBSD: dot.profile,v 1.9 2012/04/10 19:02:30 dholland Exp $
+# $NetBSD: dot.profile,v 1.10 2018/03/01 06:12:09 snj Exp $
#
# This is the default .profile file.
# Users are expected to edit it to meet their own needs.
@@ -32,7 +32,7 @@ export EDITOR=vi
#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
