From 1836e9c8042545d3f1a4d48c4febe475b7feb61f Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Thu, 12 Aug 2004 08:08:08 +0000
Subject: [PATCH] Get rid of the NO_TCSH make.conf variable.   We do not
 support removing /bin/csh from the base system as part of a buildworld
 sequence.

---
 bin/Makefile               | 7 ++-----
 etc/defaults/make.conf     | 3 +--
 share/man/man5/make.conf.5 | 8 +-------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/bin/Makefile b/bin/Makefile
index 365aadedb2..1c04ac99a4 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -1,12 +1,13 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD: src/bin/Makefile,v 1.15.2.2 2000/10/31 09:43:57 dougb Exp $
-# $DragonFly: src/bin/Makefile,v 1.6 2003/12/01 02:20:13 dillon Exp $
+# $DragonFly: src/bin/Makefile,v 1.7 2004/08/12 08:08:03 dillon Exp $
 
 SUBDIR= cat \
 	chio \
 	chmod \
 	cp \
 	cpdup \
+	csh \
 	date \
 	dd \
 	df \
@@ -33,10 +34,6 @@ SUBDIR= cat \
 	test \
 	varsym
 
-.if !defined(NO_TCSH)
-SUBDIR+=csh
-.endif
-
 .if !defined(NO_SENDMAIL) && !defined(NOUUCP)
 SUBDIR+=rmail
 .endif
diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf
index 7b537aed13..ef22289b38 100644
--- a/etc/defaults/make.conf
+++ b/etc/defaults/make.conf
@@ -1,5 +1,5 @@
 # $FreeBSD: src/etc/defaults/make.conf,v 1.97.2.80 2003/02/15 16:34:56 trhodes Exp $
-# $DragonFly: src/etc/defaults/make.conf,v 1.7 2004/07/03 17:16:21 dillon Exp $
+# $DragonFly: src/etc/defaults/make.conf,v 1.8 2004/08/12 08:08:06 dillon Exp $
 #
 # NOTE:  Please would any committer updating this file also update the
 # make.conf(5) manual page, if necessary, which is located in
@@ -111,7 +111,6 @@ BDECFLAGS=	-W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \
 #NO_OPENSSL=	true	# do not build OpenSSL (implies NO_OPENSSH)
 #NO_SENDMAIL=	true	# do not build sendmail and related programs
 #NO_SHAREDOCS=	true	# do not build the 4.4BSD legacy docs
-#NO_TCSH=	true	# do not build and install /bin/csh (which is tcsh)
 #NO_X=		true	# do not compile in XWindows support (e.g. doscmd)
 #NOCRYPT=	true	# do not build any crypto code
 #NOGAMES=	true	# do not build games (games/ subdir)
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index 7dd63145e3..f127d9466e 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.12.2.30 2003/05/18 17:05:55 brueffer Exp $
-.\" $DragonFly: src/share/man/man5/make.conf.5,v 1.7 2004/07/08 00:14:49 hmp Exp $
+.\" $DragonFly: src/share/man/man5/make.conf.5,v 1.8 2004/08/12 08:08:08 dillon Exp $
 .\"
 .Dd November 3, 2000
 .Dt MAKE.CONF 5
@@ -494,12 +494,6 @@ and related programs.
 Set to not build the
 .Bx 4.4
 legacy docs.
-.It Va NO_TCSH
-.Pq Vt bool
-Set to not build and install
-.Pa /bin/csh
-(which is
-.Xr tcsh 1 ) .
 .It Va NO_X
 .Pq Vt bool
 Set to not compile in X\-Windows support (e.g.\&
-- 
2.28.0