From e18ef30968ce652c2a5a853f9766101c91d23a33 Mon Sep 17 00:00:00 2001
From: Mark Linimon <linimon@FreeBSD.org>
Date: Wed, 30 Jan 2013 08:54:30 +0000
Subject: [PATCH] More details of the separation between srcbuild and
 portbuild.  The root crontab already went away some time ago; clean up that
 detail.

---
 .../articles/portbuild/article.xml            | 36 +++++++++++--------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/en_US.ISO8859-1/articles/portbuild/article.xml b/en_US.ISO8859-1/articles/portbuild/article.xml
index a54fffe6ac..ad51c3c311 100644
--- a/en_US.ISO8859-1/articles/portbuild/article.xml
+++ b/en_US.ISO8859-1/articles/portbuild/article.xml
@@ -2887,7 +2887,7 @@ sysutils/zfs-stats</programlisting>
       <procedure>
 	<step>
 	  <para>Copy the following files from
-	    <filename>/var/portbuild/etc/rc.d/</filename> to
+	    <filename>/a/portbuild/admin/etc/rc.d/</filename> to
 	    <filename>/usr/local/etc/rc.d/</filename>:</para>
 
 	  <programlisting>pollmachine
@@ -2917,16 +2917,16 @@ qmanager</programlisting>
 
       <procedure>
 	<step>
-	  <para>As the <replaceable>portbuild</replaceable> user,
+	  <para>As the <replaceable>srcbuild</replaceable> user,
 	    run the following commands manually to create the
 	    <literal>src</literal> and <literal>ports</literal>
 	    repositories, respectively:</para>
 
-	  <screen>&prompt.user; /<replaceable>a</replaceable>/portbuild/scripts/updatesnap.ports
-&prompt.user; /<replaceable>a</replaceable>/portbuild/scripts/updatesnap</screen>
+	  <screen>&prompt.user; /<replaceable>a</replaceable>/portbuild/admin/scripts/updatesnap.ports
+&prompt.user; /<replaceable>a</replaceable>/portbuild/admin/scripts/updatesnap</screen>
 
 	  <para>These will be periodically run from the
-	    <replaceable>portbuild</replaceable>
+	    <replaceable>srcbuild</replaceable>
 	    <filename>crontab</filename>, which you will
 	    install below.</para>
 	</step>
@@ -2944,26 +2944,26 @@ qmanager</programlisting>
 	</step>
 
 	<step>
-	  <para>Copy <filename>/var/portbuild/conf/apache.conf</filename>
+	  <para>Copy <filename>/a/portbuild/admin/conf/apache.conf</filename>
 	    to the appropriate <filename>Includes/</filename> subdirectory, e.g.,
 	    <filename>/usr/local/etc/apache22/Includes/portbuild.conf</filename>.
 	    Configure it as appropriate for your site.</para>
 	</step>
 
 	<step>
-	  <para>Install <filename>/var/portbuild/crontabs/root</filename> as
-	    the <username>root</username> crontab via
-	    <command>crontab -e</command>.</para>
-	</step>
-
-	<step>
-	  <para>Install <filename>/var/portbuild/crontabs/portbuild</filename> as
+	  <para>Install <filename>/a/portbuild/admin/crontabs/portbuild</filename> as
 	    the <username>portbuild</username> crontab via
 	    <command>crontab -u portbuild -e</command>.  If you do
 	    not support all the archs listed there, make sure to comment out
 	    the appropriate <application>dologs</application> entries.</para>
 	</step>
 
+	<step>
+	  <para>Install <filename>/a/srcbuild/admin/crontabs/portbuild</filename> as
+	    the <username>srcbuild</username> crontab via
+	    <command>crontab -u srcbuild -e</command>.</para>
+	</step>
+
 	<step>
 	  <para>If your build slaves will be pxebooted, make sure to
 	    enable the <application>tftp</application> entries in
@@ -2988,12 +2988,20 @@ qmanager</programlisting>
 	</step>
 
 	<step>
-	  <para>At some point, you will probably find it handy to append
+	  <para>You will probably find it handy to append
 	    the following to the <makevar>PATH</makevar> definition for
 	    the <replaceable>portbuild</replaceable> user:</para>
 
 	  <programlisting>/<replaceable>a</replaceable>/portbuild/scripts:/<replaceable>a</replaceable>/portbuild/tools</programlisting>
 	</step>
+
+	<step>
+	  <para>You will also probably find it handy to append
+	    the following to the <makevar>PATH</makevar> definition for
+	    the <replaceable>srcbuild</replaceable> user:</para>
+
+	  <programlisting>/<replaceable>a</replaceable>/portbuild/admin/scripts:/<replaceable>a</replaceable>/portbuild/admin/tools</programlisting>
+	</step>
       </procedure>
 
       <para>You should now be ready to build packages.</para>