From b9cd6b0a3cd73430ce832754b93c6f5d8b71f49d Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 25 Oct 2013 22:45:18 +0000
Subject: [PATCH] Switch the default mtree to nmtree our new NetBSD derived
 mtree.

Exp-run by:     bdrewery
MFC after:      3 days
Sponsored by:	DARPA/AFRL
---
 UPDATING                                            | 7 +++++++
 share/mk/bsd.own.mk                                 | 2 +-
 tools/build/options/{WITH_NMTREE => WITHOUT_NMTREE} | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)
 rename tools/build/options/{WITH_NMTREE => WITHOUT_NMTREE} (100%)

diff --git a/UPDATING b/UPDATING
index 665216af84c..16da2e9eba7 100644
--- a/UPDATING
+++ b/UPDATING
@@ -31,6 +31,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW:
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20131025:
+	The default version of mtree is nmtree which is obtained from
+	NetBSD.  The output is generally the same, but may vary
+	slightly.  If you found you need identical output adding
+	"-F freebsd9" to the command line should do the trick.  For the
+	time being, the old mtree is available as fmtree.
+
 20131014:
 	libbsdyml has been renamed to libyaml and moved to /usr/lib/private.
 	This will break ports-mgmt/pkg. Rebuild the port, or upgrade to pkg
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 40f18ba2398..d694cbb8b28 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -320,6 +320,7 @@ __DEFAULT_YES_OPTIONS = \
     NIS \
     NLS \
     NLS_CATALOGS \
+    NMTREE \
     NS_CACHING \
     NTP \
     OPENSSH \
@@ -370,7 +371,6 @@ __DEFAULT_NO_OPTIONS = \
     LIBICONV_COMPAT \
     INSTALL_AS_USER \
     LLDB \
-    NMTREE \
     NAND \
     OFED \
     OPENSSH_NONE_CIPHER \
diff --git a/tools/build/options/WITH_NMTREE b/tools/build/options/WITHOUT_NMTREE
similarity index 100%
rename from tools/build/options/WITH_NMTREE
rename to tools/build/options/WITHOUT_NMTREE
index cbaa8733609..c92109662fe 100644
--- a/tools/build/options/WITH_NMTREE
+++ b/tools/build/options/WITHOUT_NMTREE
@@ -1,9 +1,9 @@
 .\" $FreeBSD$
 Set to install
-.Xr nmtree 8
+.Xr fmtree 8
 as
 .Xr mtree 8 .
 By default
-.Xr fmtree 8
+.Xr nmtree 8
 is installed as
 .Xr mtree 8 .