Module Name:	pkgsrc
Committed By:	seb
Date:		Tue Aug  2 12:16:19 UTC 2005

Modified Files:
	pkgsrc/pkgtools/pkgdiff: Makefile
	pkgsrc/pkgtools/pkgdiff/files: pkgdiff

Log Message:
Update to version 0.118: pkgdiff fix and tuning.

Fix the automagic tuning of the number of unified diff context
lines.  It was broken since previous commit to files/pkgdiff.

Also arguments '-u' and '-U NUM' to GNU diffutils 2.8.1, as seen
in NetBSD 2.0_STABLE and current, are not intended to be used
together. Hence only '-U NUM' is now specified. I did not reverted
to the '-u -NUM' form used before as it seems undesirable.

Please note that if PKGDIFF_FMT is specified in the environment,
for testing or debugging purposes, we skip the automagic tuning of
the number of unified diff context lines.  The user probably wants
to try another diff format, as suggested in the commit log of
revision 1.12 of files/pkgdiff. So there is no point in adding '-U
NUM' to PKGDIFF_FMT: it may just not work. See:

$ diff -c -U 1 /dev/null /dev/null
diff: conflicting output style options
diff: Try `diff --help' for more information.

While here save a few basename(1) runs.


To generate a diff of this commit:
cvs rdiff -r1.56 -r1.57 pkgsrc/pkgtools/pkgdiff/Makefile
cvs rdiff -r1.15 -r1.16 pkgsrc/pkgtools/pkgdiff/files/pkgdiff

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.