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

Sergey Kandaurov pluknet at FreeBSD.org
Tue Jul 24 09:13:54 UTC 2012


Author: pluknet
Date: Tue Jul 24 09:13:54 2012
New Revision: 39258
URL: http://svn.freebsd.org/changeset/doc/39258

Log:
  MFen r38283 -> r39245
  
  PR:		docs/169710 (MFen r38759 part)
  Submitted by:	ohauer

Modified:
  head/ru_RU.KOI8-R/books/porters-handbook/book.sgml

Modified: head/ru_RU.KOI8-R/books/porters-handbook/book.sgml
==============================================================================
--- head/ru_RU.KOI8-R/books/porters-handbook/book.sgml	Tue Jul 24 09:11:44 2012	(r39257)
+++ head/ru_RU.KOI8-R/books/porters-handbook/book.sgml	Tue Jul 24 09:13:54 2012	(r39258)
@@ -4,7 +4,7 @@
      $FreeBSD$
      $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/porters-handbook/book.sgml,v 1.136 2006/10/20 09:25:00 marck Exp $
 
-     Original revision: r38283
+     Original revision: r39245
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -145,7 +145,7 @@ USE_IMAKE=     yes
 
       <para>ðÏÓÍÏÔÒÉÍ, ÓÍÏÖÅÔÅ ÌÉ ×Ù ÅÇÏ ÐÏÎÑÔØ.  îÅ ÏÂÒÁÝÁÊÔÅ ×ÎÉÍÁÎÉÅ ÎÁ
         ÓÏÄÅÒÖÉÍÏÅ ÓÔÒÏÞËÉ <literal>&dollar;FreeBSD&dollar;</literal>, ÏÎÁ
-        ÂÕÄÅÔ ÚÁÐÏÌÎÅÎÁ Á×ÔÏÍÁÔÉÞÅÓËÉ ÓÉÓÔÅÍÏÊ CVS, ËÏÇÄÁ ÐÏÒÔ ÂÕÄÅÔ
+        ÂÕÄÅÔ ÚÁÐÏÌÎÅÎÁ Á×ÔÏÍÁÔÉÞÅÓËÉ ÓÉÓÔÅÍÏÊ SVN, ËÏÇÄÁ ÐÏÒÔ ÂÕÄÅÔ
         ÉÍÐÏÒÔÉÒÏ×ÁÎ × ÎÁÛÅ ÄÅÒÅ×Ï ÐÏÒÔÏ×.  ÷Ù ÍÏÖÅÔÅ ÎÁÊÔÉ ÂÏÌÅÅ ÐÏÄÒÏÂÎÙÊ
         ÐÒÉÍÅÒ × ÒÁÚÄÅÌÅ <link linkend="porting-samplem">ÐÒÉÍÅÒ
         Makefile</link>.</para>
@@ -198,8 +198,8 @@ WWW: http://www.oneko.org/</programlisti
           ÔÁËÖÅ ÎÁÚÙ×ÁÀÔ <quote>ÓÐÉÓËÏÍ ÄÌÑ ÕÐÁËÏ×ËÉ</quote>, ÐÏÔÏÍÕ ÞÔÏ
           ÐÁËÅÔ ÇÅÎÅÒÉÒÕÅÔÓÑ ÕÐÁËÏ×ËÏÊ ÆÁÊÌÏ×, ËÏÔÏÒÙÅ ÚÄÅÓØ ÕËÁÚÁÎÙ.
           éÍÅÎÁ ÐÕÔÅÊ ÕËÁÚÙ×ÁÀÔÓÑ ÏÔÎÏÓÉÔÅÌØÎÏ ÕÓÔÁÎÏ×ÏÞÎÏÇÏ ÐÒÅÆÉËÓÁ
-          (ÏÂÙÞÎÏ <filename>/usr/local</filename> ÉÌÉ
-          <filename>/usr/X11R6</filename>).  åÓÌÉ ×Ù ÉÓÐÏÌØÚÕÅÔÅ ÐÅÒÅÍÅÎÎÙÅ
+          (ÏÂÙÞÎÏ <filename>/usr/local</filename>).
+	  åÓÌÉ ×Ù ÉÓÐÏÌØÚÕÅÔÅ ÐÅÒÅÍÅÎÎÙÅ
           <makevar>MAN<replaceable>n</replaceable></makevar> (Á ×Ù ÄÏÌÖÎÙ
           ÜÔÏ ÄÅÌÁÔØ), ÔÏ ÕËÁÚÙ×ÁÔØ ÓÔÒÁÎÉÃÙ ÓÐÒÁ×ÏÞÎÉËÁ ÚÄÅÓØ ÎÅ
           ÎÕÖÎÏ.  åÓÌÉ ÐÏÒÔ ×Ï ×ÒÅÍÑ ÕÓÔÁÎÏ×ËÉ ÓÏÚÄÁÅÔ ËÁÔÁÌÏÇÉ,  ÕÂÅÄÉÔÅÓØ,
@@ -346,6 +346,10 @@ PLIST_DIRS=     lib/X11/oneko</programli
 	<step>
 	  <para><command>make package</command></para>
 	</step>
+
+	<step>
+	  <para><command>make readme</command></para>
+	</step>
       </procedure>
 
       <para>ðÒÏ×ÅÒØÔÅ, ÞÔÏ ÎÉ ÎÁ ÛÁÇÅ <maketarget>package</maketarget>, ÎÉ ÎÁ
@@ -573,7 +577,9 @@ PLIST_DIRS=     lib/X11/oneko</programli
 	  ×ÙÚÙ×ÁÀÔ ÎÁÓÔÏÑÝÉÅ ÃÅÌÉ ÉÌÉ ÓËÒÉÐÔÙ, É ÉÈ ÎÅ ÎÕÖÎÏ ÍÅÎÑÔØ.  åÓÌÉ
 	  ×ÁÍ ÎÕÖÎÏ ÉÚÍÅÎÉÔØ ÒÁÓÐÁËÏ×ËÕ, ÉÓÐÒÁ×ÌÑÊÔÅ
 	  <maketarget>do-extract</maketarget>, ÎÏ ÎÉËÏÇÄÁ ÎÅ ÍÅÎÑÊÔÅ ÓÐÏÓÏÂ
-          ÒÁÂÏÔÙ <maketarget>extract</maketarget>!</para>
+          ÒÁÂÏÔÙ <maketarget>extract</maketarget>!  ëÒÏÍÅ ÔÏÇÏ, ÃÅÌØ
+	  <maketarget>post-deinstall</maketarget> Ñ×ÌÑÅÔÓÑ ÎÅÄÅÊÓÔ×ÉÔÅÌØÎÏÊ
+	  É ÎÅ ×ÙÐÏÌÎÑÅÔÓÑ ÉÎÆÒÁÓÔÒÕËÔÕÒÏÊ ÐÏÒÔÏ×.</para>
       </note>
 
       <para>ôÅÐÅÒØ ×Ù ÐÒÅÄÓÔÁ×ÌÑÅÔÅ, ÞÔÏ ÐÒÏÉÓÈÏÄÉÔ, ËÏÇÄÁ ÐÏÌØÚÏ×ÁÔÅÌØ
@@ -587,7 +593,7 @@ PLIST_DIRS=     lib/X11/oneko</programli
       <para>ðÏÌÕÞÉÔÅ ÏÒÉÇÉÎÁÌØÎÙÅ ÉÓÈÏÄÎÙÅ ÔÅËÓÔÙ (ÏÂÙÞÎÏ) × ×ÉÄÅ
 	ÕÐÁËÏ×ÁÎÎÏÇÏ tar-ÁÒÈÉ×Á
 	(<filename><replaceable>foo</replaceable>.tar.gz</filename> ÉÌÉ
-	<filename><replaceable>foo</replaceable>.tar.Z</filename>)
+	<filename><replaceable>foo</replaceable>.tar.bz2</filename>)
 	É ÓËÏÐÉÒÕÊÔÅ ÅÇÏ × ËÁÔÁÌÏÇ <makevar>DISTDIR</makevar>.	÷ÓÅÇÄÁ
 	ÉÓÐÏÌØÚÕÊÔÅ ÉÓÈÏÄÎÙÅ ÔÅËÓÔÙ <emphasis>ÏÓÎÏ×ÎÏÊ ×ÅÔËÉ
 	ÒÁÚÒÁÂÏÔËÉ</emphasis> ×ÅÚÄÅ, ÇÄÅ ÜÔÏ ×ÏÚÍÏÖÎÏ.</para>
@@ -708,7 +714,7 @@ PLIST_DIRS=     lib/X11/oneko</programli
 	ÔÁË ÄÁÌÅÅ, ×ÓÅÇÄÁ ÓÓÙÌÁÊÔÅÓØ ÎÁ ÐÕÔØ É ÎÁÚ×ÁÎÉÅ ÆÁÊÌÁ × ÎÁÚ×ÁÎÉÑÈ
 	ÐÁÔÞÅÊ.</para>
 
-      <para>îÅ ÐÏÍÅÝÁÊÔÅ ÓÔÒÏËÉ RCS × ÐÁÔÞÉ.  CVS ÂÕÄÅÔ ÉÚÍÅÎÑÔØ ÉÈ ÐÒÉ
+      <para>îÅ ÐÏÍÅÝÁÊÔÅ ÓÔÒÏËÉ RCS × ÐÁÔÞÉ.  SVN ÂÕÄÅÔ ÉÚÍÅÎÑÔØ ÉÈ ÐÒÉ
 	ÐÏÍÅÝÅÎÉÉ ÆÁÊÌÏ× × ÄÅÒÅ×Ï ÐÏÒÔÏ×, É ËÏÇÄÁ ÍÙ ÂÕÄÅÍ ÉÈ ÏÔÔÕÄÁ
 	ÉÚ×ÌÅËÁÔØ, ÏÎÉ ÂÕÄÕÔ ÕÖÅ ÄÒÕÇÉÅ, ÐÏÜÔÏÍÕ ÐÒÉÍÅÎÅÎÉÅ ÐÁÔÞÅÊ
 	ÏËÏÎÞÉÔÓÑ ÎÅÕÄÁÞÅÊ.  óÔÒÏÞËÉ RCS ÐÒÅÄ×ÁÒÑÀÔÓÑ ÚÎÁËÏÍ ÄÏÌÌÁÒÁ
@@ -739,7 +745,7 @@ PLIST_DIRS=     lib/X11/oneko</programli
 	ÞÁÓÔØ ÉÚ ÏÄÎÏÇÏ ÐÒÏÅËÔÁ ÄÌÑ ÉÓÐÒÁ×ÌÅÎÉÑ ÐÏÈÏÖÅÊ ÏÂÌÁÓÔÉ × ÄÒÕÇÏÍ,
 	ÔÏ ÂÕÄØÔÅ ÁËËÕÒÁÔÎÙ, ÐÏÖÁÌÕÊÓÔÁ: ÐÏÌÕÞÁÅÍÙÊ ÏÄÎÏÓÔÒÏÞÎÙÊ ÐÁÔÞ
 	ÍÏÖÅÔ ÂÙÔØ ÐÏÌÏÎ ÎÅÆÕÎËÃÉÏÎÁÌØÎÙÈ ÉÚÍÅÎÅÎÉÊ.  üÔÏ ÎÅ ÔÏÌØËÏ
-	Õ×ÅÌÉÞÉ×ÁÅÔ ÒÁÚÍÅÒ ÒÅÐÏÚÉÔÏÒÉÑ CVS, ÎÏ ÔÁËÖÅ ÕÓÌÏÖÎÑÅÔ ÐÏÉÓË ÔÏÇÏ,
+	Õ×ÅÌÉÞÉ×ÁÅÔ ÒÁÚÍÅÒ ÒÅÐÏÚÉÔÏÒÉÑ SVN, ÎÏ ÔÁËÖÅ ÕÓÌÏÖÎÑÅÔ ÐÏÉÓË ÔÏÇÏ,
 	ÞÔÏ ËÏÎËÒÅÔÎÏ ×ÙÚ×ÁÌÏ ÐÒÏÂÌÅÍÕ É ÞÔÏ ×Ù ×ÏÏÂÝÅ ÉÚÍÅÎÉÌÉ.</para>
 
       <para>åÓÌÉ ×ÁÍ ÎÕÖÎÏ ÕÄÁÌÉÔØ ÆÁÊÌ, ÔÏ ×Ù ÍÏÖÅÔÅ ÓÄÅÌÁÔØ ÜÔÏ ÐÒÉ
@@ -846,11 +852,8 @@ DOS2UNIX_REGEX=  .*\.(c|cpp|h)</programl
 	<makevar>EXTRACT_BEFORE_ARGS</makevar>,
 	<makevar>EXTRACT_AFTER_ARGS</makevar>,
 	<makevar>EXTRACT_SUFX</makevar> ÉÌÉ <makevar>DISTFILES</makevar> ×
-	ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÔÏÇÏ, ÎÁÓËÏÌØËÏ ÎÅÏÂÙÞÅÎ ÆÏÒÍÁÔ ÄÉÓÔÒÉÂÕÔÉ×ÎÏÇÏ ÆÁÊÌÁ.
-	(óÁÍÙÊ ÒÁÓÐÒÏÓÔÒÁΣÎÎÙÊ ÓÌÕÞÁÊ - ÜÔÏ
-	<literal>EXTRACT_SUFX=.tar.Z</literal>, ËÏÇÄÁ tar-ÆÁÊÌ ÕÐÁËÏ×ÁÎ
-	ÏÂÙÞÎÏÊ ÕÔÉÌÉÔÏÊ <command>compress</command>, Á ÎÅ ÁÒÈÉ×ÁÔÏÒÏÍ
-	<command>gzip</command>.)</para>
+	ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÔÏÇÏ, ÎÁÓËÏÌØËÏ ÎÅÏÂÙÞÅÎ ÆÏÒÍÁÔ ÄÉÓÔÒÉÂÕÔÉ×ÎÏÇÏ
+	ÆÁÊÌÁ.</para>
 
       <para>÷ ÈÕÄÛÅÍ ÓÌÕÞÁÅ ×Ù ÍÏÖÅÔÅ ÐÒÏÓÔÏ ÏÐÒÅÄÅÌÉÔØ Ó×ÏÀ ÓÏÂÓÔ×ÅÎÎÕÀ ÃÅÌØ
 	<maketarget>do-extract</maketarget> ÄÌÑ ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÑ ÄÅÊÓÔ×ÉÊ ÐÏ
