From owner-freebsd-ports@FreeBSD.ORG  Wed Jun 28 18:09:07 2006
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
X-Original-To: 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 CFE2816A408
	for <freebsd-ports@FreeBSD.org>; Wed, 28 Jun 2006 18:09:07 +0000 (UTC)
	(envelope-from cswiger@mac.com)
Received: from pi.codefab.com (pi.codefab.com [199.103.21.227])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 71E4943ED8
	for <freebsd-ports@FreeBSD.org>; Wed, 28 Jun 2006 18:09:07 +0000 (GMT)
	(envelope-from cswiger@mac.com)
Received: from localhost (localhost [127.0.0.1])
	by pi.codefab.com (Postfix) with ESMTP id A72A260EB;
	Wed, 28 Jun 2006 14:09:06 -0400 (EDT)
X-Virus-Scanned: amavisd-new at codefab.com
Received: from pi.codefab.com ([127.0.0.1])
	by localhost (pi.codefab.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id wMGbhat-stIG; Wed, 28 Jun 2006 14:09:05 -0400 (EDT)
Received: from [199.103.21.238] (pan.codefab.com [199.103.21.238])
	(using TLSv1 with cipher RC4-SHA (128/128 bits))
	(No client certificate requested)
	by pi.codefab.com (Postfix) with ESMTP id B80385DA7;
	Wed, 28 Jun 2006 14:09:05 -0400 (EDT)
In-Reply-To: <44A2BF19.6090105@utdallas.edu>
References: <44A2BF19.6090105@utdallas.edu>
Mime-Version: 1.0 (Apple Message framework v752.2)
Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed
Message-Id: <2DC9746C-8DAA-4231-8A40-23C6BCEF62EC@mac.com>
Content-Transfer-Encoding: 7bit
From: Charles Swiger <cswiger@mac.com>
Date: Wed, 28 Jun 2006 14:09:04 -0400
To: Paul Schmehl <pauls@utdallas.edu>
X-Mailer: Apple Mail (2.752.2)
Cc: FreeBSD Ports <freebsd-ports@FreeBSD.org>
Subject: Re: How do I include two patches for the same file?
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.5
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, 28 Jun 2006 18:09:07 -0000

On Jun 28, 2006, at 1:40 PM, Paul Schmehl wrote:
> I'm the maintainer for security/sancp.
>
> Recently a new patch was released that patches the decode.cc file.   
> A previous, still valid, patch, *also* patches the decode.cc file.   
> If I include both patches, the make fails with an error about  
> decode.cc

You ought to merge the patches into a single set of changes which is  
consistent.

-- 
-Chuck