Basic Diff question

Brooks Davis brooks at one-eyed-alien.net
Mon Sep 18 15:34:48 PDT 2006


On Mon, Sep 18, 2006 at 03:26:05PM -0700, MC wrote:
> Hello
> 
> I am getting going on my second port.  However in this new one are many
> little patches
> to most of the source code.  I always see '.orig' suffixes appended to in
> Freebsd diff files, like
> 
> --- Src/DasherCore/FileLogger.cpp.orig Tue Jan 17 01:41:44 2006
> +++ Src/DasherCore/FileLogger.cpp Tue Jan 17 01:51:33 2006
> 
> but for the life of me I don't know a way to produce these '.orig' suffixes
> in the patch file other than
> hand editing.  Using diff I never get an '.orig' suffix but something like:
> 
> diff -r -u --ignore-all-space work/FFFF323-src/FFFF3.cpp
> FFFF323-src/FFFF3.cpp
> --- work/FFFF323-src/FFFF3.cpp Thu Mar 9 02:37:18 2006
> +++ FFFF323-src/FFFF3.cpp Fri Sep 8 04:02:57 2006
> 
> What is the trick to this?

The normal way to generate the patches is to copy the files you patch to
xxx.orig.  This mirrors what patch does.  There's no need to do this,
but it's a useful convention because it means you can easily
(re)generated patches using ports/Tools/scripts/patchtool.py.

-- Brooks
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-ports/attachments/20060918/29ff4c2c/attachment.pgp


More information about the freebsd-ports mailing list