From 2114949a6927ad10526b5e04af143dc9f35529a5 Mon Sep 17 00:00:00 2001
From: Peter Avalos <pavalos@dragonflybsd.org>
Date: Sat, 26 Jul 2008 16:25:31 +0000
Subject: [PATCH] Make bsdcpio the default cpio.  Place WITH_GCPIO in make.conf
 if you want the GNU version as the default.  Both are still built and
 installed.

---
 etc/defaults/make.conf     |  6 +++---
 gnu/usr.bin/cpio/Makefile  |  4 ++--
 share/man/man5/make.conf.5 | 10 +++++-----
 usr.bin/cpio/Makefile      |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf
index e80c5d92e7..f75ba20cd1 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.36 2008/07/12 14:57:32 pavalos Exp $
+# $DragonFly: src/etc/defaults/make.conf,v 1.37 2008/07/26 16:25:30 pavalos Exp $
 #
 # NOTE:  Please would any committer updating this file also update the
 # make.conf(5) manual page, if necessary, which is located in
@@ -95,8 +95,8 @@ BDECFLAGS=	-W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \
 # Default thread library (c_r or thread_xu)
 THREAD_LIB?=	thread_xu
 #
-# To use bsdcpio as the standard cpio.  The default is GNU cpio.
-#WITH_BSDCPIO=	true
+# To use GNU cpio as the standard cpio.  The default is bsdcpio.
+#WITH_GCPIO=	true
 #
 # To avoid building various parts of the base system:
 #NO_BIND=	true	# do not build BIND
diff --git a/gnu/usr.bin/cpio/Makefile b/gnu/usr.bin/cpio/Makefile
index 647aadc8c9..4c64d0b7e7 100644
--- a/gnu/usr.bin/cpio/Makefile
+++ b/gnu/usr.bin/cpio/Makefile
@@ -2,7 +2,7 @@
 # even though it may live in src/gnu/...
 
 # $FreeBSD: src/gnu/usr.bin/cpio/Makefile,v 1.7.2.1 2001/04/25 12:03:30 ru Exp $
-# $DragonFly: src/gnu/usr.bin/cpio/Makefile,v 1.3 2008/07/12 14:57:33 pavalos Exp $
+# $DragonFly: src/gnu/usr.bin/cpio/Makefile,v 1.4 2008/07/26 16:25:31 pavalos Exp $
 
 .PATH:	${.CURDIR}/../../../contrib/cpio
 
@@ -26,7 +26,7 @@ gcpio.1: cpio.1
 
 CLEANFILES+=	gcpio.1
 
-.if !defined(WITH_BSDCPIO)
+.if defined(WITH_GCPIO)
 SYMLINKS=	${BINDIR}/gcpio ${BINDIR}/cpio
 MLINKS=		gcpio.1 cpio.1
 .endif
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index 8e08424213..3bdc97e30a 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.36 2008/07/12 14:57:33 pavalos Exp $
+.\" $DragonFly: src/share/man/man5/make.conf.5,v 1.37 2008/07/26 16:25:30 pavalos Exp $
 .\"
 .Dd July 12, 2008
 .Dt MAKE.CONF 5
@@ -267,14 +267,14 @@ Causes
 to be added to
 .Va CFLAGS
 when WARNS is in effect.
-.It Va WITH_BSDCPIO
+.It Va WITH_GCPIO
 .Pq Vt bool
 Set this to use
-.Xr bsdcpio 1
+.Xr gcpio 1
 as the standard
 .Xr cpio 1 .
-The default is to use GNU
-.Xr gcpio 1 .
+The default is to use
+.Xr bsdcpio 1 .
 .El
 .Pp
 The following list provides a name and short description for variables
diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile
index bd1d6381b7..1bee02ce45 100644
--- a/usr.bin/cpio/Makefile
+++ b/usr.bin/cpio/Makefile
@@ -1,4 +1,4 @@
-# $DragonFly: src/usr.bin/cpio/Makefile,v 1.1 2008/07/12 14:57:33 pavalos Exp $
+# $DragonFly: src/usr.bin/cpio/Makefile,v 1.2 2008/07/26 16:25:31 pavalos Exp $
 
 PROG=	bsdcpio
 SRCS=	cmdline.c cpio.c err.c matching.c pathmatch.c
@@ -10,7 +10,7 @@ CONTRIBDIR=	${.CURDIR}/../../contrib/libarchive-2/cpio
 CFLAGS+=	-I${.OBJDIR} -I${.CURDIR}/../../lib/libarchive -I${CONTRIBDIR}
 CFLAGS+=	-DPLATFORM_CONFIG_H=\"config.h\"
 
-.if defined(WITH_BSDCPIO)
+.if !defined(WITH_GCPIO)
 SYMLINKS=	${BINDIR}/bsdcpio ${BINDIR}/cpio
 MLINKS=	bsdcpio.1 cpio.1
 .endif
-- 
2.41.0