Date: Mon, 23 Jan 2006 17:16:33 -0600 From: Paul Schmehl <pauls@utdallas.edu> To: Scot Hetzel <swhetzel@gmail.com> Cc: FreeBSD Ports <freebsd-ports@freebsd.org> Subject: Re: Patching problem Message-ID: <07CBFFD4451BCF22A0DAE842@utd59514.utdallas.edu> In-Reply-To: <790a9fff0601231504q75b87e14j261faf30686adcac@mail.gmail.com> References: <D7B25AB7C48991A6558EB00E@utd59514.utdallas.edu> <790a9fff0601231504q75b87e14j261faf30686adcac@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--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/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?07CBFFD4451BCF22A0DAE842>