Patching problem

[Paul Schmehl]

--On Monday, January 23, 2006 15:40:53 -0800 Doug Barton 
<dougb at FreeBSD.org> wrote:

> Paul Schmehl wrote:
>> --On Monday, January 23, 2006 15:03:26 -0800 Doug Barton
>> <dougb at FreeBSD.org> wrote:
>>
>>> Paul Schmehl 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?
>>>
>>> Take a look at EXTRA_PATCHES In the porter's handbook. I used this
>>> method to include a patch from the windowmaker distribution in that
>>> port.
>>>
>> EXTRA_PATCHES is for *fetching* patches from more than one location.
>
> No, actually it isn't. I gave you a pointer to the documentation, AND an
> example, both of which you obviously ignored. You could also try taking a
> look at bsd.port.mk if you're still confused.
>
I read the documentation.  I obviously didn't understand it.  So now I'm 
totally confused.  :-(

Here's part of the problem.  Along with the op_* patches, I *also* need to 
patch configure.in.  In the master port, there is a patch for configure.in. 
The Handbook says you should patch the same file twice.  So, won't 
EXTRA_PATCHES simply *add* the patches to the existing ones (which is *not* 
what I want to do)?

Here's what I need.  If the user installs the master port, I want to run 
the patches in files/ in the master port.  If the user installs the slave 
port, I want to run the patches for the slave port, but *not* the ones for 
the master port.

I'm starting to think this would be way, way easier if I just used OPTIONS 
and skipped the master-slave mess entirely.

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