@@ -1706,8 +1709,8 @@ PORTEPOCH=      1</programlisting>
 	        <entry><filename>java</filename></entry>
 	        <entry>ðÒÏÇÒÁÍÍÎÏÅ ÏÂÅÓÐÅÞÅÎÉÅ, Ó×ÑÚÁÎÎÏÅ Ó ÑÚÙËÏÍ
                   Java&trade;.</entry>
-                <entry>ëÁÔÅÇÏÒÉÑ <filename>java</filename> ÎÅ ÄÏÌÖÎÁ ÂÙÔØ
-		  ÅÄÉÎÓÔ×ÅÎÎÏÊ ÄÌÑ ÐÏÒÔÁ.  ïÓÔÁ×ØÔÅ ÄÌÑ ÐÏÒÔÏ×,
+                <entry>ëÁÔÅÇÏÒÉÑ <filename>java</filename> ÎÉ × ËÏÅÍ ÓÌÕÞÁÅ
+		  ÎÅ ÄÏÌÖÎÁ ÂÙÔØ ÅÄÉÎÓÔ×ÅÎÎÏÊ ÄÌÑ ÐÏÒÔÁ.  ïÓÔÁ×ØÔÅ ÄÌÑ ÐÏÒÔÏ×,
 		  ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÏ ÉÍÅÀÝÉÈ ÏÔÎÏÛÅÎÉÅ Ë ÑÚÙËÕ Java, ÐÏÒÔÅÒÁÍ
 		  ÔÁËÖÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ ÎÅ ÉÓÐÏÌØÚÏ×ÁÔØ
 		  <filename>java</filename> ËÁË ÏÓÎÏ×ÎÕÀ ËÁÔÅÇÏÒÉÀ
@@ -1716,8 +1719,8 @@ PORTEPOCH=      1</programlisting>
 
 	      <row>
 	        <entry><filename>kde*</filename></entry>
-	        <entry>ðÏÒÔÙ ÐÒÏÅËÔÁ <ulink url="http://www.kde.org">K Desktop
-                  Environment (KDE)</ulink>.</entry>
+		<entry>ðÏÒÔÙ ÐÒÏÅËÔÁ
+		  <ulink url="http://www.kde.org">KDE</ulink>.</entry>
                 <entry></entry>
 	      </row>
 
@@ -2405,11 +2408,15 @@ MASTER_SITE_SUBDIR=   make</programlisti
 
 	<programlisting>MASTER_SITES=   SF</programlisting>
 
-	<para>åÓÌÉ ÐÏÐÙÔËÁ ÕÇÁÄÁÔØ ÎÅ ÕÄÁÌÁÓØ, ÞÔÏ ÜÔÏ ÍÏÖÅÔ ÂÙÔØ ÐÅÒÅÐÉÓÁÎÏ
+	<para>åÓÌÉ ÐÏÐÙÔËÁ ÕÇÁÄÁÔØ ÎÅ ÕÄÁÌÁÓØ, ÔÏ ÜÔÏ ÍÏÖÅÔ ÂÙÔØ ÐÅÒÅÐÉÓÁÎÏ
 	  ÓÌÅÄÕÀÝÉÍ ÏÂÒÁÚÏÍ.</para>
 
-	<programlisting>MASTER_SITES=   SF/stardict/WyabdcRealPeopleTTS/${PORTVE
-RSION}</programlisting>
+	<programlisting>MASTER_SITES=   SF/stardict/WyabdcRealPeopleTTS/${PORTVERSION}</programlisting>
+
+	<para>þÔÏ ÔÁËÖÅ ÍÏÖÎÏ ÚÁÐÉÓÁÔØ × ÔÁËÏÍ ×ÉÄÅ:</para>
+
+	<programlisting>MASTER_SITES=	SF
+MASTER_SITE_SUBDIR=	stardict/WyabdcRealPeopleTTS/${PORTVERSION}</programlisting>
 
 	<table frame="none">
 	  <title>ðÏÐÕÌÑÒÎÙÅ ÍÁÇÉÞÅÓËÉÅ ÍÁËÒÏÓÙ ÄÌÑ
@@ -2515,11 +2522,12 @@ RSION}</programlisting>
         <programlisting>DISTNAME=      foo
 EXTRACT_SUFX=  .tgz</programlisting>
 
-        <para>ðÅÒÅÍÅÎÎÙÅ <makevar>USE_BZIP2</makevar> É
+        <para>ðÅÒÅÍÅÎÎÙÅ <makevar>USE_BZIP2</makevar>,
+	  <makevar>USE_XZ</makevar> É
           <makevar>USE_ZIP</makevar> ÐÒÉ ÎÅÏÂÈÏÄÉÍÏÓÔÉ Á×ÔÏÍÁÔÉÞÅÓËÉ
 	  ÕÓÔÁÎÁ×ÌÉ×ÁÀÔ ÚÎÁÞÅÎÉÅ <makevar>EXTRACT_SUFX</makevar> ×
-	  <literal>.tar.bz2</literal> ÉÌÉ <literal>.zip</literal>.
-	  åÓÌÉ ÎÉ ÏÄÎÁ ÉÚ ÜÔÉÈ
+	  <literal>.tar.bz2</literal>, <literal>.tar.xz</literal> ÉÌÉ
+	  <literal>.zip</literal>.  åÓÌÉ ÎÉ ÏÄÎÁ ÉÚ ÜÔÉÈ
           ÐÅÒÅÍÅÎÎÙÈ ÎÅ ÚÁÄÁÎÁ, ÔÏ ÚÎÁÞÅÎÉÅ <makevar>EXTRACT_SUFX</makevar>
           ÐÏ ÕÍÏÌÞÁÎÉÀ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ × <literal>.tar.gz</literal>.</para>
 
@@ -3376,9 +3384,9 @@ ALWAYS_KEEP_DISTFILES=  yes
 	  <replaceable>target</replaceable> - ÜÔÏ ÃÅÌØ, ËÏÔÏÒÕÀ ÎÕÖÎÏ ×ÙÚ×ÁÔØ
 	  × ÜÔÏÍ ËÁÔÁÌÏÇÅ.  îÁÐÒÉÍÅÒ,</para>
 
-	<programlisting>LIB_DEPENDS=   jpeg.9:${PORTSDIR}/graphics/jpeg</programlisting>
+	<programlisting>LIB_DEPENDS=   jpeg:${PORTSDIR}/graphics/jpeg</programlisting>
 
-	<para>ÐÒÏ×ÅÒÉÔ ÎÁÌÉÞÉÅ ÂÉÂÌÉÏÔÅËÉ jpeg ÓÏ ÓÔÁÒÛÉÍ ÎÏÍÅÒÏÍ ×ÅÒÓÉÉ 9 É
+	<para>ÐÒÏ×ÅÒÉÔ ÎÁÌÉÞÉÅ ÂÉÂÌÉÏÔÅËÉ jpeg Ó ÌÀÂÙÍ ÎÏÍÅÒÏÍ ×ÅÒÓÉÉ É
 	  ÐÅÒÅÊÄÅÔ × ÐÏÄËÁÔÁÌÏÇ <filename>graphics/jpeg</filename> ×ÁÛÅÇÏ
 	  ÄÅÒÅ×Á ÐÏÒÔÏ× ÄÌÑ ÅÅ ÐÏÓÔÒÏÅÎÉÑ É ÕÓÔÁÎÏ×ËÉ, ÅÓÌÉ ÂÉÂÌÉÏÔÅËÁ
 	  ÏÔÓÕÔÓÔ×ÕÅÔ.	þÁÓÔØ <replaceable>target</replaceable> ÍÏÖÅÔ ÂÙÔØ
@@ -3389,11 +3397,11 @@ ALWAYS_KEEP_DISTFILES=  yes
 	  <para>þÁÓÔØ <replaceable>lib</replaceable> Ñ×ÌÑÅÔÓÑ ÒÅÇÕÌÑÒÎÙÍ
 	    ×ÙÒÁÖÅÎÉÅÍ, ËÏÔÏÒÏÅ ×ÙÚÙ×ÁÅÔÓÑ ÄÌÑ ×Ù×ÏÄÁ, ÐÏÌÕÞÅÎÎÏÇÏ ÉÚ
 	    <command>ldconfig -r</command>.  òÁÚÒÅÛÁÀÔÓÑ ÔÁËÉÅ ÚÎÁÞÅÎÉÑ, ËÁË
-	    <literal>intl.[5-7]</literal> É <literal>intl</literal>.
-	    ðÅÒ×ÙÅ ÛÁÂÌÏÎ, <literal>intl.[5-7]</literal>, ÓÏ×ÐÁÄÅÔ Ó ÌÀÂÙÍ
-	    ÉÚ: <literal>intl.5</literal>, <literal>intl.6</literal> ÉÌÉ
-	    <literal>intl.7</literal>.  ÷ÔÏÒÏÊ ÛÁÂÌÏÎ, <literal>intl</literal>,
-	    ÓÏ×ÐÁÄÅÔ Ó ÌÀÂÏÊ ×ÅÒÓÉÅÊ ÂÉÂÌÉÏÔÅËÉ <literal>intl</literal>.</para>
+	    <literal>intl.9</literal> É <literal>intl.[5-7]</literal>.
+	    ðÅÒ×ÙÊ ÛÁÂÌÏÎ, <literal>intl.9</literal>, ÓÏ×ÐÁÄÁÅÔ ÔÏÌØËÏ Ó
+	    intl ×ÅÒÓÉÉ 9, × ÔÏ ×ÒÅÍÑ ËÁË <literal>intl.[5-7]</literal>
+	    ÓÏ×ÐÁÄÁÅÔ Ó ÌÀÂÙÍ ÉÚ: <literal>intl.5</literal>,
+	    <literal>intl.6</literal> É <literal>intl.7</literal>.</para>
 	</note>
 
 	<para>úÁ×ÉÓÉÍÏÓÔØ ÐÒÏ×ÅÒÑÅÔÓÑ Ä×ÁÖÄÙ, ÏÄÉÎ ÒÁÚ ×ÎÕÔÒÉ ÃÅÌÉ
@@ -3423,14 +3431,15 @@ ALWAYS_KEEP_DISTFILES=  yes
 
 	<para>îÁÐÒÉÍÅÒ,</para>
 
-	<programlisting>RUN_DEPENDS=   ${LOCALBASE}/etc/innd:${PORTSDIR}/news/inn \
+	<programlisting>RUN_DEPENDS=   ${LOCALBASE}/news/bin/innd:${PORTSDIR}/news/inn \
 	       xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr</programlisting>
 
-	<para>ÐÒÏ×ÅÒÉÔ, ÓÕÝÅÓÔ×ÕÅÔ ÌÉ ÆÁÊÌ ÉÌÉ ËÁÔÁÌÏÇ
-	  <filename>/usr/local/etc/innd</filename> É ÐÏÓÔÒÏÉÔ É ÕÓÔÁÎÏ×ÉÔ ÅÇÏ
-	  ÉÚ ÐÏÄËÁÔÁÌÏÇÁ <filename>news/inn</filename> ÄÅÒÅ×Á ÐÏÒÔÏ×, ÅÓÌÉ ÏÎ
-	  ÎÅ ÂÕÄÅÔ ÎÁÊÄÅÎ.  ïÎ ÔÁËÖÅ ÐÒÏ×ÅÒÉÔ, ÉÍÅÅÔÓÑ ÌÉ ×ÙÐÏÌÎÉÍÙÊ ÆÁÊÌ Ó
-	  ÉÍÅÎÅÍ <command>xmlcatmgr</command> × ÐÕÔÉ ÐÏÉÓËÁ, É ÐÅÒÅÊÄÅÔ ×
+	<para>ÐÒÏ×ÅÒÉÔ ÓÕÝÅÓÔ×Ï×ÁÎÉÅ ÆÁÊÌÁ ÉÌÉ ËÁÔÁÌÏÇÁ
+	  <filename>/usr/local/news/bin/innd</filename>, É ÅÓÌÉ ÎÉÞÅÇÏ
+	  ÎÅ ÂÕÄÅÔ ÎÁÊÄÅÎÏ, ÔÏ ÐÏÓÔÒÏÉÔ É ÕÓÔÁÎÏ×ÉÔ ÐÏÒÔ ÉÚ ÐÏÄËÁÔÁÌÏÇÁ
+	  <filename>news/inn</filename> ÄÅÒÅ×Á ÐÏÒÔÏ×.  ôÁËÖÅ ÂÕÄÅÔ
+	  ×ÙÐÏÌÎÅÎÁ ÐÒÏ×ÅÒËÁ, ÐÒÉÓÕÔÓÔ×ÕÅÔ ÌÉ × ÐÕÔÉ ÐÏÉÓËÁ ÉÓÐÏÌÎÑÅÍÙÊ
+	  ÆÁÊÌ Ó ÉÍÅÎÅÍ <command>xmlcatmgr</command>, É ÐÅÒÅÊÄÅÔ ×
 	  ÐÏÄËÁÔÁÌÏÇ <filename>textproc/xmlcatmgr</filename> ×ÁÛÅÇÏ ÄÅÒÅ×Á
 	  ÐÏÒÔÏ× ÄÌÑ ÅÇÏ ÐÏÓÔÒÏÅÎÉÑ É ÕÓÔÁÎÏ×ËÉ, ÅÓÌÉ ÏÎ ÎÅ ÂÕÄÅÔ
 	  ÎÁÊÄÅÎ.</para>
