From owner-p4-projects@FreeBSD.ORG Sun Jan 23 14:26:30 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81DA5106566C; Sun, 23 Jan 2011 14:26:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 42847106566B for ; Sun, 23 Jan 2011 14:26:30 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 2F51E8FC12 for ; Sun, 23 Jan 2011 14:26:30 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p0NEQUIu082013 for ; Sun, 23 Jan 2011 14:26:30 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0NEQTlk082010 for perforce@freebsd.org; Sun, 23 Jan 2011 14:26:29 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 23 Jan 2011 14:26:29 GMT Message-Id: <201101231426.p0NEQTlk082010@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 188094 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Jan 2011 14:26:30 -0000 http://p4web.freebsd.org/@@188094?ac=10 Change 188094 by rene@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 @@ The &os; Ports Management Team - $FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.66 2010/12/01 16:31:06 linimon Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.67 2011/01/23 04:07:34 linimon Exp $ 2003 @@ -22,6 +22,7 @@ 2008 2009 2010 + 2011 The &os; Ports Management Team @@ -1840,14 +1841,15 @@ Configuration on <literal>pointyhat</literal> These steps need to be taken by a portmgr - acting as root on pointyhat. + acting as ports-${arch} + on pointyhat. If any of the default TCP ports is not available (see above), you will need to create an ssh - tunnel for it and include it in the appropriate + tunnel for it and include it in the crontab. @@ -1860,12 +1862,6 @@ - Add the public IP address to - /etc/hosts.allow. (Remember, multiple - machines can be on the same IP address.) - - - Create /var/portbuild/${arch}/clients/bindist-${hostname}.tar. @@ -1876,8 +1872,24 @@ in a temporary directory. - Customize etc/resolv.conf and - etc/make.conf for the local site. + Customize etc/resolv.conf + for the local site. + + + Customize etc/make.conf for + FTP fetches for the local site. Note: the nulling-out + of MASTER_SITE_BACKUP must be common + to all nodes, but the first entry in + MASTER_SITE_OVERRIDE should be the + nearest local FTP mirror. Example: +.if defined(FETCH_ORIGINAL) +MASTER_SITE_BACKUP= +.else +MASTER_SITE_OVERRIDE= \ + ftp://friendly-local-ftp-mirror/pub/FreeBSD/ports/distfiles/${DIST_SUBDIR}/ \ + ftp://${BACKUP_FTP_SITE}/pub/FreeBSD/distfiles/${DIST_SUBDIR}/ +.endif + tar it up and move it to the right @@ -1886,8 +1898,10 @@ 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. + however, if you have multiple machines at one site, you + should create a site-specific one (e.g. in + /var/portbuild/conf/clients/) + and symlink to it. @@ -1919,8 +1933,20 @@ + + These steps need to be taken by a portmgr + acting as root on pointyhat. + + + + Add the public IP address to + /etc/hosts.allow. (Remember, multiple + machines can be on the same IP address.) + + + Add an appropriate data_source entry to /usr/local/etc/gmetad.conf: @@ -1952,7 +1978,7 @@ Populate /var/portbuild/scripts/ by something like - /var/portbuild/scripts/dosetupnode arch major latest hostname. + /var/portbuild/scripts/dosetupnode arch major latest hostname. Verify that you now have files in that directory. ==== //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