git: dcb65c5a94d4 - main - csh: Remove hardlink /.cshrc

From: Emmanuel Vadot <manu_at_FreeBSD.org>
Date: Wed, 29 May 2024 07:57:37 UTC
The branch main has been updated by manu:

URL: https://cgit.FreeBSD.org/src/commit/?id=dcb65c5a94d4c622b1d486847dc20488f59974e7

commit dcb65c5a94d4c622b1d486847dc20488f59974e7
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2024-05-27 13:12:18 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2024-05-29 07:56:58 +0000

    csh: Remove hardlink /.cshrc
    
    Remove this historical artifact.
    csh will try to use /.csrch if the user has no home directory defined which
    is rather unlikely (To be exact if the concatenation of $HOME and "/.cshrc"
    fail which is the same thing).
    
    Also, with this change pkg will happily handle 3way merge for /root/.cshrc
    
    Differential Revision:  https://reviews.freebsd.org/D45382
    Reviewed by:            emaste, imp
    Sponsored by:           Beckhoff Automation GmbH & Co. KG
---
 ObsoleteFiles.inc | 3 +++
 bin/csh/Makefile  | 9 ---------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 70e6dcec50b1..bacd17a57b30 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -51,6 +51,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20240527: csh: Remove hardlink /.cshrc
+OLD_FILES+=.cshrc
+
 # 20240511: move file system driver manuals to section four
 OLD_FILES+=usr/share/man/man5/autofs.5.gz
 OLD_FILES+=usr/share/man/man5/cd9660.5.gz
diff --git a/bin/csh/Makefile b/bin/csh/Makefile
index d9f40f180343..6b05c01e0a61 100644
--- a/bin/csh/Makefile
+++ b/bin/csh/Makefile
@@ -159,13 +159,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}
 
-beforeinstallconfig:
-	rm -f ${DESTDIR}/.cshrc
-
-afterinstallconfig:
-	# XXX Set link mode explicitly via -m.  We cannot use LINKMODE for this
-	# link, as it would also apply to the tcsh link above.
-	${INSTALL_LINK} ${TAG_ARGS} -m ${CONFMODE} ${DESTDIR}/root/.cshrc \
-	    ${DESTDIR}/.cshrc
-
 .include <bsd.prog.mk>