@@ -3446,7 +3455,7 @@ ALWAYS_KEEP_DISTFILES=  yes
 	  <para>ïÆÉÃÉÁÌØÎÙÍ ÚÎÁÞÅÎÉÅÍ ÐÅÒÅÍÅÎÎÏÊ ÐÏÉÓËÁ <envar>PATH</envar>,
 	    ÉÓÐÏÌØÚÕÅÍÙÍ × ËÌÁÓÔÅÒÅ ÐÏÓÔÒÏÅÎÉÑ ÐÏÒÔÏ× Ñ×ÌÑÅÔÓÑ</para>
 
-	  <programlisting>/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin</programlisting>
+	  <programlisting>/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin</programlisting>
 	</note>
 
 	<para>úÁ×ÉÓÉÍÏÓÔØ ÐÒÏ×ÅÒÑÅÔÓÑ ×ÎÕÔÒÉ ÃÅÌÉ
@@ -3589,16 +3598,16 @@ ALWAYS_KEEP_DISTFILES=  yes
       <sect2 id="use-vars">
 	<title><makevar>USE_<replaceable>*</replaceable></makevar></title>
 
-	<para>äÌÑ ÏÂßÅÄÉÎÅÎÉÑ ÎÅÓËÏÌØËÉÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ, ËÏÔÏÒÙÅ ÅÓÔØ ×Ï ÍÎÏÇÉÈ
-          ÐÏÒÔÁÈ, ÐÒÅÄÎÁÚÎÁÞÅÎÏ ÎÅÓËÏÌØËÏ ÐÅÒÅÍÅÎÎÙÈ.  èÏÔÑ ÉÈ ÉÓÐÏÌØÚÏ×ÁÎÉÅ
-	  Ñ×ÌÑÅÔÓÑ ÎÅÏÂÑÚÁÔÅÌØÎÙÍ, ÏÎÉ ÍÏÇÕÔ ÕÐÒÏÓÔÉÔØ ÉÚÂÙÔÏÞÎÏÓÔØ ÆÁÊÌÏ×
-	  <filename>Makefile</filename> ÐÏÒÔÁ.  ëÁÖÄÙÊ ÉÚ ÎÉÈ ÏÆÏÒÍÌÑÅÔÓÑ ËÁË
-	  <makevar>USE_<replaceable>*</replaceable></makevar>.  éÓÐÏÌØÚÏ×ÁÎÉÅ
-	  ÜÔÉÈ ÐÅÒÅÍÅÎÎÙÈ ÏÇÒÁÎÉÞÅÎÏ <filename>Makefile</filename>'ÏÍ ÐÏÒÔÁ
-	  É <filename>ports/Mk/bsd.*.mk</filename> É ÎÅ ÒÁÓÓÞÉÔÁÎÏ ÎÁ
-	  ×ÌÏÖÅÎÎÏÓÔØ ÕËÁÚÙ×ÁÅÍÙÈ ÐÏÌØÚÏ×ÁÔÅÌÑÍÉ ÏÐÃÉÑ &mdash; ÉÓÐÏÌØÚÕÊÔÅ
-	  ÄÌÑ ÜÔÉÈ ÃÅÌÅÊ <makevar>WITH_<replaceable>*</replaceable></makevar>
-	  É <makevar>WITHOUT_<replaceable>*</replaceable></makevar>.</para>
+	<para>äÌÑ ÏÐÒÅÄÅÌÅÎÉÑ ÏÂÝÉÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ, ÓÏ×ÍÅÓÔÎÏ ÉÓÐÏÌØÚÕÅÍÙÈ
+	  ÍÎÏÇÉÍÉ ÐÏÒÔÁÍÉ, ÐÒÅÄÎÁÚÎÁÞÅÎÏ ÎÅÓËÏÌØËÏ ÐÅÒÅÍÅÎÎÙÈ.  éÈ
+	  ÉÓÐÏÌØÚÏ×ÁÎÉÅ Ñ×ÌÑÅÔÓÑ ÎÅÏÂÑÚÁÔÅÌØÎÙÍ, ÎÏ ÐÏÍÏÇÁÅÔ ÕÐÒÏÓÔÉÔØ
+	  ÉÚÂÙÔÏÞÎÏÓÔØ ÆÁÊÌÏ× <filename>Makefile</filename> ÐÏÒÔÁ.
+	  ëÁÖÄÙÊ ÉÚ ÎÉÈ ÏÆÏÒÍÌÑÅÔÓÑ ËÁË
+	  <makevar>USE_<replaceable>*</replaceable></makevar>.  üÔÉ
+	  ÐÅÒÅÍÅÎÎÙÅ ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÔÏÌØËÏ × <filename>Makefile</filename>
+	  ÐÏÒÔÁ É <filename>ports/Mk/bsd.*.mk</filename>.  ïÎÉ ÎÅ
+	  ÐÒÅÄÎÁÚÎÁÞÅÎÙ ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÐÏÌØÚÏ×ÁÔÅÌÑÍÉ ÐÁÒÁÍÅÔÒÏ× &mdash;
+	  ÉÓÐÏÌØÚÕÊÔÅ ÄÌÑ ÜÔÉÈ ÃÅÌÅÊ <makevar>PORT_OPTIONS</makevar>.</para>
 
 	<note>
 	  <para>õÓÔÁÎÏ×ËÁ ÌÀÂÙÈ <makevar>USE_<replaceable>*</replaceable></makevar>
@@ -3766,7 +3775,95 @@ ALWAYS_KEEP_DISTFILES=  yes
           ÌÀÄÅÊ&mdash;×ËÌÀÞÁÑ ÓÅÂÑ&mdash;ÏÔ ÇÒÑÄÕÝÉÈ ÂÅÄ.</para>
       </sect2>
 
-      </sect1>
+      <sect2>
+	<title>á×ÔÏÍÁÔÉÞÅÓËÉÅ ÚÁ×ÉÓÉÍÏÓÔÉ É ÐÒÏÂÌÅÍÙ, ËÏÔÏÒÙÅ ÏÎÉ
+	  ×ÙÚÙ×ÁÀÔ</title>
+
+	<para>úÁ×ÉÓÉÍÏÓÔÉ ÄÏÌÖÎÙ ÂÙÔØ ÕËÁÚÁÎÙ ÌÉÂÏ Ñ×ÎÏ, ÌÉÂÏ Ó
+	  ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ <link linkend="makefile-options">ÆÒÅÊÍ×ÏÒËÁ
+	  OPTIONS</link>.  éÓÐÏÌØÚÏ×ÁÎÉÅ ÐÒÏÞÉÈ ÍÅÔÏÄÏ×, ÔÁËÉÈ ËÁË
+	  Á×ÔÏÍÁÔÉÞÅÓËÏÅ ÏÂÎÁÒÕÖÅÎÉÅ ÚÁ×ÉÓÉÍÏÓÔÅÊ, ÕÓÌÏÖÎÑÅÔ ÉÎÄÅËÓÉÒÏ×ÁÎÉÅ,
+	  ÞÔÏ ×ÙÚÙ×ÁÅÔ ÐÒÏÂÌÅÍÙ × ÕÐÒÁ×ÌÅÎÉÉ ÐÏÒÔÁÍÉ É ÐÁËÅÔÁÍÉ.</para>
+
+	<example>
+	  <title>îÅËÏÒÒÅËÔÎÏÅ ÏÂßÑ×ÌÅÎÉÅ ÎÅÏÂÑÚÁÔÅÌØÎÏÊ ÚÁ×ÉÓÉÍÏÓÔÉ</title>
+
+	  <programlisting>.include &lt;bsd.port.pre.mk&gt;
+
+.if exists(${LOCALBASE}/bin/foo)
+LIB_DEPENDS=	bar:${PORTSDIR}/foo/bar
+.endif</programlisting>
+	</example>
+
+	<para>ðÒÏÂÌÅÍÁ Á×ÔÏÍÁÔÉÞÅÓËÏÇÏ ÄÏÂÁ×ÌÅÎÉÑ ÚÁ×ÉÓÉÍÏÓÔÅÊ
+	  ÚÁËÌÀÞÁÅÔÓÑ × ÔÏÍ, ÞÔÏ ÆÁÊÌÙ É ÎÁÓÔÒÏÊËÉ ÚÁ ÐÒÅÄÅÌÁÍÉ ÐÏÒÔÁ
+	  ÍÏÇÕÔ ÐÒÏÉÚ×ÏÌØÎÏ ÍÅÎÑÔØÓÑ.  ðÒÉÍÅÒ: ÐÏÓÌÅ ÐÏÓÔÒÏÅÎÉÑ
+	  ÉÎÄÅËÓÁ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÎÁÂÏÒ ÐÏÒÔÏ×.  ðÒÉ ÜÔÏÍ ÏÄÉÎ ÉÚ
+	  ÎÉÈ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ ÐÒÏ×ÅÒÑÅÍÙÊ ÆÁÊÌ.  îÁ ÜÔÏÍ ÜÔÁÐÅ ÉÎÄÅËÓ
+	  ÂÕÄÅÔ ÎÅÐÒÁ×ÉÌØÎÙÍ, ÐÏÔÏÍÕ ÞÔÏ ÕÓÔÁÎÏ×ÌÅÎÎÙÊ ÐÏÒÔ ÎÅÏÖÉÄÁÎÎÏ
+	  ÐÏÌÕÞÉÔ ÎÏ×ÕÀ ÚÁ×ÉÓÉÍÏÓÔØ.  éÎÄÅËÓ ÍÏÖÅÔ ÂÙÔØ ÐÏ ÐÒÅÖÎÅÍÕ
+	  ÎÅÐÒÁ×ÉÌØÎÙÍ ÄÁÖÅ ÐÏÓÌÅ ÅÇÏ ÐÅÒÅÓÔÒÏÅÎÉÑ, × ÓÌÕÞÁÅ ÅÓÌÉ
+	  ÄÒÕÇÉÅ ÐÏÒÔÙ ÔÁËÖÅ ÏÐÒÅÄÅÌÑÔ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ,
+	  ÏÓÎÏ×Ù×ÁÑÓØ ÎÁ ÓÕÝÅÓÔ×Ï×ÁÎÉÉ ÄÒÕÇÉÈ ÆÁÊÌÏ×.</para>
+
+	<example>
+	  <title>ëÏÒÒÅËÔÎÏÅ ÏÂßÑ×ÌÅÎÉÅ ÎÅÏÂÑÚÁÔÅÌØÎÏÊ ÚÁ×ÉÓÉÍÏÓÔÉ</title>
+
+	  <programlisting>OPTIONS_DEFINE=	BAR
+BAR_DESC=	Enable bar support
+
+.include &lt;bsd.port.options.mk&gt;
+
+.if ${PORTOPTIONS:MBAR}
+LIB_DEPENDS=	bar:${PORTSDIR}/foo/bar
+.endif</programlisting>
+	</example>
+
+	<para>ðÒÁ×ÉÌØÎÙÍ ÓÐÏÓÏÂÏÍ Ñ×ÌÑÅÔÓÑ ÐÒÏ×ÅÒËÁ ÐÅÒÅÍÅÎÎÙÈ ÐÁÒÁÍÅÔÒÏ×.
+	  üÔÏÔ ÓÐÏÓÏ ÎÅ ÐÒÉ×ÏÄÉÔ Ë ÎÅÓÏÏÔ×ÅÔÓÔ×ÉÑÍ × ÉÎÄÅËÓÅ ÎÁÂÏÒÁ
+	  ÐÏÒÔÏ×, ÐÏÓËÏÌØËÕ ÐÁÒÁÍÅÔÒÙ ÏÐÒÅÄÅÌÅÎÙ ÄÏ ÐÏÓÔÒÏÅÎÉÑ ÉÎÄÅËÓÁ.
+	  ðÒÉ ÜÔÏÍ ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÐÒÏÓÔÙÅ ÓËÒÉÐÔÙ ÄÌÑ Á×ÔÏÍÁÔÉÚÁÃÉÉ
+	  ÐÏÓÔÒÏÅÎÉÑ, ÕÓÔÁÎÏ×ËÉ É ÏÂÎÏ×ÌÅÎÉÑ ÜÔÉÈ ÐÏÒÔÏ× É ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÈ
+	  ÉÍ ÐÁËÅÔÏ×.</para>
+      </sect2>
+
+      <sect2 id="use-want">
+	<title><makevar>USE_</makevar> É
+	  <makevar>WANT_</makevar></title>
+
+	<para>ðÅÒÅÍÅÎÎÙÅ <makevar>USE_</makevar> ÚÁÄÁÀÔÓÑ ÍÅÊÎÔÅÊÎÅÒÏÍ
+	  ÐÏÒÔÁ ÄÌÑ ÏÐÒÅÄÅÌÅÎÉÑ ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ, ÏÔ ËÏÔÏÒÏÇÏ
+	  ÜÔÏÔ ÐÏÒÔ ÚÁ×ÉÓÉÔ.  ðÏÒÔ, ÄÌÑ ËÏÔÏÒÏÇÏ ÎÕÖÅÎ Firefox,
+	  ÕËÁÖÅÔ</para>
+
+	<programlisting>USE_FIREFOX=	yes</programlisting>
+
+	<para>îÅËÏÔÏÒÙÅ ÐÅÒÅÍÅÎÎÙÅ <makevar>USE_</makevar> ÍÏÇÕÔ
+	  ÐÒÉÎÉÍÁÔØ ÎÏÍÅÒÁ ×ÅÒÓÉÊ ÉÌÉ ÄÒÕÇÉÅ ÐÁÒÁÍÅÔÒÙ.  îÁÐÒÉÍÅÒ,
+	  ÐÏÒÔ, ËÏÔÏÒÙÊ ÔÒÅÂÕÅÔ Apache 2.2, ÕËÁÖÅÔ</para>
+
+	<programlisting>USE_APACHE=	22</programlisting>
+
+	<para>÷ ÎÅËÏÔÏÒÙÈ ÓÌÕÞÁÑÈ ÄÌÑ ÂÏÌØÛÅÇÏ ËÏÎÔÒÏÌÑ ÎÁÄ
+	  ÚÁ×ÉÓÉÍÏÓÔÑÍÉ ÉÓÐÏÌØÚÕÀÔÓÑ ÐÅÒÅÍÅÎÎÙÅ <makevar>WANT_</makevar>,
+	  ËÏÔÏÒÙÅ ÐÏÚ×ÏÌÑÀÔ ÕËÁÚÙ×ÁÔØ ÔÒÅÂÏ×ÁÎÉÑ × ÂÏÌÅÅ ÔÏÞÎÏÊ ÆÏÒÍÅ.
+	  îÁÐÒÉÍÅÒ, ×ÚÇÌÑÎÉÔÅ ÎÁ ÐÏÒÔ <filename
+	    role="package">mail/squirrelmail</filename>.  üÔÏÍÕ ÐÏÒÔÕ
+	  ÎÕÖÎÙ ÎÅÓËÏÌØËÏ ÍÏÄÕÌÅÊ PHP, ËÏÔÏÒÙÅ ÐÅÒÅÞÉÓÌÅÎÙ × ÐÅÒÅÍÅÎÎÏÊ
+	  <makevar>USE_PHP</makevar>:</para>
+
+	<programlisting>USE_PHP=	session mhash gettext mbstring pcre openssl xml</programlisting>
+
+	<para>üÔÉ ÍÏÄÕÌÉ ÄÏÓÔÕÐÎÙ × ×ÅÒÓÉÑÈ CLI É web, ÐÏÜÔÏÍÕ ×ÅÒÓÉÑ
+	  web ×ÙÂÒÁÎÁ Ó ÐÅÒÅÍÅÎÎÏÊ <makevar>WANT_</makevar>:</para>
+
+	<programlisting>WANT_PHP_WEB=	yes</programlisting>
+
+	<para>éÍÅÀÝÉÅÓÑ ÐÅÒÅÍÅÎÎÙÅ <makevar>USE_</makevar> É
+	  <makevar>WANT_</makevar> ÏÐÒÅÄÅÌÅÎÙ × ÆÁÊÌÁÈ
+	  <filename>/usr/ports/Mk</filename>.</para>
+      </sect2>
+    </sect1>
 
   <sect1 id="makefile-masterdir">
     <title><makevar>MASTERDIR</makevar></title>
