svn commit: r44027 - head/ru_RU.KOI8-R/books/porters-handbook

Sergey Kandaurov pluknet at FreeBSD.org
Sat Feb 22 10:29:13 UTC 2014


Author: pluknet
Date: Sat Feb 22 10:29:12 2014
New Revision: 44027
URL: http://svnweb.freebsd.org/changeset/doc/44027

Log:
  MFen up to before splitting porters-handbook.
  
  book.xml	r42833 -> r43827
  uses.xml	r43006 -> r43793
  versions.xml	r42930 -> r43967

Modified:
  head/ru_RU.KOI8-R/books/porters-handbook/book.xml
  head/ru_RU.KOI8-R/books/porters-handbook/uses.xml
  head/ru_RU.KOI8-R/books/porters-handbook/versions.xml

Modified: head/ru_RU.KOI8-R/books/porters-handbook/book.xml
==============================================================================
--- head/ru_RU.KOI8-R/books/porters-handbook/book.xml	Sat Feb 22 03:14:51 2014	(r44026)
+++ head/ru_RU.KOI8-R/books/porters-handbook/book.xml	Sat Feb 22 10:29:12 2014	(r44027)
@@ -10,14 +10,20 @@
      $FreeBSD$
      $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/porters-handbook/book.xml,v 1.136 2006/10/20 09:25:00 marck Exp $
 
-     Original revision: r42833
+     Original revision: r43827
 -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ru">
-  <info><title>òÕËÏ×ÏÄÓÔ×Ï FreeBSD ÐÏ ÓÏÚÄÁÎÉÀ ÐÏÒÔÏ×</title>
-    
+
+<book xmlns="http://docbook.org/ns/docbook"
+  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xml:lang="ru">
+
+  <info>
+    <title>òÕËÏ×ÏÄÓÔ×Ï &os; ÐÏ ÓÏÚÄÁÎÉÀ ÐÏÒÔÏ×</title>
 
     <authorgroup>
-      <author><orgname>The FreeBSD Documentation Project</orgname></author>
+      <author>
+	<orgname>The &os; Documentation Project</orgname>
+      </author>
     </authorgroup>
 
     <pubdate>$FreeBSD$</pubdate>
@@ -37,27 +43,32 @@
       <year>2011</year>
       <year>2012</year>
       <year>2013</year>
-      <holder role="mailto:doc at FreeBSD.org">
-        The FreeBSD Documentation Project</holder>
+      <holder role="mailto:doc at FreeBSD.org">The &os; Documentation
+	Project</holder>
     </copyright>
 
-    &trademarks;
-
     &legalnotice;
 
+    <legalnotice xml:id="trademarks" role="trademarks">
+      &tm-attrib.freebsd;
+      &tm-attrib.unix;
+      &tm-attrib.sun;
+      &tm-attrib.general;
+    </legalnotice>
+
     <releaseinfo>$FreeBSD$</releaseinfo>
   </info>
 
   <chapter xml:id="why-port">
     <title>÷×ÅÄÅÎÉÅ</title>
 
-    <para>ëÏÌÌÅËÃÉÑ ÐÏÒÔÏ× FreeBSD Ñ×ÌÑÅÔÓÑ ÓÐÏÓÏÂÏÍ, ÉÓÐÏÌØÚÕÅÍÙÍ
-      ÐÒÁËÔÉÞÅÓËÉ ËÁÖÄÙÍ ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÐÒÉÌÏÖÅÎÉÊ ("ÐÏÒÔÏ×") ÎÁ FreeBSD.
-      ëÁË É ÐÏÞÔÉ ×Ó£ ÏÓÔÁÌØÎÏÅ ×Ï FreeBSD, ÜÔÁ ÓÉÓÔÅÍÁ × ÏÓÎÏ×ÎÏÍ Ñ×ÌÑÅÔÓÑ
+    <para>ëÏÌÌÅËÃÉÑ ÐÏÒÔÏ× &os; Ñ×ÌÑÅÔÓÑ ÓÐÏÓÏÂÏÍ, ÉÓÐÏÌØÚÕÅÍÙÍ
+      ÐÒÁËÔÉÞÅÓËÉ ËÁÖÄÙÍ ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÐÒÉÌÏÖÅÎÉÊ ("ÐÏÒÔÏ×") ÎÁ &os;.
+      ëÁË É ÐÏÞÔÉ ×Ó£ ÏÓÔÁÌØÎÏÅ ×Ï &os;, ÜÔÁ ÓÉÓÔÅÍÁ × ÏÓÎÏ×ÎÏÍ Ñ×ÌÑÅÔÓÑ
       ÄÏÂÒÏ×ÏÌØÎÏ ÐÏÄÄÅÒÖÉ×ÁÅÍÙÍ ÎÁÞÉÎÁÎÉÅÍ.  ÷ÁÖÎÏ ÉÍÅÔØ ÜÔÏ × ×ÉÄÕ ÐÒÉ
       ÞÔÅÎÉÉ ÄÁÎÎÏÇÏ ÄÏËÕÍÅÎÔÁ.</para>
 
-    <para>÷Ï FreeBSD ÌÀÂÏÊ ÍÏÖÅÔ ÐÒÉÓÌÁÔØ ÎÏ×ÙÊ ÐÏÒÔ ÌÉÂÏ ÉÚßÑ×ÉÔØ ÖÅÌÁÎÉÅ
+    <para>÷Ï &os; ËÁÖÄÙÊ ÍÏÖÅÔ ÐÒÉÓÌÁÔØ ÎÏ×ÙÊ ÐÏÒÔ ÌÉÂÏ ÉÚßÑ×ÉÔØ ÖÅÌÁÎÉÅ
       ÐÏÄÄÅÒÖÉ×ÁÔØ ÓÕÝÅÓÔ×ÕÀÝÉÊ ÐÏÒÔ, ÅÓÌÉ ÅÇÏ ÎÉËÔÏ ÅÝ£ ÎÉËÔÏ ÎÅ
       ÐÏÄÄÅÒÖÉ×ÁÅÔ—×ÁÍ ÎÅ ÎÕÖÎÏ ÉÍÅÔØ ÎÉËÁËÉÈ ÏÓÏÂÙÈ ÐÒÉ×ÉÌÅÇÉÊ ÎÁ
       ×ÎÅÓÅÎÉÅ ÉÚÍÅÎÅÎÉÊ, ÞÔÏÂÙ ÜÔÏ ÄÅÌÁÔØ.</para>
@@ -70,7 +81,7 @@
       ÏÂÎÏ×ÉÔØ ÓÕÝÅÓÔ×ÕÀÝÉÊ?  ÷ÅÌÉËÏÌÅÐÎÏ!</para>
 
     <para>îÉÖÅ ÎÁÈÏÄÑÔÓÑ ÎÅËÏÔÏÒÙÅ ÕËÁÚÁÎÉÑ ÐÏ ÓÏÚÄÁÎÉÀ ÎÏ×ÏÇÏ ÐÏÒÔÁ ÄÌÑ
-      FreeBSD.	åÓÌÉ ×Ù ÈÏÔÉÔÅ ÏÂÎÏ×ÉÔØ ÓÕÝÅÓÔ×ÕÀÝÉÊ ÐÏÒÔ, ×Ù ÄÏÌÖÎÙ
+      &os;.  åÓÌÉ ×Ù ÈÏÔÉÔÅ ÏÂÎÏ×ÉÔØ ÓÕÝÅÓÔ×ÕÀÝÉÊ ÐÏÒÔ, ×Ù ÄÏÌÖÎÙ
       ÐÒÏÞÅÓÔØ ÉÈ, Á ÚÁÔÅÍ <xref linkend="port-upgrading"/>.</para>
 
     <para>åÓÌÉ ÜÔÏÔ ÄÏËÕÍÅÎÔ ÎÅÄÏÓÔÁÔÏÞÎÏ ÐÏÄÒÏÂÅÎ, ×Ù ÄÏÌÖÎÙ ÏÂÒÁÔÉÔØÓÑ Ë
@@ -114,11 +125,24 @@
     <note>
       <para>úÄÅÓØ ÐÒÅÄÐÏÌÁÇÁÅÔÓÑ, ÞÔÏ ÐÒÏÇÒÁÍÍÎÏÅ ÏÂÅÓÐÅÞÅÎÉÅ ËÏÍÐÉÌÉÒÕÅÔÓÑ
         ÂÅÚ ÐÒÏÂÌÅÍ ËÁË ÅÓÔØ, ÔÏ ÅÓÔØ ÄÌÑ ÒÁÂÏÔÙ ÐÒÉÌÏÖÅÎÉÑ ÎÁ ×ÁÛÅÊ ÓÉÓÔÅÍÅ
-        FreeBSD ÎÅ ÐÏÔÒÅÂÏ×ÁÌÏÓØ ÁÂÓÏÌÀÔÎÏ ÎÉËÁËÉÈ ÉÚÍÅÎÅÎÉÊ.  åÓÌÉ
+        &os; ÎÅ ÐÏÔÒÅÂÏ×ÁÌÏÓØ ÁÂÓÏÌÀÔÎÏ ÎÉËÁËÉÈ ÉÚÍÅÎÅÎÉÊ.  åÓÌÉ
         ÔÒÅÂÏ×ÁÌÏÓØ ÞÔÏ-ÔÏ ÉÚÍÅÎÉÔØ, ÔÏ ×ÁÍ ÐÒÉÄÅÔÓÑ ÏÂÒÁÔÉÔØÓÑ ÔÁËÖÅ É Ë
         ÓÌÅÄÕÀÝÅÍÕ ÒÁÚÄÅÌÕ.</para>
     </note>
 
+    <note>
+      <para>ðÅÒÅÄ ÎÁÞÁÌÏÍ ÐÏÒÔÉÒÏ×ÁÎÉÑ ÒÅËÏÍÅÎÄÕÅÔÓÑ ÕÓÔÁÎÏ×ÉÔØ
+	ÐÅÒÅÍÅÎÎÕÀ &man.make.1; <varname>DEVELOPER</varname> ×
+	<filename>/etc/make.conf</filename>.</para>
+
+      <screen>&prompt.root; <userinput>echo DEVELOPER=yes >> /etc/make.conf</userinput></screen>
+
+      <para>üÔÁ ÎÁÓÔÒÏÊËÁ ×ËÌÀÞÁÅÔ <quote>ÒÅÖÉÍ ÒÁÚÒÁÂÏÔÞÉËÁ</quote>,
+	× ËÏÔÏÒÏÍ ÏÔÏÂÒÁÖÁÀÔÓÑ ÐÒÅÄÕÐÒÅÖÄÅÎÉÑ ÐÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ
+	ÕÓÔÁÒÅ×ÛÉÈ ËÏÎÓÔÒÕËÃÉÊ É ÚÁÄÅÊÓÔ×ÕÀÔÓÑ ÎÅËÏÔÏÒÙÅ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ
+	ÐÒÏ×ÅÒËÉ ÐÒÉ ×ÙÚÏ×Å ËÏÍÁÎÄÙ <command>make</command>.</para>
+    </note>
+
     <sect1 xml:id="porting-makefile">
       <title>óÏÚÄÁÎÉÅ ÆÁÊÌÁ <filename>Makefile</filename></title>
 
@@ -132,12 +156,9 @@ PORTVERSION=   1.1b
 CATEGORIES=    games
 MASTER_SITES=  ftp://ftp.cs.columbia.edu/archives/X11R5/contrib/
 
-MAINTAINER=    asami at FreeBSD.org
+MAINTAINER=    youremail at example.com
 COMMENT=       Cat chasing a mouse all over the screen
 
-MAN1=	       oneko.1
-MANCOMPRESSED= yes
-
 .include <bsd.port.mk></programlisting>
 
       <note>
@@ -150,7 +171,8 @@ MANCOMPRESSED= yes
 
       <para>ðÏÓÍÏÔÒÉÍ, ÓÍÏÖÅÔÅ ÌÉ ×Ù ÅÇÏ ÐÏÎÑÔØ.  îÅ ÏÂÒÁÝÁÊÔÅ ×ÎÉÍÁÎÉÅ ÎÁ
         ÓÏÄÅÒÖÉÍÏÅ ÓÔÒÏÞËÉ <literal>$FreeBSD$</literal>, ÏÎÁ
-        ÂÕÄÅÔ ÚÁÐÏÌÎÅÎÁ Á×ÔÏÍÁÔÉÞÅÓËÉ ÓÉÓÔÅÍÏÊ SVN, ËÏÇÄÁ ÐÏÒÔ ÂÕÄÅÔ
+        ÂÕÄÅÔ ÚÁÐÏÌÎÅÎÁ Á×ÔÏÍÁÔÉÞÅÓËÉ ÓÉÓÔÅÍÏÊ
+        <application>Subversion</application>, ËÏÇÄÁ ÐÏÒÔ ÂÕÄÅÔ
         ÉÍÐÏÒÔÉÒÏ×ÁÎ × ÎÁÛÅ ÄÅÒÅ×Ï ÐÏÒÔÏ×.  ÷Ù ÍÏÖÅÔÅ ÎÁÊÔÉ ÂÏÌÅÅ ÐÏÄÒÏÂÎÙÊ
         ÐÒÉÍÅÒ × ÒÁÚÄÅÌÅ <link linkend="porting-samplem">ÐÒÉÍÅÒ
         Makefile</link>.</para>
@@ -178,8 +200,8 @@ MANCOMPRESSED= yes
             ÉÚ <filename>README</filename> ÉÌÉ ÓÔÒÁÎÉÃ
             ÓÐÒÁ×ÏÞÎÉËÁ</emphasis>; ÓÌÉÛËÏÍ ÞÁÓÔÏ ÏÎÉ ÎÅ Ñ×ÌÑÀÔÓÑ ËÒÁÔËÉÍ
             ÏÐÉÓÁÎÉÅÍ ÐÏÒÔÁ ÉÌÉ ÉÍÅÀÔ ÎÅÕÄÏÂÎÙÊ ÆÏÒÍÁÔ (ÎÁÐÒÉÍÅÒ, ÓÔÒÁÎÉÃÙ
-	    ÓÐÒÁ×ÏÞÎÉËÁ ×ÙÒÏ×ÎÅÎÙ ÐÒÏÂÅÌÁÍÉ, ÐÏÓËÏÌØËÕ ÜÔÏ ×ÙÇÌÑÄÉÔ ×
-	    ÏÓÏÂÅÎÎÏÓÔÉ ÐÌÏÈÏ Ó ÍÏÎÏÛÉÒÉÎÎÙÍÉ ÛÒÉÆÔÁÍÉ).</para>
+	    ÓÐÒÁ×ÏÞÎÉËÁ ×ÙÒÏ×ÎÅÎÙ ÐÒÏÂÅÌÁÍÉ, ÞÔÏ ÏÓÏÂÅÎÎÏ ÐÌÏÈÏ
+	    ÓÍÏÔÒÉÔÓÑ Ó ÍÏÎÏÛÉÒÉÎÎÙÍÉ ÛÒÉÆÔÁÍÉ).</para>
 	</note>
 
 	<para>èÏÒÏÛÏ ÓÏÓÔÁ×ÌÅÎÎÙÊ <filename>pkg-descr</filename>
@@ -225,16 +247,14 @@ WWW: http://www.oneko.org/</programlisti
           ÐÁËÅÔ ÇÅÎÅÒÉÒÕÅÔÓÑ ÕÐÁËÏ×ËÏÊ ÆÁÊÌÏ×, ËÏÔÏÒÙÅ ÚÄÅÓØ ÕËÁÚÁÎÙ.
           éÍÅÎÁ ÐÕÔÅÊ ÕËÁÚÙ×ÁÀÔÓÑ ÏÔÎÏÓÉÔÅÌØÎÏ ÕÓÔÁÎÏ×ÏÞÎÏÇÏ ÐÒÅÆÉËÓÁ
           (ÏÂÙÞÎÏ <filename>/usr/local</filename>).
-	  åÓÌÉ ×Ù ÉÓÐÏÌØÚÕÅÔÅ ÐÅÒÅÍÅÎÎÙÅ
-          <varname>MAN<replaceable>n</replaceable></varname> (Á ×Ù ÄÏÌÖÎÙ
-          ÜÔÏ ÄÅÌÁÔØ), ÔÏ ÕËÁÚÙ×ÁÔØ ÓÔÒÁÎÉÃÙ ÓÐÒÁ×ÏÞÎÉËÁ ÚÄÅÓØ ÎÅ
-          ÎÕÖÎÏ.  åÓÌÉ ÐÏÒÔ ×Ï ×ÒÅÍÑ ÕÓÔÁÎÏ×ËÉ ÓÏÚÄÁÅÔ ËÁÔÁÌÏÇÉ,  ÕÂÅÄÉÔÅÓØ,
-	  ÞÔÏ ÄÏÂÁ×ÉÌÉ ÓÔÒÏËÕ <literal>@dirrm</literal> ÄÌÑ ÕÄÁÌÅÎÉÑ
+          åÓÌÉ ÐÏÒÔ ×Ï ×ÒÅÍÑ ÕÓÔÁÎÏ×ËÉ ÓÏÚÄÁÅÔ ËÁÔÁÌÏÇÉ, ÕÂÅÄÉÔÅÓØ,
+	  ÞÔÏ ÄÏÂÁ×ÌÅÎÙ ÓÔÒÏËÉ <literal>@dirrm</literal> ÄÌÑ ÕÄÁÌÅÎÉÑ
 	  ËÁÔÁÌÏÇÏ× ÐÒÉ ÕÄÁÌÅÎÉÉ ÐÁËÅÔÁ.</para>
 
         <para>÷ÏÔ ÍÁÌÅÎØËÉÊ ÐÒÉÍÅÒ:</para>
 
         <programlisting>bin/oneko
