Preferred way of applying OSVERSION-dependend patches

Jason Helfman jhelfman at e-e.com
Sun Apr 1 20:01:17 UTC 2012


> On 1 April 2012 06:02, Ruslan Mahmatkhanov <cvs-src at yandex.ru> wrote:
>>
>> Good day!
>>
>> What is a preferred way of doing subj?
>>
>> 1. Add an extra-patch-* to files/ subdirectory and apply it depending
>>   of checks in Makefile (.if ${OSVERSION}).
>> 2. Add an patch-* to files subdirectory that applies unconditionally
>>   and that checking for __FreeBSD_version in app code itself.
>>
>> The second one will guarantee that the patch still applies cleanly on
>> port
>> versions update, but it will make it more hard to find conditional
>> checks
>> for obsoleted FreeBSD versions (because most people, I believe, only
>> looking
>> to Makefile for things like this).
>
> #1 for exactly the reason you specify: it makes it easier to figure
> out why something is being patched and when that patch is no longer
> required.
>

I say #3 :)

So if it is non-conditional in the port, but you choose to make it
conditional in the code -- Send the patch upstream, or to maintainer of
code, so the patch isn't necessary in the portstree.

-jgh




More information about the freebsd-ports mailing list