@@ -3960,27 +4057,28 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</progr
       <sect1 id="makefile-options">
       <title>ïÐÃÉÉ ÄÌÑ Makefile</title>
 
-      <para>îÅËÏÔÏÒÙÅ ÂÏÌØÛÉÅ ÐÒÉÌÏÖÅÎÉÑ ÍÏÇÕÔ ÂÙÔØ ÐÏÓÔÒÏÅÎÙ × ÒÁÚÌÉÞÎÙÈ
-	ËÏÎÆÉÇÕÒÁÃÉÑÈ, Ó ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÆÕÎËÃÉÏÎÁÌØÎÏÓÔØÀ, ÚÁ×ÉÓÑÝÅÊ ÏÔ
-	ÎÁÌÉÞÉÑ × ÓÉÓÔÅÍÅ ÏÐÒÅÄÅÌ£ÎÎÙÈ ÂÉÂÌÉÏÔÅË ÉÌÉ ÐÒÉÌÏÖÅÎÉÊ.  îÁÐÒÉÍÅÒ,
+      <para>íÎÏÇÉÅ ÐÒÉÌÏÖÅÎÉÑ ÍÏÇÕÔ ÂÙÔØ ÐÏÓÔÒÏÅÎÙ × ÒÁÚÌÉÞÎÙÈ
+	ËÏÎÆÉÇÕÒÁÃÉÑÈ É Ó ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÆÕÎËÃÉÏÎÁÌØÎÏÓÔØÀ.  îÁÐÒÉÍÅÒ,
 	×ÙÂÏÒ ÅÓÔÅÓÔ×ÅÎÎÏÇÏ (ÞÅÌÏ×ÅÞÅÓËÏÇÏ) ÑÚÙËÁ, GUI ÐÒÏÔÉ× ËÏÍÁÎÄÎÏÊ
-	ÓÔÒÏËÉ ÉÌÉ ÔÉÐÁ ÉÓÐÏÌØÚÕÅÍÏÊ ÂÁÚÙ ÄÁÎÎÙÈ. ôÁË ËÁË ÎÅ
-        ×ÓÅÍ ÐÏÌØÚÏ×ÁÔÅÌÑÍ ÔÒÅÂÕÀÔÓÑ ÜÔÉ ÂÉÂÌÉÏÔÅËÉ ÉÌÉ ÐÒÉÌÏÖÅÎÉÑ, ÔÏ ×
-        ÓÉÓÔÅÍÅ ÐÏÒÔÏ× ÐÒÅÄÕÓÍÏÔÒÅÎ ÍÅÈÁÎÉÚÍ, ÐÏÚ×ÏÌÑÀÝÉÊ Á×ÔÏÒÕ ÐÏÒÔÁ
-        ÐÒÉÎÉÍÁÔØ ÒÅÛÅÎÉÅ Ï ËÏÎÆÉÇÕÒÁÃÉÉ, ËÏÔÏÒÁÑ ÂÕÄÅÔ ÓÔÒÏÉÔØÓÑ.  ðÏÌÎÁÑ
-        ÐÏÄÄÅÒÖËÁ ÜÔÏÇÏ ÍÅÈÁÎÉÚÍÁ ÏÂÌÅÇÞÁÅÔ ÐÏÌØÚÏ×ÁÔÅÌÑÍ ÖÉÚÎØ É ÄÁ£Ô Ä×Á
-        ÉÌÉ ÂÏÌÅÅ ÐÏÒÔÁ ÃÅÎÏÊ ÓÏÚÄÁÎÉÑ ÏÄÎÏÇÏ.</para>
+	ÓÔÒÏËÉ ÉÌÉ ÔÉÐÁ ÉÓÐÏÌØÚÕÅÍÏÊ ÂÁÚÙ ÄÁÎÎÙÈ.  ðÏÌØÚÏ×ÁÔÅÌÉ ÍÏÇÕÔ
+	ÎÕÖÄÁÔØÓÑ × ÒÁÚÌÉÞÎÙÈ ËÏÎÆÉÇÕÒÁÃÉÑÈ, ÏÔÌÉÞÎÙÈ ÏÔ ÉÓÐÏÌØÚÕÅÍÏÊ ÐÏ
+	ÕÍÏÌÞÁÎÉÀ, ÐÏÜÔÏÍÕ × ÓÉÓÔÅÍÅ ÐÏÒÔÏ× ÐÒÅÄÕÓÍÏÔÒÅÎ ÍÅÈÁÎÉÚÍ,
+	ÐÏÚ×ÏÌÑÀÝÉÊ Á×ÔÏÒÕ ÐÏÒÔÁ ÕÐÒÁ×ÌÑÔØ ÓÂÏÒËÏÊ ÔÏÇÏ ÉÌÉ ÉÎÏÇÏ
+	×ÁÒÉÁÎÔÁ ËÏÎÆÉÇÕÒÁÃÉÉ.
+	ðÒÁ×ÉÌØÎÁÑ ÐÏÄÄÅÒÖËÁ ÜÔÉÈ ÎÅÏÂÑÚÁÔÅÌØÎÙÈ ÐÁÒÁÍÅÔÒÏ× ÏÂÌÅÇÞÁÅÔ
+	ÐÏÌØÚÏ×ÁÔÅÌÑÍ ÖÉÚÎØ É ÄÁ£Ô Ä×Á ÉÌÉ ÂÏÌÅÅ ÐÏÒÔÁ ÐÏ ÃÅÎÅ ÏÄÎÏÇÏ.</para>
 
       <sect2>
-	  <title>Knobs</title>
+	<title>Knobs</title>
 
 	<sect3>
-	  <title><makevar>WITH_<replaceable>*</replaceable></makevar> É
+	  <title><makevar>WITH_<replaceable>*</replaceable></makevar>
+	    É
 	    <makevar>WITHOUT_<replaceable>*</replaceable></makevar></title>
 
 	  <para>üÔÉ ÐÅÒÅÍÅÎÎÙÅ ÐÒÅÄÎÁÚÎÁÞÅÎÙ ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÓÉÓÔÅÍÎÙÍ
 	    ÁÄÍÉÎÉÓÔÒÁÔÏÒÏÍ.  íÎÏÇÉÅ ÉÚ ÎÉÈ ÓÔÁÎÄÁÒÔÉÚÏ×ÁÎÙ × ÆÁÊÌÅ
-	    <ulink url="http://www.freebsd.org/cgi/cvsweb.cgi/ports/KNOBS?rev=HEAD&amp;content-type=text/x-cvsweb-markup"><filename>ports/KNOBS</filename></ulink>.</para>
+	    <ulink url="http://svn.FreeBSD.org/ports/head/KNOBS?view=markup"><filename>ports/KNOBS</filename></ulink>.</para>
 
 	  <para>ðÒÉ ÓÏÚÄÁÎÉÉ ÐÏÒÔÁ ÎÅ ÄÁ×ÁÊÔÅ ÉÍÑ ÄÌÑ knob, ÓÐÅÃÉÆÉÞÎÏÅ
 	    ÄÌÑ ÄÁÎÎÏÇÏ ÐÒÉÌÏÖÅÎÉÑ.  îÁ ÐÒÉÍÅÒÅ ÐÏÒÔÁ Avahi, ÉÓÐÏÌØÚÕÊÔÅ
@@ -3998,7 +4096,7 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</progr
 
 	  <note>
 	    <para>åÓÌÉ ÏÂÒÁÔÎÏÅ ÎÅ ÕËÁÚÁÎÏ, ÔÏ ÐÒÏ×ÅÒÑÅÔÓÑ ÔÏÌØËÏ ÆÁËÔ
-	      ÕÓÔÁÎÏ×ËÉ ÓÁÍÉÈ ÐÅÒÅÍÅÎÎÙÈ, ÎÏ ÎÅ ÉÈ ÚÎÁÞÅÎÉÅ ÔÉÐÁ
+	      ÕÓÔÁÎÏ×ËÉ ÓÁÍÉÈ ÐÅÒÅÍÅÎÎÙÈ, ÎÏ ÎÅ ÉÈ ËÏÎËÒÅÔÎÏÅ ÚÎÁÞÅÎÉÅ ÔÉÐÁ
 	      <literal>YES</literal> ÉÌÉ <literal>NO</literal>.</para>
 	  </note>
 
@@ -4042,10 +4140,10 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</progr
 	        <row>
 		  <entry><makevar>WITHOUT_X11</makevar></entry>
 
-		  <entry>åÓÌÉ ÐÏÒÔ ÍÏÖÅÔ ÂÙÔØ ÓÏÂÒÁÎ Ó ÐÏÄÄÅÒÖËÏÊ ÉÌÉ ÂÅÚ
-		    ÐÏÄÄÅÒÖËÉ X, ÔÏ, ËÁË ÐÒÁ×ÉÌÏ, ÏÂÙÞÎÏ ÐÏÒÔ ÓÏÂÉÒÁÅÔÓÑ
-		    Ó ÐÏÄÄÅÒÖËÏÊ X.  åÓÌÉ ÜÔÁ ÐÅÒÅÍÅÎÎÁÑ ÏÐÒÅÄÅÌÅÎÁ, ÔÏ
-		    ÂÕÄÅÔ ÓÏÂÒÁÎÁ ×ÅÒÓÉÑ ÂÅÚ ÐÏÄÄÅÒÖËÉ X.</entry>
+		  <entry>ðÏÒÔÙ, ËÏÔÏÒÙÅ ÍÏÇÕÔ ÂÙÔØ ÓÏÂÒÁÎÙ Ó ÐÏÄÄÅÒÖËÏÊ
+		    ÉÌÉ ÂÅÚ ÐÏÄÄÅÒÖËÉ X, ÏÂÙÞÎÏ ÓÏÂÉÒÁÀÔÓÑ Ó ÐÏÄÄÅÒÖËÏÊ
+		    X.  åÓÌÉ ÜÔÁ ÐÅÒÅÍÅÎÎÁÑ ÏÐÒÅÄÅÌÅÎÁ, ÔÏ ÂÕÄÅÔ ÓÏÂÒÁÎÁ
+		    ×ÅÒÓÉÑ ÂÅÚ ÐÏÄÄÅÒÖËÉ X.</entry>
 	        </row>
 	      </tbody>
 	    </tgroup>
@@ -4055,11 +4153,11 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</progr
 
 	<sect3>
 	  <title>îÁÉÍÅÎÏ×ÁÎÉÅ KNOBS</title>
-	    <para>òÅËÏÍÅÎÄÕÅÔÓÑ, ÞÔÏÂÙ ÐÏÒÔÅÒÙ ÉÓÐÏÌØÚÏ×ÁÌÉ ÔÁË ÎÁÚÙ×ÁÅÍÙÅ
+	    <para>ðÏÒÔÅÒÙ ÄÏÌÖÎÙ ÉÓÐÏÌØÚÏ×ÁÔØ ÔÁË ÎÁÚÙ×ÁÅÍÙÅ
 	      knobs ÄÌÑ ÐÏÍÏÝÉ ËÏÎÅÞÎÙÍ ÐÏÌØÚÏ×ÁÔÅÌÑÍ É ÄÌÑ ÐÏÄÄÅÒÖÁÎÉÑ
 	      ËÏÌÉÞÅÓÔ×Á ÎÁÉÍÅÎÏ×ÁÎÉÊ knobs × ÎÅÂÏÌØÛÏÍ ËÏÌÉÞÅÓÔ×Å.
 	      óÐÉÓÏË ÐÏÐÕÌÑÒÎÙÈ ÎÁÚ×ÁÎÉÊ knobs ÍÏÖÎÏ ÎÁÊÔÉ × ÆÁÊÌÅ <ulink