+man/man1/oneko.1.gz
 lib/X11/app-defaults/Oneko
 lib/X11/oneko/cat1.xpm
 lib/X11/oneko/cat2.xpm
@@ -242,7 +262,7 @@ lib/X11/oneko/mouse.xpm
 @dirrm lib/X11/oneko</programlisting>
 
         <para>ïÂÒÁÔÉÔÅÓØ Ë ÓÔÒÁÎÉÃÅ ÓÐÒÁ×ÏÞÎÏÊ ÓÉÓÔÅÍÙ ÐÏ ËÏÍÁÎÄÅ
-          &man.pkg.create.1; Ó ÐÏÄÒÏÂÎÙÍ ÏÐÉÓÁÎÉÅÍ ÆÏÒÍÁÔÁ ÓÐÉÓËÁ
+          &man.pkg-create.8; Ó ÐÏÄÒÏÂÎÙÍ ÏÐÉÓÁÎÉÅÍ ÆÏÒÍÁÔÁ ÓÐÉÓËÁ
           ÕÐÁËÏ×ËÉ.</para>
 
         <note>
@@ -270,6 +290,7 @@ lib/X11/oneko/mouse.xpm
           <filename>Makefile</filename>:</para>
 
         <programlisting>PLIST_FILES=    bin/oneko \
+		man/man1/oneko.1.gz \
                 lib/X11/app-defaults/Oneko \
                 lib/X11/oneko/cat1.xpm \
                 lib/X11/oneko/cat2.xpm \
@@ -293,7 +314,7 @@ PLIST_DIRS=     lib/X11/oneko</programli
 
         <para>ïÂÒÁÔÎÏÊ ÓÔÏÒÏÎÏÊ ÔÁËÏÇÏ ÓÐÏÓÏÂÁ ÐÅÒÅÞÉÓÌÅÎÉÑ ÆÁÊÌÏ× É
           ËÁÔÁÌÏÇÏ× ÐÏÒÔÁ Ñ×ÌÑÅÔÓÑ ÎÅ×ÏÚÍÏÖÎÏÓÔØ ÉÓÐÏÌØÚÏ×ÁÎÉÑ
-          ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔÅÊ ËÏÍÁÎÄ, ÏÐÉÓÁÎÎÙÈ × &man.pkg.create.1;.
+          ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔÅÊ ËÏÍÁÎÄ, ÏÐÉÓÁÎÎÙÈ × &man.pkg-create.8;.
           ðÏÜÔÏÍÕ ÏÎ ÐÏÄÈÏÄÉÔ ÄÌÑ ÐÒÏÓÔÙÈ ÐÏÒÔÏ×, ÞÔÏ ÄÅÌÁÅÔ ÉÈ ÅÝ£ ÂÏÌÅÅ
           ÐÒÏÓÔÙÍÉ.  ïÄÎÏ×ÒÅÍÅÎÎÏ Ó ÜÔÉÍ ÐÏÌÏÖÉÔÅÌØÎÙÍ ÍÏÍÅÎÔÏÍ Ñ×ÌÑÅÔÓÑ
           ÕÍÅÎØÛÅÎÉÅ ËÏÌÉÞÅÓÔ×Á ÆÁÊÌÏ× × ËÏÌÌÅËÃÉÉ ÐÏÒÔÏ×.  ðÏÖÁÌÕÊÓÔÁ,
@@ -333,22 +354,34 @@ PLIST_DIRS=     lib/X11/oneko</programli
       <itemizedlist>
 	<listitem>
 	  <para><filename>pkg-plist</filename> ÎÅ ÓÏÄÅÒÖÉÔ ÎÉÞÅÇÏ Ó×ÅÒÈ ÔÏÇÏ,
-	    ÞÔÏ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ×ÁÛÉÍ ÐÏÒÔÏÍ</para>
+	    ÞÔÏ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÐÏÒÔÏÍ</para>
 	</listitem>
 
 	<listitem>
 	  <para><filename>pkg-plist</filename> ÓÏÄÅÒÖÉÔ ÁÂÓÏÌÀÔÎÏ ×ÓÅ, ÞÔÏ
-	    ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ×ÁÛÉÍ ÐÏÒÔÏÍ</para>
+	    ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÐÏÒÔÏÍ</para>
 	</listitem>
 
 	<listitem>
-	    <para>÷ÁÛ ÐÏÒÔ ÍÏÖÅÔ ÂÙÔØ ÐÅÒÅÕÓÔÁÎÏ×ÌÅÎ ÍÎÏÖÅÓÔ×Ï ÒÁÚ Ó ÐÏÍÏÝØÀ
-	      ÕËÁÚÁÎÉÑ ÃÅÌÉ <buildtarget>reinstall</buildtarget></para>
+	  <para>ðÏÒÔ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ Ó ÐÏÍÏÝØÀ
+	    ÕËÁÚÁÎÉÑ ÃÅÌÉ <buildtarget>install</buildtarget>.  üÔÏ
+	    ÐÏÚ×ÏÌÑÅÔ ÕÂÅÄÉÔØÓÑ × ÐÒÁ×ÉÌØÎÏÊ ÒÁÂÏÔÅ ÓÃÅÎÁÒÉÑ
+	    ÕÓÔÁÎÏ×ËÉ.</para>
 	</listitem>
 
 	<listitem>
-	  <para>÷ÁÛ ÐÏÒÔ <link linkend="plist-cleaning">ÐÏÄÞÉÝÁÅÔ</link>
-	    ÚÁ ÓÏÂÏÊ ÐÏÓÌÅ Ó×ÏÅÇÏ ÕÄÁÌÅÎÉÑ</para>
+	  <para>ðÏÒÔ ÍÏÖÅÔ ÂÙÔØ ÐÒÁ×ÉÌØÎÙÍ ÏÂÒÁÚÏÍ ÕÄÁÌ£Î Ó ÐÏÍÏÝØÀ
+	    ÕËÁÚÁÎÉÑ ÃÅÌÉ <buildtarget>deinstall</buildtarget>.  üÔÏ
+	    ÐÏÚ×ÏÌÑÅÔ ÕÂÅÄÉÔØÓÑ × ÐÒÁ×ÉÌØÎÏÊ ÒÁÂÏÔÅ ÓÃÅÎÁÒÉÑ
+	    ÕÄÁÌÅÎÉÑ.</para>
+	</listitem>
+
+	<listitem>
+	  <para>óÌÅÄÕÅÔ ÕÂÅÄÉÔØÓÑ, ÞÔÏ <command>make package</command>
+	    ÍÏÖÎÏ ÚÁÐÕÓÔÉÔØ ÉÚ-ÐÏÄ ÏÂÙÞÎÏÇÏ ÐÏÌØÚÏ×ÁÔÅÌÑ (ÔÏ ÅÓÔØ,
+	    ÎÅ ÉÚ-ÐÏÄ <systemitem class="username">root</systemitem>).
+	    åÓÌÉ ÜÔÏ ÎÅ ÔÁË, × <filename>Makefile</filename> ÐÏÒÔÁ
+	    ÄÏÌÖÎÏ ÂÙÔØ ÄÏÂÁ×ÌÅÎÏ <literal>NEED_ROOT=yes</literal>.</para>
 	</listitem>
       </itemizedlist>
 
@@ -356,20 +389,19 @@ PLIST_DIRS=     lib/X11/oneko</programli
 	<title>òÅËÏÍÅÎÄÕÅÍÙÊ ÐÏÒÑÄÏË ÐÒÏ×ÅÒËÉ</title>
 
 	<step>
-	  <para><command>make install</command></para>
+	  <para><command>make stage</command></para>
 	</step>
 
 	<step>
-	  <para><command>make package</command></para>
+	  <para><command>make check-orphans</command></para>
 	</step>
 
 	<step>
-	  <para><command>make deinstall</command></para>
+	  <para><command>make package</command></para>
 	</step>
 
 	<step>
-	  <para><command>pkg_add package-name
-	    </command></para>
+	  <para><command>make install</command></para>
 	</step>
 
 	<step>
@@ -377,31 +409,25 @@ PLIST_DIRS=     lib/X11/oneko</programli
 	</step>
 
 	<step>
-	  <para><command>make reinstall</command></para>
-	</step>
-
-	<step>
-	  <para><command>make package</command></para>
+	  <para><command>pkg add package-filename</command></para>
 	</step>
 
 	<step>
-	  <para><command>make readme</command></para>
+	  <para><command>make package</command> (ÉÚ-ÐÏÄ
+	    ÐÏÌØÚÏ×ÁÔÅÌÑ)</para>
 	</step>
       </procedure>
 
-      <para>ðÒÏ×ÅÒØÔÅ, ÞÔÏ ÎÉ ÎÁ ÛÁÇÅ <buildtarget>package</buildtarget>, ÎÉ ÎÁ
-	ÛÁÇÅ <buildtarget>deinstall</buildtarget> ÎÅ ×ÙÄÁÅÔÓÑ ÎÉËÁËÉÈ
-	ÐÒÅÄÕÐÒÅÖÄÅÎÉÊ.  ðÏÓÌÅ ×ÙÐÏÌÎÅÎÉÑ ÛÁÇÁ 3 ÐÒÏ×ÅÒØÔÅ, ÞÔÏ ×ÓÅ ÎÏ×ÙÅ
-	ËÁÔÁÌÏÇÉ ÂÙÌÉ ÕÓÐÅÛÎÏ ÕÄÁÌÅÎÙ.	ôÁËÖÅ ÐÏÐÒÏÂÕÊÔÅ ÚÁÐÕÓÔÉÔØ
-	ÐÒÏÇÒÁÍÍÎÏÅ ÏÂÅÓÐÅÞÅÎÉÅ ÐÏÓÌÅ ×ÙÐÏÌÎÅÎÉÑ ÛÁÇÁ 4, ÞÔÏÂÙ ÕÂÅÄÉÔØÓÑ, ÞÔÏ
-	ÏÎÏ ÒÁÂÏÔÁÅÔ ÐÒÁ×ÉÌØÎÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÉÚ ÐÁËÅÔÁ.</para>
-
-      <para>îÁÉÂÏÌÅÅ ÏÓÎÏ×ÁÔÅÌØÎÙÍ ÓÐÏÓÏÂÏÍ Á×ÔÏÍÁÔÉÚÁÃÉÉ ÜÔÉÈ ÛÁÇÏ× Ñ×ÌÑÅÔÓÑ
-	ÕÓÔÁÎÏ×ËÁ <application>ports tinderbox</application>.  üÔÏ
- 	ÏÂÅÓÐÅÞÉ×ÁÅÔ <literal>jails</literal>, × ËÏÔÏÒÙÈ ×Ù ÍÏÖÅÔÅ ÐÒÏ×ÅÒÑÔØ
-	×ÓÅ ×ÙÛÅÕËÁÚÁÎÎÙÅ ÛÁÇÉ ÂÅÚ ÉÚÍÅÎÅÎÉÑ ÓÏÓÔÏÑÎÉÑ × ×ÁÛÅÊ ÏÓÎÏ×ÎÏÊ
-	ÓÉÓÔÅÍÅ.  äÌÑ ÐÏÌÕÞÅÎÉÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ ÓÍÏÔÒÉÔÅ
-	<filename>ports/ports-mgmt/tinderbox</filename>.</para>
+      <para>õÂÅÄÉÔÅÓØ, ÞÔÏ ÎÁ ÌÀÂÏÍ ÉÚ ÜÔÁÐÏ× ÎÅ ×ÙÄÁÅÔÓÑ ÎÉËÁËÉÈ
+	ÐÒÅÄÕÐÒÅÖÄÅÎÉÊ.</para>
+
+      <para>ïÓÎÏ×ÁÔÅÌØÎÏÅ Á×ÔÏÍÁÔÉÚÉÒÏ×ÁÎÎÏÅ ÔÅÓÔÉÒÏ×ÁÎÉÅ ÍÏÖÅÔ ÂÙÔØ
+	×ÙÐÏÌÎÅÎÏ ÐÒÉ ÐÏÍÏÝÉ
+	<package role="port">ports-mgmt/tinderbox</package> ÉÌÉ
+	<package role="port">ports-mgmt/poudriere</package> ÉÚ ëÏÌÌÅËÃÉÉ
+	ðÏÒÔÏ×.  üÔÉ ÐÒÉÌÏÖÅÎÉÑ ÉÓÐÏÌØÚÕÀÔ <literal>jails</literal>,
+	× ËÏÔÏÒÙÈ ÐÒÏ×ÅÒÑÀÔÓÑ ×ÓÅ ÐÅÒÅÞÉÓÌÅÎÎÙÅ ×ÙÛÅ ÜÔÁÐÙ ÂÅÚ
+	ÉÚÍÅÎÅÎÉÑ ÓÏÓÔÏÑÎÉÑ ÏÓÎÏ×ÎÏÊ ÓÉÓÔÅÍÙ.</para>
     </sect1>
 
     <sect1 xml:id="porting-portlint">
@@ -410,7 +436,7 @@ PLIST_DIRS=     lib/X11/oneko</programli
 
       <para>âÕÄØÔÅ ÄÏÂÒÙ, ÐÏÌØÚÕÊÔÅÓØ ÕÔÉÌÉÔÏÊ <command>portlint</command>
 	ÄÌÑ ÐÒÏ×ÅÒËÉ ÔÏÇÏ, ÞÔÏ ×ÁÛ ÐÏÒÔ ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ÎÁÛÉÍ ÒÅËÏÍÅÎÄÁÃÉÑÍ.
-	ðÒÏÇÒÁÍÍÁ <package>ports-mgmt/portlint</package>
+	ðÒÏÇÒÁÍÍÁ <package role="port">ports-mgmt/portlint</package>
 	Ñ×ÌÑÅÔÓÑ ÞÁÓÔØÀ ëÏÌÌÅËÃÉÉ
 	ðÏÒÔÏ×.  ÷ ÞÁÓÔÎÏÓÔÉ, ×Ù ÍÏÖÅÔÅ ÚÁÈÏÔÅÔØ ÐÒÏ×ÅÒÉÔØ, ÐÒÁ×ÉÌØÎÏ ÌÉ
 	ÓÆÏÒÍÉÒÏ×ÁÎ ÆÁÊÌ <link linkend="porting-samplem">Makefile</link> É
@@ -420,38 +446,45 @@ PLIST_DIRS=     lib/X11/oneko</programli
     <sect1 xml:id="porting-submitting">
       <title>ðÏÓÙÌËÁ ÎÏ×ÏÇÏ ÐÏÒÔÁ</title>
 
-      <para>ðÅÒÅÄ ÐÏÓÙÌËÏÊ ÎÏ×ÏÇÏ ÐÏÒÔÁ ÕÄÏÓÔÏ×ÅÒØÔÅÓØ, ÞÔÏ ×Ù ÐÒÏÞÉÔÁÌÉ
-	ÒÁÚÄÅÌ Ï ÔÏÍ, ÞÔÏ <link linkend="porting-dads">ÍÏÖÎÏ É ÎÅÌØÚÑ</link> ÄÅÌÁÔØ.</para>
+      <para>ðÅÒÅÄ ÐÏÓÙÌËÏÊ ÎÏ×ÏÇÏ ÐÏÒÔÁ ÐÒÏÞÉÔÁÊÔÅ ÒÁÚÄÅÌ Ï ÔÏÍ, ÞÔÏ
+	<link linkend="porting-dads">ÍÏÖÎÏ É ÎÅÌØÚÑ</link> ÄÅÌÁÔØ.</para>
 
-      <para>ôÅÐÅÒØ, ËÏÇÄÁ ×Ù ÓÞÁÓÔÌÉ×Ù ÏÔ Ó×ÏÅÇÏ ÐÅÒ×ÏÇÏ ÐÏÒÔÁ, ÅÄÉÎÓÔ×ÅÎÎÏÅ,
+      <para>ëÏÇÄÁ ×Ù ÎÁËÏÎÅà ÄÏ×ÏÌØÎÙ Ó×ÏÉÍ ÐÅÒ×ÙÍ ÐÏÒÔÏÍ, ÅÄÉÎÓÔ×ÅÎÎÏÅ,
 	ÞÔÏ ÏÓÔÁÌÏÓØ ÓÄÅÌÁÔØ, ÜÔÏ ×ËÌÀÞÉÔØ ÅÇÏ × ÏÓÎÏ×ÎÏÅ ÄÅÒÅ×Ï ÐÏÒÔÏ×
-	&os; É ÏÓÞÁÓÔÌÉ×ÉÔØ ÜÔÉÍ ×ÓÅÈ ÏÓÔÁÌØÎÙÈ.  îÁÍ ÎÅ ÎÕÖÅÎ ÎÉ ×ÁÛ
+	&os; É ÏÓÞÁÓÔÌÉ×ÉÔØ ÜÔÉÍ ×ÓÅÈ ÏÓÔÁÌØÎÙÈ.  îÁÍ ÎÅ ÎÕÖÅÎ ÎÉ
 	ËÁÔÁÌÏÇ <filename>work</filename>, ÎÉ ÐÁËÅÔ
