From owner-freebsd-current@FreeBSD.ORG Wed Feb 18 18:49:13 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CBFD516A4CF for ; Wed, 18 Feb 2004 18:49:13 -0800 (PST) Received: from root.org (root.org [67.118.192.226]) by mx1.FreeBSD.org (Postfix) with SMTP id A10F143D2D for ; Wed, 18 Feb 2004 18:49:13 -0800 (PST) (envelope-from nate@root.org) Received: (qmail 38109 invoked by uid 1000); 19 Feb 2004 02:49:15 -0000 Date: Wed, 18 Feb 2004 18:49:15 -0800 (PST) From: Nate Lawson To: Andrey Chernov In-Reply-To: <20040219004721.GA48357@nagual.pp.ru> Message-ID: <20040218184614.N38074@root.org> References: <20040219004721.GA48357@nagual.pp.ru> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: roberto@keltia.freenix.fr cc: current@freebsd.org cc: des@des.no Subject: Re: How to perform regex upgrade? (vendor branches) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Feb 2004 02:49:13 -0000 On Thu, 19 Feb 2004, Andrey Chernov wrote: > To whom it may interest. > Since I am fear now to deal with vendor branches (while latest issue still > unclear, was it done right or wrong, and at the moment of writing this I > believe it is right), I prefer to inform about my future > actions beforehead. Thanks for posting this first. > As you can read in > ftp://ftp.gnu.org/gnu/regex/README > GNU stops to update regex as standalone library. Since I want to upgrade > our grep to 2.4.2, I must to upgrade libregex first to version which is > included into grep 2.4.2. I found it compatible. This is 3 files only > (regex.c regex.h posix/regex.h). It means all other files of > gnu/lib/libregex (configure, NEWS, etc. will be removed). The question is > the same as the latest getopt* removal issue we discuss: how they can be > removed properly, from HEAD branch or somehow else? Remember, this files > still may be actual for not regex-upgraded FreeBSD 5 and 4. Perhaps someone from cvs@ can comment on this. I assume there is a standard approach taken for FreeBSD and it would be great if someone could share this and that could go into the cvs users guide. I personally always delete files on the vendor branch if they are not off of it to avoid creating new conflicts. But I'm unsure where my personal preferences end and where FreeBSD's approach begins. Thanks, Nate