From 17b5c290e0bbfceb3b60619f3447ce18c27f7627 Mon Sep 17 00:00:00 2001
From: Marc Fonvieille <blackend@FreeBSD.org>
Date: Sat, 13 Aug 2005 16:42:42 +0000
Subject: [PATCH] Brush up a bit the Ports CVSup method:

- We currently state "Install the net/cvsup port"; let's point directly
  to the package, in particular cvsup-without-gui since all commands, in
  the text, used the legacy "-g"...
- Most of people do not edit the ports-supfile and directly use the -h
  argument for the CVSup server, the reader should uses/knows that.
- Keep, as note, the ports-supfile edition for a "hardcoded" CVSup
  server
- I kept the odd <link linkend/<xref linkend way, maybe this should be
  fixed

The text should, now, be closer to what we do when it's time to CVSup
the Ports tree.
---
 .../books/handbook/ports/chapter.sgml         | 64 +++++++++++++------
 1 file changed, 46 insertions(+), 18 deletions(-)

diff --git a/en_US.ISO8859-1/books/handbook/ports/chapter.sgml b/en_US.ISO8859-1/books/handbook/ports/chapter.sgml
index 22bd7b0a78..0709ea04f5 100644
--- a/en_US.ISO8859-1/books/handbook/ports/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/ports/chapter.sgml
@@ -659,39 +659,67 @@ docbook                     =
 
 	<step>
 	  <para>Install the <filename
-	      role="package">net/cvsup</filename> port.  See <link
+	    role="package">net/cvsup-without-gui</filename> package:</para>
+
+	  <screen>&prompt.root; <userinput>pkg_add -r cvsup-without-gui</userinput></screen>
+
+	  <para>See <link
 	      linkend="cvsup-install">CVSup Installation</link> (<xref
 	      linkend="cvsup-install">) for more details.</para>
 	</step>
 
 	<step>
-	  <para>As <username>root</username>, copy
-	    <filename>/usr/share/examples/cvsup/ports-supfile</filename>
-	    to a new location, such as <filename>/root</filename> or your
-	      home directory.</para>
-	</step>
+	  <para>Run <command>cvsup</command>:</para>
 
-	<step>
-	  <para>Edit <filename>ports-supfile</filename>.</para>
-	</step>
+	  <screen>&prompt.root; <userinput>cvsup -L 2 -h <replaceable>cvsup.FreeBSD.org</replaceable> /usr/share/examples/cvsup/ports-supfile</userinput></screen>
 
-	<step>
 	  <para>Change
-	    <replaceable>CHANGE_THIS.FreeBSD.org</replaceable> to a
+	    <replaceable>cvsup.FreeBSD.org</replaceable> to a
 	    <application>CVSup</application> server near you.  See
 	    <link linkend="cvsup-mirrors">CVSup Mirrors</link> (<xref
 	    linkend="cvsup-mirrors">) for a complete listing of mirror
 	    sites.</para>
+
+	  <note>
+	    <para>One may want to use his own
+	      <filename>ports-supfile</filename>, for example to avoid
+	      the need of passing the <application>CVSup</application>
+	      server on the command line.</para>
+
+	    <procedure>
+	      <step>
+		<para>In this case, as <username>root</username>, copy
+		  <filename>/usr/share/examples/cvsup/ports-supfile</filename>
+		  to a new location, such as
+		  <filename>/root</filename> or your home
+		  directory.</para>
+	      </step>
+
+	      <step>
+		<para>Edit <filename>ports-supfile</filename>.</para>
+	      </step>
+
+	      <step>
+		<para>Change
+		  <replaceable>CHANGE_THIS.FreeBSD.org</replaceable>
+		  to a <application>CVSup</application> server near
+		  you.  See <link linkend="cvsup-mirrors">CVSup
+		  Mirrors</link> (<xref linkend="cvsup-mirrors">) for
+		  a complete listing of mirror sites.</para>
+	      </step>
+
+	      <step>
+		<para>And now to run <command>cvsup</command>, use the
+		  following:</para>
+
+		<screen>&prompt.root; <userinput>cvsup -L 2 <replaceable>/root/ports-supfile</replaceable></userinput></screen>
+	      </step>
+	    </procedure>
+	  </note>
 	</step>
 
 	<step>
-	  <para>Run <command>cvsup</command>:</para>
-
-	  <screen>&prompt.root; <userinput>cvsup -g -L 2 <replaceable>/root/ports-supfile</replaceable></userinput></screen>
-	</step>
-
-	<step>
-	  <para>Running this command later will download and apply all
+	  <para>Running the &man.cvsup.1; command later will download and apply all
 	    the recent changes to your Ports Collection, except
 	    actually rebuilding the ports for your own system.</para>
 	</step>