-	<filename>pkgname.tgz</filename>, ÔÁË ÞÔÏ ÕÄÁÌÉÔÅ ÉÈ ÐÒÑÍÏ ÓÅÊÞÁÓ.
-	úÁÔÅÍ (ÐÒÅÄÐÏÌÏÖÉÍ, ÞÔÏ ×ÁÛ ÐÏÒÔ ÚÏ×ÕÔ oneko) ÐÅÒÅÊÄÉÔÅ × ËÁÔÁÌÏÇ
-	×ÙÛÅ, ÔÁÍ, ÇÄÅ ÎÁÈÏÄÉÔÓÑ ËÁÔÁÌÏÇ <literal>oneko</literal>, É ÎÁÂÅÒÉÔÅ
-	ÓÌÅÄÕÀÝÅÅ: <command>shar `find oneko` > oneko.shar</command></para>
-
-      <para>÷ËÌÀÞÉÔÅ ×ÁÛ ÆÁÊÌ <literal>oneko.shar</literal>
-	× ÓÏÏÂÝÅÎÉÅ ÏÂ ÏÛÉÂËÅ É ÐÏÛÌÉÔÅ
-        ÅÇÏ Ó ÐÏÍÏÝØÀ ÐÒÏÇÒÁÍÍÙ &man.send-pr.1; (ÏÂÒÁÔÉÔÅÓØ Ë ÒÁÚÄÅÌÕ <link xlink:href="&url.articles.contributing;/contrib-how.html#CONTRIB-GENERAL">
-        óÏÏÂÝÅÎÉÑ ÏÂ ÏÛÉÂËÁÈ É ÏÂÝÉÅ ÚÁÍÅÞÁÎÉÑ</link> ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÐÏÄÒÏÂÎÏÊ
-        ÉÎÆÏÒÍÁÃÉÉ Ï ÐÒÏÇÒÁÍÍÅ &man.send-pr.1;).  îÅ ÚÁÂÕÄØÔÅ
-	ÕËÁÚÁÔØ × ÓÏÏÂÝÅÎÉÉ ËÁÔÅÇÏÒÉÀ <literal>ports</literal> É ËÌÁÓÓ
-	<literal>change-request</literal> (îÅ ÕËÁÚÙ×ÁÊÔÅ, ÞÔÏ ÓÏÏÂÝÅÎÉÅ
-	ÉÍÅÅÔ ÓÔÁÔÕÓ <literal>confidential</literal>!).  äÏÂÁ×ØÔÅ ÔÁËÖÅ
-        ËÒÁÔËÏÅ ÏÐÉÓÁÎÉÅ ÐÒÏÇÒÁÍÍÙ, ÐÏÒÔ ËÏÔÏÒÏÊ ×Ù ÓÏÚÄÁÌÉ, × ÒÁÚÄÅÌ
-        <quote>Description</quote> ÏÔÐÒÁ×ÌÑÅÍÏÇÏ PR (ÎÁÐÒÉÍÅÒ, ÓÏÄÅÒÖÉÍÏÅ
-	<varname>COMMENT</varname> × ÓÏËÒÁÝÅÎÎÏÍ ×ÉÄÅ) É ÓÁÍ ÆÁÊÌ × ×ÉÄÅ ÁÒÈÉ×Á
-        shar, ÐÏÍÅÓÔÉ× ÅÇÏ × ÒÁÚÄÅÌ <quote>Fix</quote>.</para>
+	<filename>pkgname.tgz</filename>, ÔÁË ÞÔÏ ÕÄÁÌÉÔÅ ÉÈ ÐÒÑÍÏ
+	ÓÅÊÞÁÓ.</para>
+
+	<para>úÁÔÅÍ ÐÏÌÕÞÉÔÅ ÆÁÊÌ &man.shar.1;.  ðÒÅÄÐÏÌÁÇÁÑ, ÞÔÏ ÐÏÒÔ
+	ÎÁÚÙ×ÁÅÔÓÑ oneko, ÐÅÒÅÊÄÉÔÅ × ËÁÔÁÌÏÇ ×ÙÛÅ, ÇÄÅ ÎÁÈÏÄÉÔÓÑ
+	ËÁÔÁÌÏÇ <literal>oneko</literal>, É ÎÁÂÅÒÉÔÅ:
+	<command>shar `find oneko` > oneko.shar</command></para>
+
+      <para>÷ËÌÀÞÉÔÅ <filename>oneko.shar</filename> × ÓÏÏÂÝÅÎÉÅ ÏÂ
+	ÏÛÉÂËÅ É ÐÏÛÌÉÔÅ ÅÇÏ Ó ÐÏÍÏÝØÀ &man.send-pr.1;.  ïÂÒÁÔÉÔÅÓØ Ë
+	ÒÁÚÄÅÌÕ <link
+	  xlink:href="&url.articles.contributing;/contrib-how.html#CONTRIB-GENERAL">
+        óÏÏÂÝÅÎÉÑ ÏÂ ÏÛÉÂËÁÈ É ÏÂÝÉÅ ÚÁÍÅÞÁÎÉÑ</link> ÄÌÑ ÐÏÌÕÞÅÎÉÑ
+        ÐÏÄÒÏÂÎÏÊ ÉÎÆÏÒÍÁÃÉÉ Ï &man.send-pr.1;).</para>
+
+      <para>õËÁÖÉÔÅ × ÓÏÏÂÝÅÎÉÉ ËÁÔÅÇÏÒÉÀ <literal>ports</literal> É
+	ËÌÁÓÓ <literal>change-request</literal>.
+	<emphasis>îÅ</emphasis> ÕËÁÚÙ×ÁÊÔÅ, ÞÔÏ ÓÏÏÂÝÅÎÉÅ ÉÍÅÅÔ ÓÔÁÔÕÓ
+	<literal>confidential</literal>!  äÏÂÁ×ØÔÅ ËÒÁÔËÏÅ ÏÐÉÓÁÎÉÅ
+	ÐÒÏÇÒÁÍÍÙ × ÐÏÌÅ <quote>Description</quote> ÏÔÐÒÁ×ÌÑÅÍÏÇÏ PR
+	(ÎÁÐÒÉÍÅÒ, ÓÏÄÅÒÖÉÍÏÅ <varname>COMMENT</varname> × ÓÏËÒÁÝ£ÎÎÏÍ
+	×ÁÒÉÁÎÔÅ) É ÓÁÍ ÆÁÊÌ × ×ÉÄÅ ÁÒÈÉ×Á <filename>.shar</filename>
+	× ÐÏÌÅ <quote>Fix</quote>.</para>
 
       <note>
-        <para>÷Ù ÍÏÖÅÔÅ ÚÎÁÞÉÔÅÌØÎÏ ÏÂÌÅÇÞÉÔØ ÎÁÛÕ ÒÁÂÏÔÕ, ÅÓÌÉ × ÔÅÍÕ
-          ÓÏÏÂÝÅÎÉÑ Ï ÐÒÏÂÌÅÍÅ ÐÏÍÅÓÔÉÔÅ ÈÏÒÏÛÅÅ ÏÐÉÓÁÎÉÅ.  íÙ ÒÅËÏÍÅÎÄÕÅÍ
-          ÎÅÞÔÏ ×ÒÏÄÅ <quote>New port: <ËÁÔÅÇÏÒÉÑ>/<ÎÁÚ×ÁÎÉÅ
-          ÐÏÒÔÁ> <ËÒÁÔËÏÅ ÏÐÉÓÁÎÉÅ ÐÏÒÔÁ></quote> ÄÌÑ ÎÏ×ÙÈ ÐÏÒÔÏ×.
-	  åÓÌÉ ×Ù ÓÌÅÄÕÅÔÅ ÜÔÏÊ ÓÈÅÍÅ, ÔÏ ÛÁÎÓÙ ÎÁ ÔÏ, ÞÔÏ ÎÁ ×ÁÛÅ PR ×ÓËÏÒÅ
-          ËÔÏ-ÔÏ ×ÚÇÌÑÎÅÔ, ÇÏÒÁÚÄÏ ×ÙÛÅ.</para>
+	<para>èÏÒÏÛÅÅ ÏÐÉÓÁÎÉÅ × ÚÁÇÏÌÏ×ËÅ ÓÏÏÂÝÅÎÉÑ Ï ÐÒÏÂÌÅÍÅ
+	  ÚÎÁÞÉÔÅÌØÎÏ ÏÂÌÅÇÞÁÅÔ ÒÁÂÏÔÕ ËÏÍÍÉÔÔÅÒÏ× ÐÏÒÔÏ×.  äÌÑ ÎÏ×ÙÈ
+	  ÐÏÒÔÏ× ÍÙ ÐÒÅÄÐÏÞÉÔÁÅÍ ÎÅÞÔÏ ×ÒÏÄÅ <quote>New port:
+	    <ËÁÔÅÇÏÒÉÑ>/<ÎÁÚ×ÁÎÉÅ ÐÏÒÔÁ> <ËÒÁÔËÏÅ
+	    ÏÐÉÓÁÎÉÅ ÐÏÒÔÁ></quote>.  óÌÅÄÏ×ÁÎÉÅ ÜÔÏÊ ÓÈÅÍÅ
+	  ÕÐÒÏÝÁÅÔ É ÕÓËÏÒÑÅÔ ÎÁÞÁÌÏ ÒÁÂÏÔÙ ÐÏ ÄÏÂÁ×ÌÅÎÉÀ ÎÏ×ÏÇÏ
+	  ÐÏÒÔÁ.</para>
       </note>
 
       <para>ðÏ×ÔÏÒÉÍ ÅÝ£ ÒÁÚ, ÞÔÏ <emphasis>ÎÅ ÎÕÖÎÏ ×ËÌÀÞÁÔØ ÎÉ ÏÒÉÇÉÎÁÌØÎÙÊ
@@ -460,16 +493,17 @@ PLIST_DIRS=     lib/X11/oneko</programli
 	<command>make package</command></emphasis>; ÄÌÑ ÎÏ×ÙÈ ÐÏÒÔÏ×
 	ÉÓÐÏÌØÚÕÊÔÅ &man.shar.1;, ÎÏ ÎÅ &man.diff.1;.</para>
 
-      <para>ðÏÓÌÅ ÔÏÇÏ ËÁË ×Ù ÐÏÓÌÁÌÉ ÐÏÒÔ, ÐÏÖÁÌÕÊÓÔÁ, ÐÏÔÅÒÐÉÔÅ.
-        éÎÏÇÄÁ ×ËÌÀÞÅÎÉÅ ÎÏ×ÏÇÏ ÐÏÒÔÁ ×Ï &os; ÍÏÖÅÔ ÚÁÎÑÔØ ÄÏ ÎÅÓËÏÌØËÉÈ
-	ÍÅÓÑÃÅ×, Á ÉÎÏÇÄÁ ×ÓÅÇÏ ÎÅÓËÏÌØËÏ ÄÎÅÊ. <link xlink:href="http://www.FreeBSD.org/cgi/query-pr-summary.cgi?category=ports">
-        úÄÅÓØ</link> ×Ù ÍÏÖÅÔÅ ÎÁÊÔÉ ÓÐÉÓÏË PR ÄÌÑ ÐÏÒÔÏ× ÏÖÉÄÁÀÝÉÈ Ó×ÏÅÊ
-	ÏÞÅÒÅÄÉ ÄÌÑ ×ËÌÀÞÅÎÉÑ ×Ï &os;.</para>
-
-      <para>íÙ ÒÁÓÓÍÏÔÒÉÍ ×ÁÛ ÐÏÒÔ, ÐÒÉ ÎÅÏÂÈÏÄÉÍÏÓÔÉ ×ÅÒÎ£Í ÅÇÏ ÏÂÒÁÔÎÏ, Á
-        ÚÁÔÅÍ ×ËÌÀÞÉÍ ÐÏÒÔ × ÎÁÛÅ ÄÅÒÅ×Ï.  ÷ÁÛÅ ÉÍÑ ÔÁËÖÅ ÂÕÄÅÔ ÄÏÂÁ×ÌÅÎÏ
-	× ÓÐÉÓÏË <link xlink:href="&url.articles.contributors;/contrib-additional.html">
-	  äÏÐÏÌÎÉÔÅÌØÎÙÈ ËÏÎÔÒÉÂÕÔÏÒÏ× ÐÒÏÅËÔÁ FreeBSD</link> É ÄÒÕÇÉÅ
+      <para>ðÏÓÌÅ ÏÔÐÒÁ×ËÉ ÐÏÒÔÁ, ÐÏÖÁÌÕÊÓÔÁ, ÐÏÔÅÒÐÉÔÅ.  ÷ÒÅÍÑ,
+	ÎÅÏÂÈÏÄÉÍÏÅ ÄÌÑ ×ËÌÀÞÅÎÉÑ ÎÏ×ÏÇÏ ÐÏÒÔÁ ×Ï &os;, ÍÏÖÅÔ ÚÁÎÉÍÁÔØ
+	ÏÔ ÎÅÓËÏÌØËÉÈ ÄÎÅÊ ÄÏ ÎÅÓËÏÌØËÉÈ ÍÅÓÑÃÅ×.  <link
+	  xlink:href="http://www.FreeBSD.org/cgi/query-pr-summary.cgi?category=ports">
+	úÄÅÓØ</link> ÍÏÖÎÏ Õ×ÉÄÅÔØ ÓÐÉÓÏË ÏÖÉÄÁÀÝÉÈ PR ÄÌÑ ÐÏÒÔÏ×.</para>
+
+      <para>ðÏÓÌÅ ÒÁÓÓÍÏÔÒÅÎÉÑ ÎÏ×ÏÇÏ ÐÏÒÔÁ ÍÙ ÐÒÉ ÎÅÏÂÈÏÄÉÍÏÓÔÉ ×ÁÍ
+	ÏÔ×ÅÔÉÍ, Á ÚÁÔÅÍ ×ËÌÀÞÉÍ ÐÏÒÔ × ÎÁÛÅ ÄÅÒÅ×Ï.  ÷ÁÛÅ ÉÍÑ ÔÁËÖÅ
+	ÂÕÄÅÔ ÄÏÂÁ×ÌÅÎÏ × ÓÐÉÓÏË <link
+	  xlink:href="&url.articles.contributors;/contrib-additional.html">
+	  äÏÐÏÌÎÉÔÅÌØÎÙÈ ËÏÎÔÒÉÂÕÔÏÒÏ× ÐÒÏÅËÔÁ &os;</link> É ÄÒÕÇÉÅ
 	ÆÁÊÌÙ.</para>
     </sect1>
   </chapter>
@@ -502,10 +536,9 @@ PLIST_DIRS=     lib/X11/oneko</programli
 	    ÔÅËÓÔÏ× ÉÍÅÅÔÓÑ × ÎÁÌÉÞÉÉ ÌÏËÁÌØÎÏ × ËÁÔÁÌÏÇÅ
 	    <varname>DISTDIR</varname>.  åÓÌÉ ÃÅÌØ
 	    <buildtarget>fetch</buildtarget> ÎÅ ÍÏÖÅÔ ÎÁÊÔÉ ÔÒÅÂÕÅÍÙÅ ÆÁÊÌÙ ×
-	    ËÁÔÁÌÏÇÅ <varname>DISTDIR</varname>, ÔÏ ÏÎ ÂÕÄÅÔ ÉÓËÁÔØÓÑ ÐÏ
+	    ËÁÔÁÌÏÇÅ <varname>DISTDIR</varname>, ÔÏ ÏÎÉ ÂÕÄÕÔ ÉÓËÁÔØÓÑ ÐÏ
 	    ÕËÁÚÁÔÅÌÀ URL <varname>MASTER_SITES</varname>, ËÏÔÏÒÙÊ
-	    ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ × Makefile, Á ÔÁËÖÅ ÎÁ ÎÁÛÅÍ ÏÓÎÏ×ÎÏÍ FTP-ÓÅÒ×ÅÒÅ
-	    ÐÏ ÁÄÒÅÓÕ <uri xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/">ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/</uri>,
+	    ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ × Makefile, Á ÔÁËÖÅ ÎÁ ÎÁÛÉÈ FTP ÚÅÒËÁÌÁÈ,
             ËÕÄÁ ÍÙ ÐÏ ×ÏÚÍÏÖÎÏÓÔÉ ÐÏÍÅÝÁÅÍ ÄÉÓÔÒÉÂÕÔÉ×ÎÙÅ ÆÁÊÌÙ ÄÌÑ ÁÒÈÉ×Á.
 	    úÁÔÅÍ ÏÎÁ ÐÏÐÙÔÁÅÔÓÑ ÓÇÒÕÚÉÔØ ÕËÁÚÁÎÎÙÊ ÆÁÊÌ Ó ÐÏÍÏÝØÀ
 	    <varname>FETCH</varname>, ÐÏÌÁÇÁÑ, ÞÔÏ ÚÁÐÒÁÛÉ×ÁÀÝÁÑ ÍÁÛÉÎÁ ÉÍÅÅÔ
