svn commit: r41295 - head/en_US.ISO8859-1/articles/portbuild

[Martin Wilke]

Author: miwi
Date: Sat Mar 23 09:38:53 2013
New Revision: 41295
URL: http://svnweb.freebsd.org/changeset/doc/41295

Log:
  - Update to the current setup
  - Remove reference to FreeBSD 7.X

Modified:
  head/en_US.ISO8859-1/articles/portbuild/article.xml

Modified: head/en_US.ISO8859-1/articles/portbuild/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/portbuild/article.xml	Sat Mar 23 00:30:26 2013	(r41294)
+++ head/en_US.ISO8859-1/articles/portbuild/article.xml	Sat Mar 23 09:38:53 2013	(r41295)
@@ -631,19 +631,19 @@ PKG_BIN=/usr/local/sbin/pkg</programlist
       <example>
 	<title>Update the i386-7 tree and do a complete build</title>
 
-	<screen>&prompt.user; <userinput>dopackages.wrapper i386 7 -nosrc -norestr -nofinish</userinput></screen>
+	<screen>&prompt.user; <userinput>dopackages.wrapper i386 8 latest -nosrc -norestr -nofinish</userinput></screen>
       </example>
 
       <example>
 	<title>Restart an interrupted amd64-8 build without updating</title>
 
-	<screen>&prompt.user; <userinput>dopackages.wrapper amd64 8 -nosrc -noports -norestr -continue -noindex -noduds -nofinish</userinput></screen>
+	<screen>&prompt.user; <userinput>dopackages.wrapper amd64 8 latest -nosrc -noports -norestr -continue -noindex -noduds -nofinish</userinput></screen>
       </example>
 
       <example>
-	<title>Post-process a completed sparc64-7 tree</title>
+	<title>Post-process a completed sparc64-8 tree</title>
 
-	<screen>&prompt.user; <userinput>dopackages.wrapper sparc64 7 -finish</userinput></screen>
+	<screen>&prompt.user; <userinput>dopackages.wrapper sparc64 8 -finish</userinput></screen>
       </example>
 
       <para>Hint: it is usually best to run the <command>dopackages</command>
@@ -1361,7 +1361,7 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5
     <para>The following command will set up the control branch for
       the partial build:</para>
 
-    <screen>&prompt.user; <userinput>/a/portbuild/scripts/dopackages.wrapper i386 8 -noportsvcs -nobuild -novcs -nofinish</userinput></screen>
+    <screen>&prompt.user; <userinput>/a/portbuild/scripts/dopackages.wrapper i386 8 latest -noportsvcs -nobuild -novcs -nofinish</userinput></screen>
 
     <!-- XXX MCL obsolete -->
     <para>The builds must be performed from the
@@ -1710,8 +1710,8 @@ sshd_program="/usr/local/sbin/sshd"</pro
 		cache on the client, add the following</para>
 
 	      <programlisting>squid_enable="YES"
-squid_chdir="<filename>/<replaceable>usr2</replaceable>/squid/logs</filename>"
-squid_pidfile="<filename>/<replaceable>usr2</replaceable>/squid/logs/squid.pid</filename>"</programlisting>
+squid_chdir="<filename>/<replaceable>a</replaceable>/squid/logs</filename>"
+squid_pidfile="<filename>/<replaceable>a</replaceable>/squid/logs/squid.pid</filename>"</programlisting>
 	      <para>Required entries for VMWare-based nodes:</para>
 
 	      <programlisting>vmware_guest_vmmemctl_enable="YES"
@@ -1732,8 +1732,8 @@ sshd_program="/usr/local/sbin/sshd"
 
 gmond_enable="YES"
 squid_enable="YES"
-squid_chdir="<filename>/<replaceable>usr2</replaceable>/squid/logs</filename>"
-squid_pidfile="<filename>/<replaceable>usr2</replaceable>/squid/logs/squid.pid</filename>"</programlisting>
+squid_chdir="<filename>/<replaceable>a</replaceable>/squid/logs</filename>"
+squid_pidfile="<filename>/<replaceable>a</replaceable>/squid/logs/squid.pid</filename>"</programlisting>
 
 	      <para>&man.ntpd.8; should <emphasis>not</emphasis>
 		be enabled for VMWare instances.</para>
@@ -1741,7 +1741,7 @@ squid_pidfile="<filename>/<replaceable>u
 	      <para>Also, it may be possible to leave
 		<application>squid</application> disabled by default
 		so as to not have
-		<filename>/<replaceable>usr2</replaceable></filename>
+		<filename>/<replaceable>a</replaceable></filename>
 		persistent (which should save instantiation time.)
 		Work is still ongoing.
 	      </para>
@@ -1756,7 +1756,7 @@ squid_pidfile="<filename>/<replaceable>u
 	      <para>Modify <filename>etc/sysctl.conf</filename>:</para>
 
 	      <screen>9a10,30
-> kern.corefile=<filename>/<replaceable>usr2</replaceable>/%N.core</filename>
+> kern.corefile=<filename>/<replaceable>a</replaceable>/%N.core</filename>
 > kern.sugid_coredump=1
 > #debug.witness_ddb=0
 > #debug.witness_watch=0
@@ -1811,7 +1811,7 @@ security/sudo</programlisting>
 	  <para>If you are using a local <application>squid</application>
 	    cache on the client, install the following</para>
 
-	  <programlisting>www/squid (with SQUID_AUFS on)</programlisting>
+	  <programlisting>www/squid31 (with SQUID_AUFS on)</programlisting>
 	</step>
 
 	<step>
@@ -1864,7 +1864,7 @@ security/sudo</programlisting>
 #
 # Configure a package build system post-boot
 
-scratchdir=<filename>/<replaceable>usr2</replaceable></filename>
+scratchdir=<filename>/<replaceable>a</replaceable></filename>
 
 ln -sf ${scratchdir}/portbuild /var/