From owner-svn-src-projects@FreeBSD.ORG  Fri Sep 21 20:14:28 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 41773106566B;
	Fri, 21 Sep 2012 20:14:28 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2DFE78FC14;
	Fri, 21 Sep 2012 20:14:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8LKESHl099603;
	Fri, 21 Sep 2012 20:14:28 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8LKER3E099600;
	Fri, 21 Sep 2012 20:14:27 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201209212014.q8LKER3E099600@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 21 Sep 2012 20:14:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240790 - projects/mtree/contrib/mtree
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Sep 2012 20:14:28 -0000

Author: brooks
Date: Fri Sep 21 20:14:27 2012
New Revision: 240790
URL: http://svn.freebsd.org/changeset/base/240790

Log:
  Make -t the default on FreeBSD systems.  Add a -T which disables this
  behavior and document the defaults.

Modified:
  projects/mtree/contrib/mtree/mtree.8
  projects/mtree/contrib/mtree/mtree.c

Modified: projects/mtree/contrib/mtree/mtree.8
==============================================================================
--- projects/mtree/contrib/mtree/mtree.8	Fri Sep 21 20:03:13 2012	(r240789)
+++ projects/mtree/contrib/mtree/mtree.8	Fri Sep 21 20:14:27 2012	(r240790)
@@ -300,6 +300,16 @@ The checksum is seeded with the specifie
 .It Fl t
 Modify the modified time of existing files, the device type of devices, and
 symbolic link targets, to match the specification.
+This is the default on
+.Fx
+systems.
+.It Fl T
+.Em Do not
+modify the modified timeof existing files, the device type of devices, and
+symbolic link targets, to match the specification.
+This is the default on systems other than
+.Fx
+.
 .It Fl U
 Same as
 .Fl u

Modified: projects/mtree/contrib/mtree/mtree.c
==============================================================================
--- projects/mtree/contrib/mtree/mtree.c	Fri Sep 21 20:03:13 2012	(r240789)
+++ projects/mtree/contrib/mtree/mtree.c	Fri Sep 21 20:14:27 2012	(r240790)
@@ -79,8 +79,12 @@ main(int argc, char **argv)
 	spec1 = stdin;
 	spec2 = NULL;
 
+#ifdef __FreeBSD__
+	tflag = 1;
+#endif
+
 	while ((ch = getopt(argc, argv,
-	    "cCdDeE:f:I:ijk:K:lLmMnN:p:PqrR:s:StuUwWxX:"))
+	    "cCdDeE:f:I:ijk:K:lLmMnN:p:PqrR:s:StTuUwWxX:"))
 	    != -1) {
 		switch((char)ch) {
 		case 'c':
@@ -187,6 +191,9 @@ main(int argc, char **argv)
 		case 't':
 			tflag = 1;
 			break;
+		case 'T':
+			tflag = 0;
+			break;
 		case 'u':
 			uflag = 1;
 			break;