-	      url="http://www.freebsd.org/cgi/cvsweb.cgi/ports/KNOBS?rev=HEAD&amp;content-type=text/x-cvsweb-markup">KNOBS</ulink>
+		url="http://svn.FreeBSD.org/ports/head/KNOBS?view=markup"><filename>KNOBS</filename></ulink>
 	    </para>
 
 	    <para>îÁÚ×ÁÎÉÑ knobs ÄÏÌÖÎÙ ÏÔÒÁÖÁÔØ, ÞÔÏ ÜÔÏ ÔÁËÏÅ É ÞÔÏ
@@ -4074,81 +4172,188 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</progr
 
 	<sect3>
 	  <title>ïÐÉÓÁÎÉÅ</title>
-	    <para>ðÒÉ ÕÓÔÁÎÏ×ËÅ ÐÏÒÔÁ ÐÅÒÅÍÅÎÎÁÑ <makevar>OPTIONS</makevar>
-	      ÐÒÅÄÏÓÔÁ×ÌÑÅÔ ÐÏÌØÚÏ×ÁÔÅÌÀ ÏËÎÏ ÄÉÁÌÏÇÁ Ó ÄÏÓÔÕÐÎÙÍÉ
-	      ÐÁÒÁÍÅÔÒÁÍÉ É ÓÏÈÒÁÎÑÅÔ ÉÈ × ÆÁÊÌ
-	      <filename>/var/db/ports/<replaceable>portname</replaceable>/options</filename>.
-	      üÔÉ ÏÐÃÉÉ ÂÕÄÕÔ ÐÏ×ÔÏÒÎÏ ÉÓÐÏÌØÚÏ×ÁÎÙ ÐÒÉ ÓÌÅÄÕÀÝÅÍ
-	      ÐÅÒÅÓÔÒÏÅÎÉÉ ÐÏÒÔÁ.  ÷ÁÍ ÂÏÌØÛÅ ÎÉËÏÇÄÁ ÎÅ ÐÏÎÁÄÏÂÉÔÓÑ
-	      ÚÁÐÏÍÉÎÁÔØ ×ÓÅ Ä×ÁÄÃÁÔØ ÏÐÃÉÊ
-	      <makevar>WITH_<replaceable>*</replaceable></makevar> É
-	      <makevar>WITHOUT_<replaceable>*</replaceable></makevar>,
-	      ÉÓÐÏÌØÚÕÅÍÙÈ ×ÁÍÉ ÐÒÉ ÐÏÓÔÒÏÅÎÉÉ ÜÔÏÇÏ ÐÏÒÔÁ!</para>
+	    <para>ðÒÉ ÕÓÔÁÎÏ×ËÅ ÐÏÒÔÁ ÐÅÒÅÍÅÎÎÙÅ <makevar>OPTIONS_*</makevar>
+	      ÐÒÅÄÏÓÔÁ×ÌÑÀÔ ÐÏÌØÚÏ×ÁÔÅÌÀ ÏËÎÏ ÄÉÁÌÏÇÁ Ó ÏÔÏÂÒÁÖÅÎÉÅÍ
+	      ÄÏÓÔÕÐÎÙÈ ÐÁÒÁÍÅÔÒÏ×, Ó ÚÁÐÉÓØÀ ×ÙÂÒÁÎÎÙÈ ÐÁÒÁÍÅÔÒÏ× × ÆÁÊÌ
+	      <filename>/var/db/ports/<makevar>${UNIQUENAME}</makevar>/options</filename>.
+	      üÔÉ ÏÐÃÉÉ ÐÏ×ÔÏÒÎÏ ÉÓÐÏÌØÚÕÀÔÓÑ ÐÒÉ ÓÌÅÄÕÀÝÅÍ ÐÏÓÔÒÏÅÎÉÉ
+	      ÐÏÒÔÁ.</para>
 
 	    <para>ëÏÇÄÁ ÐÏÌØÚÏ×ÁÔÅÌØ ÚÁÐÕÓËÁÅÔ <command>make config</command>
 	      (ÉÌÉ ÚÁÐÕÓËÁÅÔ ×ÐÅÒ×ÙÅ <command>make build</command>),
-	      ÉÎÆÒÁÓÔÒÕËÔÕÒÁ ×ÙÐÏÌÎÉÔ ÐÒÏ×ÅÒËÕ ÓÕÝÅÓÔ×Ï×ÁÎÉÑ ÆÁÊÌÁ
-	      <filename>/var/db/ports/<replaceable>portname</replaceable>
-	      /options</filename>.  åÓÌÉ ÜÔÏÔ ÆÁÊÌ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ, ÔÏ ÐÒÉ
-	      ÓÏÚÄÁÎÉÉ ÄÉÁÌÏÇÏ×ÏÇÏ ÏËÎÁ ÂÕÄÕÔ ÉÓÐÏÌØÚÏ×ÁÎÙ ÚÎÁÞÅÎÉÑ
-	      <makevar>OPTIONS</makevar>, × ËÏÔÏÒÏÍ ÉÈ ÍÏÖÎÏ ÐÅÒÅËÌÀÞÉÔØ.
-	      úÁÔÅÍ ÓÏÈÒÁÎÑÅÔÓÑ ÆÁÊÌ ÏÐÃÉÊ, É ×ÙÂÒÁÎÎÙÅ ÐÅÒÅÍÅÎÎÙÅ
-	      ÉÓÐÏÌØÚÕÀÔÓÑ ÐÒÉ ÐÏÓÔÒÏÅÎÉÉ ÐÏÒÔÁ.</para>
+	      ÉÎÆÒÁÓÔÒÕËÔÕÒÁ ×ÙÐÏÌÎÑÅÔ ÐÒÏ×ÅÒËÕ ÓÕÝÅÓÔ×Ï×ÁÎÉÑ ÆÁÊÌÁ
+	      <filename>/var/db/ports/<makevar>${UNIQUENAME}</makevar>/options</filename>.
+	      åÓÌÉ ÜÔÏÔ ÆÁÊÌ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ, ÔÏ ÉÓÐÏÌØÚÕÀÔÓÑ ÚÎÁÞÅÎÉÑ
+	      <makevar>OPTIONS_*</makevar> É ÏÔÏÂÒÁÖÁÅÔÓÑ ÄÉÁÌÏÇÏ×ÏÅ ÏËÎÏ,
+	      × ËÏÔÏÒÏÍ ÜÔÉ ÐÁÒÁÍÅÔÒÙ ÍÏÖÎÏ ×ËÌÀÞÉÔØ ÉÌÉ ×ÙËÌÀÞÉÔØ.
+	      úÁÔÅÍ ÓÏÈÒÁÎÑÅÔÓÑ ÆÁÊÌ ÏÐÃÉÊ <filename>options</filename>,
+	      É ×ÙÂÒÁÎÎÙÅ ÐÅÒÅÍÅÎÎÙÅ ÉÓÐÏÌØÚÕÀÔÓÑ ÐÒÉ ÐÏÓÔÒÏÅÎÉÉ ÐÏÒÔÁ.</para>
 
 	    <para>åÓÌÉ ÎÏ×ÁÑ ×ÅÒÓÉÑ ÐÏÒÔÁ ÄÏÂÁ×ÌÑÅÔ ÎÏ×ÙÅ ÚÎÁÞÅÎÉÑ
 	      <makevar>OPTIONS</makevar>, ÔÏ ÐÏÌØÚÏ×ÁÔÅÌÀ ÂÕÄÅÔ ÐÒÅÄÓÔÁ×ÌÅÎÏ
 	      ÏËÎÏ ÄÉÁÌÏÇÁ Ó ÓÏÈÒÁÎÅÎÎÙÍÉ ÚÁÐÏÌÎÅÎÎÙÍÉ ÚÎÁÞÅÎÉÑÍÉ ÓÔÁÒÙÈ
 	      <makevar>OPTIONS.</makevar></para>
 
-	    <para>äÌÑ ÐÒÏÓÍÏÔÒÁ ÓÏÈÒÁÎÅÎÎÏÊ ËÏÎÆÉÇÕÒÁÃÉÉ ÉÓÐÏÌØÚÕÊÔÅ
-	      <command>make showconfig</command>.  äÌÑ ÕÄÁÌÅÎÉÑ
+	    <para><command>make showconfig</command> ÏÔÏÂÒÁÖÁÅÔ
+	      ÓÏÈÒÁÎÅÎÎÕÀ ËÏÎÆÉÇÕÒÁÃÉÀ.  äÌÑ ÕÄÁÌÅÎÉÑ
 	      ÓÏÈÒÁÎÅÎÎÏÊ ËÏÎÆÉÇÕÒÁÃÉÉ ÉÓÐÏÌØÚÕÊÔÅ
 	      <command>make rmconfig</command>.</para>
 	</sect3>
 
 	<sect3>
 	  <title>óÉÎÔÁËÓÉÓ</title>
-	    <para>óÉÎÔÁËÓÉÓ ÐÅÒÅÍÅÎÎÏÊ <makevar>OPTIONS</makevar>:</para>
 
-	    <programlisting>OPTIONS=	OPTION	"descriptive text" default ...</programlisting>
+	    <para><makevar>OPTIONS_DEFINE</makevar> ÓÏÄÅÒÖÉÔ ÓÐÉÓÏË
+	      ÉÓÐÏÌØÚÕÅÍÙÈ <makevar>OPTIONS</makevar>.  ïÎÉ ÎÅÚÁ×ÉÓÉÍÙ
+	      ÄÒÕÇ ÏÔ ÄÒÕÇÁ É ÎÅ ÓÇÒÕÐÐÉÒÏ×ÁÎÙ:</para>
+
+	    <programlisting>OPTIONS_DEFINE=	OPT1 OPT2</programlisting>
+
+	    <para>äÁÌÅÅ ÐÏÓÌÅ ÏÐÒÅÄÅÌÅÎÉÑ ÓÌÅÄÕÅÔ ÏÐÉÓÁÎÉÅ
+	      <makevar>OPTIONS</makevar> (ÎÅ Ñ×ÌÑÅÔÓÑ ÏÂÑÚÁÔÅÌØÎÙÍ,
+	      ÎÏ ÎÁÓÔÏÑÔÅÌØÎÏ ÒÅËÏÍÅÎÄÕÅÔÓÑ):</para>
+
+	    <programlisting>OPT1_DESC=	Describe OPT1
+OPT2_DESC=	Describe OPT2
+OPT3_DESC=	Describe OPT3
+OPT4_DESC=	Describe OPT4
+OPT5_DESC=	Describe OPT5
+OPT6_DESC=	Describe OPT6</programlisting>
+
+	    <tip>
+	      <para><filename>ports/Mk/bsd.options.desc.mk</filename>
+		ÓÏÄÅÒÖÉÔ ÏÐÉÓÁÎÉÅ ÍÎÏÖÅÓÔ×Á ÎÁÉÂÏÌÅÅ ÉÓÐÏÌØÚÕÅÍÙÈ
+		<makevar>OPTIONS</makevar>; ÐÅÒÅÏÐÒÅÄÅÌÑÔØ ÉÈ, ËÁË
+		ÐÒÁ×ÉÌÏ, ÎÅ ÎÕÖÎÏ.</para>
+	    </tip>
+
+	    <tip>
+	      <para>ðÒÉ ÏÐÉÓÁÎÉÉ ÐÁÒÁÍÅÔÒÏ× ÓÔÁÒÁÊÔÅÓØ ÐÒÅÄÓÔÁ×ÉÔØ ÓÅÂÑ
+		ÎÁ ÍÅÓÔÅ ÐÏÌØÚÏ×ÁÔÅÌÑ: <quote>þÔÏ ÜÔÏ ÄÅÌÁÅÔ?</quote>
+		É <quote>äÌÑ ÞÅÇÏ ÂÙ Ñ ÚÁÈÏÔÅÌ ×ËÌÀÞÉÔØ ÜÔÏ?</quote>
+		îÅ ÄÅÌÁÊÔÅ ÐÒÏÓÔÏÅ ÐÏ×ÔÏÒÅÎÉÅ ÎÁÚ×ÁÎÉÑ.  îÁÐÒÉÍÅÒ,
+		ÏÐÉÓÁÎÉÅ ÐÁÒÁÍÅÔÒÁ <literal>NLS</literal> ËÁË
+		<quote>include NLS support</quote> (<quote>×ËÌÀÞÉÔØ
+		ÐÏÄÄÅÒÖËÕ NLS</quote>) ÎÅ ÐÏÍÏÖÅÔ ÐÏÌØÚÏ×ÁÔÅÌÀ, ËÏÔÏÒÙÊ
+		ÕÖÅ ×ÉÄÉÔ ÎÁÚ×ÁÎÉÅ ÐÁÒÁÍÅÔÒÁ, ÎÏ ÍÏÖÅÔ ÎÅ ÚÎÁÔØ, ÞÔÏ
+		ÜÔÏ ÏÚÎÁÞÁÅÔ.  ïÐÉÓÁ× ÅÇÏ ËÁË <quote>Native Language
+		Support via gettext utilities</quote> (<quote>ðÏÄÄÅÒÖËÁ
+		ÎÁÃÉÏÎÁÌØÎÏÇÏ ÑÚÙËÁ ÞÅÒÅÚ ÕÔÉÌÉÔÙ gettext</quote>),
+		×Ù ÐÏÍÏÖÅÔÅ ÐÏÌØÚÏ×ÁÔÅÌÀ ÇÏÒÁÚÄÏ ÂÏÌØÛÅ.</para>
+	    </tip>
+
+	    <para><makevar>OPTIONS</makevar> ÍÏÖÎÏ ÇÒÕÐÐÉÒÏ×ÁÔØ × ×ÉÄÅ
+	      ÐÅÒÅËÌÀÞÁÔÅÌÅÊ, ÄÌÑ ËÏÔÏÒÙÈ ÒÁÚÒÅÛÅÎ ×ÙÂÏÒ ÅÄÉÎÓÔ×ÅÎÎÏÇÏ
+	      ×ÁÒÉÁÎÔÁ × ËÁÖÄÏÊ ÇÒÕÐÐÅ:</para>
+
+	    <programlisting>OPTIONS_SINGLE=		SG1
+OPTIONS_SINGLE_SG1=	OPT3 OPT4</programlisting>
+
+	    <para><makevar>OPTIONS</makevar> ÔÁËÖÅ ÍÏÖÎÏ ÇÒÕÐÐÉÒÏ×ÁÔØ
+	      × ×ÉÄÅ ÓÐÉÓËÏ× ÓÏ ÍÎÏÖÅÓÔ×ÅÎÎÙÍ ×ÙÂÏÒÏÍ, ÄÌÑ ËÏÔÏÒÙÈ
+	      ÏÂÑÚÁÎ ÂÙÔØ ×ËÌÀÞÅÎ <emphasis>ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ
+	      ÏÄÉÎ</emphasis> ÉÚ ÐÁÒÁÍÅÔÒÏ×:</para>
+
+	    <programlisting>OPTIONS_MULTI=		MG1
+OPTIONS_MULTI_MG1=	OPT5 OPT6</programlisting>
+
+	    <para><makevar>OPTIONS_MULTI</makevar> É
+	      <makevar>OPTIONS_SINGLE</makevar> ÔÁËÖÅ ÄÏÐÕÓËÁÀÔ
+	      ÏÔÓÕÔÓÔ×ÉÅ ×ÙÂÏÒÁ ÐÕÔ£Í ×ËÌÀÞÅÎÉÑ ÇÒÕÐÐÙ ×
+	      <makevar>OPTIONS_DEFINE</makevar>:</para>
+
+	    <programlisting>OPTIONS_DEFINE=		MG1
+OPTIONS_MULTI=		MG1
+OPTIONS_MULTI_MG1=	OPT5 OPT6</programlisting>
+
+	    <para>ðÏÓÌÅ ÜÔÏÇÏ ÇÒÕÐÐÁ ÔÒÅÂÕÅÔ ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ ÏÄÉÎ
+	      <makevar>OPTION</makevar> ÉÚ <makevar>MG1</makevar>,
+	      ÔÏÌØËÏ ÅÓÌÉ ×ÙÂÒÁÎ ÎÏ×ÙÊ <makevar>MG1</makevar>
+	      <makevar>OPTION</makevar>.  òÅËÏÍÅÎÄÕÅÔÓÑ
+	      ÐÏÜËÓÐÅÒÉÍÅÎÔÉÒÏ×ÁÔØ, ÞÔÏÂÙ ÕÌÕÞÛÉÔØ ÐÏÎÉÍÁÎÉÅ.</para>
+
+	    <para>ðÏ ÕÍÏÌÞÁÎÉÀ <makevar>OPTIONS</makevar> ÎÁÈÏÄÉÔÓÑ ×
+	      ×ÙËÌÀÞÅÎÎÏÍ ÐÏÌÏÖÅÎÉÉ, ÅÓÌÉ ÐÒÉ ÜÔÏÍ ÏÎÏ ÔÁËÖÅ ÏÔÓÕÔÓÔ×ÕÅÔ
+	      × ÓÐÉÓËÅ <makevar>OPTIONS_DEFAULT</makevar>:</para>
 
