| Age | Commit message (Collapse) | Author | Files | Lines |
|
1.6: Correctly handle filenames with whitespace in pkgdiff and mkpatches
|
|
in the diff output. Also, improve the error message that occurs if this
also fails. Fixes PR 46962.
|
|
|
|
|
|
|
|
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.
|
|
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
|
|
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.
|
|
option.
|
|
|
|
SH is /bin/ksh on Solaris, this gives us a working pkgdiff on Solaris.
|
|
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.
|
|
second $).
|
|
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.
|
|
|
|
patch applies to when updating a package
|
|
Bump to 0.105
|
|
change the line number in the configure script.
Mostly by Stoned Elipot, with slight changes by me.
Bump to 0.104.
|
|
pkg/13988).
|
|
Allow only one file as argument, newfile, and assume oldfile as
newfile.orig.
|
|
patches are regenerated. Update to 0.92
|
|
mkpatches doesn't generate empty patches, and warns if name and name.orig
don't differ.
Bump version to 0.91.
|
|
and maintenance.
|