From owner-freebsd-ports@FreeBSD.ORG  Wed Mar  9 20:10:26 2005
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3F94A16A4CE
	for <ports@freebsd.org>; Wed,  9 Mar 2005 20:10:26 +0000 (GMT)
Received: from mail.desa-projekt.de (mail.desa-projekt.de [217.172.178.45])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4F3B543D49
	for <ports@freebsd.org>; Wed,  9 Mar 2005 20:10:25 +0000 (GMT)
	(envelope-from lists-fbsd-ports@bsdberlin.org)
Received: (qmail 258 invoked from network); 9 Mar 2005 20:10:35 -0000
Received: from i3ed6968d.versanet.de (HELO tiberian.bsdberlin.local)
	(lists-fbsd-ports@bsdberlin.org@62.214.150.141)
	by mail.desa-projekt.de with SMTP; 9 Mar 2005 20:10:35 -0000
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>
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>
X-Mailer: Sylpheed-Claws 1.0.1 (GTK+ 1.2.10; FreeBSD/i386)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
cc: ports@freebsd.org
cc: Mark Foster <mark@foster.cc>
Subject: Re: finnicky patch
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Mar 2005 20:10:26 -0000

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.