Page MenuHomeFreeBSD
Files F152053004

D16708.diff
No OneTemporary
Actions

D16708.diff
View Options

Index: head/bin/csh/Makefile
===================================================================
--- head/bin/csh/Makefile
+++ head/bin/csh/Makefile
@@ -8,6 +8,11 @@
.include <src.opts.mk>
+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 \
+ /root/.cshrc /.cshrc
CLEANFILES= ${GENHDRS} gethost csh.1
@@ -147,5 +153,12 @@
sed -e 's/Char \([a-zA-Z0-9_]*\)\(.*\)/extern Char \1[];/' | \
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 <bsd.prog.mk>
Index: head/bin/csh/csh.cshrc
===================================================================
--- head/bin/csh/csh.cshrc
+++ head/bin/csh/csh.cshrc
@@ -0,0 +1,3 @@
+# $FreeBSD$
+#
+# System-wide .cshrc file for csh(1).
Index: head/bin/csh/csh.login
===================================================================
--- head/bin/csh/csh.login
+++ head/bin/csh/csh.login
@@ -0,0 +1,15 @@
+# $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: head/bin/csh/csh.logout
===================================================================
--- head/bin/csh/csh.logout
+++ head/bin/csh/csh.logout
@@ -0,0 +1,3 @@
+# $FreeBSD$
+#
+# System-wide .logout file for csh(1).
Index: head/bin/csh/dot.cshrc
===================================================================
--- head/bin/csh/dot.cshrc
+++ head/bin/csh/dot.cshrc
@@ -0,0 +1,43 @@
+# $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: head/bin/csh/dot.login
===================================================================
--- head/bin/csh/dot.login
+++ head/bin/csh/dot.login
@@ -0,0 +1,12 @@
+# $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: head/bin/sh/Makefile
===================================================================
--- head/bin/sh/Makefile
+++ head/bin/sh/Makefile
@@ -3,6 +3,9 @@
.include <src.opts.mk>
+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= /root/.profile /.profile
build-tools: mknodes mksyntax
@@ -59,5 +63,8 @@
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
+
+beforeinstall:
+ rm -f ${DESTDIR}/.profile
.include <bsd.prog.mk>
Index: head/bin/sh/dot.profile
===================================================================
--- head/bin/sh/dot.profile
+++ head/bin/sh/dot.profile
@@ -0,0 +1,16 @@
+# $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
Index: head/bin/sh/profile
===================================================================
--- head/bin/sh/profile
+++ head/bin/sh/profile
@@ -0,0 +1,18 @@
+# $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: head/etc/Makefile
===================================================================
--- head/etc/Makefile
+++ head/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: head/etc/csh.cshrc
===================================================================
--- head/etc/csh.cshrc
+++ head/etc/csh.cshrc
@@ -1,3 +0,0 @@
-# $FreeBSD$
-#
-# System-wide .cshrc file for csh(1).
Index: head/etc/csh.login
===================================================================
--- head/etc/csh.login
+++ head/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: head/etc/csh.logout
===================================================================
--- head/etc/csh.logout
+++ head/etc/csh.logout
@@ -1,3 +0,0 @@
-# $FreeBSD$
-#
-# System-wide .logout file for csh(1).
Index: head/etc/profile
===================================================================
--- head/etc/profile
+++ head/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: head/etc/root/dot.cshrc
===================================================================
--- head/etc/root/dot.cshrc
+++ head/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: head/etc/root/dot.login
===================================================================
--- head/etc/root/dot.login
+++ head/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: head/etc/root/dot.profile
===================================================================
--- head/etc/root/dot.profile
+++ head/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

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 13, 9:30 AM (5 h, 55 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31404132
Default Alt Text
D16708.diff (10 KB)

Event Timeline