git: This is a complete overhaul in the diffutils makefile syste
commit ea47786f593951711c20c91893bc1346804cd893
Author: John Marino <draco@marino.st>
Date: Sat Apr 30 16:05:09 2011 +0200
This is a complete overhaul in the diffutils makefile system. The
directories gnu/usr.bin/diff3 and gnu/usr.bin/sdiff have been removed
as a result. Those directories also used the deprecated patch approach.
Like grep before it, diffutils uses its own regex library. The
previous version used gnuregex.
The README.DELETED was woefully out of date. It is hoped this overhaul
will make future diffutils upgrades easier.
=========================================================
Noteworthy changes in release 2.9 (2010-02-11) [stable]
=========================================================
** New features
New diff option --suppress-blank-empty.
Bring back support for `diff -NUM', where NUM is a number,
even when conforming to POSIX 1003.1-2001. This change reverts to
the behavior of GNU diff 2.7 and earlier. This is a change only
when conforming to POSIX 1003.1-2001; there is no effect when
conforming to older POSIX versions.
This change is in response to decisions taken in the January 2005
Austin Group standardization meeting. For more details, please see
"Utility Syntax Guidelines" in the Minutes of the January 2005
Meeting <http://www.opengroup.org/austin/docs/austin_239.html>.
sdiff now understands '1' and '2' as synonyms for 'l' and 'r'.
** Changes in behavior
sdiff and diff3 now invoke diff, not $(bindir)/diff
** Administrivia
New discussion and bug-reporting address: bug-diffutils@gnu.org
updated gnulib support
=========================================================
Noteworthy changes in release 3.0 (2010-05-03) [stable]
=========================================================
** Bug fixes
diff once again prints the required "\ No newline at end of file" line
when at least one input lacks a newline-at-EOF and the final hunk plus
context-length aligns exactly with the end of the newline-lacking file.
[bug introduced between 2.8.7 and 2.9]
** Changes in behavior
In context-style diffs, diff prints a portion of a preceding "function"
line for each hunk, with --show-function-line=RE (-F) or
--show-c-function (-p). Now, it trims leading blanks from such lines
before extracting a prefix. This is useful especially when a function
line is so far indented that the name itself would be truncated or not
included in the limited-width substring that diff appends.
diff once again reports a difference with the diagnostic
"Binary files A and B differ" when at least one of the files
appears to be binary. From 2.8.4 through diffutils-2.9, it printed
"Files A and B differ".
Summary of changes:
contrib/diffutils/README.DELETED | 107 +-
contrib/diffutils/README.DRAGONFLY | 24 +-
contrib/diffutils/config.h | 571 -------
contrib/diffutils/src/diff.h | 2 +-
contrib/diffutils/src/diff3.c | 1 -
contrib/diffutils/src/sdiff.c | 1 -
gnu/usr.bin/Makefile | 2 +-
gnu/usr.bin/diff/Makefile | 32 +-
gnu/usr.bin/diff/Makefile.inc | 1 +
gnu/usr.bin/diff/Makefile.inc0 | 11 +
gnu/usr.bin/diff/diff/Makefile | 18 +
gnu/usr.bin/diff/diff/paths.h | 2 +
gnu/usr.bin/diff/diff3/Makefile | 8 +
gnu/usr.bin/diff/doc/Makefile | 12 +-
gnu/usr.bin/diff/libdiffutils/Makefile | 73 +
.../libgreputils => diff/libdiffutils}/alloca.h | 0
.../libdiffutils}/arg-nonnull.h | 0
gnu/usr.bin/diff/libdiffutils/config.h | 1583 ++++++++++++++++++++
gnu/usr.bin/diff/libdiffutils/configmake.h | 26 +
gnu/usr.bin/diff/libdiffutils/fcntl.h | 571 +++++++
gnu/usr.bin/diff/libdiffutils/fnmatch.h | 81 +
.../libgreputils => diff/libdiffutils}/getopt.h | 0
gnu/usr.bin/diff/libdiffutils/string.h | 1223 +++++++++++++++
gnu/usr.bin/diff/libdiffutils/strings.h | 152 ++
gnu/usr.bin/diff/libdiffutils/sys/stat.h | 934 ++++++++++++
.../usr.bin/diff/libdiffutils}/unitypes.h | 0
.../usr.bin/diff/libdiffutils}/uniwidth.h | 0
.../libdiffutils}/warn-on-use.h | 0
gnu/usr.bin/diff/sdiff/Makefile | 8 +
gnu/usr.bin/diff3/Makefile | 23 -
gnu/usr.bin/diff3/diff3.c.patch | 11 -
gnu/usr.bin/sdiff/Makefile | 25 -
gnu/usr.bin/sdiff/sdiff.c.patch | 11 -
33 files changed, 4791 insertions(+), 722 deletions(-)
delete mode 100644 contrib/diffutils/config.h
create mode 100644 gnu/usr.bin/diff/Makefile.inc
create mode 100644 gnu/usr.bin/diff/Makefile.inc0
create mode 100644 gnu/usr.bin/diff/diff/Makefile
create mode 100644 gnu/usr.bin/diff/diff/paths.h
create mode 100644 gnu/usr.bin/diff/diff3/Makefile
create mode 100644 gnu/usr.bin/diff/libdiffutils/Makefile
copy gnu/usr.bin/{grep/libgreputils => diff/libdiffutils}/alloca.h (100%)
copy gnu/usr.bin/{grep/libgreputils => diff/libdiffutils}/arg-nonnull.h (100%)
create mode 100644 gnu/usr.bin/diff/libdiffutils/config.h
create mode 100644 gnu/usr.bin/diff/libdiffutils/configmake.h
create mode 100644 gnu/usr.bin/diff/libdiffutils/fcntl.h
create mode 100644 gnu/usr.bin/diff/libdiffutils/fnmatch.h
copy gnu/usr.bin/{grep/libgreputils => diff/libdiffutils}/getopt.h (100%)
create mode 100644 gnu/usr.bin/diff/libdiffutils/string.h
create mode 100644 gnu/usr.bin/diff/libdiffutils/strings.h
create mode 100644 gnu/usr.bin/diff/libdiffutils/sys/stat.h
copy {contrib/diffutils/lib => gnu/usr.bin/diff/libdiffutils}/unitypes.h (100%)
copy {contrib/diffutils/lib => gnu/usr.bin/diff/libdiffutils}/uniwidth.h (100%)
copy gnu/usr.bin/{grep/libgreputils => diff/libdiffutils}/warn-on-use.h (100%)
create mode 100644 gnu/usr.bin/diff/sdiff/Makefile
delete mode 100644 gnu/usr.bin/diff3/Makefile
delete mode 100644 gnu/usr.bin/diff3/diff3.c.patch
delete mode 100644 gnu/usr.bin/sdiff/Makefile
delete mode 100644 gnu/usr.bin/sdiff/sdiff.c.patch
http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/ea47786f593951711c20c91893bc1346804cd893
--
DragonFly BSD source repository