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

[Baptiste Daroussin]

Author: bapt
Date: Sun Mar 19 17:19:59 2017
New Revision: 315565
URL: https://svnweb.freebsd.org/changeset/base/315565

Log:
  Temporary readd GNU diff
  
  etcupdate requires --change-group-format it is not easy to implement
  in bsd diff so for now readd GNU diff

Added:
  head/gnu/usr.bin/diff/
     - copied from r315050, 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	Sun Mar 19 16:17:42 2017	(r315564)
+++ head/Makefile.inc1	Sun Mar 19 17:19:59 2017	(r315565)
@@ -1936,7 +1936,7 @@ native-xtools: .PHONY
     ${_clang} \
     sbin/md5 \
     sbin/sysctl \
-    usr.bin/diff \
+    gnu/usr.bin/diff \
     usr.bin/awk \
     usr.bin/basename \
     usr.bin/bmake \

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Sun Mar 19 16:17:42 2017	(r315564)
+++ head/ObsoleteFiles.inc	Sun Mar 19 17:19:59 2017	(r315565)
@@ -49,8 +49,6 @@ OLD_FILES+=sbin/ipftest
 OLD_FILES+=sbin/ipresend
 # 20170311: Remove WITHOUT_MANDOCDB option
 OLD_FILES+=usr/share/man/man1/makewhatis.1.gz
-# 20170311: remove GNU diff
-OLD_FILES+=usr/share/man/man7/diff.7.gz
 # 20170308: rename some tests
 OLD_FILES+=usr/tests/bin/pwait/pwait
 OLD_FILES+=usr/tests/usr.bin/timeout/timeout

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Sun Mar 19 16:17:42 2017	(r315564)
+++ head/UPDATING	Sun Mar 19 17:19:59 2017	(r315565)
@@ -69,11 +69,6 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12
 	removed as the userland we provide cannot use them. The KMS version
 	(sys/dev/drm2) support the same hardware.
 
-20170311:
-	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.
-
 20170302:
 	Clang, llvm, lldb, compiler-rt and libc++ have been upgraded to 4.0.0.
 	Please see the 20141231 entry below for information about prerequisites

Modified: head/gnu/usr.bin/Makefile
==============================================================================
--- head/gnu/usr.bin/Makefile	Sun Mar 19 16:17:42 2017	(r315564)
+++ head/gnu/usr.bin/Makefile	Sun Mar 19 17:19:59 2017	(r315565)
@@ -17,7 +17,7 @@ SUBDIR_DEPEND_gdb=	binutils
 .endif
 
 SUBDIR.${MK_GCC}+=	cc
-SUBDIR.${MK_GNU_DIFF}+=	diff3
+SUBDIR.${MK_GNU_DIFF}+=	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	Sun Mar 19 16:17:42 2017	(r315564)
+++ head/usr.bin/Makefile	Sun Mar 19 17:19:59 2017	(r315565)
@@ -34,7 +34,6 @@ SUBDIR=	alias \
 	csplit \
 	ctlstat \
 	cut \
-	diff \
 	dirname \
 	du \
 	elf2aout \