1 files changed, 85 insertions, 54 deletions

diff --git a/zh_TW.Big5/books/porters-handbook/book.sgml b/zh_TW.Big5/books/porters-handbook/book.sgml
index 5dbe3bb9c0..38d644889c 100644
--- a/zh_TW.Big5/books/porters-handbook/book.sgml
+++ b/zh_TW.Big5/books/porters-handbook/book.sgml
@@ -3,7 +3,7 @@
 
      $FreeBSD$
      Original Revision: 1.675
-     Chased Revision: 1.729
+     Chased Revision: 1.733
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -457,56 +457,37 @@ PLIST_DIRS=     lib/X11/oneko</programlisting>
 	<para>取得原始的 source 檔(通常檔名是 <filename><replaceable>foo</replaceable>.tar.gz</filename> 
 	  或 <filename><replaceable>foo</replaceable>.tar.Z</filename> 之類的壓縮檔)，
 	  然後會把抓下來的檔案放在 <makevar>DISTDIR</makevar> 內。
-	  記得：抓的時候，儘量使用『主流站』上面的來源檔，以確保檔案有效、可信。</para>
-
-	<para>You will need to set the variable <makevar>MASTER_SITES</makevar>
-	  to reflect where the original tarball resides.  You will find
-	  convenient shorthand definitions for most mainstream sites
-	  in <filename>bsd.sites.mk</filename>.  Please use these
-	  sites&mdash;and the associated definitions&mdash;if
-	  at all possible, to help avoid the problem of having the same
-	  information repeated over again many times in the source base.
-	  As these sites tend to change over time, this becomes a
-	  maintenance nightmare for everyone involved.</para>
-
-	<para>If you cannot find a FTP/HTTP site that is well-connected to the
-	  net, or can only find sites that have irritatingly non-standard
-	  formats, you might want to put a copy on a reliable FTP or HTTP
-	  server that you control (e.g., your home page).</para>
-
-	<para>If you cannot find somewhere convenient and reliable to put the
-	  distfile
-	  we can <quote>house</quote> it ourselves
-	  on <hostid>ftp.FreeBSD.org</hostid>; however, this is the
-	  least-preferred solution.
-	  The distfile must be placed into
-	  <filename>~/public_distfiles/</filename> of someone's
-	  <hostid>freefall</hostid> account.
-	  Ask the person who commits your port to do this.
-	  This person will also set <makevar>MASTER_SITES</makevar> to
-	  <makevar>MASTER_SITE_LOCAL</makevar> and
-	  <makevar>MASTER_SITE_SUBDIR</makevar> to their
-	  <hostid>freefall</hostid> username.</para>
-
-	<para>If your port's distfile changes all the time without any
-	  kind of version update by the author,
-	  consider putting the distfile on your home page and listing it as
-	  the first <makevar>MASTER_SITES</makevar>.  If you can, try
-	  to talk the port author out of doing this; it
-	  really does help to establish some kind of source code control.
-	  Hosting your own version will prevent users
-	  from getting <errorname>checksum mismatch</errorname> errors, and
-	  also reduce the workload of maintainers of our FTP site.  Also, if
-	  there is only one master site for the port, it is recommended that
-	  you house a backup at your site and list it as the second
-	  <makevar>MASTER_SITES</makevar>.</para>
-
-	<para>If your port requires some additional `patches' that are
-	  available on the Internet, fetch them too and put them in
-	  <makevar>DISTDIR</makevar>.  Do not worry if they come from a site
-	  other than where you got the main source tarball, we have a way to
-	  handle these situations (see the description of <link
-	    linkend="porting-patchfiles">PATCHFILES</link> below).</para>
+	  記得：抓的時候，儘量使用『該軟體主要的正式網站』上面的來源檔，以確保檔案有效、可信。</para>
+
+	<para>需要設 <makevar>MASTER_SITES</makevar> 以指定原始檔案是放在何處。相關網址在 
+	  <filename>bsd.sites.mk</filename> 內有一些方便的速記表可以使用。  請盡可能多用對應這些網址的變數，
+	  以避免同樣的一堆網址有重複很多次出現在 port tree 內。
+	  否則，這些網址只要一有改變的話，那麼就會成為維護 port 的夢魘。</para>
+
+	<para>如果該檔並沒有放在公開的 FTP 站或網站(HTTP)上，或者該檔並非一般標準格式的話，
+	  那麼可以考慮複製該檔，然後放到你可掌握、可信任的 FTP 站或網站(HTTP)上，比如：你自己的網頁空間。</para>
+
+	<para>若找不到地方(方便、可信任)來放檔案的話，
+	  那麼可以 <quote>house(暫放)</quote> 在 <hostid>ftp.FreeBSD.org</hostid> 上的 committer 自屬空間內；
+	  然而，這是最不理想的解法。
+	  檔案要放到該 committer 的 <hostid>freefall</hostid> 上的 <filename>~/public_distfiles/</filename> 目錄內才可以。
+	  請與協助 commit 你的 port 的那位 committer 聯繫，以便把檔案放到他的目錄內。
+	  那位 committer 同時也會把 <makevar>MASTER_SITES</makevar> 設為
+	  <makevar>MASTER_SITE_LOCAL</makevar>，並且把
+	  <makevar>MASTER_SITE_SUBDIR</makevar> 設為他自己的 
+	  <hostid>freefall</hostid> 帳號名稱。</para>
+
+	<para>若該 port 的原始檔打包會經常重包，但原作者卻沒更新版號的話，
+	  請考慮把該檔改放到自己的網頁空間，並且把自己網頁空間列為 <makevar>MASTER_SITES</makevar> 的第一順位。
+	  或者請與原作者聯繫：請他不要這樣做(不斷重包同樣的檔案)；如此一來，才有助於建立一定程度的 source code 版本控制。
+	  把檔案另外複製一份放到自屬網頁空間的話，不但可有效防止使用者會發生 <errorname>checksum mismatch(檔案經檢查有問題)</errorname> 
+	  的錯誤訊息，也可降低我們 FTP 站維護者的工作量。此外，若該 port 的檔案僅有一個主要網址，
+	  那麼建議：請在自屬網站上放上備份檔，並修改 <makevar>MASTER_SITES</makevar> 把你的網址列為第二順位。</para>
+
+	<para>若該 port 需要一些額外 `patches'(可透過 Internet 下載)，並放在
+	  <makevar>DISTDIR</makevar> 內，不必擔心這些 patch 檔是否得都跟原始檔一樣來自同一網站，
+	  這些情況有另外的解法(請看下面的 <link
+	    linkend="porting-patchfiles">PATCHFILES</link> 介紹部分)。</para>
       </sect1>
 
       <sect1 id="slow-modifying">
