Page MenuHomeFreeBSD
Files F144899135

D16770.id46839.diff
No OneTemporary
Actions

D16770.id46839.diff
View Options

Index: bin/csh/Makefile
===================================================================
--- bin/csh/Makefile
+++ bin/csh/Makefile
@@ -8,8 +8,11 @@
.include <src.opts.mk>
-CONFGROUPS= ETC
+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}
@@ -150,4 +153,7 @@
sort >> ${.TARGET}
@echo '#endif /* _h_tc_const */' >> ${.TARGET}
+beforeinstallconfig:
+ rm -f ${DESTDIR}/.cshrc
+
.include <bsd.prog.mk>
Index: bin/sh/Makefile
===================================================================
--- bin/sh/Makefile
+++ bin/sh/Makefile
@@ -3,7 +3,9 @@
.include <src.opts.mk>
-CONFS= profile
+CONFS= dot.profile profile
+CONFSDIR_dot.profile= /root
+CONFSNAME_dot.profile= .profile
PACKAGE=runtime
PROG= sh
INSTALLFLAGS= -S
@@ -61,4 +63,10 @@
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
+beforeinstallconfig:
+ rm -f ${DESTDIR}/.profile
+
+afterinstallconfig:
+ ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.profile ${DESTDIR}/.profile
+
.include <bsd.prog.mk>
Index: etc/Makefile
===================================================================
--- etc/Makefile
+++ etc/Makefile
@@ -176,18 +176,6 @@
${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; \
- 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 \
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.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
Index: share/mk/bsd.confs.mk
===================================================================
--- share/mk/bsd.confs.mk
+++ share/mk/bsd.confs.mk
@@ -29,8 +29,11 @@
. if !target(afterinstallconfig)
afterinstallconfig:
. endif
-installconfig: realinstallconfig afterinstallconfig
-.ORDER: realinstallconfig afterinstallconfig
+. if !target(beforeinstallconfig)
+beforeinstallconfig:
+. endif
+installconfig: beforeinstallconfig realinstallconfig afterinstallconfig
+.ORDER: beforeinstallconfig realinstallconfig afterinstallconfig
${group}OWN?= ${SHAREOWN}
${group}GRP?= ${SHAREGRP}

File Metadata

Mime Type
text/plain
Expires
Sat, Feb 14, 9:51 PM (6 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28716459
Default Alt Text
D16770.id46839.diff (4 KB)

Event Timeline