From f01a8af5d3e1232615dff21be7b45a9cc59a6f66 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 5 Jan 2013 01:19:06 +0000
Subject: [PATCH] Remove the 'CVSup Method' of updating the Ports Collection.
 Update two package names from cvsup to colordiff. While here, change 'pkg
 remove' command to 'pkg delete' for consistency with the manual, although
 'pkg remove' works as well.

---
 .../books/handbook/ports/chapter.xml          | 95 +------------------
 1 file changed, 3 insertions(+), 92 deletions(-)

diff --git a/en_US.ISO8859-1/books/handbook/ports/chapter.xml b/en_US.ISO8859-1/books/handbook/ports/chapter.xml
index 99b90a2cd0..5ef76f26e0 100644
--- a/en_US.ISO8859-1/books/handbook/ports/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/ports/chapter.xml
@@ -537,7 +537,7 @@ local: lsof-4.56.4.tgz remote: lsof-4.56.4.tgz
       </indexterm>
 
       <screen>&prompt.root; <userinput>pkg_info</userinput>
-cvsup-16.1          A general network file distribution system optimized for CV
+colordiff-1.0.13    A tool to colorize diff output
 docbook-1.2         Meta-port for the different versions of the DocBook DTD
 ...</screen>
 
@@ -549,7 +549,7 @@ docbook-1.2         Meta-port for the different versions of the DocBook DTD
 	<primary><command>pkg_version</command></primary>
       </indexterm>
       <screen>&prompt.root; <userinput>pkg_version</userinput>
-cvsup                       =
+colordiff                   =
 docbook                     =
 ...</screen>
 
@@ -1171,95 +1171,6 @@ Deinstalling ca_root_nss-3.13.5... done</screen>
 	</step>
       </procedure>
 
-      <procedure>
-	<title>CVSup Method</title>
-
-	<warning>
-	  <para>The CVSup method of retrieving and synchronizing the
-	    Ports Collection is being deprecated as part of a
-	    migration to Subversion.  While it remains supported, the
-	    service will be discontinued as of February 28,
-	    2013.</para>
-	</warning>
-
-	<para>This is a quick method for getting and keeping your copy
-	  of the Ports Collection up to date using
-	  <application>CVSup</application> protocol.  If you want to
-	  learn more about <application>CVSup</application>, see
-	  <link linkend="cvsup">Using CVSup</link>.</para>
-
-	<note>
-	  <para>The implementation of <application>CVSup</application>
-	    protocol included with the &os; system is called
-	    <application>csup</application>.</para>
-	</note>
-
-	<para>Make sure
-	  <filename class="directory">/usr/ports</filename> is empty
-	  before you run <application>csup</application> for the first
-	  time!  If you already have the Ports Collection present,
-	  obtained from another source,
-	  <application>csup</application> will not prune removed patch
-	  files.</para>
-
-	<step>
-	  <para>Run <command>csup</command>:</para>
-
-	  <screen>&prompt.root; <userinput>csup -L 2 -h <replaceable>cvsup.FreeBSD.org</replaceable> /usr/share/examples/cvsup/ports-supfile</userinput></screen>
-
-	  <para>Change
-	    <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>csup</command>, use the
-		  following:</para>
-
-		<screen>&prompt.root; <userinput>csup -L 2 <replaceable>/root/ports-supfile</replaceable></userinput></screen>
-	      </step>
-	    </procedure>
-	  </note>
-	</step>
-
-	<step>
-	  <para>Running the &man.csup.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>
-      </procedure>
-
       <procedure>
 	<title>Sysinstall Method</title>
 
@@ -1383,7 +1294,7 @@ Deinstalling ca_root_nss-3.13.5... done</screen>
 	  <para>Users of <application>pkgng</application> can use the
 	    following command:</para>
 
-	  <screen>&prompt.root; <userinput>pkg remove cvsup-without-gui</userinput></screen>
+	  <screen>&prompt.root; <userinput>pkg delete cvsup-without-gui</userinput></screen>
 	</step>
       </procedure>