/diffutils, GNU diff utilities - find the differences between files
3.5, Package name:
diffutils-3.5, Maintainer: pkgsrc-users
GNU diff utilities:
You can use the `diff' command to show differences between two
files, or each corresponding file in two directories. `diff' outputs
differences between files line by line in any of several formats,
selectable by command line options. This set of differences is often
called a "diff" or "patch". For files that are identical, `diff'
normally produces no output; for binary (non-text) files, `diff'
normally reports only that they are different.
You can use the `cmp' command to show the offsets and line numbers
where two files differ. `cmp' can also show all the characters that
differ between the two files, side by side.
You can use the `diff3' command to show differences among three
files. When two people have made independent changes to a common
original, `diff3' can report the differences between the original and
the two changed versions, and can produce a merged file that contains
both persons' changes together with warnings about conflicts.
You can use the `sdiff' command to merge two files interactively.
Required to build:
Master sites: (Expand) SHA1:
Version history: (Expand)
- (2017-01-04) Updated to version: diffutils-3.5
- (2016-08-09) Updated to version: diffutils-3.4
- (2013-06-01) Updated to version: diffutils-3.3
- (2013-05-24) Updated to version: diffutils-3.3nb1
- (2013-05-19) Updated to version: diffutils-3.3
- (2012-06-02) Updated to version: diffutils-3.2nb2
CVS history: (Expand)
| 2017-01-04 15:04:30 by Makoto Fujiwara | Files touched by this commit (2) | |
Updated devel/diffutils to 3.5
* Noteworthy changes in release 3.5 (2016-08-20) [stable]
** Bug fixes
diff3 no longer malfunctions due to use-after-free
[bug introduced in 3.4]
diff --color no longer colorizes when TERM=dumb
| 2016-08-09 15:35:28 by Makoto Fujiwara | Files touched by this commit (6) | |
Updated devel/diffutils to 3.4
* Noteworthy changes in release 3.4 (2016-08-08) [stable]
** New features
diff accepts two new options --color and --palette to generate
and configure colored output. --color takes an optional argument
specifying when to colorize a line: --color=always, --color=auto,
--color=never. --palette is used to configure which colors are used.
** Bug fixes
When binary files differ, diff now exits with status 1 as POSIX requires.
Formerly it exited with status 2.
Unless the --ignore-file-name-case option is used, diff now
considers file names to be equal only if they are byte-for-byte
equivalent. This fixes a bug where diff in an English locale might
consider two Asian file names to be the same merely because they
contain no English characters.
diff -B no longer generates incorrect output if the two inputs
each end with a one-byte incomplete line.
diff --brief no longer reports a difference for unusual identical files.
For example, when comparing a file like /proc/cmdline (for which the linux
kernel reports st_size of 0 even though it is not an empty file) to a
copy of that file's contents residing on a "normal" file system:
$ f=/proc/cmdline; cp $f k; diff --brief $f k
Files /proc/cmdline and k differ
** Performance changes
diff's default algorithm has been adjusted to output higher-quality
results at somewhat greater computational cost, as CPUs have gotten
faster since the algorithm was last tweaked in diffutils-2.6 (1993).
- Add comments on patches, picking from (old) cvs log
| 2016-02-25 13:12:50 by Jonathan Perkin | Files touched by this commit (39) |
| 2015-11-03 04:29:40 by Alistair G. Crooks | Files touched by this commit (1995) |
Add SHA512 digests for distfiles for devel category
Issues found with existing distfiles:
No changes made to these distinfo files.
Otherwise, existing SHA1 digests verified and found to be the same on
the machine holding the existing distfiles (morden). All existing
SHA1 digests retained for now as an audit trail.
| 2014-10-09 16:07:17 by Thomas Klausner | Files touched by this commit (1163) |
Remove pkgviews: don't set PKG_INSTALLATION_TYPES in Makefiles.
| 2013-08-21 16:08:08 by Richard PALO | Files touched by this commit (2) |
fix mkdir_p problem for diffutils po files
| 2013-05-30 18:33:20 by Richard PALO | Files touched by this commit (1) |
let us backout and not be hasty to use autotools in devel/diffutils 2/2
| 2013-05-30 18:31:33 by Richard PALO | Files touched by this commit (2) |
let us backout and not be hasty to use autotools in devel/diffutils