@@ -558,11 +591,22 @@ PLIST_DIRS=     lib/X11/oneko</programli
 	<step>
 	  <para>÷ÙÐÏÌÎÑÅÔÓÑ ÃÅÌØ <buildtarget>build</buildtarget>.  ïÎÁ
 	    ÏÔ×ÅÞÁÅÔ ÚÁ ÐÅÒÅÈÏÄ × ÓÏÂÓÔ×ÅÎÎÙÊ ÒÁÂÏÞÉÊ ËÁÔÁÌÏÇ ÐÏÒÔÁ
-	    (<varname>WRKSRC</varname>) É ÅÇÏ ÐÏÓÔÒÏÅÎÉÅ.  åÓÌÉ ÚÁÄÁÎÁ
-	    ÐÅÒÅÍÅÎÎÁÑ <varname>USES= gmake</varname>, ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ
-	    GNU-×ÅÒÓÉÑ ÕÔÉÌÉÔÙ <command>make</command>, × ÐÒÏÔÉ×ÎÏÍ ÓÌÕÞÁÅ
-	    ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎÁ ÓÉÓÔÅÍÎÁÑ ÕÔÉÌÉÔÁ
-	    <command>make</command>.</para>
+	    (<varname>WRKSRC</varname>) É ÅÇÏ ÐÏÓÔÒÏÅÎÉÅ.</para>
+	</step>
+
+	<step>
+	  <para>÷ÙÐÏÌÎÑÅÔÓÑ ÃÅÌØ <buildtarget>stage</buildtarget>.
+	    ëÏÎÅÞÎÙÊ ÎÁÂÏÒ ÐÏÓÔÒÏÅÎÎÙÈ ÆÁÊÌÏ× ÐÏÍÅÝÁÅÔÓÑ ×Ï ×ÒÅÍÅÎÎÙÊ
+	    ËÁÔÁÌÏÇ (<varname>STAGEDIR</varname>, ÓÍÏÔÒÉÔÅ
+	    <xref linkend="staging"/>).  éÅÒÁÒÈÉÑ ÜÔÏÇÏ
+	    ËÁÔÁÌÏÇÁ ÏÔÒÁÖÁÅÔ ÉÅÒÁÒÈÉÀ ËÁÔÁÌÏÇÏ× ÓÉÓÔÅÍÙ, × ËÏÔÏÒÕÀ
+	    ÄÁÎÎÙÊ ÐÁËÅÔ ÂÕÄÅÔ ÕÓÔÁÎÁ×ÌÉ×ÁÔØÓÑ.</para>
+	</step>
+
+	<step>
+	  <para>÷ÙÐÏÌÎÑÅÔÓÑ ÃÅÌØ <buildtarget>install</buildtarget>.
+	    ÷ ÓÉÓÔÅÍÕ ËÏÐÉÒÕÀÔÓÑ ÆÁÊÌÙ, ÐÅÒÅÞÉÓÌÅÎÎÙÅ × pkg-plist
+	    ÐÏÒÔÁ.</para>
 	</step>
       </procedure>
 
@@ -608,8 +652,9 @@ PLIST_DIRS=     lib/X11/oneko</programli
 	  É ÎÅ ×ÙÐÏÌÎÑÅÔÓÑ ÉÎÆÒÁÓÔÒÕËÔÕÒÏÊ ÐÏÒÔÏ×.</para>
       </note>
 
-      <para>ôÅÐÅÒØ ×Ù ÐÒÅÄÓÔÁ×ÌÑÅÔÅ, ÞÔÏ ÐÒÏÉÓÈÏÄÉÔ, ËÏÇÄÁ ÐÏÌØÚÏ×ÁÔÅÌØ
-	ÎÁÂÉÒÁÅÔ ËÏÍÁÎÄÕ <command>make</command>, ÔÅÐÅÒØ ÄÁ×ÁÊÔÅ ÐÒÏÊÄÅÍÓÑ
+      <para>ôÅÐÅÒØ, ËÏÇÄÁ ×Ù ÐÒÅÄÓÔÁ×ÌÑÅÔÅ, ÞÔÏ ÐÒÏÉÓÈÏÄÉÔ, ËÏÇÄÁ
+	ÐÏÌØÚÏ×ÁÔÅÌØ ÎÁÂÉÒÁÅÔ ËÏÍÁÎÄÕ <command>make install</command>,
+	ÄÁ×ÁÊÔÅ ÐÒÏÊÄÅÍÓÑ
 	ÞÅÒÅÚ ÛÁÇÉ, ÒÅËÏÍÅÎÄÕÅÍÙÅ ÄÌÑ ÓÏÚÄÁÎÉÑ ÎÁÓÔÏÑÝÅÇÏ ÐÏÒÔÁ.</para>
     </sect1>
 
@@ -706,22 +751,44 @@ PLIST_DIRS=     lib/X11/oneko</programli
       <title>óÏÚÄÁÎÉÅ ÐÁÔÞÅÊ</title>
 
       <para>æÁÊÌÙ, ËÏÔÏÒÙÅ ÄÏÂÁ×ÌÑÌÉÓØ ÉÌÉ ÉÚÍÅÎÑÌÉÓØ × ÐÒÏÃÅÓÓÅ ÓÏÚÄÁÎÉÑ
-	ÐÏÒÔÁ, ÍÏÇÕÔ ÂÙÔØ ×ÙÑ×ÌÅÎÙ ×ÙÚÏ×ÏÍ ÐÒÏÇÒÁÍÍÙ &man.diff.1;,
+	ÐÏÒÔÁ, ÍÏÇÕÔ ÂÙÔØ ×ÙÑ×ÌÅÎÙ ÐÒÏÇÒÁÍÍÏÊ &man.diff.1;,
         Á ÒÅÚÕÌØÔÁÔ ÒÁÂÏÔÙ ÜÔÏÊ ÐÒÏÇÒÁÍÍÙ ÍÏÖÅÔ ÂÙÔØ × ÄÁÌØÎÅÊÛÅÍ ÐÅÒÅÄÁÎ
-	ÐÒÏÇÒÁÍÍÅ &man.patch.1;.  ëÁÖÄÙÊ ÐÁÔÞ, ËÏÔÏÒÙÊ ×Ù ÓÏÂÉÒÁÅÔÅÓØ
-	ÐÒÉÍÅÎÉÔØ, ÄÏÌÖÅÎ ÂÙÔØ ÓÏÈÒÁÎÅÎ × ÆÁÊÌ Ó ÉÍÅÎÅÍ
+	ÐÒÏÇÒÁÍÍÅ &man.patch.1;.  ôÁËÏÅ ÄÅÊÓÔ×ÉÅ Ó ÏÂÙÞÎÙÍ ÆÁÊÌÏÍ
+	ÐÏÄÒÁÚÕÍÅ×ÁÅÔ ÓÏÈÒÁÎÅÎÉÅ ËÏÐÉÉ ÆÁÊÌÁ Ó ÐÅÒ×ÏÎÁÞÁÌØÎÙÍ ÓÏÄÅÒÖÉÍÙÍ
+	ÐÅÒÅÄ ×ÎÅÓÅÎÉÅÍ ËÁËÉÈ-ÌÉÂÏ ÉÚÍÅÎÅÎÉÊ.</para>
+
+      <screen>&prompt.user; <userinput>cp <replaceable>file</replaceable> <replaceable>file</replaceable>.orig</userinput></screen>
+
+      <para>ðÁÔÞÉ ÓÏÈÒÁÎÑÀÔÓÑ × ×ÉÄÅ ÆÁÊÌÏ× Ó ÉÍÅÎÅÍ
 	<filename>patch-*</filename>, ÇÄÅ
-	<replaceable>*</replaceable> ÏÂÏÚÎÁÞÁÅÔ ÐÕÔØ Ë ÆÁÊÌÕ, Ë ËÏÔÏÒÏÍÕ
-	ÐÒÉÍÅÎÑÅÔÓÑ ÐÁÔÞ, ÔÁËÏÊ ËÁË
+	<replaceable>*</replaceable> ÏÂÏÚÎÁÞÁÅÔ ÐÕÔØ Ë ÆÁÊÌÕ,
+	Ë ËÏÔÏÒÏÍÕ ÐÒÉÍÅÎÑÅÔÓÑ ÐÁÔÞ, ÔÁËÏÊ ËÁË
         <filename>patch-Imakefile</filename> ÉÌÉ
-        <filename>patch-src-config.h</filename>.  üÔÉ ÆÁÊÌÙ ÄÏÌÖÎÙ ÎÁÈÏÄÉÔØÓÑ ×
+        <filename>patch-src-config.h</filename>.</para>
+
+      <para>ðÏÓÌÅ ÔÏÇÏ ËÁË ÆÁÊÌ ÂÙÌ ÉÚÍÅΣÎ, ÉÓÐÏÌØÚÕÅÔÓÑ &man.diff.1;
+	ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÒÁÚÎÉÃÙ ÍÅÖÄÕ ÐÅÒ×ÏÎÁÞÁÌØÎÏÊ É ÉÚÍÅΣÎÎÏÊ
+	×ÅÒÓÉÑÍÉ.  ðÁÒÁÍÅÔÒ <option>-u</option> ÕËÁÚÙ×ÁÅÔ &man.diff.1;
+	×Ù×ÏÄÉÔØ ÒÁÚÎÉÃÕ × <quote>ÕÎÉÆÉÃÉÒÏ×ÁÎÎÏÍ</quote> ÆÏÒÍÁÔÅ,
+	ËÏÔÏÒÙÊ ÔÁËÖÅ Ñ×ÌÑÅÔÓÑ ÐÒÅÄÐÏÞÔÉÔÅÌØÎÙÍ.</para>
+
+      <screen>&prompt.user; <userinput>diff -u <replaceable>file</replaceable>.orig <replaceable>file</replaceable> > patch-<replaceable>pathname-file</replaceable></userinput></screen>
+
+      <para>äÌÑ ÐÏÒÏÖÄÅÎÉÉ ÐÁÔÞÅÊ ÄÌÑ ÎÏ×ÙÈ ÄÏÂÁ×ÌÑÅÍÙÈ ÆÁÊÌÏ×
+	ÉÓÐÏÌØÚÕÅÔÓÑ ÐÁÒÁÍÅÔÒ <option>-N</option>, ËÏÔÏÒÙÊ ÚÁÓÔÁ×ÌÑÅÔ
+	&man.diff.1; ÔÒÁËÔÏ×ÁÔØ ÎÅÓÕÝÅÓÔ×ÕÀÝÉÅ ÐÒÅÖÄÅ ÆÁÊÌÙ ËÁË ÅÓÌÉ
+	ÂÙ ÏÎÉ ÓÕÝÅÓÔ×Ï×ÁÌÉ, ÎÏ ÉÍÅÌÉ ÐÕÓÔÏÅ ÓÏÄÅÒÖÉÍÏÅ:</para>
+
+      <screen>&prompt.user; <userinput>diff -u -N <replaceable>newfile</replaceable>.orig <replaceable>newfile</replaceable> > patch-<replaceable>pathname-newfile</replaceable></userinput></screen>
+
+      <para>æÁÊÌÙ Ó ÐÁÔÞÁÍÉ ÐÏÍÅÝÁÀÔÓÑ ×
         ËÁÔÁÌÏÇÅ <varname>PATCHDIR</varname>
-	(ËÁË ÐÒÁ×ÉÌÏ, ÜÔÏ <filename>files/</filename>),
+	(ËÁË ÐÒÁ×ÉÌÏ, ÜÔÏ <filename class="directory">files/</filename>),
 	ÏÔËÕÄÁ ÏÎÉ ÂÕÄÕÔ ×ÚÑÔÙ Á×ÔÏÍÁÔÉÞÅÓËÉ.  ÷ÓÅ ÐÁÔÞÉ ÏÂÑÚÁÎÙ ÂÙÔØ ÓÄÅÌÁÎÙ
 	ÏÔÎÏÓÉÔÅÌØÎÏ ËÁÔÁÌÏÇÁ <varname>WRKSRC</varname> (ËÁË ÐÒÁ×ÉÌÏ,
 	ÜÔÏ ËÁÔÁÌÏÇ, × ËÏÔÏÒÙÊ ÒÁÓÐÁËÏ×Ù×ÁÅÔÓÑ ÉÓÈÏÄÎÙÊ ÁÒÈÉ× É ÇÄÅ ÂÕÄÅÔ
 	×ÙÐÏÌÎÑÔØÓÑ ÐÏÓÔÒÏÅÎÉÅ).  äÌÑ ÕÐÒÏÝÅÎÉÑ ×ÎÅÓÅÎÉÑ ÉÚÍÅÎÅÎÉÊ É
-	ÏÂÎÏ×ÌÅÎÉÊ ×Ù ÄÏÌÖÎÙ ÉÚÂÅÇÁÔØ ÎÁÌÉÞÉÑ ÂÏÌÅÅ ÞÅÍ ÏÄÎÏÇÏ ÐÁÔÞÁ ÄÌÑ
+	ÏÂÎÏ×ÌÅÎÉÊ ÉÚÂÅÇÁÊÔÅ ÎÁÌÉÞÉÑ ÂÏÌÅÅ ÞÅÍ ÏÄÎÏÇÏ ÐÁÔÞÁ ÄÌÑ
 	ÏÄÎÏÇÏ É ÔÏÇÏ ÖÅ ÆÁÊÌÁ (ÎÁÐÒÉÍÅÒ, ÐÁÔÞÅÊ
 	<filename>patch-file</filename> É <filename>patch-file2</filename>,
 	ÏÂÁ ÍÅÎÑÀÝÉÈ ÆÁÊÌ <filename>WRKSRC/foobar.c</filename>).
@@ -732,14 +799,23 @@ PLIST_DIRS=     lib/X11/oneko</programli
 	ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÊ ÐÁÔÞ ÓÌÅÄÕÅÔ ÎÁÚ×ÁÔØ
 	<filename>patch-src-freeglut__joystick.c</filename>.</para>
 
-      <para>ðÏÖÁÌÕÊÓÔÁ, ÉÓÐÏÌØÚÕÊÔÅ ÄÌÑ ÉÍÅÎÏ×ÁÎÉÑ ×ÁÛÉÈ ÐÁÔÞÅÊ ÔÏÌØËÏ ÓÉÍ×ÏÌÙ
+      <para>ðÏÖÁÌÕÊÓÔÁ, ÉÓÐÏÌØÚÕÊÔÅ ÄÌÑ ÉÍÅÎÏ×ÁÎÉÑ ÐÁÔÞÅÊ ÔÏÌØËÏ ÓÉÍ×ÏÌÙ
 	<literal>[-+._a-zA-Z0-9]</literal>.  îÅ ÉÓÐÏÌØÚÕÊÔÅ ÌÀÂÙÅ ÄÒÕÇÉÅ
-	ÓÉÍ×ÏÌÙ, ËÒÏÍÅ ÜÔÉÈ.  îÅ ÎÁÚÙ×ÁÊÔÅ ×ÁÛÉ ÐÁÔÞÉ ËÁË
-	<filename>patch-aa</filename> ÉÌÉ <filename>patch-ab</filename> É
-	ÔÁË ÄÁÌÅÅ, ×ÓÅÇÄÁ ÓÓÙÌÁÊÔÅÓØ ÎÁ ÐÕÔØ É ÎÁÚ×ÁÎÉÅ ÆÁÊÌÁ × ÎÁÚ×ÁÎÉÑÈ
+	ÓÉÍ×ÏÌÙ, ËÒÏÍÅ ÜÔÉÈ.  îÅ ÎÁÚÙ×ÁÊÔÅ ÐÁÔÞÉ ËÁË
+	<filename>patch-aa</filename> ÉÌÉ <filename>patch-ab</filename>,
+	×ÓÅÇÄÁ ÓÓÙÌÁÊÔÅÓØ ÎÁ ÐÕÔØ É ÎÁÚ×ÁÎÉÅ ÆÁÊÌÁ × ÎÁÚ×ÁÎÉÑÈ ÓÁÍÉÈ
 	ÐÁÔÞÅÊ.</para>
 
-      <para>îÅ ÐÏÍÅÝÁÊÔÅ ÓÔÒÏËÉ RCS × ÐÁÔÞÉ.  SVN ÂÕÄÅÔ ÉÚÍÅÎÑÔØ ÉÈ ÐÒÉ
+      <para>óÕÝÅÓÔ×ÕÅÔ ÁÌØÔÅÒÎÁÔÉ×ÎÙÊ ÕÐÒÏÝ£ÎÎÙÊ ÓÐÏÓÏ ÓÏÚÄÁÎÉÑ
+	ÐÁÔÞÅÊ ÄÌÑ ÓÕÝÅÓÔ×ÕÀÝÉÈ ÆÁÊÌÏ×.  ðÅÒ×ÙÅ ÛÁÇÉ ÔÅ ÖÅ ÓÁÍÙÅ:
+	ÓÏÚÄÁÎÉÅ ËÏÐÉÉ ÎÅÉÚÍÅΣÎÎÏÇÏ ÆÁÊÌÁ Ó ÒÁÓÛÉÒÅÎÉÅÍ
+	<filename>.orig</filename> É ×ÎÅÓÅÎÉÅ ÉÚÍÅÎÅÎÉÊ.  ðÏÓÌÅ ÜÔÏÇÏ
+	ÉÓÐÏÌØÚÕÊÔÅ <command>make makepatch</command>, ÞÔÏÂÙ ÏÂÎÏ×ÉÔØ
+	ÆÁÊÌÙ Ó ÐÁÔÞÁÍÉ × ËÁÔÁÌÏÇÅ <filename>files</filename> ÄÁÎÎÏÇÏ
+	ÐÏÒÔÁ.</para>
+
+      <para>îÅ ÐÏÍÅÝÁÊÔÅ ÓÔÒÏËÉ RCS × ÐÁÔÞÉ.
+	<application>Subversion</application> ÂÕÄÅÔ ÉÚÍÅÎÑÔØ ÉÈ ÐÒÉ
 	ÐÏÍÅÝÅÎÉÉ ÆÁÊÌÏ× × ÄÅÒÅ×Ï ÐÏÒÔÏ×, É ËÏÇÄÁ ÍÙ ÂÕÄÅÍ ÉÈ ÏÔÔÕÄÁ
 	ÉÚ×ÌÅËÁÔØ, ÏÎÉ ÂÕÄÕÔ ÕÖÅ ÄÒÕÇÉÅ, ÐÏÜÔÏÍÕ ÐÒÉÍÅÎÅÎÉÅ ÐÁÔÞÅÊ
 	ÏËÏÎÞÉÔÓÑ ÎÅÕÄÁÞÅÊ.  óÔÒÏÞËÉ RCS ÐÒÅÄ×ÁÒÑÀÔÓÑ ÚÎÁËÏÍ ÄÏÌÌÁÒÁ
