summaryrefslogtreecommitdiff
path: root/pkgtools/pkgdiff/files/pkgdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-02-03Updated pkgtools/pkgdiff to 1.6abs1-9/+9
1.6: Correctly handle filenames with whitespace in pkgdiff and mkpatches
2012-09-16Drop back to diff without -p before giving up because of rcsids appearingdholland1-2/+17
in the diff output. Also, improve the error message that occurs if this also fails. Fixes PR 46962.
2011-02-02Fix wording in my licencse.wiz1-3/+3
2011-02-02Sign over copyright to TNFhubertf1-3/+31
2011-02-02Clarify my license.wiz1-2/+25
2011-02-02Update to 1.0.wiz1-2/+6
Smarter pkgdiff, doesn't create chunks that are added automatically by the pkgsrc infrastructure (configure:exit instead of regenerate, Makefile: localedir). mkpatches: patch file names now contain the path to the file and its name per discussion on tech-pkg June 2010. Also, the files are created directly in the patches/ directory; backups are saved as patches/patch-foo.orig. patchdiff: now compares patches/patch-foo with patches/patch-foo.orig; if they only differ in non-essential parts, patchdiff reinstates the original patch to keep commits less noisy.
2009-12-10Updated pkgtools/pkgdiff to 0.122abs1-1/+4
Set TZ=UTC before calling diff to ensure everyone uses the same timezone to avoid spurious diffs in metadata, such as: < clock/clock.c.orig 1993-06-29 01:11:39.000000000 -0400 --- > clock/clock.c.orig 1993-06-29 03:11:39.000000000 -0200
2005-08-02Update to version 0.118: pkgdiff fix and tuning.seb1-4/+9
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.
2005-05-21Use -U $lines instead of -$lines to avoid conflicts with the threeway diffrh1-5/+5
option.
2004-05-23print "can't strip away rcs ids" message to stderr, not stdoutdanw1-2/+2
2003-07-07Use '@SH@' for pkgdiff's interpreter and substitute for it.seb1-2/+2
SH is /bin/ksh on Solaris, this gives us a working pkgdiff on Solaris.
2003-06-14Add support to pkgdiff for the environment variable PKGDIFF_FMT. Thisatatat1-4/+5
allows you to get context style or plain diffs from mkpatches or pkgdiff, instead of the default unified format. Sometimes it's very nice to be able to look at a different diff format.
2003-06-10Update to 1.110: make grep only match closed CVS tags (including thewiz1-2/+2
second $).
2003-04-09Update to version 0.108.seb1-2/+2
Newer diffutils' (>=2.8, as seen in pkgsrc and -current) diff had seen the regexp syntax of its -I and -F options changed from Emacs syntax to grep syntax. Hence fix pkgdiff's diff invocation so diffs on configure scripts are kept to a minimum.
2002-12-30fix error message: s/one arguments/one argument/sommerfeld1-2/+2
2002-06-27add -p to the diff arguments; it's useful to know which function alukem1-4/+4
patch applies to when updating a package
2002-04-02Use basename in dodiff() so `pkgdiff /path/to/configure' works as expected.seb1-2/+2
Bump to 0.105
2002-03-10Make pkgdiff smarter re: configure patches: avoid most parts that onlywiz1-4/+14
change the line number in the configure script. Mostly by Stoned Elipot, with slight changes by me. Bump to 0.104.
2001-10-08Update to 0.102: Use GNU diff on Solaris for pkgdiff script (close PR ↵seb1-4/+6
pkg/13988).
2000-08-26Update to 0.95. Changes:hubertf1-10/+18
Allow only one file as argument, newfile, and assume oldfile as newfile.orig.
2000-08-15Remove date from +++ lines in patch - removes needless differences whenabs1-2/+4
patches are regenerated. Update to 0.92
2000-07-01pkgdiff now only generates output at all if the files differ.wiz1-5/+13
mkpatches doesn't generate empty patches, and warns if name and name.orig don't differ. Bump version to 0.91.
2000-06-28Import of pkgdiff & friends, some tools for easier patch creationwiz1-0/+29
and maintenance.