From owner-svn-src-stable-10@FreeBSD.ORG Thu Oct 31 18:06:33 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C8A80E39; Thu, 31 Oct 2013 18:06:33 +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 9B9C624EB; Thu, 31 Oct 2013 18:06:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9VI6XSh097347; Thu, 31 Oct 2013 18:06:33 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9VI6XKS097343; Thu, 31 Oct 2013 18:06:33 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201310311806.r9VI6XKS097343@svn.freebsd.org> From: Brooks Davis Date: Thu, 31 Oct 2013 18:06:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r257460 - in stable/10: . share/mk tools/build/options X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Oct 2013 18:06:33 -0000 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 .