From owner-freebsd-ports@FreeBSD.ORG  Mon Jan 23 23:04:33 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 2BED116A41F
	for <freebsd-ports@freebsd.org>; Mon, 23 Jan 2006 23:04:33 +0000 (GMT)
	(envelope-from swhetzel@gmail.com)
Received: from xproxy.gmail.com (xproxy.gmail.com [66.249.82.200])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 84B4C43D81
	for <freebsd-ports@freebsd.org>; Mon, 23 Jan 2006 23:04:32 +0000 (GMT)
	(envelope-from swhetzel@gmail.com)
Received: by xproxy.gmail.com with SMTP id s9so758253wxc
	for <freebsd-ports@freebsd.org>; Mon, 23 Jan 2006 15:04:31 -0800 (PST)
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=oNxpPj06TMCCEWGuaOI6rhnj8wUQ2dNs5CNk5rFwXTd7uye6Yjf1LHOBOOZRVMaLNUR2E8OeHvkdfyR3A2djoAsH1LiFyF/Y2nIV3B6jwA5eCqlsSDuLMybQSZMKjpEHFMDsuflDsAg4UHtM/tYHlohmwTNtTvxDyJwEpDX+fvM=
Received: by 10.70.74.19 with SMTP id w19mr6640586wxa;
	Mon, 23 Jan 2006 15:04:31 -0800 (PST)
Received: by 10.70.53.2 with HTTP; Mon, 23 Jan 2006 15:04:31 -0800 (PST)
Message-ID: <790a9fff0601231504q75b87e14j261faf30686adcac@mail.gmail.com>
Date: Mon, 23 Jan 2006 17:04:31 -0600
From: Scot Hetzel <swhetzel@gmail.com>
To: Paul Schmehl <pauls@utdallas.edu>
In-Reply-To: <D7B25AB7C48991A6558EB00E@utd59514.utdallas.edu>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
References: <D7B25AB7C48991A6558EB00E@utd59514.utdallas.edu>
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:04:33 -0000

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=0911 Nov 2005 10:29:21 -0000=091.2
+++ op_sguil.c=0913 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=0911 Nov 2005 10:29:21 -0000=091.2
+++ src/output-plugins/op_sguil.c=0913 Nov 2005 12:00:59 -0000
:


Scot

--
DISCLAIMER:
No electrons were mamed while sending this message. Only slightly bruised.