From owner-freebsd-ports@FreeBSD.ORG  Sun Apr  1 10:02:41 2012
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: ports@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D2A47106566B
	for <ports@freebsd.org>; Sun,  1 Apr 2012 10:02:41 +0000 (UTC)
	(envelope-from cvs-src@yandex.ru)
Received: from forward11.mail.yandex.net (forward11.mail.yandex.net
	[IPv6:2a02:6b8:0:801::1])
	by mx1.freebsd.org (Postfix) with ESMTP id 466AC8FC14
	for <ports@freebsd.org>; Sun,  1 Apr 2012 10:02:41 +0000 (UTC)
Received: from smtp14.mail.yandex.net (smtp14.mail.yandex.net [95.108.131.192])
	by forward11.mail.yandex.net (Yandex) with ESMTP id E7D36E81ECE
	for <ports@freebsd.org>; Sun,  1 Apr 2012 14:02:39 +0400 (MSK)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail;
	t=1333274559; bh=EX/cCL97TbthsxbO00SxiiB7yqywBZc2N+RuLMPUsN4=;
	h=Message-ID:Date:From:MIME-Version:To:Subject:Content-Type:
	Content-Transfer-Encoding;
	b=rpDoLba6GJi4WN1ruvf8AMofZqlpCXUKudFClsX/BGBwL+KfLmiIDWknyh/B9wZUM
	/Yg5X8zLLDyQzYkjIuRqs6JfGUDaHD+a6v7f4hrC7ZfBtZ5zC+jFDxtC5PhbElTzyt
	qfv3tekkhkcyqA5xIAaX386xI5+w7Nor8U5HrmjU=
Received: from smtp14.mail.yandex.net (localhost [127.0.0.1])
	by smtp14.mail.yandex.net (Yandex) with ESMTP id CF5971B60506
	for <ports@freebsd.org>; Sun,  1 Apr 2012 14:02:39 +0400 (MSK)
Received: from unknown (unknown [213.27.65.65])
	by smtp14.mail.yandex.net (nwsmtp/Yandex) with ESMTP id
	2cF0ivvb-2dFacsnj; Sun,  1 Apr 2012 14:02:39 +0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail;
	t=1333274559; bh=EX/cCL97TbthsxbO00SxiiB7yqywBZc2N+RuLMPUsN4=;
	h=Message-ID:Date:From:User-Agent:MIME-Version:To:Subject:
	Content-Type:Content-Transfer-Encoding;
	b=KwzTEXZ/u6EIh0NGuGyOKR1MSYFwzJ25U38JQ8rTLR9DQ3bS/jJnFnFsWblXbAspx
	eVjnr0bF4nBuI2Giuw/DkUq09BoWs7Kot3FU+bsPg8L2LLuet8xde6tClbgntEHFlB
	KN7W7a5XW1Fp8J2Bz1gTuHzNOendPyVeOq73HErg=
Message-ID: <4F7827A7.3030804@yandex.ru>
Date: Sun, 01 Apr 2012 14:02:15 +0400
From: Ruslan Mahmatkhanov <cvs-src@yandex.ru>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
	rv:10.0.3) Gecko/20120314 Thunderbird/10.0.3
MIME-Version: 1.0
To: FreeBSD Ports Mailing List <ports@freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: 
Subject: Preferred way of applying OSVERSION-dependend patches
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: Sun, 01 Apr 2012 10:02:41 -0000


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).

Thanks.

-- 
Regards,
Ruslan

Tinderboxing kills... the drives.