Index: bin/csh/Makefile =================================================================== --- bin/csh/Makefile +++ bin/csh/Makefile @@ -8,6 +8,11 @@ .include +CONFGROUPS= ETC ROOT +ETC= csh.cshrc csh.login csh.logout +ROOT= dot.cshrc +ROOTDIR= /root +ROOTNAME= .cshrc PACKAGE=runtime TCSHDIR= ${SRCTOP}/contrib/tcsh .PATH: ${TCSHDIR} @@ -44,7 +49,8 @@ LIBADD= termcapw crypt -LINKS= ${BINDIR}/csh ${BINDIR}/tcsh +LINKS= ${BINDIR}/csh ${BINDIR}/tcsh \ + ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc CLEANFILES= ${GENHDRS} gethost csh.1 @@ -148,4 +154,11 @@ sort >> ${.TARGET} @echo '#endif /* _h_tc_const */' >> ${.TARGET} +beforeinstall: + rm -f ${DESTDIR}/.cshrc + +afterinstallconfig: + sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd + pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd + .include Index: bin/sh/Makefile =================================================================== --- bin/sh/Makefile +++ bin/sh/Makefile @@ -3,6 +3,9 @@ .include +CONFS= dot.profile profile +CONFSDIR_dot.profile= /root +CONFSNAME_dot.profile= .profile PACKAGE=runtime PROG= sh INSTALLFLAGS= -S @@ -34,6 +37,7 @@ CLEANFILES+= mknodes mksyntax CLEANFILES+= ${GENSRCS} ${GENHDRS} +LINKS= ${DESTDIR}/root/.profile ${DESTDIR}/.profile build-tools: mknodes mksyntax @@ -60,4 +64,7 @@ HAS_TESTS= SUBDIR.${MK_TESTS}+= tests +beforeinstall: + rm -f ${DESTDIR}/.profile + .include Index: etc/Makefile =================================================================== --- etc/Makefile +++ etc/Makefile @@ -33,7 +33,6 @@ networks \ nsswitch.conf \ phones \ - profile \ protocols \ rc.bsdextended \ rc.firewall \ @@ -88,10 +87,6 @@ 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 @@ ${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 @@ ${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 Index: etc/csh.cshrc =================================================================== --- etc/csh.cshrc +++ etc/csh.cshrc @@ -1,3 +0,0 @@ -# $FreeBSD$ -# -# System-wide .cshrc file for csh(1). Index: etc/csh.login =================================================================== --- etc/csh.login +++ etc/csh.login @@ -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 Index: etc/csh.logout =================================================================== --- etc/csh.logout +++ etc/csh.logout @@ -1,3 +0,0 @@ -# $FreeBSD$ -# -# System-wide .logout file for csh(1). Index: etc/profile =================================================================== --- etc/profile +++ etc/profile @@ -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 Index: etc/root/dot.cshrc =================================================================== --- etc/root/dot.cshrc +++ etc/root/dot.cshrc @@ -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 Index: etc/root/dot.login =================================================================== --- etc/root/dot.login +++ etc/root/dot.login @@ -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 Index: etc/root/dot.profile =================================================================== --- etc/root/dot.profile +++ etc/root/dot.profile @@ -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