@@ -754,65 +830,72 @@ PLIST_DIRS=     lib/X11/oneko</programli
 	ÒÅÚÅÒ×ÎÙÍÉ ËÏÐÉÑÍÉ ÆÁÊÌÏ×, ÆÁÊÌÙ <filename>Makefile</filename>, ËÏÇÄÁ
 	ËÁË ÐÏÒÔ ÉÓÐÏÌØÚÕÅÔ <command>Imake</command> ÉÌÉ
 	GNU-×ÅÒÓÉÀ ÐÒÏÇÒÁÍÍÙ <command>configure</command>, É ÔÁË ÄÁÌÅÅ,
-	ÎÅ ÎÕÖÎÙ, É ÄÏÌÖÎÙ ÂÙÔØ ÕÄÁÌÅÎÙ.  åÓÌÉ ×Ù ÏÔÒÅÄÁËÔÉÒÏ×ÁÌÉ ÆÁÊÌ
-	<filename>configure.in</filename> É ÚÁÐÕÓÔÉÌÉ
-	<command>autoconf</command> ÄÌÑ ÐÅÒÅÇÅÎÅÒÁÃÉÉ
+	ÎÅ ÎÕÖÎÙ, É ÄÏÌÖÎÙ ÂÙÔØ ÕÄÁÌÅÎÙ.  åÓÌÉ ÂÙÌÏ ÎÅÏÂÈÏÄÉÍÏ
+	ÏÔÒÅÄÁËÔÉÒÏ×ÁÔØ ÆÁÊÌ <filename>configure.in</filename> É
+	ÚÁÐÕÓÔÉÔØ <command>autoconf</command> ÄÌÑ ÐÅÒÅÇÅÎÅÒÁÃÉÉ
 	<command>configure</command>, ÎÅ ÎÕÖÎÏ ×ËÌÀÞÁÔØ ÆÁÊÌÙ diff ÄÌÑ
 	<command>configure</command> (ÏÎÉ ÞÁÓÔÅÎØËÏ ×ÙÒÁÓÔÁÀÔ ÄÏ ÎÅÓËÏÌØËÉÈ
-	ÔÙÓÑÞ ÓÔÒÏË!); ÚÁÄÁÊÔÅ <literal>USE_AUTOTOOLS=autoconf:261</literal> É
+	ÔÙÓÑÞ ÓÔÒÏË!).  ÷ÍÅÓÔÏ ÜÔÏÇÏ ÚÁÄÁÊÔÅ
+	<literal>USE_AUTOTOOLS=autoconf:261</literal> É
 	×ËÌÀÞÉÔÅ diff-ÆÁÊÌ ÄÌÑ <filename>configure.in</filename>.</para>
 
-      <para>ôÁËÖÅ ÐÏÓÔÁÒÁÊÔÅÓØ ÍÉÎÉÍÉÚÉÒÏ×ÁÔØ × ×ÁÛÉÈ ÐÁÔÞÁÈ ÏÂßÅÍ
+      <para>óÔÁÒÁÊÔÅÓØ ÍÉÎÉÍÉÚÉÒÏ×ÁÔØ × ÐÁÔÞÁÈ ÏÂߣÍ
 	ÎÅÆÕÎËÃÉÏÎÁÌØÎÙÈ ÉÚÍÅÎÅÎÉÊ Ó ÐÕÓÔÙÍÉ ÓÉÍ×ÏÌÁÍÉ.  ÷ ÍÉÒÅ ïÔËÒÙÔÏÇÏ
 	éÓÈÏÄÎÏÇÏ ëÏÄÁ Ñ×ÌÑÅÔÓÑ ÒÁÓÐÒÏÓÔÒÁÎÅÎÎÙÍ ÓÏ×ÍÅÓÔÎÏÅ ÉÓÐÏÌØÚÏ×ÁÎÉÅ
 	ÐÒÏÅËÔÁÍÉ ÂÏÌØÛÉÈ ÏÂßÅÍÏ× ËÏÄÏ×ÏÊ ÂÁÚÙ, ÎÏ Ó ÒÁÚÌÉÞÎÙÍÉ ÓÔÉÌÑÍÉ
-	É ÐÒÁ×ÉÌÁÍÉ ÏÔÓÔÕÐÏ×.  åÓÌÉ ×Ù ÂÅÒÅÔÅ ÒÁÂÏÔÁÀÝÕÀ ÆÕÎËÃÉÏÎÁÌØÎÕÀ
-	ÞÁÓÔØ ÉÚ ÏÄÎÏÇÏ ÐÒÏÅËÔÁ ÄÌÑ ÉÓÐÒÁ×ÌÅÎÉÑ ÐÏÈÏÖÅÊ ÏÂÌÁÓÔÉ × ÄÒÕÇÏÍ,
-	ÔÏ ÂÕÄØÔÅ ÁËËÕÒÁÔÎÙ, ÐÏÖÁÌÕÊÓÔÁ: ÐÏÌÕÞÁÅÍÙÊ ÏÄÎÏÓÔÒÏÞÎÙÊ ÐÁÔÞ
-	ÍÏÖÅÔ ÂÙÔØ ÐÏÌÏÎ ÎÅÆÕÎËÃÉÏÎÁÌØÎÙÈ ÉÚÍÅÎÅÎÉÊ.  üÔÏ ÎÅ ÔÏÌØËÏ
-	Õ×ÅÌÉÞÉ×ÁÅÔ ÒÁÚÍÅÒ ÒÅÐÏÚÉÔÏÒÉÑ SVN, ÎÏ ÔÁËÖÅ ÕÓÌÏÖÎÑÅÔ ÐÏÉÓË ÔÏÇÏ,
-	ÞÔÏ ËÏÎËÒÅÔÎÏ ×ÙÚ×ÁÌÏ ÐÒÏÂÌÅÍÕ É ÞÔÏ ×Ù ×ÏÏÂÝÅ ÉÚÍÅÎÉÌÉ.</para>
-
-      <para>åÓÌÉ ×ÁÍ ÎÕÖÎÏ ÕÄÁÌÉÔØ ÆÁÊÌ, ÔÏ ×Ù ÍÏÖÅÔÅ ÓÄÅÌÁÔØ ÜÔÏ ÐÒÉ
-	×ÙÐÏÌÎÅÎÉÉ ÃÅÌÉ <buildtarget>post-extract</buildtarget> ×ÍÅÓÔÏ ÔÏÇÏ,
-	ÞÔÏÂÙ ÏÆÏÒÍÌÑÔØ ÜÔÏ ËÁË ÞÁÓÔØ ÐÁÔÞÁ.</para>
+	É ÐÒÁ×ÉÌÁÍÉ ÏÔÓÔÕÐÏ×.  ðÒÉ ËÏÐÉÒÏ×ÁÎÉÉ ÒÁÂÏÔÁÀÝÅÊ ÆÕÎËÃÉÏÎÁÌØÎÏÊ
+	ÞÁÓÔÉ ÉÚ ÏÄÎÏÇÏ ÐÒÏÅËÔÁ ÄÌÑ ÉÓÐÒÁ×ÌÅÎÉÑ ÐÏÈÏÖÅÊ ÏÂÌÁÓÔÉ × ÄÒÕÇÏÍ,
+	ÂÕÄØÔÅ ÁËËÕÒÁÔÎÙ, ÐÏÖÁÌÕÊÓÔÁ: ÐÏÌÕÞÁÅÍÙÊ ÏÄÎÏÓÔÒÏÞÎÙÊ ÐÁÔÞ
+	ÍÏÖÅÔ ÕËÁÚÁÔØÓÑ ÐÏÌÏÎ ÎÅÆÕÎËÃÉÏÎÁÌØÎÙÈ ÉÚÍÅÎÅÎÉÊ.  üÔÏ ÎÅ ÔÏÌØËÏ
+	Õ×ÅÌÉÞÉ×ÁÅÔ ÒÁÚÍÅÒ ÒÅÐÏÚÉÔÏÒÉÑ <application>Subversion</application>,
+	ÎÏ ÔÁËÖÅ ÕÓÌÏÖÎÑÅÔ ÐÏÉÓË ÔÏÇÏ,
+	ÞÔÏ ËÏÎËÒÅÔÎÏ ×ÙÚ×ÁÌÏ ÐÒÏÂÌÅÍÕ É ÞÔÏ ×ÏÏÂÝÅ ÐÏÍÅÎÑÌÏÓØ.</para>
+
+      <para>åÓÌÉ ÎÕÖÎÏ ÕÄÁÌÉÔØ ÆÁÊÌ, ÓÄÅÌÁÊÔÅ ÜÔÏ ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ ÃÅÌÉ
+	<buildtarget>post-extract</buildtarget>, ×ÍÅÓÔÏ ÔÏÇÏ ÞÔÏÂÙ
+	ÏÆÏÒÍÌÑÔØ ÜÔÏ ËÁË ÞÁÓÔØ ÐÁÔÞÁ.</para>
 
       <para>ðÒÏÓÔÙÅ ÐÅÒÅÍÅÝÅÎÉÑ ÍÏÇÕÔ ÂÙÔØ ×ÙÐÏÌÎÅÎÙ ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÏ ÉÚ
 	<filename>Makefile</filename> ÐÏÒÔÁ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ &man.sed.1; ×
-	ÒÅÖÉÍÅ in-place.  üÔÏ ÏÞÅÎØ ÕÄÏÂÎÏ, ËÏÇÄÁ ×ÁÍ ÎÕÖÎÏ ÐÒÉÍÅÎÉÔØ ÐÁÔÞ
-	ÎÁ ÚÎÁÞÅÎÉÅ ÐÅÒÅÍÅÎÎÏÊ.  ðÒÉÍÅÒ:</para>
+	ÒÅÖÉÍÅ in-place.  üÔÏ ÕÄÏÂÎÏ, ËÏÇÄÁ ÐÒÉ ÉÚÍÅÎÅÎÉÉ ÉÓÐÏÌØÚÕÅÔÓÑ
+	ÚÎÁÞÅÎÉÅ ÐÅÒÅÍÅÎÎÏÊ:</para>
 
       <programlisting>post-patch:
 	@${REINPLACE_CMD} -e 's|for Linux|for FreeBSD|g' ${WRKSRC}/README</programlisting>
 
-      <para>äÏ×ÏÌØÎÏ ÞÁÓÔÏ ÂÙ×ÁÀÔ ÓÉÔÕÁÃÉÉ, ËÏÇÄÁ ÐÏÒÔÉÒÕÅÍÏÅ ÐÒÏÇÒÁÍÍÎÏÅ
-	ÏÂÅÓÐÅÞÅÎÉÅ, ÏÓÏÂÅÎÎÏ ÅÓÌÉ ÏÓÎÏ×ÎÏÊ ÐÌÁÔÆÏÒÍÏÊ ÒÁÚÒÁÂÏÔËÉ Ñ×ÌÑÅÔÓÑ
-	&windows;, ÉÓÐÏÌØÚÕÅÔ ËÏÎ×ÅÎÃÉÀ CR/LF ÄÌÑ ÂÏÌØÛÉÎÓÔ×Á Ó×ÏÉÈ ÉÓÈÏÄÎÙÈ
-	ÆÁÊÌÏ×.  üÔÏ ÍÏÖÅÔ ÂÙÔØ ÐÒÉÞÉÎÏÊ ÐÒÏÂÌÅÍ Ó ÄÁÌØÎÅÊÛÅÊ ÕÐÁËÏ×ËÏÊ,
-	ÐÒÅÄÕÐÒÅÖÄÅÎÉÑÍÉ ËÏÍÐÉÌÑÔÏÒÁ, ×ÙÐÏÌÎÅÎÉÅÍ ÓËÒÉÐÔÏ×
-	(<command>/bin/sh^M</command> not found) É ÔÁË ÄÁÌÅÅ.  äÌÑ ÂÙÓÔÒÏÊ
+      <para>äÏ×ÏÌØÎÏ ÞÁÓÔÏ × ÉÓÈÏÄÎÙÈ ÆÁÊÌÁÈ ÐÏÒÔÉÒÕÅÍÏÇÏ ÐÒÏÇÒÁÍÍÎÏÇÏ
+	ÏÂÅÓÐÅÞÅÎÉÑ ÉÓÐÏÌØÚÕÅÔÓÑ ËÏÎ×ÅÎÃÉÑ CR/LF.  üÔÏ ÍÏÖÅÔ ÓÔÁÔØ
+	ÐÒÉÞÉÎÏÊ ÐÒÏÂÌÅÍ Ó ÄÁÌØÎÅÊÛÅÊ ÕÐÁËÏ×ËÏÊ, ÐÒÅÄÕÐÒÅÖÄÅÎÉÑÍÉ
+	ËÏÍÐÉÌÑÔÏÒÁ ÉÌÉ ×ÙÐÏÌÎÅÎÉÅÍ ÓËÒÉÐÔÏ× (ÔÁËÉÈ ËÁË
+	<literal>/bin/sh^M not found</literal>).  äÌÑ ÂÙÓÔÒÏÇÏ
 	ÐÒÅÏÂÒÁÚÏ×ÁÎÉÑ ×ÓÅÈ ÆÁÊÌÏ× ÉÚ CR/LF ÐÒÏÓÔÏ × LF ÄÏÂÁ×ØÔÅ
-	<literal>USE_DOS2UNIX=yes</literal> × <filename>Makefile</filename>
-	ÐÏÒÔÁ.  íÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÐÅÒÅÞÅÎØ ÐÒÅÏÂÒÁÚÕÅÍÙÈ ÆÁÊÌÏ×:</para>
+	× <filename>Makefile</filename>	ÐÏÒÔÁ ÜÔÕ ÚÁÐÉÓØ:</para>
+
+      <programlisting>USES=	dos2unix</programlisting>
 
-      <programlisting>USE_DOS2UNIX=    util.c util.h</programlisting>
+      <para>íÏÖÅÔ ÂÙÔØ ÚÁÄÁÎ ÔÏÞÎÙÊ ÓÐÉÓÏË ÐÒÅÏÂÒÁÚÕÅÍÙÈ ÆÁÊÌÏ×:</para>
 
-      <para>åÓÌÉ ×Ù ÈÏÔÉÔÅ ÐÒÅÏÂÒÁÚÏ×ÁÔØ ÇÒÕÐÐÕ ÆÁÊÌÏ× × ÒÁÚÎÙÈ ÐÏÄËÁÔÁÌÏÇÁÈ,
-	ÔÏ ÄÌÑ ÜÔÏÇÏ ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ <varname>DOS2UNIX_REGEX</varname>.
+      <programlisting>USES=	dos2unix
+DOS2UNIX_FILES=	util.c util.h</programlisting>
+
+      <para>éÓÐÏÌØÚÕÊÔÅ <varname>DOS2UNIX_REGEX</varname>, ÞÔÏÂÙ
+	ÐÒÅÏÂÒÁÚÏ×ÁÔØ ÇÒÕÐÐÕ ÆÁÊÌÏ× × ÒÁÚÎÙÈ ÐÏÄËÁÔÁÌÏÇÁÈ.
 	åÇÏ ÐÁÒÁÍÅÔÒÏÍ Ñ×ÌÑÅÔÓÑ ÒÅÇÕÌÑÒÎÏÅ ×ÙÒÁÖÅÎÉÅ, ÓÏ×ÍÅÓÔÉÍÏÅ Ó
