d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
brd 2018-08-15 14:41:24 +00:00
parent 5298a3d72f
commit 553d7626fc
10 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bin/csh/Makefile
View File

@ -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 @@ MLINKS= csh.1 tcsh.1
LIBADD= termcapw crypt
LINKS= ${BINDIR}/csh ${BINDIR}/tcsh
LINKS= ${BINDIR}/csh ${BINDIR}/tcsh \
/root/.cshrc /.cshrc
CLEANFILES= ${GENHDRS} gethost csh.1
@ -148,4 +154,11 @@ tc.const.h: tc.const.c sh.char.h config.h config_f.h sh.types.h sh.err.h ${BUILD
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>

0
etc/csh.cshrc → bin/csh/csh.cshrc
View File

0
etc/csh.login → bin/csh/csh.login
View File

0
etc/csh.logout → bin/csh/csh.logout
View File

0
etc/root/dot.cshrc → bin/csh/dot.cshrc
View File

0
etc/root/dot.login → bin/csh/dot.login
View File

7
bin/sh/Makefile
View File

@ -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 @@ WFORMAT=0
CLEANFILES+= mknodes mksyntax
CLEANFILES+= ${GENSRCS} ${GENHDRS}
LINKS= /root/.profile /.profile
build-tools: mknodes mksyntax
@ -60,4 +64,7 @@ token.h: mktokens
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
beforeinstall:
rm -f ${DESTDIR}/.profile
.include <bsd.prog.mk>

0
etc/root/dot.profile → bin/sh/dot.profile
View File

0
etc/profile → bin/sh/profile
View File

24
etc/Makefile
View File

@ -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