ports/156348: [PATCH] update games/klavaro to v0.8.1
Aldis Berjoza
aldis at bsdroot.lv
Tue Apr 12 14:50:11 UTC 2011
The following reply was made to PR ports/156348; it has been noted by GNATS.
From: Aldis Berjoza <aldis at bsdroot.lv>
To: "Herbert J. Skuhra" <h.skuhra at gmail.com>
Cc: <bug-followup at freebsd.org>
Subject: Re: ports/156348: [PATCH] update games/klavaro to v0.8.1
Date: Tue, 12 Apr 2011 14:41:06 +0000
On Tue, 12 Apr 2011 16:15:03 +0200, Herbert J. Skuhra wrote:
> On Tue, Apr 12, 2011 at 3:52 PM, Aldis Berjoza <aldis at bsdroot.lv>
> wrote:
>
>> Thanks.
>> Btw, I couldn't apply it cleanly. It failed on Makefile (other files
>> were
>> patched OK)
>
> Hmm, and the error is?
>
> Have you reverted your changes? If not rm -rf
> /usr/ports/games/klavaro
> and run csup/cvsup again.
> Afterwards:
>
> # cd /usr/ports
> # patch -p0 < klavaro_1_9_0_diff.txt
>
> I have tested this several times.
>
> -Herbert
desktop# pwd
/usr/ports
desktop# patch < /tmp/klavaro_1_9_0_diff.txt
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -ruN games/klavaro.bak/Makefile games/klavaro/Makefile
|--- games/klavaro.bak/Makefile 2011-04-12 12:58:03.000000000 +0200
|+++ games/klavaro/Makefile 2011-04-12 14:13:34.000000000 +0200
--------------------------
Patching file Makefile using Plan A...
Hunk #1 failed at 6.
Hunk #2 failed at 18.
Hunk #3 failed at 26.
3 out of 3 hunks failed--saving rejects to Makefile.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -ruN games/klavaro.bak/distinfo games/klavaro/distinfo
|--- games/klavaro.bak/distinfo 2011-04-12 12:58:03.000000000 +0200
|+++ games/klavaro/distinfo 2011-04-12 12:58:28.000000000 +0200
--------------------------
Patching file games/klavaro/distinfo using Plan A...
Hunk #1 succeeded at 1.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -ruN games/klavaro.bak/pkg-plist games/klavaro/pkg-plist
|--- games/klavaro.bak/pkg-plist 2011-04-12 12:58:03.000000000 +0200
|+++ games/klavaro/pkg-plist 2011-04-12 13:04:25.000000000 +0200
--------------------------
Patching file games/klavaro/pkg-plist using Plan A...
Hunk #1 succeeded at 57.
Hunk #2 succeeded at 115.
Hunk #3 succeeded at 133.
Hunk #4 succeeded at 144.
done
However with -p0 argument it worked fine... :)
--
Aldis Berjoza
More information about the freebsd-ports-bugs
mailing list