-	<command>find</command>.  ðÏÄÒÏÂÎÅÅ Ï ÆÏÒÍÁÔÅ × &man.re.format.7;.
-	üÔÁ ÏÐÃÉÑ ÉÓÐÏÌØÚÕÅÔÓÑ ÄÌÑ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÑ ×ÓÅÈ ÆÁÊÌÏ× ÚÁÄÁÎÎÏÇÏ
-	ÒÁÓÛÉÒÅÎÉÑ, Ë ÐÒÉÍÅÒÕ ×ÓÅÈ ÉÓÈÏÄÎÙÈ ÆÁÊÌÏ×, ÎÅ ÚÁÔÒÁÇÉ×ÁÑ Ä×ÏÉÞÎÙÅ
-	ÆÁÊÌÙ:</para>
-
-      <programlisting>USE_DOS2UNIX=    yes
-DOS2UNIX_REGEX=  .*\.(c|cpp|h)</programlisting>
-
-      <para>åÓÌÉ ×Ù ÈÏÔÉÔÅ ÓÏÚÄÁÔØ ÐÁÔÞ ÎÁ ÏÓÎÏ×Å ÓÕÝÅÓÔ×ÕÀÝÅÇÏ ÆÁÊÌÁ, ÔÏ ×Ù
-	ÍÏÖÅÔÅ ÅÇÏ ÓËÏÐÉÒÏ×ÁÔØ Ó ÒÁÓÛÉÒÅÎÉÅÍ <filename>.orig</filename>, Á
-	ÚÁÔÅÍ ÉÚÍÅÎÉÔØ ÉÓÈÏÄÎÙÊ.  ãÅÌØ<buildtarget>makepatch</buildtarget>
-	ÚÁÐÉÛÅÔ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÊ ÆÁÊÌ Ó ÐÁÔÞÅÍ × ËÁÔÁÌÏÇ
-	<filename>files</filename> ÄÁÎÎÏÇÏ ÐÏÒÔÁ.</para>
+	&man.find.1;.  ðÏÄÒÏÂÎÅÅ Ï ÆÏÒÍÁÔÅ × &man.re.format.7;.
+	ôÁËÏÊ ×ÁÒÉÁÎÔ ÕÄÏÂÅÎ ÄÌÑ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÑ ×ÓÅÈ ÆÁÊÌÏ× ÚÁÄÁÎÎÏÇÏ
+	ÒÁÓÛÉÒÅÎÉÑ.  äÌÑ ÐÒÉÍÅÒÁ, ÐÒÅÏÂÒÁÚÕÅÍ ×ÓÅ ÉÓÈÏÄÎÙÅ ÆÁÊÌÙ,
+	ÎÅ ÚÁÔÒÁÇÉ×ÁÑ Ä×ÏÉÞÎÙÅ ÆÁÊÌÙ:</para>
+
+      <programlisting>USES=	dos2unix
+DOS2UNIX_REGEX=	.*\.([ch]|cpp)</programlisting>
+
+      <para>äÒÕÇÉÍ ×ÁÒÉÁÎÔÏÍ Ñ×ÌÑÅÔÓÑ ÉÓÐÏÌØÚÏ×ÁÎÉÅ
+	<varname>DOS2UNIX_GLOB</varname>, ËÏÔÏÒÙÊ ×ÙÚÙ×ÁÅÔ
+	<command>find</command> ÄÌÑ ËÁÖÄÏÇÏ ÉÚ ÐÅÒÅÞÉÓÌÅÎÎÙÈ × Î£Í
+	ÜÌÅÍÅÎÔÏ×.</para>
+
+      <programlisting>USES=	dos2unix
+DOS2UNIX_GLOB=	*.c *.cpp *.h</programlisting>
     </sect1>
 
     <sect1 xml:id="slow-configure">
@@ -913,13 +996,16 @@ DOS2UNIX_REGEX=  .*\.(c|cpp|h)</programl
             ÅÓÔØ ËÁÖÄÙÊ ÒÁÚ, ËÏÇÄÁ ÓÏÚÄÁÔÅÌÑÍÉ ×ÙÐÕÓËÁÅÔÓÑ ÎÏ×ÙÊ ÏÆÉÃÉÁÌØÎÙÊ
             ÒÅÌÉÚ), É ÄÏÂÁ×ÌÑÅÔÓÑ Ë ÉÍÅÎÉ ÐÁËÅÔÁ, ÅÓÌÉ ÏÎÏ ÎÅ ÒÁ×ÎÏ ÎÕÌÀ.
             éÚÍÅÎÅÎÉÑ × <varname>PORTREVISION</varname> ÉÓÐÏÌØÚÕÀÔÓÑ
-            Á×ÔÏÍÁÔÉÚÉÒÏ×ÁÎÎÙÍÉ ÉÎÓÔÒÕÍÅÎÔÁÍÉ (ÎÁÐÒÉÍÅÒ, &man.pkg.version.1;)
+            Á×ÔÏÍÁÔÉÚÉÒÏ×ÁÎÎÙÍÉ ÉÎÓÔÒÕÍÅÎÔÁÍÉ (ÎÁÐÒÉÍÅÒ,
+	    <command>pkg version</command>, ÓÍ. &man.pkg-version.8;)
             ÄÌÑ ÏÐÒÅÄÅÌÅÎÉÑ ÆÁËÔÁ ÐÏÑ×ÌÅÎÉÑ ÎÏ×ÏÇÏ ÐÁËÅÔÁ.</para>
 
           <para>úÎÁÞÅÎÉÅ <varname>PORTREVISION</varname> ÄÏÌÖÎÏ Õ×ÅÌÉÞÉ×ÁÔØÓÑ
             ËÁÖÄÙÊ ÒÁÚ, ËÏÇÄÁ × ÐÏÒÔÅ FreeBSD ÄÅÌÁÀÔÓÑ ÉÚÍÅÎÅÎÉÑ, ËÏÔÏÒÙÅ
-            ÄÏÓÔÁÔÏÞÎÏ ÓÉÌØÎÏ ÚÁÔÒÁÇÉ×ÁÀÔ ÓÏÄÅÒÖÉÍÏÅ ÉÌÉ ÓÔÒÕËÔÕÒÕ
-            ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ ÐÁËÅÔÁ.</para>
+	    ËÁË-ÌÉÂÏ ÍÅÎÑÀÔ ÐÏÌÕÞÁÅÍÙÊ ÐÁËÅÔ.  óÀÄÁ ÏÔÎÏÓÑÔÓÑ ÔÏÌØËÏ
+	    ÉÚÍÅÎÅÎÉÑ, ÚÁÔÒÁÇÉ×ÁÀÝÉÅ ÐÏÓÔÒÏÅÎÉÅ ÐÁËÅÔÁ Ó <link
+	      linkend="makefile-options">ÐÁÒÁÍÅÔÒÁÍÉ</link> ÐÏ
+	    ÕÍÏÌÞÁÎÉÀ.</para>
 
           <para>ðÒÉÍÅÒÙ ÓÌÕÞÁÅ×, ËÏÇÄÁ ÚÎÁÞÅÎÉÅ <varname>PORTREVISION</varname>
             ÄÏÌÖÎÏ ÂÙÔØ Õ×ÅÌÉÞÅÎÏ:</para>
@@ -1009,7 +1095,7 @@ DOS2UNIX_REGEX=  .*\.(c|cpp|h)</programl
           <title><varname>PORTEPOCH</varname></title>
 
           <para>÷ÒÅÍÑ ÏÔ ×ÒÅÍÅÎÉ ÒÁÚÒÁÂÏÔÞÉË ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ ÉÌÉ
