Date: Wed, 9 Mar 2005 21:10:20 +0100 From: Danny Koenig <lists-fbsd-ports@bsdberlin.org> To: Danny Koenig <lists-fbsd-ports@bsdberlin.org> Cc: Mark Foster <mark@foster.cc> Subject: Re: finnicky patch Message-ID: <20050309211020.599b1783@tiberian.bsdberlin.local> In-Reply-To: <20050309202817.5d119bc0@tiberian.bsdberlin.local> References: <422F4B31.3070503@foster.cc> <20050309202817.5d119bc0@tiberian.bsdberlin.local>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, 9 Mar 2005 20:28:17 +0100 Danny Koenig <lists-fbsd-ports@bsdberlin.org> wrote: > |diff -Pur sysutils/cfengine2.orig/Makefile > sysutils/cfengine2/Makefile |--- sysutils/cfengine2.orig/Makefile > Fri Nov 12 06:08:36 2004 |+++ sysutils/cfengine2/Makefile Mon Mar 7 > 14:18:20 2005 -------------------------- > Patching file sysutils/cfengine2/Makefile using Plan A... > Hunk #1 failed at 6. > 1 out of 1 hunks failed--saving rejects to Sorry, you're right. This will work. Don't ask me why. tiberian# diff -Pur cfengine2.orig/Makefile cfengine2/Makefile > patch-cfengine2-makefile.patch tiberian# rm -r cfengine2 tiberian# cp -pR cfengine2.orig/ cfengine2 tiberian# patch < patch-cfengine2-makefile.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |--- cfengine2.orig/Makefile Wed Mar 9 20:35:16 2005 |+++ cfengine2/Makefile Wed Mar 9 20:53:23 2005 -------------------------- Patching file cfengine2/Makefile using Plan A... Hunk #1 succeeded at 6. done tiberian# cat patch-cfengine2-makefile.patch --- cfengine2.orig/Makefile Wed Mar 9 20:35:16 2005 +++ cfengine2/Makefile Wed Mar 9 20:53:23 2005 @@ -6,7 +6,7 @@ # PORTNAME= cfengine2 -PORTVERSION= 2.1.10 +PORTVERSION= 2.1.13 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.iu.hio.no/pub/cfengine/ \ ${MASTER_SITE_GNU} tiberian# I think there is "any unknown" problem. The Diff is the same as yours.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050309211020.599b1783>