problems with building a patch

Matthias Apitz m.apitz at oclcpica.org
Mon Nov 12 00:43:05 PST 2007


El día Sunday, November 11, 2007 a las 07:17:55PM +0200, Giorgos Keramidas escribió:

> > Hmm...  Looks like a unified diff to me...
> > The text leading up to this was:
> > --------------------------
> > |diff -N -r -u -X exclude nn-6.7.3/PATCH.RFC1522 nn-6.7.3.patched/PATCH.RFC1522
> > |--- nn-6.7.3/PATCH.RFC1522     Thu Jan  1 01:00:00 1970
> > |+++ nn-6.7.3.patched/PATCH.RFC1522     Sat Nov 10 11:04:58 2007
> > --------------------------
> 
> Here's the problem.
> 
> The patch files for ports should *not* include the `nn-6.7.3' part, like
> this one.  They should be relative to the toplevel directory of the
> unzipped/untarred port, i.e.:
> 
>     diff -N -u PATCH.RFC1522.orig PATCH.RFC1522
>     --- PATCH.RFC1522.orig     Thu Jan  1 01:00:00 1970
>     +++ PATCH.RFC1522     Sat Nov 10 11:04:58 2007

In this case what would be the best way to produce a recursive
patch file for this set of patched sources:

$ find . -name '*.orig' -print
./conf/s-linux.h.orig
./man/nn.1.nov.orig
./chset.c.orig
./aux.sh.orig
./answer.c.orig
./chset.h.orig
./news.c.orig
./xmakefile.orig
./db.c.orig
./global.c.orig
./global.h.orig
./more.c.orig
./news.h.orig
./pack_name.c.orig
./save.c.orig
./tables/applemacxiso.tab.orig
./tables/atarixiso.tab.orig
./tables/cp437xiso.tab.orig
./tables/cp850xiso.tab.orig
./tables/decxiso.tab.orig
./tables/isoxapplemac.tab.orig
./tables/isoxatari.tab.orig
./tables/isoxcp437.tab.orig
./tables/isoxcp850.tab.orig
./tables/isoxdec.tab.orig
./tables/isoxnext.tab.orig
./tables/nextxiso.tab.orig
./variable.c.orig
./nn.c.orig
./term.c.orig
./folder.c.orig

where the directory 'tables' and the files below this dir
are new files, i.e. their original files are just empty.

Thx

	matthias
-- 
Matthias Apitz
b http://gurucubano.blogspot.com/


More information about the freebsd-questions mailing list