From ad238f8773b546b4932b0c9bf54474a1c1565bf4 Mon Sep 17 00:00:00 2001
From: Mark Linimon <linimon@FreeBSD.org>
Date: Thu, 5 Jun 2008 21:20:39 +0000
Subject: [PATCH] Note that -distfiles should be the default for package builds
 now that we have enough disk space.

While here, remove 6.1, 6.2, and 5.x from various examples, and note
that we are no longer building ia64 packages.
---
 .../articles/portbuild/article.sgml           | 37 ++++++++-----------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/en_US.ISO8859-1/articles/portbuild/article.sgml b/en_US.ISO8859-1/articles/portbuild/article.sgml
index f217747b9c..ae67f312b8 100644
--- a/en_US.ISO8859-1/articles/portbuild/article.sgml
+++ b/en_US.ISO8859-1/articles/portbuild/article.sgml
@@ -46,14 +46,14 @@
       otherwise specified, all paths will be relative to
       this location.  <replaceable>${arch}</replaceable> will
       be used to specify one of the package architectures
-      (amd64, &i386;, ia64, and &sparc64;), and
+      (amd64, &i386;, and &sparc64;), and
       <replaceable>${branch}</replaceable> will be used
-      to specify the build branch (5, 6, 6-exp, 7, 7-exp, 8, 8-exp).
+      to specify the build branch (6, 6-exp, 7, 7-exp, 8, 8-exp).
     </para>
 
     <note>
-      <para>Packages are no longer built for Release 4, nor
-	for the alpha architecture.</para>
+      <para>Packages are no longer built for Release 4 or 5, nor
+	for the alpha nor ia64 architectures.</para>
     </note>
 
     <para>The scripts that control all of this live in
@@ -174,12 +174,6 @@
       are used to perform the builds.  Most useful are:</para>
 
     <itemizedlist>
-      <listitem>
-	<para><command>dopackages.5</command> - Perform a
-	  5.X build
-	</para>
-      </listitem>
-
       <listitem>
 	<para><command>dopackages.6</command> - Perform
 	  a 6.X build
@@ -345,10 +339,11 @@
       <listitem>
 	<para><literal>-distfiles</literal> - Collect distfiles
 	  that pass <command>make checksum</command> for later
-	  uploading to <hostid>ftp-master</hostid>.  Use this
+	  uploading to <hostid>ftp-master</hostid>.
+	  Formerly we used this
 	  sparingly because it takes up a lot of disk space.
-	  You should remove the distfiles once they have been
-	  transfered to <hostid>ftp-master</hostid>.
+	  However, now we have sufficient space that this should
+	  be considered the default.
 	</para>
       </listitem>
 
@@ -422,9 +417,9 @@
     </example>
 
     <example>
-      <title>Restart an interrupted amd64-5 build without updating</title>
+      <title>Restart an interrupted amd64-8 build without updating</title>
 
-      <para><command>dopackages.5 amd64 -nocvs -noportscvs -norestr -continue -noindex -noduds -nofinish</command></para>
+      <para><command>dopackages.8 amd64 -nocvs -noportscvs -norestr -continue -noindex -noduds -nofinish</command></para>
     </example>
 
     <example>
@@ -828,11 +823,7 @@ umount: Cleanup of /x/tmp/6-exp/chroot/53837/compat/linux/proc failed!
 
     <itemizedlist>
       <listitem>
-	<para><literal>packages-6.1-release</literal></para>
-      </listitem>
-
-      <listitem>
-	<para><literal>packages-6.2-release</literal></para>
+	<para><literal>packages-6.3-release</literal></para>
       </listitem>
 
       <listitem>
@@ -840,7 +831,11 @@ umount: Cleanup of /x/tmp/6-exp/chroot/53837/compat/linux/proc failed!
       </listitem>
 
       <listitem>
-	<para><literal>packages-7-current</literal></para>
+	<para><literal>packages-7.0-release</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>packages-7-stable</literal></para>
       </listitem>
 
       <listitem>