PERFORCE change 188094 for review

[Rene Ladan]

http://p4web.freebsd.org/@@188094?ac=10

Change 188094 by rene at rene_acer on 2011/01/23 14:25:45

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#30 integrate
.. //depot/projects/docproj_nl/www/en/events/Makefile#4 integrate
.. //depot/projects/docproj_nl/www/en/news/status/report-2010-10-2010-12.xml#1 branch

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#30 (text+ko) ====

@@ -11,7 +11,7 @@
       <corpauthor>The &os; Ports Management Team</corpauthor>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.66 2010/12/01 16:31:06 linimon Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.67 2011/01/23 04:07:34 linimon Exp $</pubdate>
 
     <copyright>
       <year>2003</year>
@@ -22,6 +22,7 @@
       <year>2008</year>
       <year>2009</year>
       <year>2010</year>
+      <year>2011</year>
       <holder role="mailto:portmgr at FreeBSD.org">The &os; Ports
 	Management Team</holder>
     </copyright>
@@ -1840,14 +1841,15 @@
       <title>Configuration on <literal>pointyhat</literal></title>
 
       <para>These steps need to be taken by a <literal>portmgr</literal>
-	acting as <literal>root</literal> on <hostid>pointyhat</hostid>.
+	acting as <literal>ports-<replaceable>${arch}</replaceable></literal>
+	on <hostid>pointyhat</hostid>.
       </para>
 
       <procedure>
 	<step>
 	  <para>If any of the default TCP ports is not available (see
 	    above), you will need to create an <command>ssh</command>
-	    tunnel for it and include it in the appropriate
+	    tunnel for it and include it in the
 	    <filename>crontab</filename>.</para>
 	</step>
 
@@ -1860,12 +1862,6 @@
 	</step>
 
 	<step>
-	  <para>Add the public IP address to
-	    <filename>/etc/hosts.allow</filename>.  (Remember, multiple
-	    machines can be on the same IP address.)</para>
-	</step>
-
-	<step>
 	  <para>Create
 <filename>/var/portbuild/<replaceable>${arch}</replaceable>/clients/bindist-<replaceable>${hostname}</replaceable>.tar</filename>.
 	  </para>
@@ -1876,8 +1872,24 @@
 		in a temporary directory.</para>
 	    </listitem>
 	    <listitem>
-	      <para>Customize <filename>etc/resolv.conf</filename> and
-	      <filename>etc/make.conf</filename> for the local site.</para>
+	      <para>Customize <filename>etc/resolv.conf</filename>
+	      for the local site.</para>
+	    </listitem>
+	    <listitem>
+	      <para>Customize <filename>etc/make.conf</filename> for
+	      FTP fetches for the local site.  Note: the nulling-out
+	      of <makevar>MASTER_SITE_BACKUP</makevar> must be common
+	      to all nodes, but the first entry in
+	      <makevar>MASTER_SITE_OVERRIDE</makevar> should be the
+	      nearest local FTP mirror.  Example:<screen><command>
+.if defined(FETCH_ORIGINAL)
+MASTER_SITE_BACKUP=
+.else
+MASTER_SITE_OVERRIDE= \
+	ftp://<replaceable>friendly-local-ftp-mirror</replaceable>/pub/FreeBSD/ports/distfiles/${DIST_SUBDIR}/ \
+	ftp://${BACKUP_FTP_SITE}/pub/FreeBSD/distfiles/${DIST_SUBDIR}/
+.endif</command></screen>
+	      </para>
 	    </listitem>
 	    <listitem>
 	      <para><command>tar</command> it up and move it to the right
@@ -1886,8 +1898,10 @@
 	  </itemizedlist>
 
 	  <para>Hint: you will need one of these for each machine;
-	    however, if you have multiple machines at one site, you may
-	    be able to create a site-specific one and symlink to it.</para>
+	    however, if you have multiple machines at one site, you
+	    should create a site-specific one (e.g. in
+	    <filename>/var/portbuild/conf/clients/</filename>)
+	    and symlink to it.</para>
 	</step>
 
 	<step>
@@ -1919,8 +1933,20 @@
 </screen>
 	  </para>
 	</step>
+      </procedure>
 
+      <para>These steps need to be taken by a <literal>portmgr</literal>
+	acting as <literal>root</literal> on <hostid>pointyhat</hostid>.
+      </para>
+
+      <procedure>
 	<step>
+	  <para>Add the public IP address to
+	    <filename>/etc/hosts.allow</filename>.  (Remember, multiple
+	    machines can be on the same IP address.)</para>
+	</step>
+
+	<step>
 	  <para>Add an appropriate <literal>data_source</literal> entry to
 	    <filename>/usr/local/etc/gmetad.conf</filename>:</para>
 	  <para>
@@ -1952,7 +1978,7 @@
 	<step>
 	  <para>Populate <filename>/var/portbuild/scripts/</filename>
 	    by something like
-	    <command>/var/portbuild/scripts/dosetupnode <replaceable>arch</replaceable> <replaceable>major</replaceable> <replaceable>latest</replaceable> <replaceable>hostname</replaceable></command>.
+	    <command>/var/portbuild/scripts/dosetupnode <replaceable>arch</replaceable> <replaceable>major</replaceable> latest <replaceable>hostname</replaceable></command>.
 	    Verify that you now have files in that directory.
 	  </para>
 	</step>

==== //depot/projects/docproj_nl/www/en/events/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/events/Makefile,v 1.18 2010/01/19 20:29:00 hrs Exp $
+# $FreeBSD: www/en/events/Makefile,v 1.19 2011/01/22 14:49:45 ryusuke Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -11,7 +11,7 @@
 SUBDIR+= 2003
 
 # The year the top level events.html file starts from:
-YEARSTART= 2009
+YEARSTART= 2010
 # Years to generate past events pages for and link from top level:
 PASTYEARS= 2009 2008 2007 2006 2005 2004 2003