-	    <para>úÎÁÞÅÎÉÅÍ ÐÏ ÕÍÏÌÞÁÎÉÀ Ñ×ÌÑÅÔÓÑ ÉÌÉ <literal>ON</literal>,
-	      ÉÌÉ <literal>OFF</literal>.  òÁÚÒÅÛÁÀÔÓÑ ÍÎÏÖÅÓÔ×ÅÎÎÙÅ
-	      ÐÏ×ÔÏÒÙ ×ÓÅÈ ÔÒÅÈ ÐÏÌÅÊ.</para>
+	    <programlisting>OPTIONS_DEFAULT=	OPT1 OPT3 OPT6</programlisting>
 
-	    <para>ïÐÒÅÄÅÌÅÎÉÅ <makevar>OPTIONS</makevar> ÏÂÑÚÁÎÏ ÐÏÑ×ÉÔØÓÑ
+	    <para>ïÐÒÅÄÅÌÅÎÉÑ <makevar>OPTIONS</makevar> ÏÂÑÚÁÎÙ ÐÏÑ×ÉÔØÓÑ
 	      ÄÏ ÐÏÄËÌÀÞÅÎÉÑ <filename>bsd.port.options.mk</filename>.
-	      ðÅÒÅÍÅÎÎÙÅ <makevar>WITH_*</makevar> É
-	      <makevar>WITHOUT_*</makevar> ÍÏÇÕÔ ÂÙÔØ ÐÒÏ×ÅÒÅÎÙ ÔÏÌØËÏ ÐÏÓÌÅ
+	      ðÅÒÅÍÅÎÎÙÅ <makevar>PORT_OPTIONS</makevar>
+	      ÍÏÇÕÔ ÂÙÔØ ÐÒÏ×ÅÒÅÎÙ ÔÏÌØËÏ ÐÏÓÌÅ
 	      ÐÏÄËÌÀÞÅÎÉÑ <filename>bsd.port.options.mk</filename>.
 	      ÷ÍÅÓÔÏ ÜÔÏÇÏ ÔÁËÖÅ ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÐÏÄËÌÀÞÅÎÉÅ
 	      <filename>bsd.port.pre.mk</filename>, ÞÔÏ ×ÓÅ ÅÝÅ ÛÉÒÏËÏ
 	      ÉÓÐÏÌØÚÕÅÔÓÑ × ÐÏÒÔÁÈ, ÎÁÐÉÓÁÎÎÙÈ ÄÏ ÐÏÑ×ÌÅÎÉÑ
 	      <filename>bsd.port.options.mk</filename>.  îÏ ÉÍÅÊÔÅ × ×ÉÄÕ,
-	      ÞÔÏ ÎÅËÏÔÏÒÙÅ ÐÅÒÅÍÅÎÎÙÅ, ÏÂÙÞÎÏ ÆÌÁÇÉ <makevar>USE_*</makevar>,
+	      ÞÔÏ ÎÅËÏÔÏÒÙÅ ÐÅÒÅÍÅÎÎÙÅ, ÏÂÙÞÎÏ, ÜÔÏ ÎÅËÏÔÏÒÙÅ ÆÌÁÇÉ
+	      <makevar>USE_*</makevar>,
 	      ÐÏÓÌÅ ÐÏÄËÌÀÞÅÎÉÑ <filename>bsd.port.pre.mk</filename> ÂÕÄÕÔ
-	      ÒÁÂÏÔÁÔØ ÎÅ ÔÁË, ËÁË ÜÔÏ ÏÔ ÎÉÈ ÏÖÉÄÁÅÔÓÑ.</para>
+	      ÒÁÂÏÔÁÔØ ÎÅ ÔÁË, ËÁË ÜÔÏÇÏ ÏÔ ÎÉÈ ÏÖÉÄÁÀÔ.</para>
 
 	  <example id="ports-options-simple-use">
 	    <title>ðÒÏÓÔÏÅ ÉÓÐÏÌØÚÏ×ÁÎÉÅ <makevar>OPTIONS</makevar></title>
-	    <programlisting>OPTIONS=      FOO "Enable option foo" On \
-              BAR "Support feature bar" Off
+
+	    <programlisting>OPTIONS_DEFINE=	FOO BAR
+FOO_DESC=	Enable option foo
+BAR_DESC=	Support feature bar
 
 .include &lt;bsd.port.options.mk&gt;
 
-.if defined(WITHOUT_FOO)
-CONFIGURE_ARGS+=	--without-foo
+.if ${PORT_OPTIONS:MFOO}
+CONFIGURE_ARGS+=--with-foo
 .else
-CONFIGURE_ARGS+=	--witht-foo
+CONFIGURE_ARGS+=--without-foo
 .endif
 
-.if defined(WITH_BAR)
+.if ${PORT_OPTIONS:MBAR}
 RUN_DEPENDS+=	bar:${PORTSDIR}/bar/bar
 .endif
 
 .include &lt;bsd.port.mk&gt;</programlisting>
 	  </example>
 
+	  <example id="ports-options-practical-use">
+	    <title>ðÒÉÍÅÒ ÒÅÁÌØÎÏÇÏ ÉÓÐÏÌØÚÏ×ÁÎÉÑ
+	      <makevar>OPTIONS</makevar></title>
+
+	    <programlisting>OPTIONS_DEFINE=		EXAMPLES
+
+OPTIONS_SINGLE=		BACKEND
+OPTIONS_SINGLE_BACKEND=	MYSQL PGSQL BDB
+
+OPTIONS_MULTI=		AUTH
+OPTIONS_MULTI_AUTH=	LDAP PAM SSL
+
+EXAMPLES_DESC=		Install extra examples
+MYSQL_DESC=		Use MySQL as backend
+PGSQL_DESC=		Use PostgreSQL as backend
+BDB_DESC=		Use Berkeley DB as backend
+LDAP_DESC=		Build with LDAP authentication support
+PAM_DESC=		Build with PAM support
+SSL_DESC=		Build with OpenSSL support
+
+OPTIONS_DEFAULT=	PGSQL LDAP SSL
+
+.include &lt;bsd.port.options.mk&gt;
+
+.if ${PORT_OPTIONS:MPGSQL}
+USE_PGSQL=		yes
+CONFIGURE_ARGS+=	--with-postgres
+.else
+CONFIGURE_ARGS+=	--without-postgres
+.endif
+
+.if ${PORT_OPTIONS:MICU}
+LIB_DEPENDS+=	icuuc:${PORTSDIR}/devel/icu
+.endif
+
+# Check other OPTIONS
+
+.include &lt;bsd.port.mk&gt;</programlisting>
+	  </example>
+
 	  <example id="ports-options-old-style-use">
 	    <title>éÓÐÏÌØÚÏ×ÁÎÉÅ <makevar>OPTIONS</makevar>
 	      × ÓÔÁÒÏÍ ÓÔÉÌÅ</title>
@@ -4164,6 +4369,12 @@ CONFIGURE_ARGS+=	--with-foo
 
 .include &lt;bsd.port.post.mk&gt;</programlisting>
 	  </example>
+
+	  <important>
+	    <para>ôÁËÏÊ ÓÐÏÓÏ ÉÓÐÏÌØÚÏ×ÁÎÉÑ <makevar>OPTIONS</makevar>
+	      Ñ×ÌÑÅÔÓÑ ÕÓÔÁÒÅ×ÛÉÍ, É × ÂÕÄÕÝÅÍ ÅÇÏ ÐÏÄÄÅÒÖËÁ ÂÕÄÅÔ
+	      ÕÄÁÌ£ÎÁ.  îÅ ÉÓÐÏÌØÚÕÊÔÅ ÜÔÏÔ ÓÐÏÓÏ ÄÌÑ ÎÏ×ÙÈ ÐÏÒÔÏ×.</para>
+	  </important>
 	</sect3>
       </sect2>
 
@@ -4180,8 +4391,9 @@ CONFIGURE_ARGS+=	--with-foo
 
 	<example>
 	  <title>îÅÐÒÁ×ÉÌØÎÏÅ ÕÐÒÁ×ÌÅÎÉÅ ÏÐÃÉÅÊ</title>
-	  <programlisting>.if defined(WITH_FOO)
-LIB_DEPENDS+=		foo.0:${PORTSDIR}/devel/foo
+
+	  <programlisting>.if ${PORT_OPTIONS:MFOO}
+LIB_DEPENDS+=		foo:${PORTSDIR}/devel/foo
 CONFIGURE_ARGS+=	--enable-foo
 .endif</programlisting>
 	</example>
@@ -4198,8 +4410,9 @@ CONFIGURE_ARGS+=	--enable-foo
 
 	<example>
 	  <title>ðÒÁ×ÉÌØÎÏÅ ÕÐÒÁ×ÌÅÎÉÅ ÏÐÃÉÅÊ</title>
-	  <programlisting>.if defined(WITH_FOO)
-LIB_DEPENDS+=		foo.0:${PORTSDIR}/devel/foo
+
+	  <programlisting>.if ${PORT_OPTIONS:MFOO}
+LIB_DEPENDS+=		foo:${PORTSDIR}/devel/foo
 CONFIGURE_ARGS+=	--enable-foo
 .else
 CONFIGURE_ARGS+=	--disable-foo
@@ -5317,7 +5530,7 @@ PLIST_SUB+=             NLS="@comment "
     </sect1>
 
     <sect1 id="using-perl">
-      <title>éÓÐÏÌØÚÏ×ÁÎÉÅ <literal>perl</literal></title>
+      <title>éÓÐÏÌØÚÏ×ÁÎÉÅ <application>Perl</application></title>
 
       <para>åÓÌÉ <makevar>MASTER_SITES</makevar> ÕÓÔÁÎÏ×ÌÅÎÁ × ÚÎÁÞÅÎÉÅ
 	<makevar>MASTER_SITE_PERL_CPAN</makevar>, ÔÏ ÐÒÅÄÐÏÞÔÉÔÅÌØÎÙÍ
@@ -5334,12 +5547,12 @@ PLIST_SUB+=             NLS="@comment "
 	× ËÁÞÅÓÔ×Å <makevar>MASTER_SITE_SUBDIR</makevar> ÒÁÚÒÅÛÁÅÔÓÑ
 	ÉÓÐÏÌØÚÏ×ÁÔØ id Á×ÔÏÒÁ.</para>
 
-      <para>÷ÓÅ ÉÚ ÎÁÓÔÒÁÉ×ÁÅÍÙÈ knobs ÎÉÖÅ ÐÒÉÎÉÍÁÀÔ É <literal>YES</literal>,
-	É ÓÔÒÏËÕ Ó ×ÅÒÓÉÅÊ, ×ÉÄÁ <literal>5.8.0+</literal>.  éÓÐÏÌØÚÏ×ÁÎÉÅ
+      <para>÷ÓÅ ÉÚ ÎÁÓÔÒÁÉ×ÁÅÍÙÈ knobs ÎÉÖÅ ÐÒÉÎÉÍÁÀÔ ÌÉÂÏ <literal>YES</literal>,
+	ÌÉÂÏ ÓÔÒÏËÕ Ó ×ÅÒÓÉÅÊ ×ÉÄÁ <literal>5.8.0+</literal>.
 	<literal>YES</literal> ÏÚÎÁÞÁÅÔ, ÞÔÏ ÄÁÎÎÙÊ ÐÏÒÔ ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ
