From owner-freebsd-ports@FreeBSD.ORG  Wed Mar 25 01:53:09 2015
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: ports@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4B6B4AAF;
 Wed, 25 Mar 2015 01:53:09 +0000 (UTC)
Received: from vps1.elischer.org (vps1.elischer.org [204.109.63.16])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "vps1.elischer.org",
 Issuer "CA Cert Signing Authority" (not verified))
 by mx1.freebsd.org (Postfix) with ESMTPS id 1C943CB7;
 Wed, 25 Mar 2015 01:53:08 +0000 (UTC)
Received: from jre-mbp.elischer.org
 (ppp121-45-255-201.lns20.per4.internode.on.net [121.45.255.201])
 (authenticated bits=0)
 by vps1.elischer.org (8.14.9/8.14.9) with ESMTP id t2P1r3Sb078624
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO);
 Tue, 24 Mar 2015 18:53:06 -0700 (PDT)
 (envelope-from julian@freebsd.org)
Message-ID: <551214F9.5070202@freebsd.org>
Date: Wed, 25 Mar 2015 09:52:57 +0800
From: Julian Elischer <julian@freebsd.org>
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10;
 rv:31.0) Gecko/20100101 Thunderbird/31.5.0
MIME-Version: 1.0
To: Bryan Drewery <bdrewery@FreeBSD.org>, ports@freebsd.org
Subject: Re: patch to bsd.ports.mk to support out-of-tree patches.
References: <5510F71B.7030900@freebsd.org>
 <20150324113240.Horde._MOpnfwGcxQa7v8pi_ozUQ2@webmail.df.eu>
 <55121468.2040308@FreeBSD.org>
In-Reply-To: <55121468.2040308@FreeBSD.org>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
Cc: mva@freebsd.org
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Wed, 25 Mar 2015 01:53:09 -0000

On 3/25/15 9:50 AM, Bryan Drewery wrote:
> On 3/24/2015 5:32 AM, Marcus von Appen wrote:
>> Julian Elischer <julian@freebsd.org>:
>>
>> [...]
>>>           esac | ${PATCH} ${PATCH_DIST_ARGS} `patch_dist_strip $$i` ; \
>>>       done )
>>>   .endif
>>> +.if defined(EXTRA_PATCH_TREE)
>> [...]
>>> +.endif
>>>   .if defined(EXTRA_PATCHES)
>>>       @set -e ; \
>>>       for i in ${EXTRA_PATCHES}; do \
>>>
>>>
>>> ============
>> Nice. I'd however change the patch behaviour to the following:
>>
>> - patch-* from FreeBSD
>> - EXTRA_PATCHES from FreeBSD
>> - local patches
>>
>> Your patch looks like it appleis the out-of-tree patches prior
>> to any EXTRA_PATCHES defined by the port itself. This should not be
>> the case, in my opinion. Locally managed patches should always come
>> last to ensure that all FreeBSD/maintainer-specific bits have been
>> applied and the local changes are just added on top of those.
>>
>> Cheers
>> Marcus
>>
> Agreed. The local patches are intended to avoid touching the port. If
> they are not last then you may have to go tweaking some of the other
> ports patches to fix your own.
>
that makes sense..  it just means shifting the code down a bit..