From owner-svn-doc-head@FreeBSD.ORG  Wed May 30 02:18:30 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 1EF781065670;
	Wed, 30 May 2012 02:18:30 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0802C8FC0C;
	Wed, 30 May 2012 02:18:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4U2ITJJ019300;
	Wed, 30 May 2012 02:18:29 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4U2ITal019298;
	Wed, 30 May 2012 02:18:29 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201205300218.q4U2ITal019298@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 30 May 2012 02:18:29 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r38939 - head/en_US.ISO8859-1/articles/portbuild
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the doc tree for head
	<svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
	<mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
	<mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 May 2012 02:18:30 -0000

Author: gjb
Date: Wed May 30 02:18:29 2012
New Revision: 38939
URL: http://svn.freebsd.org/changeset/doc/38939

Log:
  Add the "New Codebase" section of the Port Build article.
  
  Written/provided by:	linimon

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

Modified: head/en_US.ISO8859-1/articles/portbuild/article.sgml
==============================================================================
--- head/en_US.ISO8859-1/articles/portbuild/article.sgml	Wed May 30 00:33:27 2012	(r38938)
+++ head/en_US.ISO8859-1/articles/portbuild/article.sgml	Wed May 30 02:18:29 2012	(r38939)
@@ -221,6 +221,111 @@
       each pass of the <command>dopackages</command>
       script.
     </para>
+
+    <sect2>
+      <title>New Codebase</title>
+
+      <para>For both commands above, if
+	<replaceable>${buildid}</replaceable> is
+	<literal>latest</literal>, it may be omitted.
+      </para>
+    </sect2>
+  </sect1>
+
+  <sect1 id="customizing">
+    <title>Customizing Your Build</title>
+
+    <para>(The following only applies to the new codebase.)</para>
+
+    <para>You can customize your build by providing local versions of
+      <filename>make.conf</filename> and/or
+      <filename>src.conf</filename>,
+      named
+      <filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/builds/<replaceable>${buildid}</replaceable>/make.conf.server</filename>
+      and
+      <filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/builds/<replaceable>${buildid}</replaceable>/src.conf.server</filename>,
+      respectively.  These will be used in lieu of the default-named
+      files on the server side.</para>
+
+    <para>Similarly, if you wish to also affect the <emphasis>client-side</emphasis>
+      <filename>make.conf</filename>, you may use
+      <filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/builds/<replaceable>${buildid}</replaceable>/make.conf.client</filename>.
+    </para>
+
+    <note>
+      <para>Due to the fact that individual clients may each have
+	their own per-host <filename>make.conf</filename>, the
+	contents of
+	<filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/builds/<replaceable>${buildid}</replaceable>/make.conf.client</filename>
+	will be <emphasis>appended</emphasis> to that
+	<filename>make.conf</filename>, not supplant it, as is done
+	for
+	<filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/builds/<replaceable>${buildid}</replaceable>/make.conf.server</filename>.</para>
+    </note>
+
+    <note>
+      <para>There is no similar functionality for
+	<filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/builds/<replaceable>${buildid}</replaceable>/src.conf.client</filename>
+	(what effect would it have?).</para>
+    </note>
+
+    <example>
+      <title>Sample
+	<filename>make.conf.<replaceable>target</replaceable></filename>
+	to test new default <application>ruby</application>
+	version</title>
+
+      <para>(For this case, the contents are identical for both server
+	and client.)</para>
+
+      <screen>RUBY_DEFAULT_VER= 1.9</screen>
+    </example>
+
+    <example>
+      <title>Sample
+	<filename>make.conf.<replaceable>target</replaceable></filename>
+	for <application>clang</application> builds</title>
+
+      <para>(For this case, the contents are also identical for both
+	server and client.)</para>
+
+      <screen>
+.if !defined(CC) || ${CC} == "cc"
+CC=clang
+.endif
+.if !defined(CXX) || ${CXX} == "c++"
+CXX=clang++
+.endif
+.if !defined(CPP) || ${CPP} == "cpp"
+CPP=clang-cpp
+.endif
+# Don't die on warnings
+NO_WERROR=
+WERROR=
+</screen>
+    </example>
+
+    <example>
+      <title>Sample <filename>make.conf.server</filename> for
+	<application>pkgng</application></title>
+
+      <screen>WITH_PKGNG=yes
+PKG_BIN=/usr/local/sbin/pkg</screen>
+    </example>
+
+    <example>
+      <title>Sample <filename>make.conf.client</filename> for
+	<application>pkgng</application></title>
+
+      <screen>WITH_PKGNG=yes</screen>
+    </example>
+
+    <example>
+      <title>Sample <filename>src.conf.server</filename>
+	to test new <application>sort</application> codebase</title>
+
+      <screen>WITH_BSD_SORT=yes</screen>
+    </example>
   </sect1>
 
   <sect1 id="starting">