-	ÓÏ ×ÓÅÍÉ ÐÏÄÄÅÒÖÉ×ÁÅÍÙÍÉ ×ÅÒÓÉÑÍÉ <application>Perl</application>.
+	Ó ÌÀÂÏÊ ÉÚ ÐÏÄÄÅÒÖÉ×ÁÅÍÙÈ ×ÅÒÓÉÊ Perl.
 	åÓÌÉ ÐÏÒÔ ÒÁÂÏÔÁÅÔ ÔÏÌØËÏ Ó ÎÅËÏÔÏÒÙÍÉ ×ÅÒÓÉÑÍÉ
-	<application>Perl</application>, ÔÏ ÜÔÏ ÍÏÖÎÏ ÏÂÏÚÎÁÞÉÔØ ÐÒÉ ÐÏÍÏÝÉ
+	Perl, ÔÏ ÜÔÏ ÍÏÖÎÏ ÏÂÏÚÎÁÞÉÔØ ÐÒÉ ÐÏÍÏÝÉ
 	ÓÔÒÏËÉ Ó ×ÅÒÓÉÅÊ, ÕËÁÚÙ×ÁÀÝÅÊ ÎÁ ÍÉÎÉÍÁÌØÎÕÀ ×ÅÒÓÉÀ (ÐÒÉÍÅÒ:
 	<literal>5.7.3+</literal>), ÍÁËÓÉÍÁÌØÎÕÀ ×ÅÒÓÉÀ (ÐÒÉÍÅÒ:
 	<literal>5.8.0-</literal>) ÉÌÉ ÔÏÞÎÕÀ ×ÅÒÓÉÀ (ÐÒÉÍÅÒ:
@@ -5347,14 +5560,14 @@ PLIST_SUB+=             NLS="@comment "
 
       <table frame="none">
 	<title>ðÅÒÅÍÅÎÎÙÅ ÄÌÑ ÐÏÒÔÏ×, ÉÓÐÏÌØÚÕÀÝÉÈ
-          <literal>perl</literal></title>
+	  <application>Perl</application></title>
 
 	<tgroup cols="2">
 	  <thead>
 	    <row>
 	      <entry>ðÅÒÅÍÅÎÎÁÑ</entry>
 
-	      <entry>óÍÙÓÌ</entry>
+	      <entry>úÎÁÞÅÎÉÅ</entry>
 	    </row>
 	  </thead>
 
@@ -5362,29 +5575,26 @@ PLIST_SUB+=             NLS="@comment "
 	    <row>
 	      <entry><makevar>USE_PERL5</makevar></entry>
 
-	      <entry>õËÁÚÙ×ÁÅÔ ÎÁ ÔÏ, ÞÔÏ ÐÏÒÔ ÉÓÐÏÌØÚÕÅÔ <literal>perl
-                5</literal> ÄÌÑ Ó×ÏÅÇÏ ÐÏÓÔÒÏÅÎÉÑ É ÒÁÂÏÔÙ.</entry>
+	      <entry>Perl 5 ÉÓÐÏÌØÚÕÅÔÓÑ ÄÌÑ ÐÏÓÔÒÏÅÎÉÑ É ÒÁÂÏÔÙ.</entry>
 	    </row>
 
 	    <row>
               <entry><makevar>USE_PERL5_BUILD</makevar></entry>
 
-              <entry>õËÁÚÙ×ÁÅÔ ÎÁ ÔÏ, ÞÔÏ ÄÌÑ ÐÏÓÔÒÏÅÎÉÑ ÐÏÒÔ
-                ÉÓÐÏÌØÚÕÅÔ <literal>perl 5</literal>.</entry>
+	      <entry>Perl 5 ÉÓÐÏÌØÚÕÅÔÓÑ ÄÌÑ ÐÏÓÔÒÏÅÎÉÑ.</entry>
             </row>
 
             <row>
               <entry><makevar>USE_PERL5_RUN</makevar></entry>
 
-              <entry>õËÁÚÙ×ÁÅÔ ÎÁ ÔÏ, ÞÔÏ ÄÌÑ ÒÁÂÏÔÙ ÐÏÒÔ ÉÓÐÏÌØÚÕÅÔ
-                <literal>perl 5</literal>.</entry>
+	      <entry>Perl 5 ÉÓÐÏÌØÚÕÅÔÓÑ ×Ï ×ÒÅÍÑ ÒÁÂÏÔÙ.</entry>
             </row>
 
             <row>
               <entry><makevar>PERL</makevar></entry>
 
-              <entry>ðÏÌÎÙÊ ÍÁÒÛÒÕÔ Ë <literal>perl 5</literal>, ÌÉÂÏ ×
-                ÓÉÓÔÅÍÅ, ÌÉÂÏ ÕÓÔÁÎÏ×ÌÅÎÎÏÇÏ ÉÚ ÐÏÒÔÏ×, ÎÏ ÂÅÚ ÎÏÍÅÒÁ ×ÅÒÓÉÉ.
+	      <entry>ðÏÌÎÙÊ ÐÕÔØ Ë ÉÎÔÅÒÐÒÅÔÁÔÏÒÕ Perl 5, ÌÉÂÏ ×
+                ÓÉÓÔÅÍÅ, ÌÉÂÏ ÕÓÔÁÎÏ×ÌÅÎÎÏÍÕ ÉÚ ÐÏÒÔÏ×, ÎÏ ÂÅÚ ÎÏÍÅÒÁ ×ÅÒÓÉÉ.
                 éÓÐÏÌØÚÕÊÔÅ ÜÔÏ, ÅÓÌÉ ×ÁÍ ÎÕÖÎÏ ÚÁÍÅÎÉÔØ ÓÔÒÏËÉ
                 <quote><literal>#!</literal></quote> × ÓËÒÉÐÔÁÈ.</entry>
             </row>
@@ -5417,14 +5627,14 @@ PLIST_SUB+=             NLS="@comment "
 	    <row>
 	      <entry><makevar>PERL_VERSION</makevar></entry>
 
-	      <entry>ðÏÌÎÁÑ ×ÅÒÓÉÑ ÕÓÔÁÎÏ×ÌÅÎÎÏÇÏ <literal>perl</literal>
+	      <entry>ðÏÌÎÁÑ ×ÅÒÓÉÑ ÕÓÔÁÎÏ×ÌÅÎÎÏÇÏ Perl
                 (ÎÁÐÒÉÍÅÒ, <literal>5.8.9</literal>).</entry>
 	    </row>
 
             <row>
               <entry><makevar>PERL_LEVEL</makevar></entry>
 
-              <entry>÷ÅÒÓÉÑ ÕÓÔÁÎÏ×ÌÅÎÎÏÇÏ <literal>perl</literal> × ÆÏÒÍÅ
+	      <entry>õÓÔÁÎÏ×ÌÅÎÎÁÑ ×ÅÒÓÉÑ Perl × ÆÏÒÍÅ
                 ÃÅÌÏÇÏ ÞÉÓÌÁ ×ÉÄÁ <literal>MNNNPP</literal> (ÎÁÐÒÉÍÅÒ,
                 <literal>500809</literal>).</entry>
 	    </row>
@@ -5432,7 +5642,7 @@ PLIST_SUB+=             NLS="@comment "
 	    <row>
 	      <entry><makevar>PERL_ARCH</makevar></entry>
 
-	      <entry>íÅÓÔÏ, ÇÄÅ <literal>perl</literal> ÈÒÁÎÉÔ
+	      <entry>íÅÓÔÏ, × ËÏÔÏÒÏÍ Perl ÈÒÁÎÉÔ
                 ÁÒÈÉÔÅËÔÕÒÎÏ-ÚÁ×ÉÓÉÍÙÅ ÂÉÂÌÉÏÔÅËÉ.  ðÏ ÕÍÏÌÞÁÎÉÀ
                 ÜÔÏ <literal>${ARCH}-freebsd</literal>.</entry>
             </row>
@@ -5440,7 +5650,7 @@ PLIST_SUB+=             NLS="@comment "
             <row>
               <entry><makevar>PERL_PORT</makevar></entry>
 
-              <entry>îÁÚ×ÁÎÉÅ ÕÓÔÁÎÏ×ÌÅÎÎÏÇÏ ÐÏÒÔÁ <literal>perl</literal>,
+	      <entry>îÁÚ×ÁÎÉÅ ÕÓÔÁÎÏ×ÌÅÎÎÏÇÏ ÐÏÒÔÁ Perl,
                 (Ë ÐÒÉÍÅÒÕ, <literal>perl5</literal>).</entry>
             </row>
 
@@ -5448,8 +5658,8 @@ PLIST_SUB+=             NLS="@comment "
               <entry><makevar>SITE_PERL</makevar></entry>
 
               <entry>éÍÑ ËÁÔÁÌÏÇÁ, ËÕÄÁ ÐÏÍÅÝÁÀÔÓÑ ÓÐÅÃÉÆÉÞÎÙÅ ÄÌÑ ÓÁÊÔÁ
-                ÐÁËÅÔÙ <literal>perl</literal>.  üÔÏ ÚÎÁÞÅÎÉÅ ÄÏÂÁ×ÌÑÅÔÓÑ Ë
-                PLIST_SUB.</entry>
+                ÐÁËÅÔÙ Perl.  üÔÏ ÚÎÁÞÅÎÉÅ ÄÏÂÁ×ÌÑÅÔÓÑ Ë
+                <makevar>PLIST_SUB</makevar>.</entry>
             </row>
 	  </tbody>
 	</tgroup>
@@ -5462,6 +5672,23 @@ PLIST_SUB+=             NLS="@comment "
 	  <literal>http://search.cpan.org/dist/Module-Name/</literal>
 	  (×ËÌÀÞÁÑ ÚÁ×ÅÒÛÁÀÝÉÊ ÓÌÜÛ).</para>
       </note>
+
+      <note>
+	<para>îÅ ÉÓÐÏÌØÚÕÊÔÅ <literal>${SITE_PERL}</literal> × ÏÂßÑ×ÌÅÎÉÉ
+	  ÚÁ×ÉÓÉÍÏÓÔÅÊ.  éÓÐÏÌØÚÏ×ÁÎÉÅ ÜÔÏÊ ËÏÎÓÔÒÕËÃÉÉ ÐÏÄÒÁÚÕÍÅ×ÁÅÔ
+	  ÎÁÌÉÞÉÅ ÐÏÄËÌÀÞÅÎÎÏÇÏ <filename>bsd.perl.mk</filename>, ÞÔÏ
+	  ÎÅ ×ÓÅÇÄÁ ÔÁË.  ðÏÒÔÙ, ÚÁ×ÉÓÉÍÙÅ ÏÔ ÜÔÏÇÏ ÐÏÒÔÁ, ÐÏÌÕÞÁÔ
+	  ÎÅÐÒÁ×ÉÌØÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ, ÅÓÌÉ ÆÁÊÌÙ ÜÔÏÇÏ ÐÏÒÔÁ ÂÕÄÕÔ
+	  ÐÅÒÅÍÅÝÅÎÙ ÐÒÉ ÐÏÓÌÅÄÕÀÝÅÍ ÏÂÎÏ×ÌÅÎÉÉ.  ðÒÁ×ÉÌØÎÙÊ ÓÐÏÓÏÂ
+	  ÏÂßÑ×ÌÅÎÉÑ ÚÁ×ÉÓÉÍÏÓÔÅÊ ÄÌÑ ÍÏÄÕÌÅÊ Perl ÐÏËÁÚÁÎ × ÐÒÉÍÅÒÅ
+	  ÎÉÖÅ.</para>
+      </note>
+
+      <example id="use-perl-dependency-example">
+	<title>ðÒÉÍÅÒ ÚÁ×ÉÓÉÍÏÓÔÉ Perl</title>
+
+	<programlisting>p5-IO-Tee&gt;=0.64:${PORTSDIR}/devel/p5-IO-Tee</programlisting>
+      </example>
     </sect1>
 
     <sect1 id="using-x11">
@@ -5476,17 +5703,19 @@ PLIST_SUB+=             NLS="@comment "
 	  ËÏÍÐÏÎÅÎÔÏ×.  ë ÎÁÓÔÏÑÝÅÍÕ ×ÒÅÍÅÎÉ ÄÏÓÔÕÐÎÙÍÉ ËÏÍÐÏÎÅÎÔÁÍÉ
 	  Ñ×ÌÑÀÔÓÑ:</para>
 
-	<para><literal>bigreqsproto compositeproto damageproto dmx dmxproto
-	  evieproto fixesproto fontcacheproto fontenc fontsproto fontutil
-	  glproto ice inputproto kbproto libfs oldx printproto randrproto
-	  recordproto renderproto resourceproto scrnsaverproto sm trapproto
-	  videoproto x11 xau xaw xaw6 xaw7 xaw8 xbitmaps xcmiscproto xcomposite
-	  xcursor xdamage xdmcp xevie xext xextproto xf86bigfontproto
-	  xf86dgaproto xf86driproto xf86miscproto xf86rushproto
-	  xf86vidmodeproto xfixes xfont xfontcache xft xi xinerama
-	  xineramaproto xkbfile xkbui xmu xmuu xorg-server xp xpm xprintapputil
-	  xprintutil xpr oto xproxymngproto xrandr xrender xres xscrnsaver xt
-	  xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm</literal>.</para>
+	<para><literal>bigreqsproto compositeproto damageproto dmx
+	    dmxproto dri2proto evieproto fixesproto fontcacheproto
+	    fontenc fontsproto fontutil glproto ice inputproto kbproto
+	    libfs oldx pciaccess pixman printproto randrproto
+	    recordproto renderproto resourceproto scrnsaverproto sm
+	    trapproto videoproto x11 xau xaw xaw6 xaw7 xbitmaps
+	    xcmiscproto xcomposite xcursor xdamage xdmcp xevie xext
+	    xextproto xf86bigfontproto xf86dgaproto xf86driproto
+	    xf86miscproto xf86rushproto xf86vidmodeproto xfixes xfont
+	    xfontcache xft xi xinerama xineramaproto xkbfile xkbui
+	    xmu xmuu xorg-server xp xpm xprintapputil xprintutil
+	    xproto xproxymngproto xrandr xrender xres xscrnsaver xt
+	    xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm</literal>.</para>
 
 	<para>÷ÓÅÇÄÁ ÁËÔÕÁÌØÎÙÊ ÐÅÒÅÞÅÎØ ÍÏÖÎÏ ÎÁÊÔÉ ×
 	  <filename>/usr/ports/Mk/bsd.xorg.mk</filename>.</para>
@@ -5504,7 +5733,7 @@ PLIST_SUB+=             NLS="@comment "
 USE_GL=     glu</programlisting>
 	</example>
 
-	<para>íÎÏÇÉÅ ÐÏÒÔÙ ÏÐÒÅÄÅÌÑÀÔ <makevar>USE_XLIB</makevar>, ËÏÔÏÒÁÑ
+	<para>îÅËÏÔÏÒÙÅ ÐÏÒÔÙ ÏÐÒÅÄÅÌÑÀÔ <makevar>USE_XLIB</makevar>, ËÏÔÏÒÁÑ
 	  ÄÅÌÁÅÔ ÐÏÒÔ ÚÁ×ÉÓÉÍÙÍ ÏÔÏ ×ÓÅÈ 50 ÉÌÉ ÏËÏÌÏ ÔÏÇÏ ÂÉÂÌÉÏÔÅË.  üÔÁ
 	  ÐÅÒÅÍÅÎÎÁÑ ÓÕÝÅÓÔ×ÕÅÔ ÄÌÑ ÏÂÒÁÔÎÏÊ ÓÏ×ÍÅÓÔÉÍÏÓÔÉ, Ô.Ë. ÐÒÅÄÛÅÓÔ×ÕÅÔ
 	  ÍÏÄÕÌØÎÏÍÕ X.Org, É ÎÅ ÄÏÌÖÎÁ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ × ÎÏ×ÙÈ ÐÏÒÔÁÈ.</para>
@@ -5529,14 +5758,6 @@ USE_GL=     glu</programlisting>
 	    </row>
 
 	    <row>
-	      <entry><makevar>USE_X_PREFIX</makevar></entry>
-
-	      <entry>ñ×ÌÑÅÔÓÑ ÕÓÔÁÒÅ×ÛÉÍ.  óÅÊÞÁÓ ÜÔÏ ÜË×É×ÁÌÅÎÔÎÏ
-		<makevar>USE_XLIB</makevar> É ÍÏÖÅÔ ÂÙÔØ Ó×ÏÂÏÄÎÏ ÉÍ
-		ÚÁÍÅÎÅÎÏ.</entry>
-	    </row>
-
-	    <row>
 	      <entry><makevar>XMKMF</makevar></entry>
 
 	      <entry>úÁÄÁ£ÔÓÑ ÍÁÒÛÒÕÔ ÄÏ <command>xmkmf</command>, ÅÓÌÉ ÏÎ
@@ -5706,8 +5927,8 @@ USE_XORG=      x11 xpm</programlisting>
 	</itemizedlist>
 
 	<para>úÁÍÅÔØÔÅ, ÞÔÏ ÐÅÒÅÍÅÎÎÁÑ <makevar>MOTIFLIB</makevar> (ËÁË
-	  ÐÒÁ×ÉÌÏ) ÒÁÓËÒÙ×ÁÅÔÓÑ × <literal>-L/usr/X11R6/lib -lXm</literal> ÉÌÉ
-	  <literal>/usr/X11R6/lib/libXm.a</literal>, ÔÁË ÞÔÏ ÎÅÔ ÎÕÖÄÙ ×ÐÅÒÅÄÉ
+	  ÐÒÁ×ÉÌÏ) ÒÁÓËÒÙ×ÁÅÔÓÑ × <literal>-L/usr/local/lib -lXm</literal> ÉÌÉ
+	  <literal>/usr/local/lib/libXm.a</literal>, ÔÁË ÞÔÏ ÎÅÔ ÎÕÖÄÙ ×ÐÅÒÅÄÉ
 	  ÄÏÂÁ×ÌÑÔØ <literal>-L</literal> ÉÌÉ <literal>-l</literal>.</para>
 
       </sect2>
