From owner-svn-src-all@freebsd.org Thu Apr 20 19:24:53 2017 Return-Path: Delivered-To: svn-src-all@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 57C70D484A6; Thu, 20 Apr 2017 19:24:53 +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 1B15991D; Thu, 20 Apr 2017 19:24:53 +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 v3KJOqYa056435; Thu, 20 Apr 2017 19:24:52 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3KJOpxR056429; Thu, 20 Apr 2017 19:24:51 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201704201924.v3KJOpxR056429@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 20 Apr 2017 19:24:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r317209 - in head: . gnu/usr.bin gnu/usr.bin/diff usr.bin X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Apr 2017 19:24:53 -0000 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 to _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 \