From owner-cvs-all Mon Mar 17 12:37:17 2003 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C954337B404 for ; Mon, 17 Mar 2003 12:37:15 -0800 (PST) Received: from mail.speakeasy.net (mail16.speakeasy.net [216.254.0.216]) by mx1.FreeBSD.org (Postfix) with ESMTP id D826C43F75 for ; Mon, 17 Mar 2003 12:37:13 -0800 (PST) (envelope-from jhb@FreeBSD.org) Received: (qmail 27028 invoked from network); 17 Mar 2003 20:37:21 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail16.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 17 Mar 2003 20:37:21 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.8/8.12.8) with ESMTP id h2HKb9Ov069103; Mon, 17 Mar 2003 15:37:11 -0500 (EST) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <20030316222859.GA78822@dragon.nuxi.com> Date: Mon, 17 Mar 2003 15:37:26 -0500 (EST) From: John Baldwin To: "David O'Brien" Subject: Re: cvs commit: src/release Makefile Cc: cvs-all@FreeBSD.org, cvs-committers@FreeBSD.org Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 16-Mar-2003 David O'Brien wrote: > Please MFC this (and all the other things you did to release/Makefile) > since you have the power to do so. Or give me approval to do so. > 5-CURRENT and RELENG_4 have strayed too far apart and it makes it hard to > apply patches from 5-CURRENT to RELENG_4. Thanks. If you want to merge those changes into a tested patch, go for it. I would be more than happy to approve such a patch. > On Fri, Nov 15, 2002 at 02:03:25PM -0800, John Baldwin wrote: >> jhb 2002/11/15 14:03:25 PST >> >> Modified files: >> release Makefile >> Log: >> Rework the checking out of the doc, src, and ports trees a bit to make it >> more manageable. >> - Add some helper variables (CVS_{SRC,DOC,PORTS}ARGS) to be used when >> using CVS to checkout files. We stick release tags in these helper >> variables if they are defined and then use only one cvs command instead >> of two cvs commands with an .ifdef to choose between them. >> - rm the old src/doc/ports directories as separate commands from the >> CVS comands so that the rm commands don't need to be duplicated. >> - Simplify the DOMINIMALDOCPORTS case by overriding RELEASEPORTSMODULE to >> be ${MINIMALDOCPORTS} thus removing yet another nearly-duplicate cvs >> command in an .ifdef. >> - Add support for grabbing src/ and doc/ from external directories >> specified via EXTSRCDIR and EXTDOCDIR instead of from CVS. The same >> is not done for ports/ quite yet as the DOMINIMALDOCPORTS case is a >> bit tricky. >> >> The rerelease target scripts have not been changed to use the helper >> variables yet, so there is still some room for improvement. >> >> Submitted by: kuriyama (4) >> >> Revision Changes Path >> 1.729 +31 -19 src/release/Makefile >> http://cvsweb.freebsd.org/src/release/Makefile.diff?r1=1.728&r2=1.729 -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message