svn commit: r40541 - head/en_US.ISO8859-1/books/handbook/ports

[Glen Barber]

Author: gjb
Date: Sat Jan  5 01:19:06 2013
New Revision: 40541
URL: http://svnweb.freebsd.org/changeset/doc/40541

Log:
  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.

Modified:
  head/en_US.ISO8859-1/books/handbook/ports/chapter.xml

Modified: head/en_US.ISO8859-1/books/handbook/ports/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Sat Jan  5 01:19:02 2013	(r40540)
+++ head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Sat Jan  5 01:19:06 2013	(r40541)
@@ -537,7 +537,7 @@ local: lsof-4.56.4.tgz remote: lsof-4.56
       </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 di
 	<primary><command>pkg_version</command></primary>
       </indexterm>
       <screen>&prompt.root; <userinput>pkg_version</userinput>
-cvsup                       =
+colordiff                   =
 docbook                     =
 ...</screen>
 
@@ -1172,95 +1172,6 @@ Deinstalling ca_root_nss-3.13.5... done<
       </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>
 
 	<para>This method involves using
@@ -1383,7 +1294,7 @@ Deinstalling ca_root_nss-3.13.5... done<
 	  <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>