From owner-freebsd-ports@FreeBSD.ORG  Mon Jan 23 23:16:34 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 4A74B16A41F
	for <freebsd-ports@freebsd.org>; Mon, 23 Jan 2006 23:16:34 +0000 (GMT)
	(envelope-from pauls@utdallas.edu)
Received: from smtp1.utdallas.edu (smtp1.utdallas.edu [129.110.10.12])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 056FA43D46
	for <freebsd-ports@freebsd.org>; Mon, 23 Jan 2006 23:16:33 +0000 (GMT)
	(envelope-from pauls@utdallas.edu)
Received: from utd59514.utdallas.edu (utd59514.utdallas.edu [129.110.3.28])
	by smtp1.utdallas.edu (Postfix) with ESMTP id 8C03A389143;
	Mon, 23 Jan 2006 17:16:33 -0600 (CST)
Date: Mon, 23 Jan 2006 17:16:33 -0600
From: Paul Schmehl <pauls@utdallas.edu>
To: Scot Hetzel <swhetzel@gmail.com>
Message-ID: <07CBFFD4451BCF22A0DAE842@utd59514.utdallas.edu>
In-Reply-To: <790a9fff0601231504q75b87e14j261faf30686adcac@mail.gmail.com>
References: <D7B25AB7C48991A6558EB00E@utd59514.utdallas.edu>
	<790a9fff0601231504q75b87e14j261faf30686adcac@mail.gmail.com>
X-Mailer: Mulberry/3.1.6 (Linux/x86)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Cc: FreeBSD Ports <freebsd-ports@freebsd.org>
Subject: Re: Patching problem
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: Mon, 23 Jan 2006 23:16:34 -0000

--On Monday, January 23, 2006 17:04:31 -0600 Scot Hetzel 
<swhetzel@gmail.com> wrote:

> On 1/23/06, Paul Schmehl <pauls@utdallas.edu> wrote:
>> I'm working on a slave port that applies some patches that are not needed
>> in the master port.
>>
>> Three of the files being patched are op_sguil.c, op_sguil.h and
>> op_plugbase.c.  Those files exists in WRKDIR/src/output-plugins when the
>> tarball is extracted.  How should I name these patches so that they will
>> be applied?
>>
>> I tried patch-src-output-plugins-op_*, but that fails.  (I'm sure it's
>> because of the conflict in naming the output-plugins dir with a dash.)
>>
> Is it failing when the port tries to apply the patch?
>
>
> If your patch file looks like:
> --- op_sguil.c-orig	11 Nov 2005 10:29:21 -0000	1.2
> +++ op_sguil.c	13 Nov 2005 12:00:59 -0000
> :
>
> Then you need to edit so that it contains the patch to the file:
>
> --- src/output-plugins/op_sguil.c-orig	11 Nov 2005 10:29:21 -0000	1.2
> +++ src/output-plugins/op_sguil.c	13 Nov 2005 12:00:59 -0000
> :
>
Doh!!

I knew that.  :-(

Paul Schmehl (pauls@utdallas.edu)
Adjunct Information Security Officer
University of Texas at Dallas
AVIEN Founding Member
http://www.utdallas.edu/ir/security/