From 7793b47479d450fc06b5c6270afe894d077d550e Mon Sep 17 00:00:00 2001
From: brd <brd@FreeBSD.org>
Date: Wed, 15 Aug 2018 23:18:34 +0000
Subject: [PATCH] Revert parts of r337849 and r337857

This fixes the build and I will redo these changes as part of a future review
that organizes them differently.  The way I tried to do it here could be done
better.  Sorry for the noise.

Approved by:	will (mentor)
Differential Revision:	https://reviews.freebsd.org/D16737
---
 bin/csh/Makefile                 | 12 +-----------
 bin/sh/Makefile                  | 10 +---------
 etc/Makefile                     | 16 ++++++++++++++++
 etc/master.passwd                |  2 +-
 {bin/csh => etc/root}/dot.cshrc  |  0
 {bin/sh => etc/root}/dot.profile |  0
 6 files changed, 19 insertions(+), 21 deletions(-)
 rename {bin/csh => etc/root}/dot.cshrc (100%)
 rename {bin/sh => etc/root}/dot.profile (100%)

diff --git a/bin/csh/Makefile b/bin/csh/Makefile
index 6abf35076c4..3aaa50d4a64 100644
--- a/bin/csh/Makefile
+++ b/bin/csh/Makefile
@@ -8,11 +8,8 @@
 
 .include <src.opts.mk>
 
-CONFGROUPS=	ETC ROOT
+CONFGROUPS=	ETC
 ETC=	csh.cshrc csh.login csh.logout
-ROOT=	dot.cshrc
-ROOTDIR=	/root
-ROOTNAME=	.cshrc
 PACKAGE=runtime
 TCSHDIR= ${SRCTOP}/contrib/tcsh
 .PATH: ${TCSHDIR}
@@ -153,11 +150,4 @@ 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/sh;/bin/csh;' ${DESTDIR}/etc/master.passwd
-	pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd
-
 .include <bsd.prog.mk>
diff --git a/bin/sh/Makefile b/bin/sh/Makefile
index b50e3217e97..652e9ddc3db 100644
--- a/bin/sh/Makefile
+++ b/bin/sh/Makefile
@@ -3,9 +3,7 @@
 
 .include <src.opts.mk>
 
-CONFS=	dot.profile profile
-CONFSDIR_dot.profile=	/root
-CONFSNAME_dot.profile=	.profile
+CONFS=	profile
 PACKAGE=runtime
 PROG=	sh
 INSTALLFLAGS= -S
@@ -63,10 +61,4 @@ token.h: mktokens
 HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
-beforeinstall:
-	rm -f ${DESTDIR}/.profile
-
-afterinstallconfig:
-	${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.profile ${DESTDIR}/.profile
-
 .include <bsd.prog.mk>
diff --git a/etc/Makefile b/etc/Makefile
index be034ee3d0d..fb60669fbd4 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -135,6 +135,10 @@ 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"; \
@@ -172,6 +176,18 @@ 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; \
+	    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 \
diff --git a/etc/master.passwd b/etc/master.passwd
index 094d2da1383..a7903f08a57 100644
--- a/etc/master.passwd
+++ b/etc/master.passwd
@@ -1,6 +1,6 @@
 # $FreeBSD$
 #
-root::0:0::0:0:Charlie &:/root:/bin/sh
+root::0:0::0:0:Charlie &:/root:/bin/csh
 toor:*:0:0::0:0:Bourne-again Superuser:/root:
 daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin
 operator:*:2:5::0:0:System &:/:/usr/sbin/nologin
diff --git a/bin/csh/dot.cshrc b/etc/root/dot.cshrc
similarity index 100%
rename from bin/csh/dot.cshrc
rename to etc/root/dot.cshrc
diff --git a/bin/sh/dot.profile b/etc/root/dot.profile
similarity index 100%
rename from bin/sh/dot.profile
rename to etc/root/dot.profile
-- 
2.45.0