From b2c01596ed8cf7dd2c8366cd47c73b0c2e732710 Mon Sep 17 00:00:00 2001
From: cube <cube@NetBSD.org>
Date: Wed, 19 Nov 2008 18:07:19 +0000
Subject: [PATCH] Sprinkle /usr/X11R7 where relevant.  rc.d/x{fs,dm} are left
 to be done.

---
 etc/login.conf       | 4 ++--
 etc/root/dot.cshrc   | 4 ++--
 etc/root/dot.profile | 4 ++--
 etc/skel/dot.cshrc   | 4 ++--
 etc/skel/dot.profile | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/etc/login.conf b/etc/login.conf
index 5afad10e9d51..ce2dd7a9aacc 100644
--- a/etc/login.conf
+++ b/etc/login.conf
@@ -1,4 +1,4 @@
-# $NetBSD: login.conf,v 1.2 2007/06/01 19:01:51 agc Exp $
+# $NetBSD: login.conf,v 1.3 2008/11/19 18:07:19 cube Exp $
 
 # Based on:
 # OpenBSD: login.conf,v 1.22 2005/08/12 18:48:20 millert Exp 
@@ -13,7 +13,7 @@
 # class.
 #
 #default:\
-#	:path=/usr/bin /bin /usr/sbin /sbin /usr/X11R6/bin /usr/pkg/bin /usr/pkg/sbin /usr/local/bin:\
+#	:path=/usr/bin /bin /usr/sbin /sbin /usr/X11R7/bin /usr/X11R6/bin /usr/pkg/bin /usr/pkg/sbin /usr/local/bin:\
 #	:umask=022:\
 #	:datasize-max=512M:\
 #	:datasize-cur=512M:\
diff --git a/etc/root/dot.cshrc b/etc/root/dot.cshrc
index f848eba98faa..4e7bbdfa16df 100644
--- a/etc/root/dot.cshrc
+++ b/etc/root/dot.cshrc
@@ -1,4 +1,4 @@
-#	$NetBSD: dot.cshrc,v 1.18 2008/11/11 01:05:48 agc Exp $
+#	$NetBSD: dot.cshrc,v 1.19 2008/11/19 18:07:20 cube Exp $
 
 alias	h	history
 alias	j	jobs -l
@@ -25,7 +25,7 @@ setenv BLOCKSIZE 1k
 #setenv PKG_PATH ftp://ftp.netbsd.org/pkgsrc/packages/NetBSD/`uname -m`/5.99/All
 
 set history=1000
-set path=(/sbin /usr/sbin /bin /usr/bin /usr/pkg/sbin /usr/pkg/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/X11R6/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 --git a/etc/root/dot.profile b/etc/root/dot.profile
index 436f668bb507..7248c3312897 100644
--- a/etc/root/dot.profile
+++ b/etc/root/dot.profile
@@ -1,7 +1,7 @@
-#	$NetBSD: dot.profile,v 1.19 2008/11/10 23:17:13 joerg Exp $
+#	$NetBSD: dot.profile,v 1.20 2008/11/19 18:07:20 cube Exp $
 
 export PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/pkg/sbin:/usr/pkg/bin
-export PATH=${PATH}:/usr/X11R6/bin:/usr/local/sbin:/usr/local/bin
+export PATH=${PATH}:/usr/X11R7/bin:/usr/X11R6/bin:/usr/local/sbin:/usr/local/bin
 
 # Uncomment the following line to install binary packages
 # from ftp.NetBSD.org via pkg_add.
diff --git a/etc/skel/dot.cshrc b/etc/skel/dot.cshrc
index c6046ba755e3..17290bebe734 100644
--- a/etc/skel/dot.cshrc
+++ b/etc/skel/dot.cshrc
@@ -1,4 +1,4 @@
-#	$NetBSD: dot.cshrc,v 1.3 2003/04/24 01:02:26 perry Exp $
+#	$NetBSD: dot.cshrc,v 1.4 2008/11/19 18:07:20 cube Exp $
 #
 # This is the default .cshrc file.
 # Users are expected to edit it to meet their own needs.
@@ -21,7 +21,7 @@ setenv	VISUAL	${EDITOR}
 setenv	EXINIT	'set autoindent'
 setenv	PAGER	more
 
-set path = (~/bin /bin /sbin /usr/{bin,sbin,X11R6/bin,pkg/{,s}bin,games} \
+set path = (~/bin /bin /sbin /usr/{bin,sbin,X11R7/bin,X11R6/bin,pkg/{,s}bin,games} \
 	    /usr/local/{,s}bin)
 
 if ($?prompt) then
diff --git a/etc/skel/dot.profile b/etc/skel/dot.profile
index edab15e6b5eb..ba0d33e39cf4 100644
--- a/etc/skel/dot.profile
+++ b/etc/skel/dot.profile
@@ -1,4 +1,4 @@
-#	$NetBSD: dot.profile,v 1.4 2006/08/31 22:49:55 hubertf Exp $
+#	$NetBSD: dot.profile,v 1.5 2008/11/19 18:07:20 cube Exp $
 #
 # This is the default .profile file.
 # Users are expected to edit it to meet their own needs.
@@ -9,7 +9,7 @@
 # See sh(1) for details.
 #
 
-PATH=$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/usr/pkg/bin
+PATH=$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R7/bin:/usr/X11R6/bin:/usr/pkg/bin
 PATH=${PATH}:/usr/pkg/sbin:/usr/games:/usr/local/bin:/usr/local/sbin
 export PATH