-            ÓÏÚÄÁÔÅÌØ ÐÏÒÔÁ FreeBSD ÄÅÌÁÀÔ ÞÔÏ-ÔÏ ÎÅ ÔÁË É ×ÙÐÕÓËÁÀÔ ×ÅÒÓÉÀ
+            ÓÏÚÄÁÔÅÌØ ÐÏÒÔÁ &os; ÄÅÌÁÀÔ ÞÔÏ-ÔÏ ÎÅ ÔÁË É ×ÙÐÕÓËÁÀÔ ×ÅÒÓÉÀ
             ÐÒÏÇÒÁÍÍÙ, ÎÏÍÅÒ ËÏÔÏÒÏÊ ÍÅÎØÛÅ ÐÒÅÄÙÄÕÝÅÊ ×ÅÒÓÉÉ.  ðÒÉÍÅÒÏÍ ÜÔÏÇÏ
             Ñ×ÌÑÅÔÓÑ ÐÏÒÔ, ÎÁÚ×ÁÎÉÅ ËÏÔÏÒÏÇÏ ÍÅÎÑÅÔÓÑ Ó foo-20000801 ÎÁ foo-1.0
             (ÉÚÎÁÞÁÌØÎÏ ÜÔÏ ÎÅ ÓÞÉÔÁÌÏÓØ ÂÙ ÂÏÌÅÅ ÎÏ×ÏÊ ×ÅÒÓÉÅÊ, ÔÁË ËÁË
@@ -1018,9 +1104,8 @@ DOS2UNIX_REGEX=  .*\.(c|cpp|h)</programl
 	  <tip>
 	    <para>òÅÚÕÌØÔÁÔ ÓÒÁ×ÎÅÎÉÑ ÎÏÍÅÒÁ ×ÅÒÓÉÉ ÎÅ ×ÓÅÇÄÁ ÏÞÅ×ÉÄÅÎ.
 	      äÌÑ ×ÙÐÏÌÎÅÎÉÑ ÓÒÁ×ÎÅÎÉÑ Ä×ÕÈ ÓÔÒÏË Ó ÎÏÍÅÒÏÍ ×ÅÒÓÉÉ ÍÏÖÎÏ
-	      ÉÓÐÏÌØÚÏ×ÁÔØ &man.pkg.version.1;.  üË×É×ÁÌÅÎÔÏÍ ×
-	      <application>pkgng</application> Ñ×ÌÑÅÔÓÑ
-	      <command>pkg version -t</command>.  îÁÐÒÉÍÅÒ:</para>
+	      ÉÓÐÏÌØÚÏ×ÁÔØ <command>pkg version</command>
+	      (ÓÍ. &man.pkg-version.8;).  îÁÐÒÉÍÅÒ:</para>
 
 	    <screen>&prompt.user; <userinput>pkg_version -t 0.031 0.29</userinput>
 ></screen>
@@ -1060,7 +1145,7 @@ DOS2UNIX_REGEX=  .*\.(c|cpp|h)</programl
             ËÏÒÒÅËÔÎÏÍ ÉÓÐÏÌØÚÏ×ÁÎÉÉ <varname>PORTVERSION</varname> ÍÏÖÅÔ
             ÐÏÑ×ÉÔØÓÑ ÎÅÏÂÈÏÄÉÍÏÓÔØ Å£ ÉÍÅÔØ, ÅÓÌÉ × ÂÕÄÕÝÉÈ ÒÅÌÉÚÁÈ
             ÐÒÏÇÒÁÍÍÎÏÅ ÏÂÅÓÐÅÞÅÎÉÅ ÄÏÌÖÎÏ ÉÚÍÅÎÉÔØ ÓÔÒÕËÔÕÒÕ ÎÏÍÅÒÁ ×ÅÒÓÉÉ.
-            ïÄÎÁËÏ ÓÏÚÄÁÔÅÌÑÍ ÐÏÒÔÏ× ÎÕÖÎÏ ÂÙÔØ ×ÎÉÍÁÔÅÌØÎÙÍÉ, ËÏÇÄÁ
+            ïÄÎÁËÏ ÓÏÚÄÁÔÅÌÑÍ ÐÏÒÔÏ× ÄÌÑ &os; ÎÕÖÎÏ ÂÙÔØ ×ÎÉÍÁÔÅÌØÎÙÍÉ, ËÏÇÄÁ
             ÒÁÚÒÁÂÏÔÞÉË ×ÙÐÕÓËÁÅÔ ÒÅÌÉÚ ÂÅÚ ÏÆÉÃÉÁÌØÎÏÇÏ ÎÏÍÅÒÁ ×ÅÒÓÉÉ —
             ÜÄÁËÉÅ <quote>ÐÒÏÍÅÖÕÔÏÞÎÙÅ</quote> ÒÅÌÉÚÙ.  éÍÅÅÔÓÑ ÓÏÂÌÁÚÎ
             ÐÏÍÅÔÉÔØ ÒÅÌÉÚ ÄÁÔÏÊ ÅÇÏ ×ÙÈÏÄÁ, ÞÔÏ ÍÏÖÅÔ ×ÙÚ×ÁÔØ ÐÒÏÂÌÅÍÙ, ËÁË É
@@ -1091,7 +1176,7 @@ PORTVERSION=    0.10</programlisting>
 
           <para>ïÂÎÁÒÕÖÅÎÁ ÂÒÅÛØ × ÂÅÚÏÐÁÓÎÏÓÔÉ, ÉÓÐÒÁ×ÌÅÎÉÅ ËÏÔÏÒÏÊ
 	    ÐÏÔÒÅÂÏ×ÁÌÏ ÓÏÚÄÁÎÉÑ
-            ÌÏËÁÌØÎÏÇÏ ÐÁÔÞÁ ÄÌÑ FreeBSD.  óÏÏÔ×ÅÔÓÔ×ÅÎÎÏ ÂÙÌÏ Õ×ÅÌÉÞÅÎÏ
+            ÌÏËÁÌØÎÏÇÏ ÐÁÔÞÁ ÄÌÑ &os;.  óÏÏÔ×ÅÔÓÔ×ÅÎÎÏ ÂÙÌÏ Õ×ÅÌÉÞÅÎÏ
             ÚÎÁÞÅÎÉÅ ÐÅÒÅÍÅÎÎÏÊ <varname>PORTREVISION</varname>.</para>
 
           <programlisting>PORTNAME=       gtkmumble
@@ -1165,40 +1250,6 @@ PORTEPOCH=      1</programlisting>
           ÞÁÓÔØÀ ÚÎÁÞÅÎÉÑ ÐÅÒÅÍÅÎÎÏÊ <varname>PORTNAME</varname>.</para>
       </sect2>
 
-      <sect2>
-	<title><varname>LATEST_LINK</varname></title>
-
-	<para><varname>LATEST_LINK</varname> ÚÁÄÁÅÔ × ÐÒÏÃÅÓÓÅ ÐÏÓÔÒÏÅÎÉÑ
-	  ÐÁËÅÔÁ ËÏÒÏÔËÏÅ ÉÍÑ ÓÓÙÌËÉ, ËÏÔÏÒÙÅ ÍÏÇÕÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÐÒÉ
-	  ×ÙÐÏÌÎÅÎÉÉ ËÏÍÁÎÄÙ <command>pkg_add -r</command>.  üÔÏ ÐÏÚ×ÏÌÑÅÔ,
-	  Ë ÐÒÉÍÅÒÕ, ÕÓÔÁÎÏ×ÉÔØ ÐÏÓÌÅÄÎÀÀ ×ÅÒÓÉÀ perl, ÉÓÐÏÌØÚÕÑ
-	  <command>pkg_add -r perl</command>, ÂÅÚ ÚÎÁÎÉÑ ÔÏÞÎÏÇÏ ÎÏÍÅÒÁ
-	  ×ÅÒÓÉÉ.  ôÁËÏÅ ÉÍÑ ÄÏÌÖÎÏ ÂÙÔØ ÕÎÉËÁÌØÎÙÍ É ÏÞÅ×ÉÄÎÙÍ ÄÌÑ
-	  ÐÏÌØÚÏ×ÁÔÅÌÅÊ.</para>
-
-	<para>÷ ÎÅËÏÔÏÒÙÈ ÓÌÕÞÁÑÈ × ËÏÌÌÅËÃÉÉ ÐÏÒÔÏ× ÍÏÖÅÔ ÐÒÉÓÕÔÓÔ×Ï×ÁÔØ
-	  ÎÅÓËÏÌØËÏ ×ÅÒÓÉÊ ÐÒÏÇÒÁÍÍÙ ÏÄÎÏ×ÒÅÍÅÎÎÏ.  ïÂÅ ÓÉÓÔÅÍÙ, ÐÏÓÔÒÏÅÎÉÑ
-	  ÉÎÄÅËÓÏ× É ÐÏÓÔÒÏÅÎÉÑ ÐÁËÅÔÏ×, ÎÕÖÄÁÀÔÓÑ × ÓÐÏÓÏÂÎÏÓÔÉ ÉÈ ×ÉÄÅÔØ
-	  ËÁË ÒÁÚÎÙÅ, ÎÅÚÁ×ÉÓÉÍÙÅ ÐÏÒÔÙ, ÈÏÔÑ ×ÓÅ ÏÎÉ ÍÏÇÕÔ ÉÍÅÔØ ÓÈÏÖÅÅ
-	  ÚÎÁÞÅÎÉÅ ÄÌÑ <varname>PORTNAME</varname>,
-	  <varname>PKGNAMEPREFIX</varname> É ÄÁÖÅ
-	  <varname>PKGNAMESUFFIX</varname>.  ÷ ÜÔÉÈ ÓÌÕÞÁÑÈ ÄÌÑ ×ÓÅÈ ÐÏÒÔÏ×
-	  ËÒÏÍÅ <quote>ÇÌÁ×ÎÏÇÏ</quote> ÓÌÅÄÕÅÔ ÐÒÉÓ×ÏÉÔØ ÒÁÚÌÉÞÎÙÅ ÚÎÁÞÅÎÉÑ ÄÌÑ
-	  ÎÅÏÂÑÚÁÔÅÌØÎÏÊ ÐÅÒÅÍÅÎÎÏÊ <varname>LATEST_LINK</varname> —
-	  ÞÔÏÂÙ ÐÏÌÕÞÉÔØ ÐÒÉÍÅÒ ÅÅ ÉÓÐÏÌØÚÏ×ÁÎÉÑ, ÓÍÏÔÒÉÔÅ ÐÏÒÔÙ
-	  <filename>lang/gcc46</filename> É <filename>lang/gcc</filename>,
-	  Á ÔÁËÖÅ ÓÅÍÅÊÓÔ×Ï <filename>www/apache*</filename>.  ðÒÉ ÕÓÔÁÎÏ×ËÅ
-	  <varname>NO_LATEST_LINK</varname> ÓÓÙÌËÉ ÎÅ ÓÏÚÄÁÀÔÓÑ; ÜÔÁ
-	  ÎÅÏÂÑÚÁÔÅÌØÎÁÑ ÐÅÒÅÍÅÎÎÁÑ ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ×Ï ×ÓÅÈ ×ÅÒÓÉÑÈ,
-	  ËÒÏÍÅ <quote>ÇÌÁ×ÎÏÊ</quote>.  ïÂÒÁÔÉÔÅ
-	  ×ÎÉÍÁÎÉÅ, ËÁË ×ÙÂÉÒÁÔØ <quote>ÇÌÁ×ÎÕÀ</quote> ×ÅÒÓÉÀ —
-	  <quote>ÓÁÍÕÀ ÐÏÐÕÌÑÒÎÕÀ</quote>, <quote>ÓÁÍÕÀ ÐÏÄÄÅÒÖÉ×ÁÅÍÕÀ</quote>,
-	  <quote>Ó ÎÁÉÍÅÎØÛÉÍÉ ÉÚÍÅÎÅÎÉÑÍÉ</quote> É ÔÁË ÄÁÌÅÅ — ÜÔÏ
-	  ×ÙÈÏÄÉÔ ÚÁ ÒÁÍËÉ ÒÅËÏÍÅÎÄÁÃÉÊ ÜÔÏÇÏ ÒÕËÏ×ÏÄÓÔ×Á; ÍÙ ×ÓÅÇÏ ÌÉÛØ
-	  ÓÏÏÂÝÁÅÍ ×ÁÍ, ËÁË ÕËÁÚÙ×ÁÔØ ×ÅÒÓÉÉ ÄÒÕÇÉÈ ÐÏÒÔÏ× ÐÏÓÌÅ ÔÏÇÏ, ËÁË
-	  ×Ù ×ÙÂÒÁÌÉ <quote>ÇÌÁ×ÎÙÊ</quote>.</para>
-      </sect2>
-
       <sect2 xml:id="porting-pkgname">
         <title>óÏÇÌÁÛÅÎÉÑ ÐÏ ÉÍÅÎÏ×ÁÎÉÀ ÐÁËÅÔÏ×</title>
 
@@ -1218,7 +1269,7 @@ PORTEPOCH=      1</programlisting>
 
         <orderedlist>
           <listitem>
-	    <para>FreeBSD ÐÙÔÁÅÔÓÑ ÐÏÄÄÅÒÖÉ×ÁÔØ ÑÚÙËÉ, ÎÁ ËÏÔÏÒÙÈ ÒÁÚÇÏ×ÁÒÉ×ÁÀÔ
+	    <para>&os; ÐÙÔÁÅÔÓÑ ÐÏÄÄÅÒÖÉ×ÁÔØ ÑÚÙËÉ, ÎÁ ËÏÔÏÒÙÈ ÒÁÚÇÏ×ÁÒÉ×ÁÀÔ
 	      Å£ ÐÏÌØÚÏ×ÁÔÅÌÉ.  þÁÓÔØ <replaceable>language-</replaceable>
 	      ÄÏÌÖÎÁ ÂÙÔØ Ä×ÕÈÓÉÍ×ÏÌØÎÙÍ ÓÏËÒÁÝÅÎÉÅÍ ÏÔ ÎÁÚ×ÁÎÉÑ ÑÚÙËÁ ÐÏ
 	      ÓÔÁÎÄÁÒÔÕ ISO-639, ÅÓÌÉ ÐÏÒÔ ÓÐÅÃÉÆÉÞÅÎ ÄÌÑ ËÏÎËÒÅÔÎÏÇÏ ÑÚÙËÁ.
@@ -1262,9 +1313,8 @@ PORTEPOCH=      1</programlisting>
 	      ÉÍÅÀÔ ÏÄÉÎÁËÏ×ÙÊ <varname>PORTNAME</varname>, Ñ×ÌÑÅÔÓÑ ×ÐÏÌÎÅ
 	      ÎÏÒÍÁÌØÎÙÍ, ËÁË ÄÌÑ ÐÏÒÔÏ× <filename>www/apache*</filename>;
 	      × ÜÔÏÍ ÓÌÕÞÁÅ ÒÁÚÌÉÞÎÙÅ ×ÅÒÓÉÉ (É ÒÁÚÌÉÞÎÙÅ ÚÁÐÉÓÉ × ÉÎÄÅËÓÅ)
-	      ÏÔÌÉÞÁÀÔÓÑ ÐÏ ÚÎÁÞÅÎÉÑÍ <varname>PKGNAMEPREFIX</varname>,
-	      <varname>PKGNAMESUFFIX</varname> É
-	      <varname>LATEST_LINK</varname>.</para>
+	      ÏÔÌÉÞÁÀÔÓÑ ÐÏ ÚÎÁÞÅÎÉÑÍ <varname>PKGNAMEPREFIX</varname>
+	      É <varname>PKGNAMESUFFIX</varname>.</para>
           </listitem>
 
           <listitem>
@@ -1613,7 +1663,7 @@ PORTEPOCH=      1</programlisting>
 
               <row>
                 <entry><filename>docs*</filename></entry>
-                <entry>íÅÔÁ-ÐÏÒÔÙ ÄÌÑ ÄÏËÕÍÅÎÔÁÃÉÉ FreeBSD.</entry>
+                <entry>íÅÔÁ-ÐÏÒÔÙ ÄÌÑ ÄÏËÕÍÅÎÔÁÃÉÉ &os;.</entry>
                 <entry/>
               </row>
 
@@ -1902,7 +1952,7 @@ PORTEPOCH=      1</programlisting>
               <row>
                 <entry><filename>ports-mgmt</filename></entry>
                 <entry>ðÏÒÔÙ ÄÌÑ ÕÐÒÁ×ÌÅÎÉÑ, ÕÓÔÁÎÏ×ËÉ É ÒÁÚÒÁÂÏÔËÉ
-		  ÐÏÒÔÏ× É ÐÁËÅÔÏ× FreeBSD.</entry>
+		  ÐÏÒÔÏ× É ÐÁËÅÔÏ× &os;.</entry>
                 <entry/>
               </row>
 
@@ -2158,7 +2208,9 @@ PORTEPOCH=      1</programlisting>
 	  <listitem>
 	    <para>ðÏÒÔÙ, ÕÓÔÁÎÁ×ÌÉ×ÁÀÝÉÅ ÚÁÇÒÕÖÁÅÍÙÅ ÍÏÄÕÌÉ ÑÄÒÁ, ÄÏÌÖÎÙ
 	      ÓÏÄÅÒÖÁÔØ ×ÉÒÔÕÁÌØÎÕÀ ËÁÔÅÇÏÒÉÀ <filename>kld</filename> ×
-	      ÓÔÒÏËÅ <varname>CATEGORIES</varname>.
+	      ÓÔÒÏËÅ <varname>CATEGORIES</varname>.  üÔÏ ÏÄÎÏ ÉÚ ÄÅÊÓÔ×ÉÊ,
+	      ×ÙÐÏÌÎÑÅÍÙÈ Á×ÔÏÍÁÔÉÞÅÓËÉ Ó ÄÏÂÁ×ÌÅÎÉÅÍ
+	      <literal>kmod</literal> × ÓÔÒÏËÅ <varname>USES</varname>.
 	    </para>
 	  </listitem>
 
@@ -2694,7 +2746,7 @@ EXTRACT_ONLY=  source.tar.gz</programlis
           ÎÁ ÓÅÔØ, ËÏÔÏÒÕÀ ÜÔÏ ÄÁ£Ô.</para>
 
 	<para>÷ ÐÏÓÌÅÄÕÀÝÉÈ ÒÁÚÄÅÌÁÈ ÉÎÆÏÒÍÁÃÉÑ ÂÕÄÅÔ ÄÁ×ÁÔØÓÑ ×ÍÅÓÔÅ Ó
-           ÒÅÁÌÉÚÁÃÉÅÊ ÜÔÏÊ ÉÄÅÉ ×Ï FreeBSD.  íÙ ÎÅÓËÏÌØËÏ ÕÌÕÞÛÉÌÉ ËÏÎÃÅÐÃÉÀ
+           ÒÅÁÌÉÚÁÃÉÅÊ ÜÔÏÊ ÉÄÅÉ ×Ï &os;.  íÙ ÎÅÓËÏÌØËÏ ÕÌÕÞÛÉÌÉ ËÏÎÃÅÐÃÉÀ
            OpenBSD.</para>
 
 	<sect3>
@@ -3358,9 +3410,9 @@ ALWAYS_KEEP_DISTFILES=  yes
       <orderedlist>
 	<listitem>
 	  <para>óÔÁÒÁÊÔÅÓØ ÄÅÌÁÔØ ÓÔÒÏËÕ COMMENT ÄÌÉÎÏÊ ÎÅ ÂÏÌØÛÅ, ÞÅÍ 70
-	    ÓÉÍ×ÏÌÏ×, ÔÁË ËÁË ÜÔÁ ÓÔÒÏËÁ ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎÁ ÐÒÏÇÒÁÍÍÏÊ
-	    &man.pkg.info.1; ÄÌÑ ÏÔÏÂÒÁÖÅÎÉÑ ÏÄÎÏÓÔÒÏÞÎÏÇÏ ÏÐÉÓÁÎÉÑ
-	    ÐÏÒÔÁ;</para>
+	    ÓÉÍ×ÏÌÏ×, ÔÁË ËÁË ÜÔÁ ÓÔÒÏËÁ ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎÁ ËÏÍÁÎÄÏÊ
+	    <command>pkg info</command> (ÓÍ. &man.pkg-info.8;) ÄÌÑ
+	    ÏÔÏÂÒÁÖÅÎÉÑ ÏÄÎÏÓÔÒÏÞÎÏÇÏ ÏÐÉÓÁÎÉÑ ÐÏÒÔÁ;</para>
 	</listitem>
 
 	<listitem>
@@ -3442,7 +3494,7 @@ ALWAYS_KEEP_DISTFILES=  yes
 	  <para>ëÏÇÄÁ URL, × ËÏÔÏÒÙÈ ÕËÁÚÁÎÙ ÄÏÓÔÕÐÎÙÅ ×ÅÒÓÉÉ, ÏÔÌÉÞÁÀÔÓÑ
 	    ÏÔ URL ÉÈ ÚÁÇÒÕÚËÉ.  îÁÐÒÉÍÅÒ, ÞÔÏÂÙ ÐÒÉ×ÑÚÁÔØ ÐÒÏ×ÅÒËÕ ÎÏ×ÙÈ
 	    ×ÅÒÓÉÊ ÄÉÓÔÒÉÂÕÔÉ×ÎÙÈ ÆÁÊÌÏ× Ë ÓÔÒÁÎÉÃÅ ÚÁÇÒÕÚËÉ ÄÌÑ ÐÏÒÔÁ
-	    <package>databases/pgtune</package>,
+	    <package role="port">databases/pgtune</package>,
 	    ÄÏÂÁ×ØÔÅ:</para>
 
 	  <programlisting>PORTSCOUT=	site:http://pgfoundry.org/frs/?group_id=1000416</programlisting>
@@ -3482,9 +3534,10 @@ ALWAYS_KEEP_DISTFILES=  yes
 	  ÏÔÓÕÔÓÔ×ÕÅÔ.</para>
 
 	<para>úÁ×ÉÓÉÍÏÓÔØ ÐÒÏ×ÅÒÑÅÔÓÑ Ä×ÁÖÄÙ, ÏÄÉÎ ÒÁÚ ×ÎÕÔÒÉ ÃÅÌÉ
-	  <buildtarget>extract</buildtarget>, Á ÚÁÔÅÍ ÉÚ ÃÅÌÉ
+	  <buildtarget>build</buildtarget>, Á ÚÁÔÅÍ ÉÚ ÃÅÌÉ
 	  <buildtarget>install</buildtarget>.  ëÒÏÍÅ ÔÏÇÏ, ÉÍÑ ÚÁ×ÉÓÉÍÏÓÔÉ
-	  ÐÏÍÅÝÁÅÔÓÑ × ÐÁËÅÔ, ÔÁË ÞÔÏ &man.pkg.add.1; ÂÕÄÅÔ
+	  ÐÏÍÅÝÁÅÔÓÑ × ÐÁËÅÔ, ÔÁË ÞÔÏ <command>pkg install</command>
+	  (ÓÍ. &man.pkg-install.8;) ÂÕÄÅÔ
 	  Á×ÔÏÍÁÔÉÞÅÓËÉ Å£ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ, ÅÓÌÉ Å£ ÎÅÔ ÎÁ ÐÏÌØÚÏ×ÁÔÅÌØÓËÏÊ
 	  ÓÉÓÔÅÍÅ.</para>
       </sect2>
@@ -3537,7 +3590,8 @@ ALWAYS_KEEP_DISTFILES=  yes
 
 	<para>úÁ×ÉÓÉÍÏÓÔØ ÐÒÏ×ÅÒÑÅÔÓÑ ×ÎÕÔÒÉ ÃÅÌÉ
 	  <buildtarget>install</buildtarget>. ëÒÏÍÅ ÔÏÇÏ, ÉÍÑ ÚÁ×ÉÓÉÍÏÓÔÉ
-	  ÐÏÍÅÝÁÅÔÓÑ × ÐÁËÅÔ, ÔÁË ÞÔÏ ÐÒÏÇÒÁÍÍÁ &man.pkg.add.1;
+	  ÐÏÍÅÝÁÅÔÓÑ × ÐÁËÅÔ, ÔÁË ÞÔÏ <command>pkg install</command>
+	  (ÓÍ. &man.pkg-install.8;)
 	  ÂÕÄÅÔ Á×ÔÏÍÁÔÉÞÅÓËÉ ÅÇÏ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ, ÅÓÌÉ ÏÎ ÎÅ ÂÕÄÅÔ ÎÁÊÄÅÎ
 	  × ÐÏÌØÚÏ×ÁÔÅÌØÓËÏÊ ÓÉÓÔÅÍÅ.  þÁÓÔØ
 	  <replaceable>target</replaceable> ÍÏÖÅÔ ÂÙÔØ ÏÐÕÝÅÎÁ, ÅÓÌÉ ÏÎÁ
@@ -3562,7 +3616,7 @@ ALWAYS_KEEP_DISTFILES=  yes
 	  ËÏÔÏÒÙÅ ÏÂÒÁÂÁÔÙ×ÁÀÔÓÑ × <filename>ports/Mk/bsd.*.mk</filename>
 	  ÄÌÑ ÐÏÐÏÌÎÅÎÉÑ ÐÅÒ×ÏÎÁÞÁÌØÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ ÐÏÓÔÒÏÅÎÉÑ.  îÁÐÒÉÍÅÒ,
 	  <literal>USES= gmake</literal> ÄÏÂÁ×ÌÑÅÔ
-	  <package>devel/gmake</package> ×
+	  <package role="port">devel/gmake</package> ×
 	  <varname>BUILD_DEPENDS</varname>.  äÌÑ ÐÒÅÄÏÔ×ÒÁÝÅÎÉÑ ÚÁÇÒÑÚÎÅÎÉÑ
 	  <varname>RUN_DEPENDS</varname> ÐÏÄÏÂÎÙÍÉ ÄÏÐÏÌÎÉÔÅÌØÎÙÍÉ
 	  ÚÁ×ÉÓÉÍÏÓÔÑÍÉ ÐÒÏÑ×ÌÑÊÔÅ ÏÓÔÏÒÏÖÎÏÓÔØ Ó ÐÒÉÓ×ÏÅÎÉÅÍ Ó ÒÁÓËÒÙÔÉÅÍ,
@@ -3675,15 +3729,15 @@ ALWAYS_KEEP_DISTFILES=  yes
       <sect2 xml:id="uses">
 	<title><varname>USES</varname></title>
 
-	<para>óÕÝÅÓÔ×ÕÅÔ ÎÅÓËÏÌØËÏ ÐÁÒÁÍÅÔÒÏ× ÄÌÑ ÏÐÒÅÄÅÌÅÎÉÑ ÒÁÚÌÉÞÎÙÈ
-	  ×ÉÄÏ× ÈÁÒÁËÔÅÒÎÙÈ ÏÓÏÂÅÎÎÏÓÔÅÊ É ÚÁ×ÉÓÉÍÏÓÔÅÊ, ËÏÔÏÒÙÍÉ
-	  ÏÂÌÁÄÁÅÔ ÒÁÓÓÍÁÔÒÉ×ÁÅÍÙÊ ÐÏÒÔ.  ïÎÉ ÍÏÇÕÔ ÂÙÔØ ÕËÁÚÁÎÙ ÐÕÔ£Í
-	  ÄÏÂÁ×ÌÅÎÉÑ ÓÌÅÄÕÀÝÅÊ ÓÔÒÏËÉ × <filename>Makefile</filename>
-	  ÐÏÒÔÁ:</para>
+	<para>íÏÇÕÔ ÂÙÔØ ÄÏÂÁ×ÌÅÎÙ ÐÁÒÁÍÅÔÒÙ ÄÌÑ ÏÐÒÅÄÅÌÅÎÉÑ ÒÁÚÌÉÞÎÙÈ
+	  ÈÁÒÁËÔÅÒÎÙÈ ÏÓÏÂÅÎÎÏÓÔÅÊ É ÚÁ×ÉÓÉÍÏÓÔÅÊ, ËÏÔÏÒÙÍÉ
+	  ÏÂÌÁÄÁÅÔ ÄÁÎÎÙÊ ÐÏÒÔ.  ïÎÉ ÕËÁÚÙ×ÁÀÔÓÑ ÐÕÔ£Í ÄÏÂÁ×ÌÅÎÉÑ
+	  × <filename>Makefile</filename> ÜÔÏÊ ÓÔÒÏËÉ:</para>
 
 	<programlisting>USES= feature[:arguments]</programlisting>
 
-	<para>äÌÑ ÐÏÌÕÞÅÎÉÑ ÐÏÌÎÏÇÏ ÓÐÉÓËÁ ÚÎÁÞÅÎÉÊ ÓÍÏÔÒÉÔÅ <xref linkend="uses-values"/>.</para>
+	<para>äÌÑ ÐÏÌÕÞÅÎÉÑ ÐÏÌÎÏÇÏ ÓÐÉÓËÁ ÚÎÁÞÅÎÉÊ ÓÍÏÔÒÉÔÅ
+	  <xref linkend="uses-values"/>.</para>
 
 	<warning>
 	  <para>úÎÁÞÅÎÉÅ <varname>USES</varname> ÎÅÌØÚÑ ÐÒÉÓ×ÁÉ×ÁÔØ
@@ -3855,7 +3909,7 @@ ALWAYS_KEEP_DISTFILES=  yes
 
         <para>ôÅÈÎÏÌÏÇÉÑ ÐÏÓÔÒÏÅÎÉÑ ÐÏÒÔÏ× ÎÅ ÚÁÝÉÝÅÎÁ ÏÔ ÚÁÃÉËÌÅÎÎÙÈ
           ÚÁ×ÉÓÉÍÏÓÔÅÊ.  åÓÌÉ ×Ù ÓÏÚÄÁÄÉÔÅ ÔÁËÕÀ, ÔÏ Õ ËÏÇÏ-ÎÉÂÕÄØ É
-          ÇÄÅ-ÎÉÂÕÄØ ÕÓÔÁÎÏ×ËÁ FreeBSD ÂÕÄÅÔ ÎÅÍÅÄÌÅÎÎÏ ÓÌÏÍÁÎÁ, Á Õ ÏÓÔÁÌØÎÙÈ
+          ÇÄÅ-ÎÉÂÕÄØ ÕÓÔÁÎÏ×ËÁ &os; ÂÕÄÅÔ ÎÅÍÅÄÌÅÎÎÏ ÓÌÏÍÁÎÁ, Á Õ ÏÓÔÁÌØÎÙÈ
           ÓÌÏÍÁÅÔÓÑ ÎÅÓËÏÌØËÏ ÐÏÚÖÅ.  üÔÏ ÎÁ ÓÁÍÏÍ ÄÅÌÅ ÏÞÅÎØ ÔÒÕÄÎÏ
           ÒÁÓÐÏÚÎÁÔØ; ÅÓÌÉ ×Ù ÓÏÍÎÅ×ÁÅÔÅÓØ, ÔÏ ÐÅÒÅÄ ×ÎÅÓÅÎÉÅÍ ÉÚÍÅÎÅÎÉÊ
           ÐÒÏ×ÅÒØÔÅ, ÞÔÏ ×ÙÐÏÌÎÉÌÉ ÓÌÅÄÕÀÝÅÅ: <command>cd /usr/ports; make
@@ -3880,7 +3934,7 @@ ALWAYS_KEEP_DISTFILES=  yes
 	  <programlisting>.include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/bin/foo)
