From owner-freebsd-ports@FreeBSD.ORG Thu Dec 11 22:23:56 2008 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 59F001065673 for ; Thu, 11 Dec 2008 22:23:56 +0000 (UTC) (envelope-from njm@njm.me.uk) Received: from smtp004.apm-internet.net (smtp004.apm-internet.net [85.119.248.54]) by mx1.freebsd.org (Postfix) with SMTP id BE28C8FC52 for ; Thu, 11 Dec 2008 22:23:55 +0000 (UTC) (envelope-from njm@njm.me.uk) Received: (qmail 37615 invoked from network); 11 Dec 2008 21:57:13 -0000 Received: from unknown (HELO titania.njm.me.uk) (86.129.204.56) by smtp004.apm-internet.net with SMTP; 11 Dec 2008 21:57:13 -0000 Received: from titania.njm.me.uk (localhost [127.0.0.1]) by titania.njm.me.uk (8.14.3/8.14.3) with ESMTP id mBBLvCBo043335; Thu, 11 Dec 2008 21:57:12 GMT (envelope-from njm@njm.me.uk) Received: (from njm@localhost) by titania.njm.me.uk (8.14.3/8.14.3/Submit) id mBBLvCCR043334; Thu, 11 Dec 2008 21:57:12 GMT (envelope-from njm@njm.me.uk) Date: Thu, 11 Dec 2008 21:57:12 +0000 From: "N.J. Mann" To: Dmitry Marakasov Message-ID: <20081211215712.GA72408@titania.njm.me.uk> Mail-Followup-To: Dmitry Marakasov , freebsd-ports@freebsd.org References: <20081202201610.GA8753@atarininja.org> <20081203131234.GD70240@hades.panopticon> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20081203131234.GD70240@hades.panopticon> X-Operating-System: FreeBSD 7.1-PRERELEASE User-Agent: Mutt/1.5.18cvs (2008-07-02) Cc: freebsd-ports@freebsd.org Subject: Re: Proposal: mechanism for local patches X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Dec 2008 22:23:57 -0000 In message <20081203131234.GD70240@hades.panopticon>, Dmitry Marakasov (amdmi3@amdmi3.ru) wrote: > * G. Paul Ziemba (pz-freebsd-ports@ziemba.us) wrote: [...] > > > 2. I'm not sure we need the test for *.orig|*.rej|*~|*,v, but it > > wouldn't hurt. Maybe it helps admins who are actively developing > > local patches. I see that it's in the existing do-patch code above. > > I suppose that check was done to help to detect patching failures, so it > may be removed. I've just been trying out your patch and I think from an organisational point of view it is very good. What I mean by this is that with the patch I am now able to keep my local patches completely separate from the official, FreeBSD patches. No more backing up the whole of /usr/ports just in case I have a private patch in there somewhere. Now I just need to backup /usr/ports.localpatchdir (which is what I called the directory LOCAPATCHDIR points to). However, please consider putting back in the test for *.orig and *~ files. That way one can be actively be hacking on a patch without having to keep deleting editor backup files, which you may not wish to delete anyway, before attempting another build. In my case I see no need to skip *.rej and *,v files, but others may have a need for them. I hope some form of your patch gets into the tree once 7.1 ships. Cheers, Nick. --