svn commit: r317209 - in head: . gnu/usr.bin gnu/usr.bin/diff usr.bin

[Baptiste Daroussin]

Author: bapt
Date: Thu Apr 20 19:24:51 2017
New Revision: 317209
URL: https://svnweb.freebsd.org/changeset/base/317209

Log:
  Replace again GNU diff with BSD diff
  
  After a firts failed attempt, BSD diff is now good enough to replace
  GNU diff.
  
  Relnotes:	yes

Deleted:
  head/gnu/usr.bin/diff/
Modified:
  head/Makefile.inc1
  head/ObsoleteFiles.inc
  head/UPDATING
  head/gnu/usr.bin/Makefile
  head/usr.bin/Makefile

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Thu Apr 20 19:19:33 2017	(r317208)
+++ head/Makefile.inc1	Thu Apr 20 19:24:51 2017	(r317209)
@@ -1972,7 +1972,7 @@ native-xtools: .PHONY
     ${_clang} \
     sbin/md5 \
     sbin/sysctl \
-    gnu/usr.bin/diff \
+    usr.bin/diff \
     usr.bin/awk \
     usr.bin/basename \
     usr.bin/bmake \

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Thu Apr 20 19:19:33 2017	(r317208)
+++ head/ObsoleteFiles.inc	Thu Apr 20 19:24:51 2017	(r317209)
@@ -38,6 +38,8 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20170420: remove GNU diff
+OLD_FILES+=usr/share/man/man7/diff.7.gz
 # 20170322: rename <x> to <x>_test to match the FreeBSD test suite name scheme
 OLD_FILES+=usr/tests/usr.bin/col/col
 OLD_FILES+=usr/tests/usr.bin/diff/diff

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Thu Apr 20 19:19:33 2017	(r317208)
+++ head/UPDATING	Thu Apr 20 19:24:51 2017	(r317209)
@@ -51,6 +51,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12
 
 ****************************** SPECIAL WARNING: ******************************
 
+20170420:
+	GNU diff has been replaced by a BSD licensed diff. Some features of GNU
+	diff has not been implemented, if those are needed a newer version of
+	GNU diff is available via the diffutils package under the gdiff name.
+
 20170413:
 	As of r316810 for ipfilter, keep frags is no longer assumed when
 	keep state is specified in a rule. r316810 aligns ipfilter with

Modified: head/gnu/usr.bin/Makefile
==============================================================================
--- head/gnu/usr.bin/Makefile	Thu Apr 20 19:19:33 2017	(r317208)
+++ head/gnu/usr.bin/Makefile	Thu Apr 20 19:24:51 2017	(r317209)
@@ -17,7 +17,7 @@ SUBDIR_DEPEND_gdb=	binutils
 .endif
 
 SUBDIR.${MK_GCC}+=	cc
-SUBDIR.${MK_GNU_DIFF}+=	diff diff3
+SUBDIR.${MK_GNU_DIFF}+=	diff3
 SUBDIR.${MK_GNU_GREP}+=	grep
 SUBDIR.${MK_GPL_DTC}+=	dtc
 SUBDIR.${MK_TESTS}+=	tests

Modified: head/usr.bin/Makefile
==============================================================================
--- head/usr.bin/Makefile	Thu Apr 20 19:19:33 2017	(r317208)
+++ head/usr.bin/Makefile	Thu Apr 20 19:24:51 2017	(r317209)
@@ -34,6 +34,7 @@ SUBDIR=	alias \
 	csplit \
 	ctlstat \
 	cut \
+	diff \
 	dirname \
 	du \
 	elf2aout \