-LIB_DEPENDS=	bar:${PORTSDIR}/foo/bar
+LIB_DEPENDS=	libbar.so:${PORTSDIR}/foo/bar
 .endif</programlisting>
 	</example>
 
@@ -3904,7 +3958,7 @@ BAR_DESC=	Bar support
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MBAR}
-LIB_DEPENDS=	bar:${PORTSDIR}/foo/bar
+LIB_DEPENDS=	libbar.so:${PORTSDIR}/foo/bar
 .endif</programlisting>
 	</example>
 
@@ -3936,7 +3990,8 @@ LIB_DEPENDS=	bar:${PORTSDIR}/foo/bar
 	<para>÷ ÎÅËÏÔÏÒÙÈ ÓÌÕÞÁÑÈ ÄÌÑ ÂÏÌØÛÅÇÏ ËÏÎÔÒÏÌÑ ÎÁÄ
 	  ÚÁ×ÉÓÉÍÏÓÔÑÍÉ ÉÓÐÏÌØÚÕÀÔÓÑ ÐÅÒÅÍÅÎÎÙÅ <varname>WANT_</varname>,
 	  ËÏÔÏÒÙÅ ÐÏÚ×ÏÌÑÀÔ ÕËÁÚÙ×ÁÔØ ÔÒÅÂÏ×ÁÎÉÑ × ÂÏÌÅÅ ÔÏÞÎÏÊ ÆÏÒÍÅ.
-	  îÁÐÒÉÍÅÒ, ×ÚÇÌÑÎÉÔÅ ÎÁ ÐÏÒÔ <package>mail/squirrelmail</package>.  üÔÏÍÕ ÐÏÒÔÕ
+	  îÁÐÒÉÍÅÒ, ×ÚÇÌÑÎÉÔÅ ÎÁ ÐÏÒÔ
+	  <package role="port">mail/squirrelmail</package>.  üÔÏÍÕ ÐÏÒÔÕ
 	  ÎÕÖÎÙ ÎÅÓËÏÌØËÏ ÍÏÄÕÌÅÊ PHP, ËÏÔÏÒÙÅ ÐÅÒÅÞÉÓÌÅÎÙ × ÐÅÒÅÍÅÎÎÏÊ
 	  <varname>USE_PHP</varname>:</para>
 
@@ -3948,8 +4003,8 @@ LIB_DEPENDS=	bar:${PORTSDIR}/foo/bar
 	<programlisting>WANT_PHP_WEB=	yes</programlisting>
 
 	<para>éÍÅÀÝÉÅÓÑ ÐÅÒÅÍÅÎÎÙÅ <varname>USE_</varname> É
-	  <varname>WANT_</varname> ÏÐÒÅÄÅÌÅÎÙ × ÆÁÊÌÁÈ
-	  <filename>/usr/ports/Mk</filename>.</para>
+	  <varname>WANT_</varname> ÏÐÒÅÄÅÌÅÎÙ × ÆÁÊÌÁÈ ×
+	  <filename class="directory">/usr/ports/Mk</filename>.</para>
       </sect2>
     </sect1>
 
@@ -3989,7 +4044,7 @@ RESOLUTION?=   300
 .endif
     </programlisting>
 
-    <para>ðÏÒÔ <package>japanese/xdvi300</package> ÓÏÄÅÒÖÉÔ
+    <para>ðÏÒÔ <package role="port">japanese/xdvi300</package> ÓÏÄÅÒÖÉÔ
       ÔÁËÖÅ ×ÓÅ ÏÂÙÞÎÙÅ ÐÁÔÞÉ, ÆÁÊÌÙ ÄÌÑ ÐÁËÅÔÁ É ÔÁË ÄÁÌÅÅ.  åÓÌÉ ×Ù ××ÅÄÅÔÅ
       ÚÄÅÓØ ËÏÍÁÎÄÕ <command>make</command>, ÏÎÁ ×ÏÚØÍÅÔ × ËÁÞÅÓÔ×Å ÒÁÚÒÅÛÅÎÉÑ
       ÚÎÁÞÅÎÉÅ ÐÏ ÕÍÏÌÞÁÎÉÀ (300) É ÐÏÓÔÒÏÉÔ ÐÏÒÔ ÏÂÙÞÎÙÍ ÏÂÒÁÚÏÍ.</para>
@@ -4017,98 +4072,14 @@ MASTERDIR=	${.CURDIR}/../xdvi300
   <sect1 xml:id="makefile-manpages">
     <title>óÔÒÁÎÉÃÙ óÐÒÁ×ÏÞÎÉËÁ</title>
 
-    <para>ðÅÒÅÍÅÎÎÙÅ <varname>MAN[1-9LN]</varname> Á×ÔÏÍÁÔÉÞÅÓËÉ ÄÏÂÁ×ÑÔ ÌÀÂÙÅ
-      ÓÔÒÁÎÉÃÙ óÐÒÁ×ÏÞÎÉËÁ Ë ÆÁÊÌÕ <filename>pkg-plist</filename> (ÜÔÏ
-      ÏÚÎÁÞÁÅÔ, ÞÔÏ ×ÁÍ <emphasis>ÎÅ ÎÕÖÎÏ</emphasis> ÕËÁÚÙ×ÁÔØ ÓÔÒÁÎÉÃÙ
-      óÐÒÁ×ÏÞÎÉËÁ × ÆÁÊÌÅ <filename>pkg-plist</filename>—ÏÂÒÁÔÉÔÅÓØ Ë
-      ÇÌÁ×Å Ï <link linkend="plist-sub">ÇÅÎÅÒÁÃÉÉ ÆÁÊÌÁ PLIST</link> ÄÌÑ
-      ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÊ ÉÎÆÏÒÍÁÃÉÉ).  üÔÏ ÔÁËÖÅ ÐÏÚ×ÏÌÑÅÔ ÎÁ ÜÔÁÐÅ
-      ÕÓÔÁÎÏ×ËÉ Á×ÔÏÍÁÔÉÞÅÓËÉ ÕÐÁËÏ×Ù×ÁÔØ É ÒÁÓÐÁËÏ×Ù×ÁÔØ ÓÔÒÁÎÉÃÙ
-      óÐÒÁ×ÏÞÎÉËÁ × ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÚÎÁÞÅÎÉÑ ÐÅÒÅÍÅÎÎÏÊ
-      <varname>NO_MANCOMPRESS</varname> × ÆÁÊÌÅ
-      <filename>/etc/make.conf</filename>.</para>
-
-    <para>åÓÌÉ ×ÁÛ ÐÏÒÔ ÐÙÔÁÅÔÓÑ ÚÁÄÁÔØ ÎÅÓËÏÌØËÏ ÉÍÅÎ ÄÌÑ ÓÔÒÁÎÉÃ
-      óÐÒÁ×ÏÞÎÉËÁ ÐÒÉ ÐÏÍÏÝÉ ÓÉÍ×ÏÌÉÞÅÓËÉÈ ÉÌÉ ÖÅÓÔËÉÈ ÓÓÙÌÏË, ÔÏ ×Ù ÄÏÌÖÎÙ
-      ÉÓÐÏÌØÚÏ×ÁÔØ ÐÅÒÅÍÅÎÎÕÀ <varname>MLINKS</varname>, ÞÔÏÂÙ ÕËÁÚÁÔØ ÎÁ
-      ÜÔÏ.  óÓÙÌËÁ, ÕÓÔÁÎÏ×ÌÅÎÎÁÑ ×ÁÛÉÍ ÐÏÒÔÏÍ, ÂÕÄÅÔ ÕÎÉÞÔÏÖÅÎÁ É ÓÏÚÄÁÎÁ
-      ÚÁÎÏ×Ï ÓÃÅÎÁÒÉÅÍ <filename>bsd.port.mk</filename> ÄÌÑ ÐÒÏ×ÅÒËÉ ÔÏÇÏ,
-      ÞÔÏ ÏÎÁ ÕËÁÚÙ×ÁÅÔ ÎÁ ÐÒÁ×ÉÌØÎÙÊ ÆÁÊÌ.  ìÀÂÙÅ ÓÔÒÁÎÉÃÙ óÐÒÁ×ÏÞÎÉËÁ,
-      ÐÅÒÅÞÉÓÌÅÎÎÙÅ × ÐÅÒÅÍÅÎÎÏÊ MLINKS, ÎÅ ÄÏÌÖÎÙ ÆÉÇÕÒÉÒÏ×ÁÔØ × ÆÁÊÌÅ
-      <filename>pkg-plist</filename>.</para>
-
-    <para>äÌÑ ÕËÁÚÁÎÉÑ ÔÏÇÏ, ÞÔÏ ÓÔÒÁÎÉÃÙ óÐÒÁ×ÏÞÎÉËÁ ÎÕÖÎÏ ÓÖÉÍÁÔØ ×Ï
-      ×ÒÅÍÑ ÕÓÔÁÎÏ×ËÉ, ÉÓÐÏÌØÚÕÊÔÅ ÐÅÒÅÍÅÎÎÕÀ
-      <varname>MANCOMPRESSED</varname>.  üÔÁ ÐÅÒÅÍÅÎÎÁÑ ÍÏÖÅÔ ÐÒÉÎÉÍÁÔØ ÔÒÉ
-      ÚÎÁÞÅÎÉÑ - <literal>yes</literal>, <literal>no</literal> É
-      <literal>maybe</literal>.  <literal>yes</literal> ÏÚÎÁÞÁÅÔ, ÞÔÏ
-      ÓÔÒÁÎÉÃÙ óÐÒÁ×ÏÞÎÉËÁ ÕÓÔÁÎÁ×ÌÉ×ÁÀÔÓÑ ÕÖÅ ÓÖÁÔÙÍÉ, <literal>no</literal>
-      ÏÚÎÁÞÁÅÔ, ÞÔÏ ÏÎÉ ÎÅ ÓÖÉÍÁÀÔÓÑ É <literal>maybe</literal> ÏÚÎÁÞÁÅÔ, ÞÔÏ
-      ÐÒÏÇÒÁÍÍÎÏÅ ÏÂÅÓÐÅÞÅÎÉÅ ÐÒÉÎÉÍÁÅÔ ×Ï ×ÎÉÍÁÎÉÅ ÚÎÁÞÅÎÉÅ ÐÅÒÅÍÅÎÎÏÊ
-      <varname>NO_MANCOMPRESS</varname>, ÔÁË ÞÔÏ ÓÃÅÎÁÒÉÀ
-      <filename>bsd.port.mk</filename> ÎÉÞÅÇÏ ÄÏÐÏÌÎÉÔÅÌØÎÏ ÄÅÌÁÔØ ÎÅ
-      ÎÕÖÎÏ.</para>
-
     <para>åÓÌÉ ×ÁÛ ÐÏÒÔ ÏÐÒÅÄÅÌÑÅÔ ËÏÒÎÅÍ ÄÌÑ ÆÁÊÌÏ× óÐÒÁ×ÏÞÎÉËÁ ËÁÔÁÌÏÇ,
       ÏÔÌÉÞÎÙÊ ÏÔ <varname>PREFIX</varname>, ×Ù ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ
-      ÐÅÒÅÍÅÎÎÕÀ <varname>MANPREFIX</varname>, ÞÔÏÂÙ ÚÁÄÁÔØ ÅÇÏ Ñ×ÎÏ.  ëÒÏÍÅ
-      ÔÏÇÏ, ÅÓÌÉ ÓÔÒÁÎÉÃÙ ÔÏÌØËÏ ÎÅËÏÔÏÒÙÈ ÒÁÚÄÅÌÏ× ÐÏÍÅÝÁÀÔÓÑ ×
-      ÎÅÓÔÁÎÄÁÒÔÎÏÅ ÍÅÓÔÏ, ÎÁÐÒÉÍÅÒ, × ÓÌÕÞÁÅ ÐÏÒÔÏ× ÍÏÄÕÌÅÊ ÑÚÙËÁ
-      <literal>perl</literal> Perl, ×Ù ÍÏÖÅÔÅ ÕÓÔÁÎÏ×ÉÔØ ÍÁÒÛÒÕÔÙ Ë ÓÐÒÁ×ÏÞÎÙÍ
-      ÓÔÒÁÎÉÃÁÍ ÉÎÄÉ×ÉÄÕÁÌØÎÏ, ÐÒÉ ÐÏÍÏÝÉ
-      <varname>MAN<replaceable>sect</replaceable>PREFIX</varname> (ÇÄÅ
-      <replaceable>sect</replaceable> ÐÒÉÎÉÍÁÅÔ ÚÎÁÞÅÎÉÑ
-      <literal>1-9</literal>, <literal>L</literal> ÉÌÉ
-      <literal>N</literal>).</para>
-
-    <para>åÓÌÉ ÓÔÒÁÎÉÃÙ óÐÒÁ×ÏÞÎÉËÁ ÐÏÍÅÝÁÀÔÓÑ × ÐÏÄËÁÔÁÌÏÇÉ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ
-      ÎÅËÏÔÏÒÏÍÕ ÑÚÙËÕ, ÔÏ ÚÁÄÁÊÔÅ ÎÁÚ×ÁÎÉÅ ÑÚÙËÁ ÑÚÙËÁ × ÐÅÒÅÍÅÎÎÏÊ
-      <varname>MANLANG</varname>.  úÎÁÞÅÎÉÅ ÜÔÏÊ ÐÅÒÅÍÅÎÎÏÊ ÐÏ ÕÍÏÌÞÁÎÉÀ
-      ÒÁ×ÎÏ <literal>""</literal> (ÔÏ ÅÓÔØ ÔÏÌØËÏ ÁÎÇÌÉÊÓËÉÊ ÑÚÙË).</para>
-

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-doc-all mailing list