svn commit: r257460 - in stable/10: . share/mk tools/build/options

[Brooks Davis]

Author: brooks
Date: Thu Oct 31 18:06:32 2013
New Revision: 257460
URL: http://svnweb.freebsd.org/changeset/base/257460

Log:
  MFC r257138:
  
  Switch the default mtree to nmtree our new NetBSD derived mtree.
  
  Exp-runs by:	bdrewery (ports/182438)
  Sponsored by:	DARPA/AFRL
  Approved by:	re (gjb)

Added:
  stable/10/tools/build/options/WITHOUT_NMTREE
     - copied unchanged from r257138, head/tools/build/options/WITHOUT_NMTREE
Deleted:
  stable/10/tools/build/options/WITH_NMTREE
Modified:
  stable/10/UPDATING   (contents, props changed)
  stable/10/share/mk/bsd.own.mk
Directory Properties:
  stable/10/share/mk/   (props changed)
  stable/10/tools/build/options/   (props changed)

Modified: stable/10/UPDATING
==============================================================================
--- stable/10/UPDATING	Thu Oct 31 17:56:27 2013	(r257459)
+++ stable/10/UPDATING	Thu Oct 31 18:06:32 2013	(r257460)
@@ -16,6 +16,13 @@ from older versions of FreeBSD, try WITH
 stable/10, and then rebuild without this option. The bootstrap process from
 older version of current is a bit fragile.
 
+20131031:
+	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

Modified: stable/10/share/mk/bsd.own.mk
==============================================================================
--- stable/10/share/mk/bsd.own.mk	Thu Oct 31 17:56:27 2013	(r257459)
+++ stable/10/share/mk/bsd.own.mk	Thu Oct 31 18:06:32 2013	(r257460)
@@ -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 \

Copied: stable/10/tools/build/options/WITHOUT_NMTREE (from r257138, head/tools/build/options/WITHOUT_NMTREE)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/tools/build/options/WITHOUT_NMTREE	Thu Oct 31 18:06:32 2013	(r257460, copy of r257138, head/tools/build/options/WITHOUT_NMTREE)
@@ -0,0 +1,9 @@
+.\" $FreeBSD$
+Set to install
+.Xr fmtree 8
+as
+.Xr mtree 8 .
+By default
+.Xr nmtree 8
+is installed as
+.Xr mtree 8 .