diff options
-rw-r--r-- | Makefile.inc1 | 2 | ||||
-rw-r--r-- | ObsoleteFiles.inc | 2 | ||||
-rw-r--r-- | UPDATING | 5 | ||||
-rw-r--r-- | gnu/usr.bin/Makefile | 2 | ||||
-rw-r--r-- | gnu/usr.bin/diff/Makefile | 36 | ||||
-rw-r--r-- | gnu/usr.bin/diff/Makefile.depend | 19 | ||||
-rw-r--r-- | gnu/usr.bin/diff/tests/Makefile | 15 | ||||
-rw-r--r-- | gnu/usr.bin/diff/tests/Makefile.depend | 11 | ||||
-rw-r--r-- | usr.bin/Makefile | 1 |
9 files changed, 10 insertions, 83 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 6a0ecca4b364..d5458e587813 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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 \ diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 1f9012dc3059..958a54fc1688 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -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 @@ -51,6 +51,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: ****************************** 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 diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index 57aaf19afeea..1dc26f32968e 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -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 diff --git a/gnu/usr.bin/diff/Makefile b/gnu/usr.bin/diff/Makefile deleted file mode 100644 index f5b38f1db9a8..000000000000 --- a/gnu/usr.bin/diff/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# $FreeBSD$ - -.include <src.opts.mk> - -DIFFSRC=${.CURDIR}/../../../contrib/diff/src -.PATH: ${DIFFSRC} \ - ${.CURDIR}/../../../contrib/diff/lib \ - ${.CURDIR}/../../../contrib/diff/man \ - ${.CURDIR}/../../../contrib/diff/doc - -PROG= diff -SRCS= analyze.c context.c diff.c dir.c ed.c ifdef.c io.c \ - normal.c side.c util.c \ - xmalloc.c strtoumax.c cmpbuf.c exitfail.c error.c quotesys.c \ - strftime.c c-stack.c basename.c exclude.c hard-locale.c \ - file-type.c posixver.c prepargs.c version-etc.c - -# Important for ctype macros! -CFLAGS+=-funsigned-char - -CFLAGS+=-DHAVE_CONFIG_H -CFLAGS+=-DPR_PROGRAM=\"/usr/bin/pr\" -CFLAGS+=-I${.CURDIR}/../../../contrib/diff -CFLAGS+=-I${.CURDIR}/../../../contrib/diff/src -CFLAGS+=-I${.CURDIR}/../../../contrib/diff/lib -CFLAGS+=-I${DESTDIR}/usr/include/gnu - -MAN= diff.1 diff.7 - -LIBADD+= gnuregex - -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif - -.include <bsd.prog.mk> diff --git a/gnu/usr.bin/diff/Makefile.depend b/gnu/usr.bin/diff/Makefile.depend deleted file mode 100644 index 1cce740db52b..000000000000 --- a/gnu/usr.bin/diff/Makefile.depend +++ /dev/null @@ -1,19 +0,0 @@ -# $FreeBSD$ -# Autogenerated - do NOT edit! - -DIRDEPS = \ - gnu/lib/csu \ - gnu/lib/libgcc \ - gnu/lib/libregex \ - include \ - include/xlocale \ - lib/${CSU_DIR} \ - lib/libc \ - lib/libcompiler_rt \ - - -.include <dirdeps.mk> - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif diff --git a/gnu/usr.bin/diff/tests/Makefile b/gnu/usr.bin/diff/tests/Makefile deleted file mode 100644 index ffe31a6851e3..000000000000 --- a/gnu/usr.bin/diff/tests/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $FreeBSD$ - -PACKAGE= tests - -TESTSRC= ${SRCTOP}/contrib/netbsd-tests/usr.bin/diff - -NETBSD_ATF_TESTS_SH= diff_test -ATF_TESTS_SH_SED_diff_test= -e 's/t_diff/`basename $$0`/g' - -${PACKAGE}FILES+= d_mallocv1.in -${PACKAGE}FILES+= d_mallocv2.in - -.include <netbsd-tests.test.mk> - -.include <bsd.test.mk> diff --git a/gnu/usr.bin/diff/tests/Makefile.depend b/gnu/usr.bin/diff/tests/Makefile.depend deleted file mode 100644 index f80275d86ab1..000000000000 --- a/gnu/usr.bin/diff/tests/Makefile.depend +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ -# Autogenerated - do NOT edit! - -DIRDEPS = \ - - -.include <dirdeps.mk> - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif diff --git a/usr.bin/Makefile b/usr.bin/Makefile index b3ff6b9602d3..db6b22c37e56 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -34,6 +34,7 @@ SUBDIR= alias \ csplit \ ctlstat \ cut \ + diff \ dirname \ du \ elf2aout \ |