From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Apr 12 14:50:11 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A46CB106564A for ; Tue, 12 Apr 2011 14:50:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 798CE8FC14 for ; Tue, 12 Apr 2011 14:50:11 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p3CEoBRq078009 for ; Tue, 12 Apr 2011 14:50:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p3CEoBwk078007; Tue, 12 Apr 2011 14:50:11 GMT (envelope-from gnats) Date: Tue, 12 Apr 2011 14:50:11 GMT Message-Id: <201104121450.p3CEoBwk078007@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Aldis Berjoza Cc: Subject: Re: ports/156348: [PATCH] update games/klavaro to v0.8.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Aldis Berjoza List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Apr 2011 14:50:11 -0000 The following reply was made to PR ports/156348; it has been noted by GNATS. From: Aldis Berjoza To: "Herbert J. Skuhra" Cc: 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 > 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