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]

3 files changed, 11 insertions, 0 deletions

diff --git a/tools/build/options/WITHOUT_BSD_CPIO b/tools/build/options/WITHOUT_BSD_CPIO
new file mode 100644
index 0000000..9c722ee
--- /dev/null
+++ b/tools/build/options/WITHOUT_BSD_CPIO
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to not build the BSD licensed version of cpio based on
+.Xr libarchive 3 .
diff --git a/tools/build/options/WITHOUT_GNU_GREP b/tools/build/options/WITHOUT_GNU_GREP
new file mode 100644
index 0000000..23f8de1
--- /dev/null
+++ b/tools/build/options/WITHOUT_GNU_GREP
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to not build GNU grep as a part of the base system.
diff --git a/tools/build/options/WITH_GNU_CPIO b/tools/build/options/WITH_GNU_CPIO
new file mode 100644
index 0000000..b4e756a
--- /dev/null
+++ b/tools/build/options/WITH_GNU_CPIO
@@ -0,0 +1,6 @@
+.\" $FreeBSD$
+Set to build GNU cpio as a part of the base system,
+and symlink
+.Pa /usr/bin/cpio
+to this version.
+(This will override the symlink to the BSD version.)