-D provides the previous behaviour of creating patches in $WRKDIR/.newpatches
-d dir specifies the directory where the patches will be created.
Requested by Aleksey Cheusov for read-only pkgsrc checkouts.
Fix minor bugs while here.
Bump version.
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.
diff version must uses spaces to separate the filename and timestamp (that
or somepeople do cut-n-pasting of patches).
2) add the comma "," to the pattern used to match line numbers, to match POSIX.
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
parsing a file name from the "+++" line in an old patch file. (New
patch files created by mkpatches do not have "./" in the file name in
the "+++" line, but some old patches currently in pkgsrc do have "./"
there.)
Bump version to 0.120.
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.
Add feedback-patches, a script to ... feedback patches:
The feedback-patches script is intended to help sending back patches in
the NetBSD Packages Collection, pkgsrc, back to the maintainers of the
original package, for inclusion into future releases. The given
category/pkg is either a path relative to the pkgsrc base directory, or
an absolute patch, which will be stripped the base directory. A pathname
of . will be expanded to the current directory, which is useful when the
current working directory is in a package's directory in pkgsrc.
If an email address is given, the patches will be sent to that address,
with some nice words. If no email address is given, the mail will only be
displayed instead of sent.
See feedback-patches(1) for the full enchilada.
Pkgvi fix: deal with pathnames like `dir-with.a-dot/file-without-dot'
for which the temporary file pathname hold in $tmp ended up as
`dir-with.a-dot/file-without-dot.$$.a-dot/file-without-dot'.
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.
Belatedly document pkgvi's '+command' option per zuntum@ request.
As textproc/groff now brings in a lot of dependencies
don't make it a build dependency for this package on Solaris.
XXX Hence do not install any man pages on Solaris. This is a temporary
stopgap measure. Do people really want a somewhat important number of
dependencies installed just to be able to do 'man mkpatches'? I surely
don't... A better solution has to be devised.
But as added bonus this package now handles gracefully MANINSTALL setting.
See you have not lost everything!
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.
if pkgdiff failed due to a problem with RCS ids, mkpatches would save the
failure message as a patch. Change to abort if pkgdiff has a non zero exit
(with the pkgdiff output). Also add a '-v' flag to indicate which .orig
file is being associated with which patchfile as processed.
