From 77dec3a0c76af7a34f5f54c22dc065a5c58a582d Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Wed, 15 Sep 1999 03:52:17 +0000
Subject: [PATCH] Add a hook for disabling cvs and collect a few similar
 options together. (We do this on freefall as we use a tweaked /usr/bin/cvs
 wrapper)

---
 etc/defaults/make.conf       | 3 ++-
 etc/make.conf                | 3 ++-
 gnu/usr.bin/Makefile         | 6 +++++-
 share/examples/etc/make.conf | 3 ++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf
index e5146e1a7f3..a6eaba1f7a3 100644
--- a/etc/defaults/make.conf
+++ b/etc/defaults/make.conf
@@ -26,8 +26,9 @@
 # To build perl with thread support
 #PERL_THREADED=	true
 #
-# To avoid building sendmail
+# To avoid building various parts of the base system:
 #NO_SENDMAIL=	true
+#NO_CVS=	true
 #
 # To compile just the kernel with special optimisations, you should use
 # this instead of CFLAGS (which is not applicable to kernel builds anyway):
diff --git a/etc/make.conf b/etc/make.conf
index e5146e1a7f3..a6eaba1f7a3 100644
--- a/etc/make.conf
+++ b/etc/make.conf
@@ -26,8 +26,9 @@
 # To build perl with thread support
 #PERL_THREADED=	true
 #
-# To avoid building sendmail
+# To avoid building various parts of the base system:
 #NO_SENDMAIL=	true
+#NO_CVS=	true
 #
 # To compile just the kernel with special optimisations, you should use
 # this instead of CFLAGS (which is not applicable to kernel builds anyway):
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index 6d3dbfebf70..8d1e080c8f3 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -1,8 +1,12 @@
 # $FreeBSD$
 
-SUBDIR= awk bc binutils bison cc cpio cvs dc dialog diff diff3 gperf \
+SUBDIR= awk bc binutils bison cc cpio dc dialog diff diff3 gperf \
 	grep groff gzip man patch ptx rcs sdiff send-pr sort tar texinfo
 
+.if !defined(NO_CVS)
+SUBDIR+=cvs
+.endif
+
 .if ${MACHINE_ARCH} == "i386"
 SUBDIR+=as ld
 .endif
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index e5146e1a7f3..a6eaba1f7a3 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -26,8 +26,9 @@
 # To build perl with thread support
 #PERL_THREADED=	true
 #
-# To avoid building sendmail
+# To avoid building various parts of the base system:
 #NO_SENDMAIL=	true
+#NO_CVS=	true
 #
 # To compile just the kernel with special optimisations, you should use
 # this instead of CFLAGS (which is not applicable to kernel builds anyway):