From 6973701a00e3228aeb354768f596e5c35663bdb2 Mon Sep 17 00:00:00 2001
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 16 Jun 2008 05:48:15 +0000
Subject: 1. Make the BSD version of cpio the default [1] a. The BSD version
 will be built and installed unless WITHOUT_BSD_CPIO is defined. b. The GNU
 version will not be built or installed unless WITH_GNU_CPIO is defined. If
 this is defined, the symlink in /usr/bin will be to the GNU version whether
 the BSD version is present or not.

When these changes are MFCed the defaults should be flipped.

2. Add a knob to disable the building of GNU grep. This will
make it easier for those that want to test the BSD version in
the ports.

Approved by:	kientzle [1]
---
 gnu/usr.bin/Makefile | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'gnu/usr.bin/Makefile')

diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index b54f8409655d..10f230080e16 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -5,7 +5,7 @@
 SUBDIR= bc \
 	${_binutils} \
 	${_cc} \
-	cpio \
+	${_cpio} \
 	${_cvs} \
 	dc \
 	dialog \
@@ -13,7 +13,7 @@ SUBDIR= bc \
 	diff3 \
 	${_gdb} \
 	${_gperf} \
-	grep \
+	${_grep} \
 	${_groff} \
 	${_man} \
 	patch \
@@ -30,10 +30,18 @@ _groff=		groff
 .endif
 .endif
 
+.if ${MK_GNU_CPIO} == "yes"
+_cpio=		cpio
+.endif
+
 .if ${MK_CVS} != "no"
 _cvs=		cvs
 .endif
 
+.if ${MK_GNU_GREP} != "no"
+_grep=		grep
+.endif
+
 .if ${MK_MAN} != "no"
 _man=		man
 .endif
-- 
cgit v1.2.3