@@ -9024,6 +9005,33 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
 		    <entry>600104</entry>
 		  </row>
 		  <row>
+		    <entry>6.0-STABLE after NLS catalog support of
+		      csh(1).</entry>
+		    <entry>600105</entry>
+		  </row>
+		  <row>
+		    <entry>6.1-RELEASE</entry>
+		    <entry>601000</entry>
+		  </row>
+		  <row>
+		    <entry>6.1-STABLE after 6.1-RELEASE.</entry>
+		    <entry>601100</entry>
+		  </row>
+		  <row>
+		    <entry>6.1-STABLE after the import of csup.</entry>
+		    <entry>601101</entry>
+		  </row>
+		  <row>
+		    <entry>6.1-STABLE after the iwi(4) update.</entry>
+		    <entry>601102</entry>
+		  </row>
+		  <row>
+		    <entry>6.1-STABLE after the resolver update to
+		      BIND9, and exposure of reentrant version of
+		      netdb functions.</entry>
+		    <entry>601103</entry>
+		  </row>
+		  <row>
 		    <entry>7.0-CURRENT.</entry>
 		    <entry>700000</entry>
 		  </row>
@@ -9099,6 +9107,24 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
 		    <entry>7-0.CURRENT after pts import.</entry>
 		    <entry>700014</entry>
 		  </row>
+		  <row>
+		    <entry>7.0-CURRENT after the introduction of version 2
+		      of &man.hwpmc.4;'s ABI.</entry>
+		    <entry>700015</entry>
+		  </row>
+		  <row>
+		    <entry>7.0-CURRENT after addition of &man.fcloseall.3;
+		      to libc.</entry>
+		    <entry>700016</entry>
+		  </row>
+		  <row>
+		    <entry>7.0-CURRENT after removal of ip6fw.</entry>
+		    <entry>700017</entry>
+		  </row>
+		  <row>
+		    <entry>7.0-CURRENT after import of snd_emu10kx.</entry>
+		    <entry>700018</entry>
+		  </row>
 		</tbody>
 	      </tgroup>
 	    </table>
@@ -9726,10 +9752,15 @@ bacula:*:910:</programlisting>
 	    <para><makevar>BROKEN</makevar> is reserved for ports that
 	      currently do not compile, install, or deinstall correctly.
 	      It should be used for ports where the the problem is
-	      believed to be temporary.
-	      The build cluster will still attempt to try to build
+	      believed to be temporary.</para>
+
+	    <para>If instructed, the build cluster will still attempt to
+	      try to build
 	      them to see if the underlying problem has been
-	      resolved.  For instance, use
+	      resolved.  (However, in general, the cluster is run without
+	      this.)</para>
+	      
+	    <para>For instance, use
 	      <makevar>BROKEN</makevar> when a port:</para>
 
 	    <itemizedlist>