More details about getting pkgsrc via cvs, updates

2 files changed, 52 insertions, 24 deletions

diff --git a/doc/guide/files/Makefile b/doc/guide/files/Makefile
index f3af8d27611..fd9ac7fb869 100644
--- a/doc/guide/files/Makefile
+++ b/doc/guide/files/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2007/09/18 08:17:21 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2008/02/18 23:57:53 weinem Exp $
 
-WEB_PREFIX?=	${.CURDIR}/../htdocs
+WEB_PREFIX?=	/home/mark/Desktop/cvs/htdocs
 
 DOC=	pkgsrc
 
diff --git a/doc/guide/files/getting.xml b/doc/guide/files/getting.xml
index 3dfdae581d0..6af128d29be 100644
--- a/doc/guide/files/getting.xml
+++ b/doc/guide/files/getting.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: getting.xml,v 1.21 2007/07/20 23:08:14 wiz Exp $ -->
+<!-- $NetBSD: getting.xml,v 1.22 2008/02/18 23:57:53 weinem Exp $ -->
 
 <chapter id="getting">
 <title>Where to get pkgsrc and how to keep it up-to-date</title>
@@ -21,7 +21,7 @@ and dashes.</para>
 	quarterly basis from the current branch and only gets modified
 	for security updates. The names of the stable branches are built
 	from the year and the quarter, for example
-	<literal>2007Q1</literal>.</para>
+	<literal>2007Q4</literal>.</para>
 
 	<para>The second step is to decide <emphasis>how</emphasis> you
 	want to download pkgsrc. You can get it as a tar file, via SUP,
@@ -40,14 +40,35 @@ and dashes.</para>
 	url="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc.tar.gz"><filename>pkgsrc.tar.gz</filename></ulink>.
 	It is autogenerated daily.</para>
 
-	<para>The tar file for the stable branch 2007Q1 is in the
-	directory <filename>pkgsrc-2007Q1</filename> and is also called <ulink
-	url="ftp://ftp.NetBSD.org/pub/pkgsrc/pkgsrc-2007Q1/pkgsrc-2007Q1.tar.gz"><filename>pkgsrc-2007Q1.tar.gz</filename></ulink>.</para>
+	<para>The tar file for the stable branch 2007Q4 is in the
+	directory <filename>pkgsrc-2007Q4</filename> and is also called <ulink
+	url="ftp://ftp.NetBSD.org/pub/pkgsrc/pkgsrc-2007Q4/pkgsrc-2007Q4.tar.gz"><filename>pkgsrc-2007Q4.tar.gz</filename></ulink>.</para>
 
+	<para>To download a pkgsrc stable tarball, run:</para>
+
+<screen>
+&uprompt; <userinput>ftp ftp://ftp.NetBSD.org/pub/pkgsrc/<replaceable>pkgsrc-200xQy</replaceable>/<replaceable>pkgsrc-200xQy</replaceable>.tar.gz</userinput></screen>
+
+	<para>Where <replaceable>pkgsrc-200xQy</replaceable> is the
+	stable branch to be downloaded, for example, 
+	<quote>pkgsrc-2007Q4</quote>.</para>
+<!--
 	<para>After downloading the tar file, change to the directory
 	where you want to have pkgsrc. This is usually
 	<filename>/usr</filename>. Then, run <command>gzcat
 	pkgsrc.tar.gz | tar xf -</command> to extract the files.</para>
+-->
+	<para>Then, extract it with:</para>
+
+<screen>&uprompt; <userinput>tar -xzf <replaceable>pkgsrc-200xQy</replaceable>.tar.gz -C /usr</userinput></screen>
+
+	<para>This will create the directory <filename>pkgsrc/</filename>
+	in <filename>/usr/</filename> and all the package source will be 
+	stored under <filename>/usr/pkgsrc/</filename>.</para>
+
+	<para>To download pkgsrc-current, run:</para>
+
+<screen>&uprompt; <userinput>ftp ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc.tar.gz</userinput></screen>
 
 </sect2>
 <sect2 id="getting-via-sup">
@@ -71,8 +92,7 @@ release=pkgsrc
 <sect2 id="getting-via-cvs">
 <title>Via anonymous CVS</title>
 
-	<para>To get pkgsrc via CVS, make sure you have &man.cvs.1;
-	installed. To do an initial (full) checkout of pkgsrc, you first
+	<para>To do an initial (full) checkout of pkgsrc, you first
 	have to set some environment variables. For the C-Shell,
 	type:</para>
 
@@ -84,13 +104,12 @@ release=pkgsrc
 	<para>Or, the same for the bourne shell:</para>
 
 <screen>
-    &uprompt; <userinput>CVSROOT="anoncvs@anoncvs.NetBSD.org:/cvsroot"</userinput>
-    &uprompt; <userinput>CVS_RSH="ssh"</userinput>
-    &uprompt; <userinput>export CVSROOT CVS_RSH</userinput>
+    &uprompt; <userinput>export CVSROOT="anoncvs@anoncvs.NetBSD.org:/cvsroot"</userinput>
+    &uprompt; <userinput>export CVS_RSH="ssh"</userinput>
 </screen>
 
 	<para>By default, cvs doesn't do things like most people would
-	expect it to do, and this is unlikely to change. But there is a
+	expect it to do. But there is a
 	way to convince cvs, by creating a file called
 	<filename>.cvsrc</filename> in your home directory and saving
 	the following lines to it. This file will save you lots of
@@ -108,15 +127,23 @@ cvs -q -z3
 rdiff -u
 </programlisting>
 
-	<para>Then, you change to the directory where you want to have
-	your copy of pkgsrc. In most cases this is
-	<filename>/usr</filename>. In that directory you run the
-	checkout command, which is <command>cvs -q checkout -P
-	pkgsrc</command> for the current branch and <command>cvs -q
-	checkout -rpkgsrc-2007Q1 -P pkgsrc</command> for the stable
-	branch. This command will create a directory called
-	<filename>pkgsrc</filename> with all the pkgsrc files in
-	it.</para>
+
+<para>To fetch a specific pkgsrc stable branch from scratch, run:</para>
+
+<screen>&uprompt; <userinput>cd /usr</userinput>
+	&uprompt; <userinput>cvs checkout -r <replaceable>pkgsrc-200xQy</replaceable> -P pkgsrc</userinput></screen>
+
+	<para>Where <replaceable>pkgsrc-200xQy</replaceable> is the stable 
+	branch to be checked out, for example, <quote>pkgsrc-2007Q4</quote></para>
+
+	<para>This will create the directory <filename>pkgsrc/</filename> 
+	in your <filename>/usr/</filename> directory and all the package source 
+	will be stored under <filename>/usr/pkgsrc/</filename>.</para>
+
+<para>To fetch the pkgsrc current branch, run:</para>
+
+<screen>&uprompt; <userinput>cd /usr</userinput>
+&uprompt; <userinput>cvs checkout -r -P pkgsrc</userinput></screen>
 
 </sect2>
 </sect1>
@@ -158,8 +185,9 @@ rdiff -u
 
 	<para>To update pkgsrc via CVS, make sure the environment
 	variable <varname>CVS_RSH</varname> is set as above. Then,
-	change to the pkgsrc directory and run <command>cvs -q update
-	-dP</command>.</para>
+	change to the pkgsrc directory and run:</para>
+
+<screen>&uprompt; <userinput>cvs update -dP</userinput></screen>
 
 <sect3 id="uptodate-cvs-switch">
 <title>Switching between different pkgsrc branches</title>