From owner-svn-src-head@freebsd.org  Wed Oct 11 14:41:13 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 2A3EEE2DE1C;
 Wed, 11 Oct 2017 14:41:13 +0000 (UTC)
 (envelope-from bapt@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 EDF116A808;
 Wed, 11 Oct 2017 14:41:12 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9BEfC0K023024;
 Wed, 11 Oct 2017 14:41:12 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9BEfCOC023023;
 Wed, 11 Oct 2017 14:41:12 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201710111441.v9BEfCOC023023@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 11 Oct 2017 14:41:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r324532 - head/tools/build/mk
X-SVN-Group: head
X-SVN-Commit-Author: bapt
X-SVN-Commit-Paths: head/tools/build/mk
X-SVN-Commit-Revision: 324532
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:41:13 -0000

Author: bapt
Date: Wed Oct 11 14:41:11 2017
New Revision: 324532
URL: https://svnweb.freebsd.org/changeset/base/324532

Log:
  Do not try to remove diff.7 optionaly has it is always removed
  since GNU diff(1) has been replaced with BSD diff(1)

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

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