From owner-svn-src-all@FreeBSD.ORG Fri Oct 25 22:45:19 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B294DE98; Fri, 25 Oct 2013 22:45:19 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 84B1F27EE; Fri, 25 Oct 2013 22:45:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9PMjJKZ065795; Fri, 25 Oct 2013 22:45:19 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9PMjICG065791; Fri, 25 Oct 2013 22:45:18 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201310252245.r9PMjICG065791@svn.freebsd.org> From: Brooks Davis Date: Fri, 25 Oct 2013 22:45:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r257138 - in head: . share/mk tools/build/options X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Oct 2013 22:45:19 -0000 Author: brooks Date: Fri Oct 25 22:45:18 2013 New Revision: 257138 URL: http://svnweb.freebsd.org/changeset/base/257138 Log: Switch the default mtree to nmtree our new NetBSD derived mtree. Exp-run by: bdrewery MFC after: 3 days Sponsored by: DARPA/AFRL Added: head/tools/build/options/WITHOUT_NMTREE - copied, changed from r255666, head/tools/build/options/WITH_NMTREE Deleted: head/tools/build/options/WITH_NMTREE Modified: head/UPDATING head/share/mk/bsd.own.mk Modified: head/UPDATING ============================================================================== --- head/UPDATING Fri Oct 25 21:57:03 2013 (r257137) +++ head/UPDATING Fri Oct 25 22:45:18 2013 (r257138) @@ -31,6 +31,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 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 Modified: head/share/mk/bsd.own.mk ============================================================================== --- head/share/mk/bsd.own.mk Fri Oct 25 21:57:03 2013 (r257137) +++ head/share/mk/bsd.own.mk Fri Oct 25 22:45:18 2013 (r257138) @@ -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 and modified: head/tools/build/options/WITHOUT_NMTREE (from r255666, head/tools/build/options/WITH_NMTREE) ============================================================================== --- head/tools/build/options/WITH_NMTREE Wed Sep 18 11:07:32 2013 (r255666, copy source) +++ head/tools/build/options/WITHOUT_NMTREE Fri Oct 25 22:45:18 2013 (r257138) @@ -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 .