From owner-cvs-all Sun Mar 16 14:29: 3 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 4D11937B401; Sun, 16 Mar 2003 14:29:01 -0800 (PST) Received: from dragon.nuxi.com (trang.nuxi.com [66.93.134.19]) by mx1.FreeBSD.org (Postfix) with ESMTP id 625E943F93; Sun, 16 Mar 2003 14:29:00 -0800 (PST) (envelope-from obrien@NUXI.com) Received: from dragon.nuxi.com (smmsp@localhost [127.0.0.1]) by dragon.nuxi.com (8.12.7/8.12.7) with ESMTP id h2GMT0FU078877; Sun, 16 Mar 2003 14:29:00 -0800 (PST) (envelope-from obrien@dragon.nuxi.com) Received: (from obrien@localhost) by dragon.nuxi.com (8.12.7/8.12.7/Submit) id h2GMT097078876; Sun, 16 Mar 2003 14:29:00 -0800 (PST) Date: Sun, 16 Mar 2003 14:29:00 -0800 From: "David O'Brien" To: John Baldwin Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/release Makefile Message-ID: <20030316222859.GA78822@dragon.nuxi.com> Reply-To: obrien@FreeBSD.org Mail-Followup-To: David O'Brien , John Baldwin , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org References: <200211152203.gAFM3PKx045982@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200211152203.gAFM3PKx045982@repoman.freebsd.org> User-Agent: Mutt/1.4i X-Operating-System: FreeBSD 5.0-CURRENT Organization: The NUXI BSD Group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 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 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. 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 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message