From owner-svn-doc-all@FreeBSD.ORG  Mon Feb 11 13:47:43 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id C81122F3;
 Mon, 11 Feb 2013 13:47:43 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id AC9D9FB;
 Mon, 11 Feb 2013 13:47:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BDlhfE013135;
 Mon, 11 Feb 2013 13:47:43 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BDlh5b013134;
 Mon, 11 Feb 2013 13:47:43 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201302111347.r1BDlh5b013134@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Mon, 11 Feb 2013 13:47:43 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40945 - head/en_US.ISO8859-1/articles/portbuild
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Feb 2013 13:47:43 -0000

Author: linimon
Date: Mon Feb 11 13:47:43 2013
New Revision: 40945
URL: http://svnweb.freebsd.org/changeset/doc/40945

Log:
  Move some variable definitions away from control of PORTBUILD_USER and
  into control of SRCBUILD_USER, from portbuild/conf/server.conf to
  portbuild/admin/conf/admin.conf, respectively.
  
  Implicitly requested by:	rwatson

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	Mon Feb 11 13:46:30 2013	(r40944)
+++ head/en_US.ISO8859-1/articles/portbuild/article.xml	Mon Feb 11 13:47:43 2013	(r40945)
@@ -2783,7 +2783,38 @@ sysutils/zfs-stats</programlisting>
 
       <procedure>
 	<step>
-	  <para>(in process of being refactored)</para>
+	  <para>Configure the server by making the following changes to
+	    <filename>/<replaceable>a</replaceable>/portbuild/admin/conf/admin.conf</filename>:</para>
+
+	  <itemizedlist>
+	    <listitem>
+	      <para>For each source branch you will be building for, set
+		<makevar>SRC_BRANCHES</makevar> and
+		<makevar>SRC_BRANCH_<replaceable>branch</replaceable>_SUBDIR</makevar>
+		as detailed in <xref linkend="new-branch-pre-qmanager"/>.
+		You should not need to change
+		<makevar>SRC_BRANCHES_PATTERN</makevar>.</para>
+	    </listitem>
+
+	    <listitem>
+	      <para>Set <makevar>ZFS_VOLUME</makevar> and
+		<makevar>ZFS_MOUNTPOINT</makevar> to whatever you
+		chose above.</para>
+	    </listitem>
+
+	    <listitem>
+	      <para>Set <makevar>VCS_REPOSITORY</makevar> to whatever
+		you chose above.</para>
+	    </listitem>
+
+	    <listitem>
+	      <para>Set <makevar>MASTER_URL</makevar> to the http
+		URL of your server.  This will be stamped into the
+		package build logs and the indices thereof.</para>
+	    </listitem>
+	  </itemizedlist>
+
+	  <para>Most of the other default values should be fine.</para>
 	</step>
       </procedure>
     </sect2>
@@ -2836,6 +2867,7 @@ sysutils/zfs-stats</programlisting>
 		list of architectures you wish to build packages for.</para>
 	    </listitem>
 
+<!--
 	    <listitem>
 	      <para>For each source branch you will be building for, set
 		<makevar>SRC_BRANCHES</makevar> and
@@ -2850,6 +2882,7 @@ sysutils/zfs-stats</programlisting>
 		<makevar>ZFS_MOUNTPOINT</makevar> to whatever you
 		chose above.</para>
 	    </listitem>
+-->
 
 	    <listitem>
 	      <para>Set <makevar>UPLOAD_DIRECTORY</makevar>,
@@ -2858,6 +2891,7 @@ sysutils/zfs-stats</programlisting>
 		for your site.</para>
 	    </listitem>
 
+<!--
 	    <listitem>
 	      <para>Set <makevar>VCS_REPOSITORY</makevar> to whatever
 		you chose above.</para>
@@ -2868,6 +2902,7 @@ sysutils/zfs-stats</programlisting>
 		URL of your server.  This will be stamped into the
 		package build logs and the indices thereof.</para>
 	    </listitem>
+-->
 	  </itemizedlist>
 
 	  <para>Most of the other default values should be fine.</para>