@@ -5877,7 +6098,8 @@ USE_XORG=      x11 xpm</programlisting>
 		<entry><makevar>QTNONSTANDARD</makevar></entry>
 
 		<entry>ðÏÄÁ×ÌÑÅÔ ÉÚÍÅÎÅÎÉÅ <makevar>CONFIGURE_ENV</makevar>,
-		  <makevar>CONFIGURE_ARGS</makevar> É
+		  <makevar>CONFIGURE_ARGS</makevar>,
+		  <makevar>CPPFLAGS</makevar> É
 		  <makevar>MAKE_ENV</makevar>.</entry>
 	      </row>
 
@@ -5895,36 +6117,29 @@ USE_XORG=      x11 xpm</programlisting>
 		<entry><makevar>QT_COMPONENTS</makevar></entry>
 
 		<entry>õËÁÚÙ×ÁÅÔ ÉÎÓÔÒÕÍÅÎÔÙ É ÂÉÂÌÉÏÔÅËÉ × ËÁÞÅÓÔ×Å
-		  ÚÁ×ÉÓÉÍÏÓÔÅÊ ÄÌÑ Qt4.  óÍÏÔÒÉÔÅ ÐÏÄÒÏÂÎÅÅ ÎÉÖÅ.</entry>
+		  ÚÁ×ÉÓÉÍÏÓÔÅÊ ÄÌÑ Qt 4.  óÍÏÔÒÉÔÅ ÐÏÄÒÏÂÎÅÅ ÎÉÖÅ.</entry>
 	      </row>
 
 	      <row>
 		<entry><makevar>UIC</makevar></entry>
 
 		<entry>õÓÔÁÎÁ×ÌÉ×ÁÅÔ ÐÕÔØ Ë <command>uic</command>
-		  (ÐÅÒÅÍÅÎÎÁÑ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ).  ðÏ ÕÍÏÌÞÁÎÉÀ
-		  ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ × ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÐÅÒÅÍÅÎÎÏÊ
-		  <makevar>USE_QT_VER</makevar>.</entry>
+		  (ÐÅÒÅÍÅÎÎÁÑ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ).</entry>
 	      </row>
 
 	      <row>
 		<entry><makevar>QMAKE</makevar></entry>
 
 		<entry>õÓÔÁÎÁ×ÌÉ×ÁÅÔ ÐÕÔØ Ë <command>qmake</command>
-		  (ÐÅÒÅÍÅÎÎÁÑ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ).  ðÏ ÕÍÏÌÞÁÎÉÀ
-		  ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ × ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÐÅÒÅÍÅÎÎÏÊ
-		  <makevar>USE_QT_VER</makevar>.</entry>
+		  (ÐÅÒÅÍÅÎÎÁÑ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ).</entry>
 	      </row>
 
 	      <row>
 		<entry><makevar>QMAKESPEC</makevar></entry>
 
 		<entry>õÓÔÁÎÁ×ÌÉ×ÁÅÔ ÐÕÔØ Ë ËÏÎÆÉÇÕÒÁÃÉÏÎÎÏÍÕ ÆÁÊÌÕ ÄÌÑ
-		  <command>qmake</command> (ÐÅÒÅÍÅÎÎÁÑ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ).
-		  ðÏ ÕÍÏÌÞÁÎÉÀ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ × ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÐÅÒÅÍÅÎÎÏÊ
-		  <makevar>USE_QT_VER</makevar>.</entry>
+		  <command>qmake</command> (ÐÅÒÅÍÅÎÎÁÑ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ).</entry>
 	      </row>
-
 	    </tbody>
 	  </tgroup>
 	</table>
@@ -5937,8 +6152,9 @@ USE_XORG=      x11 xpm</programlisting>
                  --with-qt-libraries=${QT_PREFIX}/lib \
                  --with-extra-libs=${LOCALBASE}/lib \
                  --with-extra-includes=${LOCALBASE}/include
-CONFIGURE_ENV+=  MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
-                 QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}"</programlisting>
+CONFIGURE_ENV+=  MOC="${MOC}" LIBS="${QTCFGLIBS}" \
+                 QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}"
+CPPFLAGS+=       ${QTCPPFLAGS}</programlisting>
 
 	<para>åÓÌÉ ÐÅÒÅÍÅÎÎÁÑ <makevar>USE_QT_VER</makevar> ÕÓÔÁÎÏ×ÌÅÎÁ ×
 	  ÚÎÁÞÅÎÉÅ <literal>4</literal>,  ÔÏ ÔÁËÖÅ ÒÁÚ×ÏÒÁÞÉ×ÁÀÔÓÑ ÓÌÅÄÕÀÝÉÅ
@@ -5952,9 +6168,10 @@ MAKE_ENV+=      QMAKESPEC="${QMAKESPEC}"
       <sect2 id="qt4-components">
 	<title>÷ÙÂÏÒ ËÏÍÐÏÎÅÎÔÏ× (ÔÏÌØËÏ ÄÌÑ Qt 4.x)</title>
 
-	<para>åÓÌÉ <makevar>USE_QT_VER</makevar> ÕÓÔÁÎÏ×ÌÅÎÁ × 4, ÔÏ ×
+	<para>åÓÌÉ <makevar>USE_QT_VER</makevar> ÕÓÔÁÎÏ×ÌÅÎÁ ×
+	  ÚÎÁÞÅÎÉÅ <literal>4</literal>, ÔÏ ×
 	  ÐÅÒÅÍÅÎÎÏÊ <makevar>QT_COMPONENTS</makevar> ÍÏÖÎÏ ÕËÁÚÁÔØ
-	  ÚÁ×ÉÓÉÍÏÓÔØ ÏÔ ÏÔÄÅÌØÎÙÈ ÉÎÓÔÒÕÍÅÎÔÏ× É ÂÉÂÌÉÏÔÅË Qt4.  ë ËÁÖÄÏÍÕ
+	  ÚÁ×ÉÓÉÍÏÓÔØ ÏÔ ÏÔÄÅÌØÎÙÈ ÉÎÓÔÒÕÍÅÎÔÏ× É ÂÉÂÌÉÏÔÅË Qt 4.  ë ËÁÖÄÏÍÕ
 	  ËÏÍÐÏÎÅÎÔÕ ÍÏÖÎÏ ÄÏÂÁ×ÉÔØ ÓÕÆÆÉËÓ, <literal>_build</literal>
 	  ÉÌÉ <literal>_run</literal>, ÏÔÒÁÖÁÀÝÉÊ, ËÏÇÄÁ ÄÏÌÖÎÁ ÂÙÔØ ÐÒÉÍÅÎÅÎÁ
 	  ÚÁ×ÉÓÉÍÏÓÔØ, ×Ï ×ÒÅÍÑ ÓÂÏÒËÉ ÉÌÉ ×ÙÐÏÌÎÅÎÉÑ, ÓÏÏÔ×ÅÔÓÔ×ÅÎÎÏ.  åÓÌÉ
@@ -5968,7 +6185,7 @@ MAKE_ENV+=      QMAKESPEC="${QMAKESPEC}"
 	  <filename>/usr/ports/Mk/bsd.qt.mk</filename>):</para>
 
 	<table frame="none">
-	  <title>äÏÓÔÕÐÎÙÅ ÂÉÂÌÉÏÔÅÞÎÙÅ ËÏÍÐÏÎÅÎÔÙ Qt4</title>
+	  <title>äÏÓÔÕÐÎÙÅ ÂÉÂÌÉÏÔÅÞÎÙÅ ËÏÍÐÏÎÅÎÔÙ Qt 4</title>
 
 	  <tgroup cols="2">
 	    <thead>
@@ -6003,7 +6220,7 @@ MAKE_ENV+=      QMAKESPEC="${QMAKESPEC}"
 
 	      <row>
 		<entry><literal>qt3support</literal></entry>
-		<entry>ÂÉÂÌÉÏÔÅËÁ ÓÏ×ÍÅÓÔÉÍÏÓÔÉ Ó Qt3</entry>
+		<entry>ÂÉÂÌÉÏÔÅËÁ ÓÏ×ÍÅÓÔÉÍÏÓÔÉ Ó Qt 3</entry>
 	      </row>
 
 	      <row>
@@ -6035,7 +6252,7 @@ MAKE_ENV+=      QMAKESPEC="${QMAKESPEC}"
 	  ÐÏÓÌÅ ÕÓÐÅÛÎÏÊ ËÏÍÐÉÌÑÃÉÉ.</para>
 
 	<table frame="none">
-	  <title>äÏÓÔÕÐÎÙÅ ËÏÍÐÏÎÅÎÔÙ ÉÎÓÔÒÕÍÅÎÔÏ× Qt4</title>
+	  <title>äÏÓÔÕÐÎÙÅ ËÏÍÐÏÎÅÎÔÙ ÉÎÓÔÒÕÍÅÎÔÏ× Qt 4</title>
 
 	  <tgroup cols="2">
 	    <thead>
@@ -6077,7 +6294,7 @@ MAKE_ENV+=      QMAKESPEC="${QMAKESPEC}"
 	</table>
 
 	<table frame="none">
-	  <title>äÏÓÔÕÐÎÙÅ ËÏÍÐÏÎÅÎÔÙ ÐÌÁÇÉÎÏ× Qt4</title>
+	  <title>äÏÓÔÕÐÎÙÅ ËÏÍÐÏÎÅÎÔÙ ÐÌÁÇÉÎÏ× Qt 4</title>
 
 	  <tgroup cols="2">

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


More information about the svn-doc-all mailing list