svn commit: r324531 - head/tools/build/mk

[Ed Maste]

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