From 867e3b0436f903aca9e0b2bc5ecc3f85cc71fda8 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <swildner@dragonflybsd.org>
Date: Sun, 2 Jul 2006 16:03:42 +0000
Subject: [PATCH] Bring etc/defaults/make.conf closer to reality:

* Add WITH_BSDTAR

* NOSHARE -> NO_SHARE

* Fix ports related comment.
---
 etc/defaults/make.conf     | 11 +++++++----
 share/man/man5/make.conf.5 | 12 ++++++++++--
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf
index 22d2366cac..c99ccda9b3 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.16 2005/12/09 23:55:28 swildner Exp $
+# $DragonFly: src/etc/defaults/make.conf,v 1.17 2006/07/02 16:03:42 swildner Exp $
 #
 # NOTE:  Please would any committer updating this file also update the
 # make.conf(5) manual page, if necessary, which is located in
@@ -95,6 +95,9 @@ 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 avoid building various parts of the base system:
 #NO_BIND=	true	# do not build BIND
 #NO_CRYPT=	true	# do not build crypto code
@@ -119,7 +122,7 @@ BDECFLAGS=	-W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \
 #NOMAN=		true	# do not build manual pages
 #NOMANCOMPRESS=	true	# do not compress man pages
 #NOPROFILE=	true	# Avoid compiling profiled libraries
-#NOSHARE=	true	# do not go into the share subdir
+#NO_SHARE=	true	# do not go into the share subdir
 #
 # To build sys/modules when building the world (our old way of doing things)
 #MODULES_WITH_WORLD=true	# do not build modules when building kernel
@@ -130,8 +133,8 @@ BDECFLAGS=	-W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \
 # To avoid running MAKEDEV all on /dev during install:
 #NO_MAKEDEV=	true
 #
-# The following controls building optional IDEA code in libcrypto and
-# certain ports.  Patents are involved - you must not use this unless
+# The following controls building optional IDEA code in libcrypto.
+# Patents are involved - you must not use this unless
 # you either have a license or fall within patent 'fair use'
 # provisions.
 #
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index 1a7038dc41..f5440221ab 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -23,9 +23,9 @@
 .\" 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.13 2006/06/28 21:21:35 swildner Exp $
+.\" $DragonFly: src/share/man/man5/make.conf.5,v 1.14 2006/07/02 16:03:42 swildner Exp $
 .\"
-.Dd November 3, 2000
+.Dd July 2, 2006
 .Dt MAKE.CONF 5
 .Os
 .Sh NAME
@@ -598,6 +598,14 @@ to determine if you can legally use IDEA.
 Set this to build Kerberos5 (KTH Heimdal).
 .Em WARNING !
 This is still experimental code.
+.It Va WITH_BSDTAR
+.Pq Vt bool
+Set this to use
+.Xr bsdtar 1
+as the stardard
+.Xr tar 1 .
+The default is to use GNU
+.Xr tar 1 .
 .El
 .Pp
 The following list provides a name and short description for variables
-- 
2.41.0