From owner-svn-src-all@freebsd.org  Wed May 20 17:20:49 2020
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 708412DF535;
 Wed, 20 May 2020 17:20:49 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 49Rzzj2TpXz4T83;
 Wed, 20 May 2020 17:20:49 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 50A361F660;
 Wed, 20 May 2020 17:20:49 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04KHKn0o041219;
 Wed, 20 May 2020 17:20:49 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04KHKmMM041217;
 Wed, 20 May 2020 17:20:48 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <202005201720.04KHKmMM041217@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 20 May 2020 17:20:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r361282 - head/tools/build/options
X-SVN-Group: head
X-SVN-Commit-Author: emaste
X-SVN-Commit-Paths: head/tools/build/options
X-SVN-Commit-Revision: 361282
X-SVN-Commit-Repository: base
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.33
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 May 2020 17:20:49 -0000

Author: emaste
Date: Wed May 20 17:20:48 2020
New Revision: 361282
URL: https://svnweb.freebsd.org/changeset/base/361282

Log:
  Update GNU_DIFF knob descriptions
  
  After r317209 the WITH_/WITHOUT_GNU_DIFF knob controls only diff3;
  diff is always BSD diff.
  
  MFC after:	1 week

Modified:
  head/tools/build/options/WITHOUT_GNU_DIFF
  head/tools/build/options/WITH_GNU_DIFF

Modified: head/tools/build/options/WITHOUT_GNU_DIFF
==============================================================================
--- head/tools/build/options/WITHOUT_GNU_DIFF	Wed May 20 16:14:07 2020	(r361281)
+++ head/tools/build/options/WITHOUT_GNU_DIFF	Wed May 20 17:20:48 2020	(r361282)
@@ -1,5 +1,3 @@
 .\" $FreeBSD$
 Set to not build GNU
-.Xr diff 1
-and
 .Xr diff3 1 .

Modified: head/tools/build/options/WITH_GNU_DIFF
==============================================================================
--- head/tools/build/options/WITH_GNU_DIFF	Wed May 20 16:14:07 2020	(r361281)
+++ head/tools/build/options/WITH_GNU_DIFF	Wed May 20 17:20:48 2020	(r361282)
@@ -1,5 +1,3 @@
 .\" $FreeBSD$
 Build and install GNU
-.Xr diff 1
-and
 .Xr diff3 1 .