Date: Sun, 11 Nov 2007 19:17:55 +0200 From: Giorgos Keramidas <keramida@ceid.upatras.gr> To: Matthias Apitz <m.apitz@oclcpica.org> Cc: freebsd-questions@freebsd.org Subject: Re: problems with building a patch Message-ID: <20071111171755.GC3038@kobe.laptop> In-Reply-To: <20071111150251.GA15448@rebelion.Sisis.de> References: <20071111150251.GA15448@rebelion.Sisis.de>
next in thread | previous in thread | raw e-mail | index | archive | help
On 2007-11-11 16:02, Matthias Apitz <m.apitz@oclcpica.org> wrote:
>
> Hello,
>
> I've build a patch for 'nn-6.7.3' to add support for RFC1522 to my
> beloved news-reader. Before giving it away I was trying it on a fresh
> workspace of the /usr/ports/news/nn and run into the problem that
> new files which brings the patch to the tree are always created
> in the current working dir, even if I create them before with touch(1),
> existing files, like 'answer.c' in the example below, get patched
> correctly:
>
> $ /usr/ports/news/nn/work
> $ touch nn-6.7.3/PATCH.RFC1522
> $ patch < ../myRFC1522.patch
> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20071111171755.GC3038>