Subject: Re: diff and patch (was: CVS commit: pkgsrc/sysutils/coreutils)
To: grant beattie <>
From: Frederick Bruckman <>
List: tech-pkg
Date: 11/23/2003 08:34:53
On Sun, 23 Nov 2003, grant beattie wrote:

> On Sat, Nov 22, 2003 at 05:35:53PM -0800, Jeremy C. Reed wrote:
> > > Log Message:
> > > Recreate patch because Mac OS X's patch refuses to apply it.
> >
> > I have had problems like this about ten times in the past year or so.
> >
> > Are there any diff (or patch) switches that we should use to make sure
> > that it works better over different versions of patch (or diff)?
> use pkgdiff from pkgtools/pkgdiff.
> I don't know why anyone would create patches using anything else, this
> is the documented, working tool to do it.

Sure. It has problems, though:

1) It sometimes litters the file with junk after the "+++" and "---"

2) It diffs against anything with ".orig", not just the ones you
changed, so it can pick up crud from pkg locale munging, or from the
packages distribution patches.

3) You usually have to rename the patch files, if you want to keep the
CVS history coherent.

I use it, but blind trust is inappropriate.