Move all sh and csh files into bin/sh/ or bin/csh/

This simplifies pkgbase by migrating these to CONFS so they are properly
tagged as config files.

Approved by:	will (mentor)
Differential Revision:	https://reviews.freebsd.org/D16708

8 files changed, 1 insertions, 133 deletions

diff --git a/etc/Makefile b/etc/Makefile
index 85b8c5c2e8b6..7f02abfba2ea 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -33,7 +33,6 @@ BIN1=	crontab \
 	networks \
 	nsswitch.conf \
 	phones \
-	profile \
 	protocols \
 	rc.bsdextended \
 	rc.firewall \
@@ -88,10 +87,6 @@ SSL=	${SRCTOP}/crypto/openssl/apps/openssl.cnf
 BIN1+=	rc.sendmail
 .endif
 
-.if ${MK_TCSH} != "no"
-BIN1+= csh.cshrc csh.login csh.logout
-.endif
-
 .if ${MK_WIRELESS} != "no"
 BIN1+= regdomain.xml
 .endif
@@ -145,10 +140,6 @@ distribution:
 		${DESTDIR}/etc/services;
 .endif
 
-.if ${MK_TCSH} == "no"
-	sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
-.endif
-	pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd
 .if defined(NO_ROOT)
 	( \
 		echo "./etc/login.conf.db type=file mode=0644 uname=root gname=wheel"; \
@@ -190,20 +181,7 @@ distribution:
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 		dot.k5login ${DESTDIR}/root/.k5login;
 .endif
-	cd ${.CURDIR}/root; \
-	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
-		dot.profile ${DESTDIR}/root/.profile; \
-	    rm -f ${DESTDIR}/.profile; \
-	    ${INSTALL_LINK} ${DESTDIR}/root/.profile ${DESTDIR}/.profile
-.if ${MK_TCSH} != "no"
-	cd ${.CURDIR}/root; \
-	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
-		dot.cshrc ${DESTDIR}/root/.cshrc; \
-	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
-		dot.login ${DESTDIR}/root/.login; \
-	    rm -f ${DESTDIR}/.cshrc; \
-	    ${INSTALL_LINK} ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc
-.endif
+
 .if ${MK_MAIL} != "no"
 	cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${ETCMAIL} ${DESTDIR}/etc/mail
diff --git a/etc/csh.cshrc b/etc/csh.cshrc
deleted file mode 100644
index f4f775ae6ada..000000000000
--- a/etc/csh.cshrc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $FreeBSD$
-#
-# System-wide .cshrc file for csh(1).
diff --git a/etc/csh.login b/etc/csh.login
deleted file mode 100644
index 283c6d4fddbc..000000000000
--- a/etc/csh.login
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-#
-# System-wide .login file for csh(1).
-# Uncomment this to give you the default 4.2 behavior, where disk
-# information is shown in K-Blocks
-# setenv BLOCKSIZE	K
-#
-# For the setting of languages and character sets please see
-# login.conf(5) and in particular the charset and lang options.
-# For full locales list check /usr/share/locale/*
-#
-# Check system messages
-# msgs -q
-# Allow terminal messages
-# mesg y
diff --git a/etc/csh.logout b/etc/csh.logout
deleted file mode 100644
index 6b0584f49984..000000000000
--- a/etc/csh.logout
+++ /dev/null
@@ -1,3 +0,0 @@
-# $FreeBSD$
-#
-# System-wide .logout file for csh(1).
diff --git a/etc/profile b/etc/profile
deleted file mode 100644
index 23c993c40214..000000000000
--- a/etc/profile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-#
-# System-wide .profile file for sh(1).
-#
-# Uncomment this to give you the default 4.2 behavior, where disk
-# information is shown in K-Blocks
-# BLOCKSIZE=K; export BLOCKSIZE
-#
-# For the setting of languages and character sets please see
-# login.conf(5) and in particular the charset and lang options.
-# For full locales list check /usr/share/locale/*
-# You should also read the setlocale(3) man page for information
-# on how to achieve more precise control of locale settings.
-#
-# Check system messages
-# msgs -q
-# Allow terminal messages
-# mesg y
diff --git a/etc/root/dot.cshrc b/etc/root/dot.cshrc
deleted file mode 100644
index 1fcc9917f0f9..000000000000
--- a/etc/root/dot.cshrc
+++ /dev/null
@@ -1,43 +0,0 @@
-# $FreeBSD$
-#
-# .cshrc - csh resource script, read at beginning of execution by each shell
-#
-# see also csh(1), environ(7).
-# more examples available at /usr/share/examples/csh/
-#
-
-alias h		history 25
-alias j		jobs -l
-alias la	ls -aF
-alias lf	ls -FA
-alias ll	ls -lAF
-
-# A righteous umask
-umask 22
-
-set path = (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin $HOME/bin)
-
-setenv	EDITOR	vi
-setenv	PAGER	less
-setenv	BLOCKSIZE	K
-
-if ($?prompt) then
-	# An interactive shell -- set some stuff up
-	set prompt = "%N@%m:%~ %# "
-	set promptchars = "%#"
-
-	set filec
-	set history = 1000
-	set savehist = (1000 merge)
-	set autolist = ambiguous
-	# Use history to aid expansion
-	set autoexpand
-	set autorehash
-	set mail = (/var/mail/$USER)
-	if ( $?tcsh ) then
-		bindkey "^W" backward-delete-word
-		bindkey -k up history-search-backward
-		bindkey -k down history-search-forward
-	endif
-
-endif
diff --git a/etc/root/dot.login b/etc/root/dot.login
deleted file mode 100644
index 8d87604f4f7d..000000000000
--- a/etc/root/dot.login
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-#
-# .login - csh login script, read by login shell, after `.cshrc' at login.
-#
-# See also csh(1), environ(7).
-#
-
-# Query terminal size; useful for serial lines.
-if ( -x /usr/bin/resizewin ) /usr/bin/resizewin -z
-
-# Uncomment to display a random cookie on each login.
-# if ( -x /usr/bin/fortune ) /usr/bin/fortune -s
diff --git a/etc/root/dot.profile b/etc/root/dot.profile
deleted file mode 100644
index 76ebfd5e6168..000000000000
--- a/etc/root/dot.profile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-#
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:~/bin
-export PATH
-HOME=/root
-export HOME
-TERM=${TERM:-xterm}
-export TERM
-PAGER=less
-export PAGER
-
-# Query terminal size; useful for serial lines.
-if [ -x /usr/bin/resizewin ] ; then /usr/bin/resizewin -z ; fi
-
-# Uncomment to display a random cookie on each login.
-# if [ -x /usr/bin/fortune ] ; then /usr/bin/fortune -s ; fi