Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Sep 2012 02:45:53 +0000 (UTC)
From:      Glen Barber <gjb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r240588 - head/share/man/man7
Message-ID:  <201209170245.q8H2jrdK032511@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gjb (doc,ports committer)
Date: Mon Sep 17 02:45:52 2012
New Revision: 240588
URL: http://svn.freebsd.org/changeset/base/240588

Log:
  Update release(7) to reflect changes from r240586 and r240587:
  
   - Remove cvs(1) references.
   - Remove CVS* environment references.
   - Add default entries for the default SVNROOT for the Ports
     Collection, and Documentation Project.
   - While here, update 'SGML-based documentation' to 'XML-based',
     since the recent SGML->XML conversion.
   - Update an example providing SVNROOT environment usage.
  
  Reminded by:	nwhitehorn
  MFC After:	1 week
  X-MFC-With:	r240586, r240587

Modified:
  head/share/man/man7/release.7

Modified: head/share/man/man7/release.7
==============================================================================
--- head/share/man/man7/release.7	Mon Sep 17 02:35:00 2012	(r240587)
+++ head/share/man/man7/release.7	Mon Sep 17 02:45:52 2012	(r240588)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 14, 2012
+.Dd September 16, 2012
 .Dt RELEASE 7
 .Os
 .Sh NAME
@@ -105,11 +105,7 @@ environment in
 It then checks out the src tree specified by
 .Ar svn-branch
 using
-.Xr svn 1
-and (optionally) the ports and documentation trees using
-.Xr csup 1
-or
-.Xr cvs 1 .
+.Xr svn 1 .
 Once the various source trees have been obtained, it executes
 .Dq Li "make release"
 within the
@@ -122,33 +118,19 @@ release media.
 .Pp
 Environment variables:
 .Bl -tag -width ".Cm MAKE_FLAGS"
-.It Ev CVSUP_HOST
-The CVSUP server to use for the doc and ports trees. One of
-.Ev CVSUP_HOST
-or
-.Ev CVSROOT
-must be specified for ports and documentation to be included in the release.
-.It Ev CVSROOT
-The location of the
-.Fx
-CVS repository to use for the doc and ports trees. One of
-.Ev CVSUP_HOST
-or
-.Ev CVSROOT
-must be specified for ports and documentation to be included in the release.
-.It Ev CVS_TAG
-If the variable
-.Ev CVS_TAG
-is set, that tag will be used for CVS checkouts (doc and ports), otherwise
-.Ic generate-release.sh
-will use HEAD.
 .It Ev MAKE_FLAGS
 This environment variable can be set to pass flags (e.g. -j) to
 .Xr make 1
 when invoked by the script.
 .It Ev SVNROOT
-The location of the FreeBSD SVN source repository. Defaults to
-.Pa svn://svn.freebsd.org/base .
+The location of the FreeBSD SVN source, doc, and ports repositories.
+Defaults to
+.Pa svn://svn.freebsd.org/base
+for the source tree,
+.Pa svn://svn.freebsd.org/ports/head
+for the Ports Collection, and
+.Pa svn://svn.freebsd.org/doc/head
+for the Documentation Project source.
 .It Ev RELSTRING
 Optional base name for generated media images (e.g. FreeBSD-9.0-RC2-amd64).
 Defaults to the output of
@@ -246,7 +228,7 @@ If defined, the Ports Collection will be
 .It Va NOSRC
 If set, do not include system source code in the release.
 .It Va NODOC
-If defined, the SGML-based documentation from the
+If defined, the XML-based documentation from the
 .Fx
 Documentation Project will not be built.
 However, the
@@ -317,7 +299,7 @@ The following sequence of commands can b
 in a clean environment, including ports and documentation:
 .Bd -literal -offset indent
 cd /usr/src/release
-export CVSUP_HOST=cvsupN.freebsd.org
+export SVNROOT=svn://svn.freebsd.org/base
 sh generate-release.sh head /local3/release
 .Ed
 .Pp
@@ -326,7 +308,6 @@ After running these commands, all prepar
 directory.
 .Sh SEE ALSO
 .Xr cc 1 ,
-.Xr cvs 1 ,
 .Xr install 1 ,
 .Xr make 1 ,
 .Xr svn 1 Pq Pa ports/devel/subversion-freebsd ,
@@ -376,7 +357,7 @@ was overhauled and the wrapper script
 introduced to support the introduction of a new installer.
 .Pp
 At near 1000 revisions spread over multiple branches, the
-.Xr cvs 1
+.Xr svn 1
 log of
 .Pa src/release/Makefile
 contains a vivid historical record of some



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209170245.q8H2jrdK032511>