From owner-svn-src-head@freebsd.org  Wed Oct 11 14:34:07 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CA5F0E2D945;
 Wed, 11 Oct 2017 14:34:07 +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 mx1.freebsd.org (Postfix) with ESMTPS id 998F16A1C8;
 Wed, 11 Oct 2017 14:34:07 +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 v9BEY6HL020263;
 Wed, 11 Oct 2017 14:34:06 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9BEY64u020262;
 Wed, 11 Oct 2017 14:34:06 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201710111434.v9BEY64u020262@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, 11 Oct 2017 14:34:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r324531 - head/tools/build/mk
X-SVN-Group: head
X-SVN-Commit-Author: emaste
X-SVN-Commit-Paths: head/tools/build/mk
X-SVN-Commit-Revision: 324531
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Oct 2017 14:34:07 -0000

Author: emaste
Date: Wed Oct 11 14:34:06 2017
New Revision: 324531
URL: https://svnweb.freebsd.org/changeset/base/324531

Log:
  OptionalObsoleteFiles: remove diff from MK_GNU_DIFF=no block
  
  diff (and man page) are not from GNU, as of r317209, and should not be
  deleted if WITHOUT_GNU_DIFF is set. (WITHOUT_GNU_DIFF still controls
  whether diff3 is built.)
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Wed Oct 11 13:33:11 2017	(r324530)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Wed Oct 11 14:34:06 2017	(r324531)
@@ -2480,9 +2480,7 @@ OLD_FILES+=usr/share/man/man8/gpioctl.8.gz
 .endif
 
 .if ${MK_GNU_DIFF} == no
-OLD_FILES+=usr/bin/diff
 OLD_FILES+=usr/bin/diff3
-OLD_FILES+=usr/share/man/man1/diff.1.gz
 OLD_FILES+=usr/share/man/man1/diff3.1.gz
 OLD_FILES+=usr/share/man/man7/diff.7.gz
 .endif