From 2ddb1e62c98a44f0362d8da2957f4f534483af86 Mon Sep 17 00:00:00 2001
From: Benedict Reuschling <bcr@FreeBSD.org>
Date: Wed, 10 Oct 2012 17:12:49 +0000
Subject: [PATCH] Add a section about the migration away from CVSup towards
 portsnap.

I made some corrections (mostly typo fixes) to the submitted patch
where appropriate.

PR:		docs/172554
Submitted by:	beat
---
 .../books/handbook/ports/chapter.xml          | 75 +++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/en_US.ISO8859-1/books/handbook/ports/chapter.xml b/en_US.ISO8859-1/books/handbook/ports/chapter.xml
index 35c2055d4c..ea6bb34cab 100644
--- a/en_US.ISO8859-1/books/handbook/ports/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/ports/chapter.xml
@@ -910,6 +910,81 @@ docbook                     =
       </procedure>
     </sect2>
 
+    <sect2 id="cvsup-migration">
+      <title>Migrating from CVSup/csup to portsnap</title>
+
+      <warning>
+	<para>By February 28, 2013 the ports tree will no longer be
+	  exported to <application>CVS</application> and therefore
+	  <application>CVSup</application> and
+	  <application>csup</application> will no longer provide
+	  updates for the ports tree.</para>
+      </warning>
+
+      <procedure>
+	<title>Migration to Portsnap</title>
+
+	<para>The migration will require about 1&nbsp;GB of disk space
+	  on <filename class="directory">/usr</filename>, plus
+	  <application>Portsnap</application> requires about
+	  150&nbsp;MB disk space on <filename
+	  class="directory">/var</filename>.</para>
+
+	<step>
+	  <para>Disable any automated ports updates you may use, such
+	    as a &man.cron.8; job calling
+	    <application>CVSup</application> or
+	    <application>csup</application>.</para>
+	</step>
+
+	<step>
+	  <para>Move the existing ports tree to a temporary location:
+	  </para>
+
+	  <screen>&prompt.root; <userinput>mv /usr/ports /usr/ports.old</userinput></screen>
+	</step>
+
+	<step>
+	  <para>Fetch the new ports tree with
+	    <application>Portsnap</application> and extract it to
+	    <filename class="directory">/usr/ports</filename>:</para>
+
+	  <screen>&prompt.root; <userinput>portsnap fetch extract</userinput></screen>
+	</step>
+
+	<step>
+	  <para>Move distfiles and saved packages to the new ports
+	    tree:</para>
+
+	  <screen>&prompt.root; <userinput>mv /usr/ports.old/distfiles /usr/ports</userinput>
+&prompt.root; <userinput>mv /usr/ports.old/packages /usr/ports</userinput></screen>
+	</step>
+
+	<step>
+	  <para>Delete the old ports tree:</para>
+
+	  <screen>&prompt.root; <userinput>rm -rf /usr/ports.old</userinput></screen>
+	</step>
+
+	<step>
+	  <para>If <application>CVSup</application> was used before,
+	    it can now be uninstalled:</para>
+
+	  <screen>&prompt.root; <userinput>pkg_delete -r -v cvsup-without-gui-\*</userinput></screen>
+
+	  <para>Users of <application>pkgng</application> can use the
+	    following command:</para>
+
+	  <screen>&prompt.root; <userinput>pkg remove cvsup-without-gui</userinput></screen>
+	</step>
+      </procedure>
+
+      <para>See <link linkend="updating-upgrading-portsnap">Using
+	Portsnap</link> for a detailed description of
+	<application>Portsnap</application> and how to update the
+	ports tree with <application>Portsnap</application>.</para>
+    </sect2>
+
     <sect2 id="ports-skeleton">
       <title>Installing Ports</title>