From 62101763e9a6ac428a73bf8e7c43129df2fc0c81 Mon Sep 17 00:00:00 2001
From: Peter Avalos <pavalos@dragonflybsd.org>
Date: Sat, 23 Sep 2006 20:31:45 +0000
Subject: [PATCH] Make bsdtar our default tar.  GNU tar is still installed as
 gtar, and can be "tar" by using WITH_GTAR in make.conf.

Discussed on:	users
---
 etc/defaults/make.conf     |  6 +++---
 gnu/usr.bin/tar/Makefile   |  4 ++--
 share/man/man5/make.conf.5 | 12 ++++++------
 usr.bin/tar/Makefile       |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf
index 97f725af4e..31693c5080 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.18 2006/09/10 20:53:21 swildner Exp $
+# $DragonFly: src/etc/defaults/make.conf,v 1.19 2006/09/23 20:31:45 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 \
 # To enable installing ssh(1) with the setuid bit turned on
 #ENABLE_SUID_SSH=	true
 #
-# To use bsdtar as the standard tar.  The default is GNU tar.
-#WITH_BSDTAR=   true
+# To use GNU tar as the standard tar.  The default is bsdtar.
+#WITH_GTAR=   true
 #
 # To avoid building various parts of the base system:
 #NO_BIND=	true	# do not build BIND
diff --git a/gnu/usr.bin/tar/Makefile b/gnu/usr.bin/tar/Makefile
index 558ec9b19c..5fc1bb915a 100644
--- a/gnu/usr.bin/tar/Makefile
+++ b/gnu/usr.bin/tar/Makefile
@@ -1,11 +1,11 @@
 # $FreeBSD: src/gnu/usr.bin/tar/Makefile,v 1.11.6.4 2002/07/14 13:19:46 sobomax Exp $
-# $DragonFly: src/gnu/usr.bin/tar/Attic/Makefile,v 1.3 2004/11/10 00:01:54 joerg Exp $
+# $DragonFly: src/gnu/usr.bin/tar/Attic/Makefile,v 1.4 2006/09/23 20:31:45 pavalos Exp $
 
 TARDIR=	${.CURDIR}/../../../contrib/tar
 .PATH: ${TARDIR}/lib ${TARDIR}/src
 
 PROG=	gtar
-.if !defined(WITH_BSDTAR)
+.if defined(WITH_GTAR)
 SYMLINKS=	${BINDIR}/gtar ${BINDIR}/tar
 MLINKS=	gtar.1 tar.1
 .endif
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index 40fa3c2fc2..6c41f918ab 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.15 2006/09/10 20:53:21 swildner Exp $
+.\" $DragonFly: src/share/man/man5/make.conf.5,v 1.16 2006/09/23 20:31:45 pavalos Exp $
 .\"
 .Dd September 10, 2006
 .Dt MAKE.CONF 5
@@ -591,14 +591,14 @@ This is still experimental code.
 .It Va WANT_LUKEMFTPD
 Set this to enable building of
 .Xr lukemftpd 8 .
-.It Va WITH_BSDTAR
+.It Va WITH_GTAR
 .Pq Vt bool
-Set this to use
-.Xr bsdtar 1
+Set this to use GNU
+.Xr gtar 1
 as the stardard
 .Xr tar 1 .
-The default is to use GNU
-.Xr tar 1 .
+The default is to use
+.Xr bsdtar 1 .
 .El
 .Pp
 The following list provides a name and short description for variables
diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile
index e0fcc655d1..2bb6817a31 100644
--- a/usr.bin/tar/Makefile
+++ b/usr.bin/tar/Makefile
@@ -1,4 +1,4 @@
-# $DragonFly: src/usr.bin/tar/Makefile,v 1.3 2006/09/18 01:47:10 pavalos Exp $
+# $DragonFly: src/usr.bin/tar/Makefile,v 1.4 2006/09/23 20:31:45 pavalos Exp $
 
 PROG=	bsdtar
 SRCS=	bsdtar.c getdate.y matching.c read.c tree.c util.c write.c
@@ -16,7 +16,7 @@ VERSION=	1.3.1
 CFLAGS+=	-I${.OBJDIR} -I${.CURDIR}/../../lib/libarchive -I${CONTRIBDIR} -I-
 CFLAGS+=	-DHAVE_CONFIG_H
 
-.if defined(WITH_BSDTAR)
+.if !defined(WITH_GTAR)
 SYMLINKS=	${BINDIR}/bsdtar ${BINDIR}/tar
 MLINKS=	bsdtar.1 tar.1
 .endif
-- 
2.41.0