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

Sergey Kandaurov pluknet at FreeBSD.org
Wed Oct 23 21:02:21 UTC 2013


Author: pluknet
Date: Wed Oct 23 21:02:20 2013
New Revision: 43032
URL: http://svnweb.freebsd.org/changeset/doc/43032

Log:
  MFen r39245 -> r42833.
  Set proper svn properties.

Added:
  head/ru_RU.KOI8-R/books/porters-handbook/uses.xml   (contents, props changed)
  head/ru_RU.KOI8-R/books/porters-handbook/versions.xml   (contents, props changed)
Modified:
  head/ru_RU.KOI8-R/books/porters-handbook/Makefile
  head/ru_RU.KOI8-R/books/porters-handbook/book.xml   (contents, props changed)

Modified: head/ru_RU.KOI8-R/books/porters-handbook/Makefile
==============================================================================
--- head/ru_RU.KOI8-R/books/porters-handbook/Makefile	Wed Oct 23 17:44:01 2013	(r43031)
+++ head/ru_RU.KOI8-R/books/porters-handbook/Makefile	Wed Oct 23 21:02:20 2013	(r43032)
@@ -27,6 +27,8 @@ INSTALL_ONLY_COMPRESSED?=
 
 # XML content
 SRCS=  book.xml
+SRCS+= uses.xml
+SRCS+= versions.xml
 
 # Entities
 #SRCS+= ../../../en_US.ISO8859-1/books/handbook/authors.ent

Modified: head/ru_RU.KOI8-R/books/porters-handbook/book.xml
==============================================================================
--- head/ru_RU.KOI8-R/books/porters-handbook/book.xml	Wed Oct 23 17:44:01 2013	(r43031)
+++ head/ru_RU.KOI8-R/books/porters-handbook/book.xml	Wed Oct 23 21:02:20 2013	(r43032)
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="koi8-r"?>
 <!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-	"../../../share/xml/freebsd45.dtd">
+	"../../../share/xml/freebsd45.dtd" [
+<!ENTITY values.uses SYSTEM "uses.xml">
+<!ENTITY values.versions SYSTEM "versions.xml">
+]>
 
 <!--
      The FreeBSD Russian Documentation Project
@@ -8,7 +11,7 @@
      $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: r39245
+     Original revision: r42833
 -->
 
 <book lang="ru">
@@ -19,7 +22,7 @@
       <corpauthor>The FreeBSD Documentation Project</corpauthor>
     </authorgroup>
 
-    <pubdate>áÐÒÅÌØ 2000</pubdate>
+    <pubdate>$FreeBSD$</pubdate>
 
     <copyright>
       <year>2000</year>
@@ -35,6 +38,7 @@
       <year>2010</year>
       <year>2011</year>
       <year>2012</year>
+      <year>2013</year>
       <holder role="mailto:doc at FreeBSD.org">
         The FreeBSD Documentation Project</holder>
     </copyright>
@@ -124,12 +128,7 @@
       <para>íÉÎÉÍÁÌØÎÙÊ <filename>Makefile</filename> ÂÕÄÅÔ ×ÙÇÌÑÄÅÔØ
         ÐÒÉÍÅÒÎÏ ÔÁË:</para>
 
-      <programlisting># New ports collection makefile for:   oneko
-# Date created:        5 December 1994
-# Whom:                asami
-#
-# $FreeBSD$
-#
+      <programlisting># $FreeBSD$
 
 PORTNAME=      oneko
 PORTVERSION=   1.1b
@@ -137,13 +136,21 @@ CATEGORIES=    games
 MASTER_SITES=  ftp://ftp.cs.columbia.edu/archives/X11R5/contrib/
 
 MAINTAINER=    asami at FreeBSD.org
+COMMENT=       Cat chasing a mouse all over the screen
 
 MAN1=	       oneko.1
 MANCOMPRESSED= yes
-USE_IMAKE=     yes
 
 .include <bsd.port.mk></programlisting>
 
+      <note>
+	<para>÷ ÎÅËÏÔÏÒÙÈ ÓÌÕÞÁÑÈ × ÚÁÇÏÌÏ×ËÅ <filename>Makefile</filename>
+	  ÓÕÝÅÓÔ×ÕÀÝÅÇÏ ÐÏÒÔÁ ÍÏÇÕÔ ÓÏÄÅÒÖÁÔØÓÑ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÓÔÒÏËÉ,
+	  ÔÁËÉÅ ËÁË ÎÁÚ×ÁÎÉÅ ÐÏÒÔÁ É ÄÁÔÁ ÅÇÏ ÓÏÚÄÁÎÉÑ.
+	  üÔÁ ÄÏÐÏÌÎÉÔÅÌØÎÁÑ ÉÎÆÏÒÍÁÃÉÑ ÂÙÌÁ ÏÂßÑ×ÌÅÎÁ ÕÓÔÁÒÅ×ÛÅÊ
+	  É ÎÁÈÏÄÉÔÓÑ × ÐÒÏÃÅÓÓÅ ÕÄÁÌÅÎÉÑ.</para>
+      </note>
+
       <para>ðÏÓÍÏÔÒÉÍ, ÓÍÏÖÅÔÅ ÌÉ ×Ù ÅÇÏ ÐÏÎÑÔØ.  îÅ ÏÂÒÁÝÁÊÔÅ ×ÎÉÍÁÎÉÅ ÎÁ
         ÓÏÄÅÒÖÉÍÏÅ ÓÔÒÏÞËÉ <literal>$FreeBSD$</literal>, ÏÎÁ
         ÂÕÄÅÔ ÚÁÐÏÌÎÅÎÁ Á×ÔÏÍÁÔÉÞÅÓËÉ ÓÉÓÔÅÍÏÊ SVN, ËÏÇÄÁ ÐÏÒÔ ÂÕÄÅÔ
@@ -174,12 +181,33 @@ USE_IMAKE=     yes
             ÉÚ <filename>README</filename> ÉÌÉ ÓÔÒÁÎÉÃ
             ÓÐÒÁ×ÏÞÎÉËÁ</emphasis>; ÓÌÉÛËÏÍ ÞÁÓÔÏ ÏÎÉ ÎÅ Ñ×ÌÑÀÔÓÑ ËÒÁÔËÉÍ
             ÏÐÉÓÁÎÉÅÍ ÐÏÒÔÁ ÉÌÉ ÉÍÅÀÔ ÎÅÕÄÏÂÎÙÊ ÆÏÒÍÁÔ (ÎÁÐÒÉÍÅÒ, ÓÔÒÁÎÉÃÙ
-	    ÓÐÒÁ×ÏÞÎÉËÁ ×ÙÒÏ×ÎÅÎÙ ÐÒÏÂÅÌÁÍÉ).  åÓÌÉ ÐÏÒÔÉÒÕÅÍÏÅ ÐÒÉÌÏÖÅÎÉÅ
-	    ÉÍÅÅÔ ÏÆÉÃÉÁÌØÎÕÀ ÓÔÒÁÎÉÞËÕ éÎÔÅÒÎÅÔ, ÕËÁÖÉÔÅ ÅÅ ÚÄÅÓØ.
-	    ðÅÒÅÄ <emphasis>ÏÄÎÉÍ</emphasis> ÉÚ ÓÁÊÔÏ× ÄÏÂÁ×ØÔÅ ÓÌÏ×Ï
-	    <literal>WWW:</literal> ÄÌÑ ÔÏÇÏ, ÞÔÏÂÙ ×ÓÐÏÍÏÇÁÔÅÌØÎÙÅ ÕÔÉÌÉÔÙ
-	    ÒÁÂÏÔÁÌÉ ÐÒÁ×ÉÌØÎÏ.</para>
-        </note>
+	    ÓÐÒÁ×ÏÞÎÉËÁ ×ÙÒÏ×ÎÅÎÙ ÐÒÏÂÅÌÁÍÉ, ÐÏÓËÏÌØËÕ ÜÔÏ ×ÙÇÌÑÄÉÔ ×
+	    ÏÓÏÂÅÎÎÏÓÔÉ ÐÌÏÈÏ Ó ÍÏÎÏÛÉÒÉÎÎÙÍÉ ÛÒÉÆÔÁÍÉ).</para>
+	</note>
+
+	<para>èÏÒÏÛÏ ÓÏÓÔÁ×ÌÅÎÎÙÊ <filename>pkg-descr</filename>
+	  ÏÐÉÓÙ×ÁÅÔ ÐÏÒÔ ÄÏÓÔÁÔÏÞÎÏ ÐÏÌÎÏ, ÞÔÏÂÙ ÐÏÌØÚÏ×ÁÔÅÌÀ ÎÅ
+	  ÐÒÉÈÏÄÉÌÏÓØ Ó×ÅÒÑÔØÓÑ Ó ÄÏËÕÍÅÎÔÁÃÉÅÊ ÉÌÉ ÐÏÓÅÝÁÔØ ×ÅÂÓÁÊÔ
+	  ÄÌÑ ÐÏÎÉÍÁÎÉÑ ÔÏÇÏ, ÞÔÏ ÄÅÌÁÅÔ ÄÁÎÎÏÅ ÐÒÏÇÒÁÍÍÎÏÅ ÏÂÅÓÐÅÞÅÎÉÅ,
+	  ÞÅÍ ÏÎÏ ÍÏÖÅÔ ÂÙÔØ ÐÏÌÅÚÎÏ ÉÌÉ ËÁËÉÅ ÈÏÒÏÛÉÅ ÆÕÎËÃÉÉ Õ ÎÅÇÏ
+	  ÉÍÅÀÔÓÑ.  õÐÏÍÉÎÁÎÉÅ ÐÒÏ ÏÐÒÅÄÅÌ£ÎÎÙÅ ÔÒÅÂÏ×ÁÎÉÑ, ÔÁËÉÅ ËÁË
+	  ÉÓÐÏÌØÚÕÅÍÙÊ ÇÒÁÆÉÞÅÓËÉÊ ÉÎÓÔÒÕÍÅÎÔÁÒÉÊ, ÔÑÖ£ÌÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ,
+	  ÏËÒÕÖÅÎÉÅ ÄÌÑ ÚÁÐÕÓËÁ ÉÌÉ ÉÓÐÏÌØÚÕÅÍÙÊ ÑÚÙË ÐÒÏÇÒÁÍÍÉÒÏ×ÁÎÉÑ
+	  ÐÏÍÏÇÕÔ ÐÏÌØÚÏ×ÁÔÅÌÑÍ ÏÐÒÅÄÅÌÉÔØÓÑ, ÂÕÄÅÔ ÌÉ ÜÔÏÔ ÐÏÒÔ ÄÌÑ
+	  ÎÉÈ ÒÁÂÏÔÁÔØ.</para>
+
+	<para>÷ËÌÀÞÉÔÅ ÓÀÄÁ URL ÏÆÉÃÉÁÌØÎÏÊ ÄÏÍÁÛÎÅÊ ÓÔÒÁÎÉÃÙ éÎÔÅÒÎÅÔ.
+	  ðÅÒÅÄ <emphasis>ÏÄÎÉÍ</emphasis> ÉÚ ÓÁÊÔÏ× (×ÙÂÅÒÉÔÅ ÏÓÎÏ×ÎÏÊ)
+	  ÄÏÂÁ×ØÔÅ <literal>WWW:</literal> (Ó ÐÏÓÌÅÄÕÀÝÉÍ ÅÄÉÎÉÞÎÙÍ
+	  ÐÒÏÂÅÌÏÍ) ÄÌÑ ÔÏÇÏ, ÞÔÏÂÙ ×ÓÐÏÍÏÇÁÔÅÌØÎÙÅ ÕÔÉÌÉÔÙ ÒÁÂÏÔÁÌÉ
+	  ÐÒÁ×ÉÌØÎÏ.  åÓÌÉ URI Ñ×ÌÑÅÔÓÑ ËÏÒÎÅÍ ÓÁÊÔÁ ÉÌÉ ËÁÔÁÌÏÇÏÍ,
+	  ÔÏ ÚÎÁÞÅÎÉÅ ÄÏÌÖÎÏ ÂÙÔØ ÄÏÐÏÌÎÅÎÏ ËÏÓÏÊ ÞÅÒÔÏÊ.</para>
+
+	<note>
+	  <para>åÓÌÉ ÕËÁÚÁÎÎÁÑ ÄÌÑ ÐÏÒÔÁ ×ÅÂ-ÓÔÒÁÎÉÃÁ ÎÅ ÄÏÓÔÕÐÎÁ,
+	    ÐÏÐÙÔÁÊÔÅÓØ ÓÐÅÒ×Á ÐÏÉÓËÁÔØ, ÂÙÌ ÌÉ ÏÆÉÃÉÁÌØÎÙÊ ÓÁÊÔ
+	    ÐÅÒÅÍÅÝ£Î, ÐÅÒÅÉÍÅÎÏ×ÁÎ ÉÌÉ ÒÁÚÍÅÝ£Î × ÄÒÕÇÏÍ ÍÅÓÔÅ.</para>
+	</note>
 
         <para>óÌÅÄÕÀÝÉÊ ÐÒÉÍÅÒ ÐÏËÁÚÙ×ÁÅÔ, ËÁË ÄÏÌÖÅÎ ×ÙÇÌÑÄÅÔØ ×ÁÛ
 	  <filename>pkg-descr</filename>:</para>
@@ -255,6 +283,18 @@ PLIST_DIRS=     lib/X11/oneko</programli
         <para>ëÏÎÅÞÎÏ, ÐÅÒÅÍÅÎÎÁÑ <makevar>PLIST_DIRS</makevar> ÎÅ ÄÏÌÖÎÁ
           ÚÁÄÁ×ÁÔØÓÑ, ÅÓÌÉ ÐÏÒÔ ÎÅ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ ÎÉËÁËÉÈ ËÁÔÁÌÏÇÏ×.</para>
 
+	<note>
+	  <para>îÅÓËÏÌØËÏ ÐÏÒÔÏ× ÍÏÇÕÔ ÓÏ×ÍÅÓÔÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÏÂÝÉÊ
+	    ËÁÔÁÌÏÇ.  ÷ ÜÔÏÍ ÓÌÕÞÁÅ <makevar>PLIST_DIRS</makevar>
+	    ÓÌÅÄÕÅÔ ÚÁÍÅÎÉÔØ ÎÁ <makevar>PLIST_DIRSTRY</makevar>, ÔÁË
+	    ÞÔÏÂÙ ËÁÔÁÌÏÇ ÕÄÁÌÑÌÓÑ ÔÏÌØËÏ ÅÓÌÉ ÏÎ ÐÕÓÔ, Á ÉÎÁÞÅ
+	    ÉÇÎÏÒÉÒÏ×ÁÌÓÑ.  éÓÐÏÌØÚÏ×ÁÎÉÅ <makevar>PLIST_DIRS</makevar>
+	    É <makevar>PLIST_DIRSTRY</makevar> ÁÎÁÌÏÇÉÞÎÏ
+	    <literal>@dirrm</literal> É <literal>@dirrmtry</literal>
+	    × <filename>pkg-plist</filename>, ÏÐÉÓÁÎÉÅ ËÏÔÏÒÙÈ
+	    ×ÈÏÄÉÔ × <xref linkend="plist-dir-cleaning"/>.</para>
+	</note>
+
         <para>ïÂÒÁÔÎÏÊ ÓÔÏÒÏÎÏÊ ÔÁËÏÇÏ ÓÐÏÓÏÂÁ ÐÅÒÅÞÉÓÌÅÎÉÑ ÆÁÊÌÏ× É
           ËÁÔÁÌÏÇÏ× ÐÏÒÔÁ Ñ×ÌÑÅÔÓÑ ÎÅ×ÏÚÍÏÖÎÏÓÔØ ÉÓÐÏÌØÚÏ×ÁÎÉÑ
           ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔÅÊ ËÏÍÁÎÄ, ÏÐÉÓÁÎÎÙÈ × &man.pkg.create.1;.
@@ -435,10 +475,11 @@ PLIST_DIRS=     lib/X11/oneko</programli
 	ÏÞÅÒÅÄÉ ÄÌÑ ×ËÌÀÞÅÎÉÑ ×Ï &os;.</para>
 
       <para>íÙ ÒÁÓÓÍÏÔÒÉÍ ×ÁÛ ÐÏÒÔ, ÐÒÉ ÎÅÏÂÈÏÄÉÍÏÓÔÉ ×ÅÒÎ£Í ÅÇÏ ÏÂÒÁÔÎÏ, Á
-        ÚÁÔÅÍ ×ËÌÀÞÉÍ ÐÏÒÔ × ÎÁÛÅ ÄÅÒÅ×Ï.  ÷ÁÛÅ ÉÍÑ ÔÁËÖÅ ÐÏÑ×ÉÔÓÑ × ÓÐÉÓËÅ
-	<ulink url="&url.articles.contributors;/contrib-additional.html">
-        äÏÐÏÌÎÉÔÅÌØÎÙÈ ËÏÎÔÒÉÂÕÔÏÒÏ× ÐÒÏÅËÔÁ FreeBSD</ulink> É ÄÒÕÇÉÈ
-	ÆÁÊÌÁÈ.  òÁÚ×Å ÜÔÏ ÎÅ ×ÅÌÉËÏÌÅÐÎÏ?!? <!-- smiley -->:-)</para>
+        ÚÁÔÅÍ ×ËÌÀÞÉÍ ÐÏÒÔ × ÎÁÛÅ ÄÅÒÅ×Ï.  ÷ÁÛÅ ÉÍÑ ÔÁËÖÅ ÂÕÄÅÔ ÄÏÂÁ×ÌÅÎÏ
+	× ÓÐÉÓÏË <ulink
+	  url="&url.articles.contributors;/contrib-additional.html">
+	  äÏÐÏÌÎÉÔÅÌØÎÙÈ ËÏÎÔÒÉÂÕÔÏÒÏ× ÐÒÏÅËÔÁ FreeBSD</ulink> É ÄÒÕÇÉÅ
+	ÆÁÊÌÙ.</para>
     </sect1>
   </chapter>
 
@@ -521,12 +562,6 @@ PLIST_DIRS=     lib/X11/oneko</programli
 		<filename><makevar>WRKSRC</makevar>/configure</filename>.
 	      </para>
 	    </listitem>
-
-	    <listitem>
-	      <para>åÓÌÉ ÚÁÄÁÎÁ ÐÅÒÅÍÅÎÎÁÑ <makevar>USE_IMAKE</makevar>,
-		ÔÏ ÚÁÐÕÓËÁÅÔÓÑ ËÏÍÁÎÄÁ <makevar>XMKMF</makevar> (ÐÏ ÕÍÏÌÞÁÎÉÀ
-		ÜÔÏ <command>xmkmf -a</command>).</para>
-	    </listitem>
 	  </orderedlist>
 	</step>
 
@@ -534,7 +569,7 @@ PLIST_DIRS=     lib/X11/oneko</programli
 	  <para>÷ÙÐÏÌÎÑÅÔÓÑ ÃÅÌØ <maketarget>build</maketarget>.  ïÎÁ
 	    ÏÔ×ÅÞÁÅÔ ÚÁ ÐÅÒÅÈÏÄ × ÓÏÂÓÔ×ÅÎÎÙÊ ÒÁÂÏÞÉÊ ËÁÔÁÌÏÇ ÐÏÒÔÁ
 	    (<makevar>WRKSRC</makevar>) É ÅÇÏ ÐÏÓÔÒÏÅÎÉÅ.  åÓÌÉ ÚÁÄÁÎÁ
-	    ÐÅÒÅÍÅÎÎÁÑ <makevar>USE_GMAKE</makevar>, ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ
+	    ÐÅÒÅÍÅÎÎÁÑ <makevar>USES= gmake</makevar>, ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ
 	    GNU-×ÅÒÓÉÑ ÕÔÉÌÉÔÙ <command>make</command>, × ÐÒÏÔÉ×ÎÏÍ ÓÌÕÞÁÅ
 	    ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎÁ ÓÉÓÔÅÍÎÁÑ ÕÔÉÌÉÔÁ
 	    <command>make</command>.</para>
@@ -759,8 +794,7 @@ PLIST_DIRS=     lib/X11/oneko</programli
 	ÎÁ ÚÎÁÞÅÎÉÅ ÐÅÒÅÍÅÎÎÏÊ.  ðÒÉÍÅÒ:</para>
 
       <programlisting>post-patch:
-	@${REINPLACE_CMD} -e 's|for Linux|for FreeBSD|g' ${WRKSRC}/README
-	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|' ${WRKSRC}/configure</programlisting>
+	@${REINPLACE_CMD} -e 's|for Linux|for FreeBSD|g' ${WRKSRC}/README</programlisting>
 
       <para>äÏ×ÏÌØÎÏ ÞÁÓÔÏ ÂÙ×ÁÀÔ ÓÉÔÕÁÃÉÉ, ËÏÇÄÁ ÐÏÒÔÉÒÕÅÍÏÅ ÐÒÏÇÒÁÍÍÎÏÅ
 	ÏÂÅÓÐÅÞÅÎÉÅ, ÏÓÏÂÅÎÎÏ ÅÓÌÉ ÏÓÎÏ×ÎÏÊ ÐÌÁÔÆÏÒÍÏÊ ÒÁÚÒÁÂÏÔËÉ Ñ×ÌÑÅÔÓÑ
@@ -993,6 +1027,26 @@ DOS2UNIX_REGEX=  .*\.(c|cpp|h)</programl
             (ÉÚÎÁÞÁÌØÎÏ ÜÔÏ ÎÅ ÓÞÉÔÁÌÏÓØ ÂÙ ÂÏÌÅÅ ÎÏ×ÏÊ ×ÅÒÓÉÅÊ, ÔÁË ËÁË
             20000801 ÞÉÓÌÅÎÎÏ ÂÏÌØÛÅ, ÞÅÍ 1).</para>
 
+	  <tip>
+	    <para>òÅÚÕÌØÔÁÔ ÓÒÁ×ÎÅÎÉÑ ÎÏÍÅÒÁ ×ÅÒÓÉÉ ÎÅ ×ÓÅÇÄÁ ÏÞÅ×ÉÄÅÎ.
+	      äÌÑ ×ÙÐÏÌÎÅÎÉÑ ÓÒÁ×ÎÅÎÉÑ Ä×ÕÈ ÓÔÒÏË Ó ÎÏÍÅÒÏÍ ×ÅÒÓÉÉ ÍÏÖÎÏ
+	      ÉÓÐÏÌØÚÏ×ÁÔØ &man.pkg.version.1;.  üË×É×ÁÌÅÎÔÏÍ ×
+	      <application>pkgng</application> Ñ×ÌÑÅÔÓÑ
+	      <command>pkg version -t</command>.  îÁÐÒÉÍÅÒ:</para>
+
+	    <screen>&prompt.user; <userinput>pkg_version -t 0.031 0.29</userinput>
+></screen>
+
+	    <para>äÌÑ ÐÏÌØÚÏ×ÁÔÅÌÅÊ <application>pkgng</application>:</para>
+
+	    <screen>&prompt.user; <userinput>pkg version -t 0.031 0.29</userinput>
+></screen>
+
+	    <para>óÔÒÏËÁ <literal>></literal> × ×Ù×ÏÄÅ ËÏÍÁÎÄÙ ÏÚÎÁÞÁÅÔ,
+	      ÞÔÏ ×ÅÒÓÉÑ 0.031 ÓÞÉÔÁÅÔÓÑ ×ÙÛÅ, ÞÅÍ ×ÅÒÓÉÑ 0.29, ÞÔÏ ÍÏÖÅÔ
+	      ÂÙÔØ ÎÅ ÏÞÅ×ÉÄÎÏ ÄÌÑ ÔÏÇÏ, ËÔÏ ×ÙÐÏÌÎÑÅÔ ÐÏÒÔÉÒÏ×ÁÎÉÅ.</para>
+	</tip>
+
           <para>÷ ÓÉÔÕÁÃÉÑÈ, ÐÏÄÏÂÎÙÈ ÜÔÏÊ, ÄÏÌÖÎÏ ÂÙÔØ Õ×ÅÌÉÞÅÎÏ ÚÎÁÞÅÎÉÅ
             <makevar>PORTEPOCH</makevar>.  åÓÌÉ ÚÎÁÞÅÎÉÅ
             <makevar>PORTEPOCH</makevar> ÎÅ ÒÁ×ÎÏ ÎÕÌÀ, ÔÏ ÏÎÏ ÄÏÂÁ×ÌÑÅÔÓÑ Ë
@@ -2003,11 +2057,7 @@ PORTEPOCH=      1</programlisting>
                   ÐÏÄÄÅÒÖÉ×ÁÅÔ ÓÁÍÕ ÏËÏÎÎÕÀ ÓÉÓÔÅÍÕ.  îÅ ÐÏÍÅÝÁÊÔÅ ÓÀÄÁ
                   ÏÂÙÞÎÙÅ ÐÒÉÌÏÖÅÎÉÑ ÄÌÑ X: ÂÏÌØÛÉÎÓÔ×Ï ÉÚ ÎÉÈ ÄÏÌÖÎÙ ÂÙÔØ
                   ÐÅÒÅÎÅÓÅÎÙ × ÄÒÕÇÉÅ ËÁÔÅÇÏÒÉÉ <filename>x11-*</filename>
-                  (ÓÍÏÔÒÉÔÅ ÎÉÖÅ).  åÓÌÉ ×ÁÛ ÐÏÒÔ <emphasis>Ñ×ÌÑÅÔÓÑ</emphasis>
-                  ÐÒÉÌÏÖÅÎÉÅÍ ÄÌÑ X, ÚÁÄÁÊÔÅ <makevar>USE_XLIB</makevar> (ÞÔÏ
-                  ÐÏÄÒÁÚÕÍÅ×ÁÅÔÓÑ ÐÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ
-                  <makevar>USE_IMAKE</makevar>) É ÕËÁÖÉÔÅ ÐÏÄÈÏÄÑÝÕÀ
-	          ËÁÔÅÇÏÒÉÀ.</entry>
+		  (ÓÍÏÔÒÉÔÅ ÎÉÖÅ).</entry>
 	      </row>
 
 	      <row>
@@ -3343,19 +3393,102 @@ ALWAYS_KEEP_DISTFILES=  yes
     <sect1 id="makefile-comment">
       <title><makevar>COMMENT</makevar></title>
 
-      <para>üÔÏ ÏÄÎÏÓÔÒÏÞÎÏÅ ÏÐÉÓÁÎÉÅ ÐÏÒÔÁ.  <emphasis>ðÏÖÁÌÕÊÓÔÁ</emphasis>,
-        ÎÅ ×ËÌÀÞÁÊÔÅ ÓÀÄÁ ÎÁÚ×ÁÎÉÅ ÐÁËÅÔÁ (ÉÌÉ ÎÏÍÅÒ ×ÅÒÓÉÉ ÐÒÏÇÒÁÍÍÎÏÇÏ
-        ÏÂÅÓÐÅÞÅÎÉÑ).  ëÏÍÍÅÎÔÁÒÉÊ ÄÏÌÖÅÎ ÎÁÞÉÎÁÔØÓÑ Ó ÚÁÇÌÁ×ÎÏÊ ÂÕË×Ù É ÎÅ
-        ÚÁËÁÎÞÉ×ÁÔØÓÑ ÔÏÞËÏÊ.  ÷ÏÔ ÐÒÉÍÅÒ:</para>
+      <para>óÏÄÅÒÖÉÔ ÏÄÎÏÓÔÒÏÞÎÏÅ ÏÐÉÓÁÎÉÅ ÐÏÒÔÁ.  ðÏÖÁÌÕÊÓÔÁ, ÓÏÂÌÀÄÁÊÔÅ
+	ÓÌÅÄÕÀÝÉÅ ÐÒÁ×ÉÌÁ:</para>
+
+      <orderedlist>
+	<listitem>
+	  <para>óÔÁÒÁÊÔÅÓØ ÄÅÌÁÔØ ÓÔÒÏËÕ COMMENT ÄÌÉÎÏÊ ÎÅ ÂÏÌØÛÅ, ÞÅÍ 70
+	    ÓÉÍ×ÏÌÏ×, ÔÁË ËÁË ÜÔÁ ÓÔÒÏËÁ ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎÁ ÐÒÏÇÒÁÍÍÏÊ
+	    &man.pkg.info.1; ÄÌÑ ÏÔÏÂÒÁÖÅÎÉÑ ÏÄÎÏÓÔÒÏÞÎÏÇÏ ÏÐÉÓÁÎÉÑ
+	    ÐÏÒÔÁ;</para>
+	</listitem>
+
+	<listitem>
+	  <para><emphasis>îÅ</emphasis> ×ËÌÀÞÁÊÔÅ ÓÀÄÁ ÎÁÚ×ÁÎÉÅ ÐÁËÅÔÁ
+	    (ÉÌÉ ÎÏÍÅÒ ×ÅÒÓÉÉ ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ);</para>
+	</listitem>
+
+	<listitem>
+	  <para>ëÏÍÍÅÎÔÁÒÉÊ ÄÏÌÖÅÎ ÎÁÞÉÎÁÔØÓÑ Ó ÚÁÇÌÁ×ÎÏÊ ÂÕË×Ù É ÎÅ
+	    ÚÁËÁÎÞÉ×ÁÔØÓÑ ÔÏÞËÏÊ;</para>
+	</listitem>
+
+	<listitem>
+	  <para>îÅ ÎÁÞÉÎÁÊÔÅ ËÏÍÍÅÎÔÁÒÉÊ Ó ÎÅÏÐÒÅÄÅÌ£ÎÎÏÇÏ ÁÒÔÉËÌÑ (A
+	    ÉÌÉ An);</para>
+	</listitem>
+
+	<listitem>
+	  <para>éÍÅÎÁ ÐÉÛÕÔÓÑ Ó ÚÁÇÌÁ×ÎÏÊ ÂÕË×Ù (ÎÁÐÒÉÍÅÒ, Apache,
+	    JavaScript. Perl);</para>
+	</listitem>
+
+	<listitem>
+	  <para>äÌÑ ÐÅÒÅÞÉÓÌÅÎÉÊ ÉÓÐÏÌØÚÕÊÔÅ ÁÎÇÌÉÊÓËÕÀ ïËÓÆÏÒÄÓËÕÀ
+	    ÚÁÐÑÔÕÀ (ÁÎÇÌ. Oxford comma) (ÎÁÐÒÉÍÅÒ, green,
+	    red<emphasis>,</emphasis> and blue);</para>
+	</listitem>
+
+	<listitem>
+	  <para>éÓÐÏÌØÚÕÊÔÅ ÐÒÏÇÒÁÍÍÕ ÐÒÏ×ÅÒËÉ ÏÒÆÏÇÒÁÆÉÉ.</para>
+	</listitem>
+      </orderedlist>
+
+      <para>÷ÏÔ ÐÒÉÍÅÒ:</para>
 
-      <programlisting>A cat chasing a mouse all over the screen</programlisting>
+      <programlisting>Cat chasing a mouse all over the screen</programlisting>
 
       <para>÷ ÆÁÊÌÅ <filename>Makefile</filename> ÐÅÒÅÍÅÎÎÁÑ COMMENT ÄÏÌÖÎÁ
         ÓÌÅÄÏ×ÁÔØ ÓÒÁÚÕ ÚÁ ÐÅÒÅÍÅÎÎÏÊ MAINTAINER.</para>
+    </sect1>
+
+    <sect1 id="makefile-portscout">
+      <title><makevar>PORTSCOUT</makevar></title>
+
+      <para><application>Portscout</application> Ñ×ÌÑÅÔ ÓÏÂÏÊ
+	Á×ÔÏÍÁÔÉÚÉÒÏ×ÁÎÎÏÅ ÓÒÅÄÓÔ×Ï ÐÒÏ×ÅÒËÉ ÄÏÓÔÕÐÎÏÓÔÉ ÄÉÓÔÒÉÂÕÔÉ×ÎÙÈ
+	ÆÁÊÌÏ× ÄÌÑ ëÏÌÌÅËÃÉÉ ðÏÒÔÏ× &os;, ÐÏÄÒÏÂÎÏÅ ÏÐÉÓÁÎÉÅ ËÏÔÏÒÏÇÏ
+	ÐÒÅÄÏÓÔÁ×ÌÑÅÔ <xref linkend="distfile-survey"/>.</para>
+
+      <para>ðÅÒÅÍÅÎÎÁÑ <makevar>PORTSCOUT</makevar> ÚÁÄÁ£Ô ÓÐÅÃÉÁÌØÎÙÅ
+	ÕÓÌÏ×ÉÑ, ÏÇÒÁÎÉÞÉ×ÁÀÝÉÅ ÒÁÂÏÔÕ <application>Portscout</application>
+	-  ÓËÁÎÅÒÁ ÄÉÓÔÒÉÂÕÔÉ×ÎÙÈ ÆÁÊÌÏ×.</para>
+
+      <para>óÉÔÕÁÃÉÉ, ÐÒÉ ËÏÔÏÒÙÈ ÓÌÅÄÕÅÔ ÕËÁÚÙ×ÁÔØ ÐÅÒÅÍÅÎÎÕÀ
+	<makevar>PORTSCOUT</makevar>:</para>
+
+      <itemizedlist>
+	<listitem>
+	  <para>ëÏÇÄÁ ÄÏÌÖÎÙ ÉÇÎÏÒÉÒÏ×ÁÔØÓÑ ÄÉÓÔÒÉÂÕÔÉ×ÎÙÅ ÆÁÊÌÙ ÄÌÑ
+	    ËÏÎËÒÅÔÎÙÈ ×ÅÒÓÉÊ ÉÌÉ ÍÌÁÄÛÉÈ ÒÅ×ÉÚÉÊ.  îÁÐÒÉÍÅÒ, ÞÔÏÂÙ
+	    ÉÓËÌÀÞÉÔØ ÉÚ ÐÒÏ×ÅÒÏË ÎÏ×ÙÈ ×ÅÒÓÉÊ ÄÉÓÔÒÉÂÕÔÉ×ÎÙÈ ÆÁÊÌÏ×
+	    ×ÅÒÓÉÀ <replaceable>8.2</replaceable> ÐÏ ÐÒÉÞÉÎÅ ÔÏÇÏ, ÞÔÏ
+	    ÏÎÁ Ñ×ÌÑÅÔÓÑ ÐÏÌÏÍÁÎÎÏÊ, ÄÏÂÁ×ØÔÅ ÓÌÅÄÕÀÝÅÅ:</para>
+
+	  <programlisting>PORTSCOUT=	ignore:8.2</programlisting>
+
+	</listitem>
+	<listitem>
+	  <para>ëÏÇÄÁ ÄÏÌÖÎÙ ÐÒÏ×ÅÒÑÔØÓÑ ËÏÎËÒÅÔÎÙÅ ×ÅÒÓÉÉ ÉÌÉ ÓÔÁÒÛÉÅ
+	    É ÍÌÁÄÛÉÅ ÒÅ×ÉÚÉÉ ÄÉÓÔÒÉÂÕÔÉ×ÎÙÈ ÆÁÊÌÏ×.  îÁÐÒÉÍÅÒ, ÅÓÌÉ
+	    ÓÌÅÄÕÅÔ ÏÇÒÁÎÉÞÉÔØÓÑ ÐÒÏ×ÅÒËÏÊ ×ÅÒÓÉÉ
+	    <replaceable>0.6.4</replaceable>, ÐÏÔÏÍÕ ÞÔÏ ÂÏÌÅÅ ÎÏ×ÙÅ
+	    ×ÅÒÓÉÉ ÉÍÅÀÔ ÐÒÏÂÌÅÍÙ ÓÏ×ÍÅÓÔÉÍÏÓÔÉ Ó &os;, ÄÏÂÁ×ØÔÅ:</para>
+
+	  <programlisting>PORTSCOUT=	limit:^0\.6\.4</programlisting>
+
+	</listitem>
+	<listitem>
+	  <para>ëÏÇÄÁ URL, × ËÏÔÏÒÙÈ ÕËÁÚÁÎÙ ÄÏÓÔÕÐÎÙÅ ×ÅÒÓÉÉ, ÏÔÌÉÞÁÀÔÓÑ
+	    ÏÔ URL ÉÈ ÚÁÇÒÕÚËÉ.  îÁÐÒÉÍÅÒ, ÞÔÏÂÙ ÐÒÉ×ÑÚÁÔØ ÐÒÏ×ÅÒËÕ ÎÏ×ÙÈ
+	    ×ÅÒÓÉÊ ÄÉÓÔÒÉÂÕÔÉ×ÎÙÈ ÆÁÊÌÏ× Ë ÓÔÒÁÎÉÃÅ ÚÁÇÒÕÚËÉ ÄÌÑ ÐÏÒÔÁ
+	    <filename role="package">databases/pgtune</filename>,
+	    ÄÏÂÁ×ØÔÅ:</para>
 
-      <para>ðÏÖÁÌÕÊÓÔÁ, ÐÏÓÔÁÒÁÊÔÅÓØ ÄÅÌÁÔØ ÓÔÒÏËÕ COMMENT ÄÌÉÎÏÊ ÎÅ ÂÏÌØÛÅ,
-        ÞÅÍ 70 ÓÉÍ×ÏÌÏ×, ÔÁË ËÁË ÜÔÁ ÓÔÒÏËÁ ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎÁ ÐÒÏÇÒÁÍÍÏÊ
-	&man.pkg.info.1; ÄÌÑ ÏÔÏÂÒÁÖÅÎÉÑ ÏÄÎÏÓÔÒÏÞÎÏÇÏ ÏÐÉÓÁÎÉÑ ÐÏÒÔÁ.</para>
+	  <programlisting>PORTSCOUT=	site:http://pgfoundry.org/frs/?group_id=1000416</programlisting>
+	</listitem>
+      </itemizedlist>
     </sect1>
 
     <sect1 id="makefile-depend">
@@ -3377,38 +3510,23 @@ ALWAYS_KEEP_DISTFILES=  yes
 
 	<para>üÔÁ ÐÅÒÅÍÅÎÎÁÑ ÕËÁÚÙ×ÁÅÔ, ÏÔ ËÁËÉÈ ÓÏ×ÍÅÓÔÎÏ ÉÓÐÏÌØÚÕÅÍÙÈ
 	  ÂÉÂÌÉÏÔÅË ÚÁ×ÉÓÉÔ ÐÏÒÔ.  üÔÏ ÓÐÉÓÏË ÐÁÒ
-	  <replaceable>lib</replaceable>:<replaceable>dir</replaceable><optional><replaceable>:target</replaceable></optional>
+	  <replaceable>lib</replaceable>:<replaceable>dir</replaceable>
 	  ÇÄÅ <replaceable>lib</replaceable> - ÜÔÏ ÉÍÑ ÂÉÂÌÉÏÔÅËÉ,
 	  <replaceable>dir</replaceable> - ÜÔÏ ËÁÔÁÌÏÇ, × ËÏÔÏÒÏÍ ÍÏÖÎÏ ÅÅ
-	  ÎÁÊÔÉ × ÓÌÕÞÁÅ, ÅÓÌÉ ÅÅ ÎÅÔ ÎÁ ÍÁÛÉÎÅ, É
-	  <replaceable>target</replaceable> - ÜÔÏ ÃÅÌØ, ËÏÔÏÒÕÀ ÎÕÖÎÏ ×ÙÚ×ÁÔØ
-	  × ÜÔÏÍ ËÁÔÁÌÏÇÅ.  îÁÐÒÉÍÅÒ,</para>
+	  ÎÁÊÔÉ × ÓÌÕÞÁÅ, ÅÓÌÉ ÅÅ ÎÅÔ ÎÁ ÍÁÛÉÎÅ.  îÁÐÒÉÍÅÒ,</para>
 
-	<programlisting>LIB_DEPENDS=   jpeg:${PORTSDIR}/graphics/jpeg</programlisting>
+	<programlisting>LIB_DEPENDS=   libjpeg.so:${PORTSDIR}/graphics/jpeg</programlisting>
 
 	<para>ÐÒÏ×ÅÒÉÔ ÎÁÌÉÞÉÅ ÂÉÂÌÉÏÔÅËÉ jpeg Ó ÌÀÂÙÍ ÎÏÍÅÒÏÍ ×ÅÒÓÉÉ É
 	  ÐÅÒÅÊÄÅÔ × ÐÏÄËÁÔÁÌÏÇ <filename>graphics/jpeg</filename> ×ÁÛÅÇÏ
 	  ÄÅÒÅ×Á ÐÏÒÔÏ× ÄÌÑ ÅÅ ÐÏÓÔÒÏÅÎÉÑ É ÕÓÔÁÎÏ×ËÉ, ÅÓÌÉ ÂÉÂÌÉÏÔÅËÁ
-	  ÏÔÓÕÔÓÔ×ÕÅÔ.	þÁÓÔØ <replaceable>target</replaceable> ÍÏÖÅÔ ÂÙÔØ
-	  ÏÐÕÝÅÎÁ, ÅÓÌÉ ÏÎÁ ÒÁ×ÎÁ <makevar>DEPENDS_TARGET</makevar>
-	  (ÐÏ ÕÍÏÌÞÁÎÉÀ <literal>install</literal>).</para>
-
-	<note>
-	  <para>þÁÓÔØ <replaceable>lib</replaceable> Ñ×ÌÑÅÔÓÑ ÒÅÇÕÌÑÒÎÙÍ
-	    ×ÙÒÁÖÅÎÉÅÍ, ËÏÔÏÒÏÅ ×ÙÚÙ×ÁÅÔÓÑ ÄÌÑ ×Ù×ÏÄÁ, ÐÏÌÕÞÅÎÎÏÇÏ ÉÚ
-	    <command>ldconfig -r</command>.  òÁÚÒÅÛÁÀÔÓÑ ÔÁËÉÅ ÚÎÁÞÅÎÉÑ, ËÁË
-	    <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>
 
 	<para>úÁ×ÉÓÉÍÏÓÔØ ÐÒÏ×ÅÒÑÅÔÓÑ Ä×ÁÖÄÙ, ÏÄÉÎ ÒÁÚ ×ÎÕÔÒÉ ÃÅÌÉ
 	  <maketarget>extract</maketarget>, Á ÚÁÔÅÍ ÉÚ ÃÅÌÉ
 	  <maketarget>install</maketarget>.  ëÒÏÍÅ ÔÏÇÏ, ÉÍÑ ÚÁ×ÉÓÉÍÏÓÔÉ
 	  ÐÏÍÅÝÁÅÔÓÑ × ÐÁËÅÔ, ÔÁË ÞÔÏ &man.pkg.add.1; ÂÕÄÅÔ
-	  Á×ÔÏÍÁÔÉÞÅÓËÉ ÅÇÏ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ, ÅÓÌÉ ÅÇÏ ÎÅÔ ÎÁ ÐÏÌØÚÏ×ÁÔÅÌØÓËÏÊ
+	  Á×ÔÏÍÁÔÉÞÅÓËÉ Å£ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ, ÅÓÌÉ Å£ ÎÅÔ ÎÁ ÐÏÌØÚÏ×ÁÔÅÌØÓËÏÊ
 	  ÓÉÓÔÅÍÅ.</para>
       </sect2>
 
@@ -3484,7 +3602,7 @@ ALWAYS_KEEP_DISTFILES=  yes
 	  Ó ÐÅÒÅÍÅÎÎÙÍÉ <makevar>USE_<replaceable>*</replaceable></makevar>,
 	  ËÏÔÏÒÙÅ ÏÂÒÁÂÁÔÙ×ÁÀÔÓÑ × <filename>ports/Mk/bsd.*.mk</filename>
 	  ÄÌÑ ÐÏÐÏÌÎÅÎÉÑ ÐÅÒ×ÏÎÁÞÁÌØÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ ÐÏÓÔÒÏÅÎÉÑ.  îÁÐÒÉÍÅÒ,
-	  <literal>USE_GMAKE=yes</literal> ÄÏÂÁ×ÌÑÅÔ
+	  <literal>USES= gmake</literal> ÄÏÂÁ×ÌÑÅÔ
 	  <filename role="package">devel/gmake</filename> ×
 	  <makevar>BUILD_DEPENDS</makevar>.  äÌÑ ÐÒÅÄÏÔ×ÒÁÝÅÎÉÑ ÚÁÇÒÑÚÎÅÎÉÑ
 	  <makevar>RUN_DEPENDS</makevar> ÐÏÄÏÂÎÙÍÉ ÄÏÐÏÌÎÉÔÅÌØÎÙÍÉ
@@ -3595,6 +3713,26 @@ ALWAYS_KEEP_DISTFILES=  yes
           ÓÏ×ÐÁÄÁÅÔ Ó <makevar>DEPENDS_TARGET</makevar>.</para>
       </sect2>
 
+      <sect2 id="uses">
+	<title><makevar>USES</makevar></title>
+
+	<para>óÕÝÅÓÔ×ÕÅÔ ÎÅÓËÏÌØËÏ ÐÁÒÁÍÅÔÒÏ× ÄÌÑ ÏÐÒÅÄÅÌÅÎÉÑ ÒÁÚÌÉÞÎÙÈ
+	  ×ÉÄÏ× ÈÁÒÁËÔÅÒÎÙÈ ÏÓÏÂÅÎÎÏÓÔÅÊ É ÚÁ×ÉÓÉÍÏÓÔÅÊ, ËÏÔÏÒÙÍÉ
+	  ÏÂÌÁÄÁÅÔ ÒÁÓÓÍÁÔÒÉ×ÁÅÍÙÊ ÐÏÒÔ.  ïÎÉ ÍÏÇÕÔ ÂÙÔØ ÕËÁÚÁÎÙ ÐÕÔ£Í
+	  ÄÏÂÁ×ÌÅÎÉÑ ÓÌÅÄÕÀÝÅÊ ÓÔÒÏËÉ × <filename>Makefile</filename>
+	  ÐÏÒÔÁ:</para>
+
+	<programlisting>USES= feature[:arguments]</programlisting>
+
+	<para>äÌÑ ÐÏÌÕÞÅÎÉÑ ÐÏÌÎÏÇÏ ÓÐÉÓËÁ ÚÎÁÞÅÎÉÊ ÓÍÏÔÒÉÔÅ <xref
+	    linkend="uses-values"/>.</para>
+
+	<warning>
+	  <para>úÎÁÞÅÎÉÅ <makevar>USES</makevar> ÎÅÌØÚÑ ÐÒÉÓ×ÁÉ×ÁÔØ
+	    ÐÏÓÌÅ ÐÏÄËÌÀÞÅÎÉÑ <filename>bsd.port.pre.mk</filename>.</para>
+	</warning>
+      </sect2>
+
       <sect2 id="use-vars">
 	<title><makevar>USE_<replaceable>*</replaceable></makevar></title>
 
@@ -3614,10 +3752,11 @@ ALWAYS_KEEP_DISTFILES=  yes
 	  × <filename>/etc/make.conf</filename> <emphasis>×ÓÅÇÄÁ</emphasis>
 	  Ñ×ÌÑÅÔÓÑ ÏÛÉÂÏÞÎÙÍ ÄÅÊÓÔ×ÉÅÍ.  ÷ ÞÁÓÔÎÏÓÔÉ, ÕÓÔÁÎÏ×ËÁ</para>
 
-	  <programlisting>USE_GCC=        3.4</programlisting>
+	  <programlisting>USE_GCC=X.Y</programlisting>
 
-	  <para>ÄÏÂÁ×ÉÔ ÚÁ×ÉÓÉÍÏÓÔØ
-	  ÏÔ gcc34 Ë ËÁÖÄÏÍÕ ÐÏÒÔÕ, ×ËÌÀÞÁÑ ÓÁÍ gcc34!</para>
+	  <para>(ÇÄÅ X.Y ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ×ÅÒÓÉÉ) ÄÏÂÁ×ÉÔ ÚÁ×ÉÓÉÍÏÓÔØ
+	    ÏÔ gccXY Ë ËÁÖÄÏÍÕ ÐÏÒÔÕ, ×ËÌÀÞÁÑ É ÓÁÍ
+	    <literal>lang/gccXY</literal>!</para>
 	</note>
 
 	<table frame="none">
@@ -3629,7 +3768,7 @@ ALWAYS_KEEP_DISTFILES=  yes
 	      <row>
 		<entry>ðÅÒÅÍÅÎÎÁÑ</entry>
 
-		<entry>óÍÙÓÌ</entry>
+		<entry>úÎÁÞÅÎÉÅ</entry>
 	      </row>
 	    </thead>
 
@@ -3649,35 +3788,30 @@ ALWAYS_KEEP_DISTFILES=  yes
 	      </row>
 
 	      <row>
-		<entry><makevar>USE_BISON</makevar></entry>
-
-		<entry>äÌÑ ÐÏÓÔÒÏÅÎÉÑ ÐÏÒÔ ÉÓÐÏÌØÚÕÅÔ
-                  <command>bison</command>.</entry>
-	      </row>
-
-	      <row>
-		<entry><makevar>USE_CDRTOOLS</makevar></entry>
-
-		<entry>ðÏÒÔ ÔÒÅÂÕÅÔ <application>cdrecord</application>
-		  ÉÚ <filename
-		  role="package">sysutils/cdrtools</filename> ÉÌÉ <filename
-		  role="package">sysutils/cdrtools-cjk</filename> ×
-		  ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÐÒÅÄÐÏÞÔÅÎÉÊ ÐÏÌØÚÏ×ÁÔÅÌÑ.</entry>
-	      </row>
-
-	      <row>
 		<entry><makevar>USE_GCC</makevar></entry>
 
-		<entry>ðÏÒÔ ÔÒÅÂÕÅÔ ÄÌÑ ÓÂÏÒËÉ ÓÐÅÃÉÁÌØÎÕÀ ×ÅÒÓÉÀ
-		  <command>gcc</command>.  ôÏÞÎÁÑ ×ÅÒÓÉÑ ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ
-		  × ÚÎÁÞÅÎÉÉ ÐÅÒÅÍÅÎÎÏÊ, ÎÁÐÒÉÍÅÒ <literal>3.4</literal>.
-		  íÉÎÉÍÁÌØÎÏ ÎÅÏÂÈÏÄÉÍÕÀ ×ÅÒÓÉÀ ÍÏÖÎÏ ÕËÁÚÁÔØ ËÁË
-		  <literal>3.4+</literal>.  <command>gcc</command> ÉÚ
-		  ÏÓÎÏ×ÎÏÊ ÓÉÓÔÅÍÙ ÉÓÐÏÌØÚÕÅÔÓÑ × ÓÌÕÞÁÅ, ÅÓÌÉ ÏÎ
-		  ÕÄÏ×ÌÅÔ×ÏÒÑÅÔ ÚÁÐÒÏÛÅÎÎÏÊ ×ÅÒÓÉÉ, ÉÎÁÞÅ ÐÒÏÉÚ×ÏÄÉÔÓÑ
-		  ËÏÍÐÉÌÑÃÉÑ ÐÏÄÈÏÄÑÝÅÊ ×ÅÒÓÉÉ <command>gcc</command> ÉÚ
-		  ÐÏÒÔÏ× Ó ËÏÒÒÅËÃÉÊ ÐÅÒÅÍÅÎÎÙÈ <makevar>CC</makevar> É
-		  <makevar>CXX</makevar>.</entry>
+		<entry>äÌÑ ÓÂÏÒËÉ ÐÏÒÔÁ ÔÒÅÂÕÅÔÓÑ GCC
+		  (<command>gcc</command> ÉÌÉ <command>g++</command>).
+		  îÅËÏÔÏÒÙÍ ÐÏÒÔÁÍ ÐÏÄÈÏÄÉÔ ÌÀÂÁÑ ×ÅÒÓÉÑ, ÄÌÑ ÄÒÕÇÉÈ
+		  ÔÒÅÂÕÀÔÓÑ ÐÏÓÌÅÄÎÉÅ ÓÏ×ÒÅÍÅÎÎÙÅ ×ÅÒÓÉÉ.  ïÂÙÞÎÏ
+		  ÉÓÐÏÌØÚÕÅÔÓÑ ÓÏ ÚÎÁÞÅÎÉÅÍ <literal>any</literal> (×
+		  ÜÔÏÍ ÓÌÕÞÁÅ ÉÓÐÏÌØÚÕÅÔÓÑ ×ÓÔÒÏÅÎÎÙÊ GCC × ÔÅÈ
+		  ×ÅÒÓÉÑÈ &os;, × ÓÏÓÔÁ× ËÏÔÏÒÙÈ ÏÎ ×Ó£ ÅÝ£ ×ÈÏÄÉÔ,
+		  ÉÌÉ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÐÏÒÔ
+		  <literal>lang/gcc</literal>, ËÏÇÄÁ Clang Ñ×ÌÑÅÔÓÑ
+		  ËÏÍÐÉÌÑÔÏÒÏÍ C/C++ ÐÏ ÕÍÏÌÞÁÎÉÀ) ÉÌÉ
+		  <literal>yes</literal> (×ÓÅÇÄÁ ÉÓÐÏÌØÚÕÅÔÓÑ
+		  ÓÔÁÂÉÌØÎÁÑ ÓÏ×ÒÅÍÅÎÎÁÑ ×ÅÒÓÉÑ GCC ÉÚ ÐÏÒÔÁ
+		  <literal>lang/gcc</literal>).  ôÁËÖÅ × ÚÎÁÞÅÎÉÉ
+		  ÐÅÒÅÍÅÎÎÏÊ ÍÏÖÎÏ ÕËÁÚÁÔØ ÔÏÞÎÕÀ ×ÅÒÓÉÀ, ÎÁÐÒÉÍÅÒ
+		  <literal>4.7</literal>.  íÉÎÉÍÁÌØÎÏ ÄÏÐÕÓÔÉÍÕÀ
+		  ×ÅÒÓÉÀ ÍÏÖÎÏ ÕËÁÚÁÔØ ËÁË <literal>4.6+</literal>.
+		  GCC ÉÚ ÏÓÎÏ×ÎÏÊ ÓÉÓÔÅÍÙ ÉÓÐÏÌØÚÕÅÔÓÑ × ÓÌÕÞÁÅ, ÅÓÌÉ
+		  ÅÇÏ ×ÅÒÓÉÑ ÕÄÏ×ÌÅÔ×ÏÒÑÅÔ ÚÁÐÒÏÛÅÎÎÏÊ, ÉÎÁÞÅ
+		  ÓÏÂÉÒÁÅÔÓÑ ÐÏÄÈÏÄÑÝÁÑ ×ÅÒÓÉÉ ËÏÍÐÉÌÑÔÏÒÁ ÉÚ ÐÏÒÔÁ Ó
+		  ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÊ ËÏÒÒÅËÃÉÅÊ ÐÅÒÅÍÅÎÎÙÈ
+		  <makevar>CC</makevar> É <makevar>CXX</makevar>.
+		</entry>
 	      </row>
 
 	    </tbody>
@@ -3810,11 +3944,11 @@ LIB_DEPENDS=	bar:${PORTSDIR}/foo/bar
 	  <title>ëÏÒÒÅËÔÎÏÅ ÏÂßÑ×ÌÅÎÉÅ ÎÅÏÂÑÚÁÔÅÌØÎÏÊ ÚÁ×ÉÓÉÍÏÓÔÉ</title>
 
 	  <programlisting>OPTIONS_DEFINE=	BAR
-BAR_DESC=	Enable bar support
+BAR_DESC=	Bar support
 
 .include <bsd.port.options.mk>
 
-.if ${PORTOPTIONS:MBAR}
+.if ${PORT_OPTIONS:MBAR}
 LIB_DEPENDS=	bar:${PORTSDIR}/foo/bar
 .endif</programlisting>
 	</example>
@@ -3962,13 +4096,6 @@ MASTERDIR=	${.CURDIR}/../xdvi300
       <filename>bsd.port.mk</filename> ÎÉÞÅÇÏ ÄÏÐÏÌÎÉÔÅÌØÎÏ ÄÅÌÁÔØ ÎÅ
       ÎÕÖÎÏ.</para>
 
-    <para>úÎÁÞÅÎÉÅ ÐÅÒÅÍÅÎÎÏÊ <makevar>MANCOMPRESSED</makevar> Á×ÔÏÍÁÔÉÞÅÓËÉ
-      ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ × <literal>yes</literal>, ÅÓÌÉ ÐÅÒÅÍÅÎÎÁÑ
-      <makevar>USE_IMAKE</makevar> ÚÁÄÁÎÁ, Á
-      <makevar>NO_INSTALL_MANPAGES</makevar> ÎÅÔ, É × ÚÎÁÞÅÎÉÅ
-      <literal>no</literal> × ÐÒÏÔÉ×ÎÏÍ ÓÌÕÞÁÅ.  ÷ÁÍ ÎÅ ÎÕÖÎÏ ÚÁÄÁ×ÁÔØ ÅÅ
-      Ñ×ÎÏ, ÅÓÌÉ ÚÎÁÞÅÎÉÅ ÐÏ ÕÍÏÌÞÁÎÉÀ ÐÏÄÈÏÄÉÔ ×ÁÛÅÍÕ ÐÏÒÔÕ.</para>
-
     <para>åÓÌÉ ×ÁÛ ÐÏÒÔ ÏÐÒÅÄÅÌÑÅÔ ËÏÒÎÅÍ ÄÌÑ ÆÁÊÌÏ× óÐÒÁ×ÏÞÎÉËÁ ËÁÔÁÌÏÇ,
       ÏÔÌÉÞÎÙÊ ÏÔ <makevar>PREFIX</makevar>, ×Ù ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ
       ÐÅÒÅÍÅÎÎÕÀ <makevar>MANPREFIX</makevar>, ÞÔÏÂÙ ÚÁÄÁÔØ ÅÇÏ Ñ×ÎÏ.  ëÒÏÍÅ
@@ -4078,7 +4205,7 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</progr
 
 	  <para>üÔÉ ÐÅÒÅÍÅÎÎÙÅ ÐÒÅÄÎÁÚÎÁÞÅÎÙ ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÓÉÓÔÅÍÎÙÍ
 	    ÁÄÍÉÎÉÓÔÒÁÔÏÒÏÍ.  íÎÏÇÉÅ ÉÚ ÎÉÈ ÓÔÁÎÄÁÒÔÉÚÏ×ÁÎÙ × ÆÁÊÌÅ
-	    <ulink url="http://svn.FreeBSD.org/ports/head/KNOBS?view=markup"><filename>ports/KNOBS</filename></ulink>.</para>
+	    <ulink url="http://svnweb.FreeBSD.org/ports/head/KNOBS?view=markup"><filename>ports/KNOBS</filename></ulink>.</para>
 
 	  <para>ðÒÉ ÓÏÚÄÁÎÉÉ ÐÏÒÔÁ ÎÅ ÄÁ×ÁÊÔÅ ÉÍÑ ÄÌÑ knob, ÓÐÅÃÉÆÉÞÎÏÅ
 	    ÄÌÑ ÄÁÎÎÏÇÏ ÐÒÉÌÏÖÅÎÉÑ.  îÁ ÐÒÉÍÅÒÅ ÐÏÒÔÁ Avahi, ÉÓÐÏÌØÚÕÊÔÅ
@@ -4110,19 +4237,11 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</progr
 	        <row>
 		  <entry>ðÅÒÅÍÅÎÎÁÑ</entry>
 
-		  <entry>úÎÁÞÅÎÉÑ</entry>
+		  <entry>úÎÁÞÅÎÉÅ</entry>
 	        </row>
 	      </thead>
 
 	      <tbody>
-	        <row id="knobs-without-nls">
-		  <entry><makevar>WITHOUT_NLS</makevar></entry>
-
-		  <entry>åÓÌÉ ÕÓÔÁÎÏ×ÌÅÎÁ, ÕËÁÚÙ×ÁÅÔ ÎÅ ÚÁÄÅÊÓÔ×Ï×ÁÔØ
-		    ÉÎÔÅÒÎÁÃÉÏÎÁÌÉÚÁÃÉÀ, ÞÔÏ ÍÏÖÅÔ ÕÓËÏÒÉÔØ ËÏÍÐÉÌÑÃÉÀ.
-		    ðÏ ÕÍÏÌÞÁÎÉÀ, ÉÎÔÅÒÎÁÃÉÏÎÁÌÉÚÁÃÉÑ ÉÓÐÏÌØÚÕÅÔÓÑ.</entry>
-	        </row>
-
 	        <row>
 		  <entry><makevar>WITH_OPENSSL_BASE</makevar></entry>
 
@@ -4136,15 +4255,6 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</progr
 		    <filename role="package">security/openssl</filename>,
 		    ÄÁÖÅ ÅÓÌÉ × ÂÁÚÏ×ÏÊ ÓÉÓÔÅÍÅ ÐÏÓÌÅÄÎÑÑ ×ÅÒÓÉÑ.</entry>
 	        </row>
-
-	        <row>
-		  <entry><makevar>WITHOUT_X11</makevar></entry>
-
-		  <entry>ðÏÒÔÙ, ËÏÔÏÒÙÅ ÍÏÇÕÔ ÂÙÔØ ÓÏÂÒÁÎÙ Ó ÐÏÄÄÅÒÖËÏÊ
-		    ÉÌÉ ÂÅÚ ÐÏÄÄÅÒÖËÉ X, ÏÂÙÞÎÏ ÓÏÂÉÒÁÀÔÓÑ Ó ÐÏÄÄÅÒÖËÏÊ
-		    X.  åÓÌÉ ÜÔÁ ÐÅÒÅÍÅÎÎÁÑ ÏÐÒÅÄÅÌÅÎÁ, ÔÏ ÂÕÄÅÔ ÓÏÂÒÁÎÁ
-		    ×ÅÒÓÉÑ ÂÅÚ ÐÏÄÄÅÒÖËÉ X.</entry>
-	        </row>
 	      </tbody>
 	    </tgroup>
 	  </table>
@@ -4157,7 +4267,7 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</progr
 	      knobs ÄÌÑ ÐÏÍÏÝÉ ËÏÎÅÞÎÙÍ ÐÏÌØÚÏ×ÁÔÅÌÑÍ É ÄÌÑ ÐÏÄÄÅÒÖÁÎÉÑ
 	      ËÏÌÉÞÅÓÔ×Á ÎÁÉÍÅÎÏ×ÁÎÉÊ knobs × ÎÅÂÏÌØÛÏÍ ËÏÌÉÞÅÓÔ×Å.
 	      óÐÉÓÏË ÐÏÐÕÌÑÒÎÙÈ ÎÁÚ×ÁÎÉÊ knobs ÍÏÖÎÏ ÎÁÊÔÉ × ÆÁÊÌÅ <ulink
-		url="http://svn.FreeBSD.org/ports/head/KNOBS?view=markup"><filename>KNOBS</filename></ulink>
+		url="http://svnweb.FreeBSD.org/ports/head/KNOBS?view=markup"><filename>KNOBS</filename></ulink>
 	    </para>
 
 	    <para>îÁÚ×ÁÎÉÑ knobs ÄÏÌÖÎÙ ÏÔÒÁÖÁÔØ, ÞÔÏ ÜÔÏ ÔÁËÏÅ É ÞÔÏ
@@ -4249,6 +4359,13 @@ OPT6_DESC=	Describe OPT6</programlisting
 	    <programlisting>OPTIONS_SINGLE=		SG1
 OPTIONS_SINGLE_SG1=	OPT3 OPT4</programlisting>
 
+	    <para><makevar>OPTIONS</makevar> ÍÏÖÎÏ ÇÒÕÐÐÉÒÏ×ÁÔØ × ×ÉÄÅ
+	      ÐÅÒÅËÌÀÞÁÔÅÌÅÊ, ÄÌÑ ËÏÔÏÒÙÈ ÒÁÚÒÅÛÅÎ ×ÙÂÏÒ ÅÄÉÎÓÔ×ÅÎÎÏÇÏ
+	      ×ÁÒÉÁÎÔÁ (ÉÌÉ ÎÉ ÏÄÎÏÇÏ) × ËÁÖÄÏÊ ÇÒÕÐÐÅ:</para>
+
+	    <programlisting>OPTIONS_RADIO=		RG1
+OPTIONS_RADIO_RG1=	OPT7 OPT8</programlisting>
+
 	    <para><makevar>OPTIONS</makevar> ÔÁËÖÅ ÍÏÖÎÏ ÇÒÕÐÐÉÒÏ×ÁÔØ
 	      × ×ÉÄÅ ÓÐÉÓËÏ× ÓÏ ÍÎÏÖÅÓÔ×ÅÎÎÙÍ ×ÙÂÏÒÏÍ, ÄÌÑ ËÏÔÏÒÙÈ
 	      ÏÂÑÚÁÎ ÂÙÔØ ×ËÌÀÞÅÎ <emphasis>ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ
@@ -4257,20 +4374,13 @@ OPTIONS_SINGLE_SG1=	OPT3 OPT4</programli
 	    <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>OPTIONS</makevar> ÔÁËÖÅ ÍÏÖÎÏ ÇÒÕÐÐÉÒÏ×ÁÔØ
+	      × ×ÉÄÅ ÓÐÉÓËÏ× ÓÏ ÍÎÏÖÅÓÔ×ÅÎÎÙÍ ×ÙÂÏÒÏÍ, ÄÌÑ ËÏÔÏÒÙÈ
+	      ÍÏÇÕÔ ÂÙÔØ ×ËÌÀÞÅÎÙ ÌÀÂÙÅ ÐÁÒÁÍÅÔÒÙ, ×ËÌÀÞÁÑ ÏÔÓÕÔÓÔ×ÉÅ
+	      ×ÙÂÏÒÁ:</para>
 
-	    <para>ðÏÓÌÅ ÜÔÏÇÏ ÇÒÕÐÐÁ ÔÒÅÂÕÅÔ ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ ÏÄÉÎ
-	      <makevar>OPTION</makevar> ÉÚ <makevar>MG1</makevar>,
-	      ÔÏÌØËÏ ÅÓÌÉ ×ÙÂÒÁÎ ÎÏ×ÙÊ <makevar>MG1</makevar>
-	      <makevar>OPTION</makevar>.  òÅËÏÍÅÎÄÕÅÔÓÑ
-	      ÐÏÜËÓÐÅÒÉÍÅÎÔÉÒÏ×ÁÔØ, ÞÔÏÂÙ ÕÌÕÞÛÉÔØ ÐÏÎÉÍÁÎÉÅ.</para>
+	    <programlisting>OPTIONS_GROUP=		GG1
+OPTIONS_GROUP_GG1=	OPT9 OPT10</programlisting>
 
 	    <para>ðÏ ÕÍÏÌÞÁÎÉÀ <makevar>OPTIONS</makevar> ÎÁÈÏÄÉÔÓÑ ×
 	      ×ÙËÌÀÞÅÎÎÏÍ ÐÏÌÏÖÅÎÉÉ, ÅÓÌÉ ÐÒÉ ÜÔÏÍ ÏÎÏ ÔÁËÖÅ ÏÔÓÕÔÓÔ×ÕÅÔ
@@ -4314,6 +4424,15 @@ RUN_DEPENDS+=	bar:${PORTSDIR}/bar/bar
 .include <bsd.port.mk></programlisting>
 	  </example>
 
+	  <example id ="ports-options-check-unset">
+	    <title>ðÒÏ×ÅÒËÁ ÎÅÚÁÄÁÎÎÙÈ ÚÎÁÞÅÎÉÊ
+	      <makevar>OPTIONS</makevar></title>
+
+	    <programlisting>.if ! ${PORT_OPTIONS:MEXAMPLES}
+CONFIGURE_ARGS+=--without-examples
+.endif</programlisting>
+	  </example>
+
 	  <example id="ports-options-practical-use">
 	    <title>ðÒÉÍÅÒ ÒÅÁÌØÎÏÇÏ ÉÓÐÏÌØÚÏ×ÁÎÉÑ
 	      <makevar>OPTIONS</makevar></title>
@@ -4349,32 +4468,42 @@ CONFIGURE_ARGS+=	--without-postgres
 LIB_DEPENDS+=	icuuc:${PORTSDIR}/devel/icu
 .endif
 
-# Check other OPTIONS
-
-.include <bsd.port.mk></programlisting>
-	  </example>
-
-	  <example id="ports-options-old-style-use">
-	    <title>éÓÐÏÌØÚÏ×ÁÎÉÅ <makevar>OPTIONS</makevar>
-	      × ÓÔÁÒÏÍ ÓÔÉÌÅ</title>
-	    <programlisting>OPTIONS=      FOO "Enable option foo" On
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITHOUT_FOO)
-CONFIGURE_ARGS+=	--without-foo
-.else
-CONFIGURE_ARGS+=	--with-foo
+.if ! ${PORT_OPTIONS:MEXAMPLES}
+CONFIGURE_ARGS+=	--without-examples
 .endif
 
-.include <bsd.port.post.mk></programlisting>
+# ðÒÏ×ÅÒËÁ ÄÒÕÇÉÈ ÐÁÒÁÍÅÔÒÏ× OPTIONS
+
+.include <bsd.port.mk></programlisting>
 	  </example>
+	</sect3>
 
-	  <important>
-	    <para>ôÁËÏÊ ÓÐÏÓÏ ÉÓÐÏÌØÚÏ×ÁÎÉÑ <makevar>OPTIONS</makevar>
-	      Ñ×ÌÑÅÔÓÑ ÕÓÔÁÒÅ×ÛÉÍ, É × ÂÕÄÕÝÅÍ ÅÇÏ ÐÏÄÄÅÒÖËÁ ÂÕÄÅÔ
-	      ÕÄÁÌ£ÎÁ.  îÅ ÉÓÐÏÌØÚÕÊÔÅ ÜÔÏÔ ÓÐÏÓÏ ÄÌÑ ÎÏ×ÙÈ ÐÏÒÔÏ×.</para>
-	  </important>
+	<sect3>
+	  <title>ðÁÒÁÍÅÔÒÙ ÐÏ ÕÍÏÌÞÁÎÉÀ</title>
+  	  <para>óÌÅÄÕÀÝÉÅ ÐÁÒÁÍÅÔÒÙ ÐÏ ÕÍÏÌÞÁÎÉÀ ×ÓÅÇÄÁ ×ËÌÀÞÅÎÙ.</para>
+          <itemizedlist>
+	    <listitem>
+	      <para><literal>DOCS</literal> — ÐÏÓÔÒÏÅÎÉÅ É ÕÓÔÁÎÏ×ËÁ
+		ÄÏËÕÍÅÎÔÁÃÉÉ.</para>
+	    </listitem>
+	    <listitem>
+	      <para><literal>NLS</literal> — ÉÎÔÅÒÎÁÃÉÏÎÁÌÉÚÁÃÉÑ.</para>
+            </listitem>
+	    <listitem>
+	      <para><literal>EXAMPLES</literal> — ÐÏÓÔÒÏÅÎÉÅ É
+		ÕÓÔÁÎÏ×ËÁ ÐÒÉÍÅÒÏ× ÉÓÐÏÌØÚÏ×ÁÎÉÑ.</para>
+	    </listitem>
+	    <listitem>
+	      <para><literal>IPV6</literal> — ÐÏÄÄÅÒÖËÁ ÐÒÏÔÏËÏÌÁ
+		IPv6.</para>
+	    </listitem>
+	  </itemizedlist>
+	  <note>
+	    <para>îÅÔ ÎÅÏÂÈÏÄÉÍÏÓÔÉ ÄÏÂÁ×ÌÑÔØ ÜÔÉ ÐÁÒÁÍÅÔÒÙ ×
+	      <makevar>OPTIONS_DEFAULT</makevar>.  ôÅÍ ÎÅ ÍÅÎÅÅ, ÞÔÏÂÙ
+	      ÏÔÏÂÒÁÚÉÔØ ÉÈ × ÏËÎÅ ÄÉÁÌÏÇÁ ×ÙÂÏÒÁ ÐÁÒÁÍÅÔÒÏ×, ÏÎÉ ÄÏÌÖÎÙ
+	      ÂÙÔØ ÄÏÂÁ×ÌÅÎÙ × <makevar>OPTIONS_DEFINE</makevar>.</para>
+          </note>
 	</sect3>
       </sect2>
 
@@ -4393,7 +4522,7 @@ CONFIGURE_ARGS+=	--with-foo
 	  <title>îÅÐÒÁ×ÉÌØÎÏÅ ÕÐÒÁ×ÌÅÎÉÅ ÏÐÃÉÅÊ</title>
 
 	  <programlisting>.if ${PORT_OPTIONS:MFOO}
-LIB_DEPENDS+=		foo:${PORTSDIR}/devel/foo
+LIB_DEPENDS+=		libfoo.so:${PORTSDIR}/devel/foo
 CONFIGURE_ARGS+=	--enable-foo
 .endif</programlisting>
 	</example>
@@ -4412,7 +4541,7 @@ CONFIGURE_ARGS+=	--enable-foo
 	  <title>ðÒÁ×ÉÌØÎÏÅ ÕÐÒÁ×ÌÅÎÉÅ ÏÐÃÉÅÊ</title>
 
 	  <programlisting>.if ${PORT_OPTIONS:MFOO}
-LIB_DEPENDS+=		foo:${PORTSDIR}/devel/foo
+LIB_DEPENDS+=		libfoo.so:${PORTSDIR}/devel/foo
 CONFIGURE_ARGS+=	--enable-foo
 .else
 CONFIGURE_ARGS+=	--disable-foo
@@ -4422,148 +4551,445 @@ CONFIGURE_ARGS+=	--disable-foo
 	<para>÷Ï ×ÔÏÒÏÍ ÐÒÉÍÅÒÅ ÂÉÂÌÉÏÔÅËÁ libfoo ÏÔËÌÀÞÅÎÁ Ñ×ÎÙÍ ÏÂÒÁÚÏÍ.
 	  óÃÅÎÁÒÉÊ configure ÎÅ ×ËÌÀÞÁÅÔ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ ÆÕÎËÃÉÉ × ÐÒÉÌÏÖÅÎÉÉ,
 	  ÎÅÓÍÏÔÒÑ ÎÁ ÐÒÉÓÕÔÓÔ×ÉÅ ÂÉÂÌÉÏÔÅËÉ × ÓÉÓÔÅÍÅ.</para>
-      </sect2>
 
-    </sect1>
+	<note>
+	  <para>ðÒÉ ÏÐÒÅÄÅÌÅÎÎÙÈ ÕÓÌÏ×ÉÑÈ ÓÏËÒÁÝÅÎÎÙÊ ÓÉÎÔÁËÓÉÓ ÚÁÐÉÓÉ
+	    ÕÓÌÏ×ÉÊ ÍÏÖÅÔ ×ÙÚÙ×ÁÔØ ÐÒÏÂÌÅÍÙ ÓÏ ÓÌÏÖÎÙÍÉ ËÏÎÓÔÒÕËÃÉÑÍÉ.
+	    åÓÌÉ ×Ù ÐÏÌÕÞÁÅÔÅ ÏÛÉÂËÉ, ÔÁËÉÅ ËÁË <literal>Malformed
+	      conditional</literal>, ÔÏ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ
+	    ÁÌØÔÅÒÎÁÔÉ×ÎÙÊ ÓÉÎÔÁËÓÉÓ.</para>
+
+	  <programlisting>.if !empty(VARIABLE:MVALUE)
+# as an alternative to
+.if ${VARIABLE:MVALUE}</programlisting>
+	</note>
+      </sect2>
 
-    <sect1 id="makefile-wrkdir">
-      <title>úÁÄÁÎÉÅ ÒÁÂÏÞÅÇÏ ËÁÔÁÌÏÇÁ</title>
+      <sect2>
+	<title>÷ÓÐÏÍÏÇÁÔÅÌØÎÙÅ ÍÁËÒÏÓÙ</title>
 
-      <para>ëÁÖÄÙÊ ÐÏÒÔ ÒÁÓÐÁËÏ×Ù×ÁÅÔÓÑ × ÒÁÂÏÞÉÊ ËÁÔÁÌÏÇ, ËÏÔÏÒÙÊ ÄÏÌÖÅÎ ÂÙÔØ
-        ÄÏÓÔÕÐÎÙÍ ÄÌÑ ÚÁÐÉÓÉ.  ÷ ÓÉÓÔÅÍÅ ÐÏÒÔÏ× ÐÏ ÕÍÏÌÞÁÎÉÀ
-        <makevar>DISTFILES</makevar> ÒÁÓÐÁËÏ×Ù×ÁÀÔÓÑ × ËÁÔÁÌÏÇ Ó ÉÍÅÎÅÍ
-        <literal>${DISTNAME}</literal>.  äÒÕÇÉÍÉ ÓÌÏ×ÁÍÉ, ÅÓÌÉ ×Ù
-        ÚÁÄÁÌÉ:</para>
+	<para>óÕÝÅÓÔ×ÕÅÔ ÎÅÓËÏÌØËÏ ÍÁËÒÏÓÏ×, ÕÐÒÏÝÁÀÝÉÈ ÚÁÐÉÓØ ÕÓÌÏ×ÎÙÈ
+	  ÚÎÁÞÅÎÉÊ, ËÏÔÏÒÙÅ ÏÔÌÉÞÁÀÔÓÑ × ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÎÁÂÏÒÁ
+	  ÐÁÒÁÍÅÔÒÏ×.</para>
 
-      <programlisting>PORTNAME=      foo
-PORTVERSION=   1.0</programlisting>
+	<para>åÓÌÉ ÐÅÒÅÍÅÎÎÁÑ <makevar>OPTIONS_SUB</makevar> ÉÍÅÅÔ
+	  ÚÎÁÞÅÎÉÅ <literal>yes</literal>, ÔÏ ËÁÖÄÙÊ ÉÚ ÕËÁÚÁÎÎÙÈ ×
+	  <makevar>OPTIONS_DEFINE</makevar> ÐÁÒÁÍÅÔÒÏ× ÂÕÄÅÔ ÄÏÂÁ×ÌÅÎ
+	  × <makevar>PLIST_SUB</makevar>.  óÌÅÄÕÀÝÁÑ ÚÁÐÉÓØ:</para>
 
-      <para>ÔÏ ÄÉÓÔÒÉÂÕÔÉ×ÎÙÅ ÆÁÊÌÙ ÐÏÒÔÁ ÓÏÄÅÒÖÁÔ ËÁÔÁÌÏÇ ×ÅÒÈÎÅÇÏ ÕÒÏ×ÎÑ,
-        <filename>foo-1.0</filename>, É ×ÓÅ ÆÁÊÌÙ ÒÁÓÐÏÌÏÖÅÎÙ × ÜÔÏÍ
-        ËÁÔÁÌÏÇÅ.</para>
+	<programlisting>OPTIONS_DEFINE=	OPT1
+OPTIONS_SUB=	yes</programlisting>
 
-      <para>åÓÌÉ ÜÔÏ ÎÅ ×ÁÛ ÓÌÕÞÁÊ, ÔÏ ÉÍÅÅÔÓÑ ÎÅÓËÏÌØËÏ ÐÅÒÅÍÅÎÎÙÈ, ËÏÔÏÒÙÅ
-        ×Ù ÍÏÖÅÔÅ ÐÅÒÅÏÐÒÅÄÅÌÉÔØ.</para>
+	<para>ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ:</para>
 
-      <sect2>
-        <title><makevar>WRKSRC</makevar></title>
+	<programlisting>OPTIONS_DEFINE=	OPT1
 
-        <para>üÔÁ ÐÅÒÅÍÅÎÎÁÑ ÚÁÄÁ£Ô ÉÍÑ ËÁÔÁÌÏÇÁ, ËÏÔÏÒÙÊ ÓÏÚÄÁ£ÔÓÑ ÐÒÉ
-          ÒÁÓÐÁËÏ×ËÅ ÉÓÈÏÄÎÙÈ ÆÁÊÌÏ× ÐÒÉÌÏÖÅÎÉÑ.  ÷ ÎÁÛÅÍ ÐÒÅÄÙÄÕÝÅÍ
-          ÐÒÉÍÅÒÅ ÅÓÌÉ ÂÙ ÒÁÓÐÁËÏ×ËÁ ÐÒÏÉÓÈÏÄÉÌÁ × ËÁÔÁÌÏÇ Ó ÉÍÅÎÅÍ
-          <filename>foo</filename> (Á ÎÅ
-          <filename>foo-1.0</filename>), ÔÏ ×Ù ÄÏÌÖÎÙ ÎÁÐÉÓÁÔØ:</para>
+.include <bsd.port.options.mk>
 
-        <programlisting>WRKSRC=      ${WRKDIR}/foo</programlisting>
+.if ${PORT_OPTIONS:MOPT1}
+PLIST_SUB+=	OPT1=""
+.else
+PLIST_SUB+=	OPT1="@comment "
+.endif</programlisting>
 
-        <para>ÉÌÉ, ËÁË ×ÁÒÉÁÎÔ</para>
+	<para><makevar>X_CONFIGURE_ENABLE</makevar> ÄÏÐÉÓÙ×ÁÅÔ ×
+	  <makevar>CONFIGURE_ARGS</makevar> ÓÔÒÏËÕ
+	  <literal>--enable-${X_CONFIGURE_ENABLE}</literal> ÉÌÉ
+	  <literal>--disable-${X_CONFIGURE_ENABLE}</literal> ×
+	  ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÓÏÓÔÏÑÎÉÅÍ <makevar>X</makevar>.  óÌÅÄÕÀÝÁÑ
+	  ÚÁÐÉÓØ:</para>
 
-        <programlisting>WRKSRC=      ${WRKDIR}/${PORTNAME}</programlisting>
-      </sect2>
+	<programlisting>OPTIONS_DEFINE=	OPT1
+OPT1_CONFIGURE_ENABLE=	test</programlisting>
 
-      <sect2>
-        <title><makevar>NO_WRKSUBDIR</makevar></title>
+	<para>ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ:</para>
 
-        <para>åÓÌÉ ÐÏÒÔ ×ÏÏÂÝÅ ÎÅ ÒÁÓÐÁËÏ×Ù×ÁÅÔÓÑ ÎÉ × ËÁËÏÊ ËÁÔÁÌÏÇ, ÔÏ ×Ù
-          ÄÏÌÖÎÙ ÚÁÄÁÔØ ÐÅÒÅÍÅÎÎÕÀ <makevar>NO_WRKSUBDIR</makevar> ÄÌÑ ÕËÁÚÁÎÉÑ
-          ÎÁ ÜÔÏÔ ÆÁËÔ.</para>
+	<programlisting>OPTIONS_DEFINE=	OPT1
 
-        <programlisting>NO_WRKSUBDIR= yes</programlisting>
-      </sect2>
-    </sect1>
+.include <bsd.port.options.mk>
 
-    <sect1 id="conflicts">
-      <title>òÁÚÒÅÛÅÎÉÅ ËÏÎÆÌÉËÔÏ×</title>
+.if ${PORT_OPTIONS:MOPT1}
+CONFIGURE_ARGS+=	--enable-test
+.else
+CONFIGURE_ARGS+=	--disable-test
+.endif</programlisting>
 
-      <para>äÌÑ ÒÅÇÉÓÔÒÁÃÉÉ ËÏÎÆÌÉËÔÁ ÍÅÖÄÕ ÐÁËÅÔÁÍÉ É ÐÏÒÔÁÍÉ ÉÓÐÏÌØÚÕÀÔÓÑ
-	ÔÒÉ ÒÁÚÌÉÞÎÙÅ ÐÅÒÅÍÅÎÎÙÅ: <makevar>CONFLICTS</makevar>,
-	<makevar>CONFLICTS_INSTALL</makevar> É
-	<makevar>CONFLICTS_BUILD</makevar>.</para>
+	<para><makevar>X_CONFIGURE_WITH</makevar> ÄÏÐÉÓÙ×ÁÅÔ ×
+	  <makevar>CONFIGURE_ARGS</makevar> ÓÔÒÏËÕ
+	  <literal>--with-${X_CONFIGURE_WITH}</literal> ÉÌÉ
+	  <literal>--without-${X_CONFIGURE_WITH}</literal> ×
+	  ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÓÏÓÔÏÑÎÉÅÍ <makevar>X</makevar>.  óÌÅÄÕÀÝÁÑ
+	  ÚÁÐÉÓØ:</para>
 
-      <note>
-	<para>ðÅÒÅÍÅÎÎÙÅ ÒÅÇÉÓÔÒÁÃÉÉ ËÏÎÆÌÉËÔÁ Á×ÔÏÍÁÔÉÞÅÓËÉ ÏÐÒÅÄÅÌÑÀÔ
-	  ÐÅÒÅÍÅÎÎÕÀ <makevar>IGNORE</makevar>, ËÏÔÏÒÁÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏ
-	  ÏÐÉÓÁÎÁ × <xref linkend="dads-noinstall"/>.</para>
-      </note>
+	<programlisting>OPTIONS_DEFINE=	OPT1
+OPT1_CONFIGURE_WITH=	test</programlisting>
 
-      <para>ðÒÉ ÕÄÁÌÅÎÉÉ ÏÄÎÏÇÏ ÉÚ ËÏÎÆÌÉËÔÕÀÝÉÈ ÐÏÒÔÏ× ÃÅÌÅÓÏÏÂÒÁÚÎÏ
-	ÓÏÈÒÁÎÉÔØ ÚÁÐÉÓÉ <makevar>CONFLICTS</makevar> × ÔÅÈ ÄÒÕÇÉÈ ÐÏÒÔÁÈ
-	× ÔÅÞÅÎÉÉ ÎÅÓËÏÌØËÉÈ ÍÅÓÑÃÅ×, ÞÔÏÂÙ ÐÏÚÁÂÏÔÉÔØÓÑ Ï ÔÅÈ ÐÏÌØÚÏ×ÁÔÅÌÅÊ,
-	ËÏÔÏÒÙÅ ÏÂÎÏ×ÌÑÀÔÓÑ ÏÔ ÓÌÕÞÁÑ Ë ÓÌÕÞÁÀ.</para>
+	<para>ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ:</para>
 
-      <sect2>
-	<title><makevar>CONFLICTS_INSTALL</makevar></title>
+	<programlisting>OPTIONS_DEFINE=	OPT1
 
-	<para>åÓÌÉ ×ÁÛ ÐÁËÅÔ ÎÅ ÍÏÖÅÔ ÓÕÝÅÓÔ×Ï×ÁÔØ ×ÍÅÓÔÅ Ó ÄÒÕÇÉÍÉ
-	  (ÉÚ-ÚÁ ËÏÎÆÌÉËÔÁ ÆÁÊÌÏ×, ÎÅÓÏ×ÍÅÓÔÉÍÏÓÔÉ ×ÒÅÍÅÎÉ ×ÙÐÏÌÎÅÎÉÑ É ÔÁË
-	  ÄÁÌÅÅ), ÐÅÒÅÞÉÓÌÉÔÅ ÉÍÅÎÁ ÏÓÔÁÌØÎÙÈ ÐÁËÅÔÏ× × ÐÅÒÅÍÅÎÎÏÊ
-	  <makevar>CONFLICTS_INSTALL</makevar>.  úÄÅÓØ ×Ù ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ
-	  ÛÁÂÌÏÎÙ ËÏÍÁÎÄÎÏÇÏ ÉÎÔÅÒÐÒÅÔÁÔÏÒÁ, ÔÁËÉÅ ËÁË <literal>*</literal>
-	  É <literal>?</literal>.  éÍÅÎÁ ÐÁËÅÔÏ× ÄÏÌÖÎÙ ×ÙÇÌÑÄÅÔØ ÔÁË ÖÅ,
-	  ËÁË × <filename>/var/db/pkg</filename>.  ðÏÖÁÌÕÊÓÔÁ, ÕÂÅÄÉÔÅÓØ,
-	  ÞÔÏ <makevar>CONFLICTS_INSTALL</makevar> ÎÅ ÓÏÄÅÒÖÉÔ ÐÁËÅÔ ÓÁÍÏÇÏ
-	  ÜÔÏÇÏ ÐÏÒÔÁ.  ÷ ÐÒÏÔÉ×ÎÏÍ ÓÌÕÞÁÅ ÎÅ ÂÕÄÅÔ ÒÁÂÏÔÁÔØ ÕÓÔÁÎÏ×ËÁ Ó
-	  ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÅÒÅÍÅÎÎÏÊ <makevar>FORCE_PKG_REGISTER</makevar>.
-	  ðÒÏ×ÅÒËÁ CONFLICTS_INSTALL ×ÙÐÏÌÎÑÅÔÓÑ ÐÏÓÌÅ ÐÒÏÃÅÓÓÁ ÓÂÏÒËÉ É
-	  ÄÏ ÐÒÏÃÅÓÓÁ ÕÓÔÁÎÏ×ËÉ.</para>
-      </sect2>
+.include <bsd.port.options.mk>
 
-      <sect2>
-	<title><makevar>CONFLICTS_BUILD</makevar></title>
+.if ${PORT_OPTIONS:MOPT1}
+CONFIGURE_ARGS+=	--with-test
+.else
+CONFIGURE_ARGS+=	--without-test
+.endif</programlisting>
 
-	<para>åÓÌÉ ×ÁÛ ÐÏÒÔ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÓÏÂÒÁÎ, ËÏÇÄÁ ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ
-	  ÄÒÕÇÏÊ, ÐÅÒÅÞÉÓÌÉÔÅ ÉÍÅÎÁ ÏÓÔÁÌØÎÙÈ ÐÏÒÔÏ× × ÐÅÒÅÍÅÎÎÏÊ
-	  <makevar>CONFLICTS_BUILD</makevar>.  úÄÅÓØ ×Ù ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ
-	  ÛÁÂÌÏÎÙ ËÏÍÁÎÄÎÏÇÏ ÉÎÔÅÒÐÒÅÔÁÔÏÒÁ, ÔÁËÉÅ ËÁË <literal>*</literal>
-	  É <literal>?</literal>.  éÍÅÎÁ ÐÁËÅÔÏ× ÄÏÌÖÎÙ ×ÙÇÌÑÄÅÔØ ÔÁË ÖÅ,
-	  ËÁË × <filename>/var/db/pkg</filename>.  ðÒÏ×ÅÒËÁ CONFLICTS_BUILD
-	  ×ÙÐÏÌÎÑÅÔÓÑ ÄÏ ÐÒÏÃÅÓÓÁ ÓÂÏÒËÉ.  ëÏÎÆÌÉËÔÙ ÓÂÏÒËÉ × ÐÏÌÕÞÁÅÍÏÍ
-	  ÐÁËÅÔÅ ÎÅ ÚÁÐÉÓÙ×ÁÀÔÓÑ.</para>
-      </sect2>
+	<para>úÎÁÞÅÎÉÅ ÐÅÒÅÍÅÎÎÏÊ <makevar>X_CONFIGURE_ON</makevar>
+	  ÂÕÄÅÔ ÄÏÐÉÓÁÎÏ × <makevar>CONFIGURE_ARGS</makevar> ×
+	  ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÓÏÓÔÏÑÎÉÅÍ <makevar>X</makevar>.  óÌÅÄÕÀÝÁÑ
+	  ÚÁÐÉÓØ:</para>
 
-      <sect2>
-	<title><makevar>CONFLICTS</makevar></title>
+	<programlisting>OPTIONS_DEFINE=	OPT1
+OPT1_CONFIGURE_ON=	--add-test</programlisting>
 
-	<para>åÓÌÉ ×ÁÛ ÐÏÒÔ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÓÏÂÒÁÎ, ËÏÇÄÁ ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ
-	  ÄÒÕÇÏÊ, Á ÐÏÌÕÞÁÅÍÙÊ ÐÁËÅÔ ÎÅ ÍÏÖÅÔ ÓÕÝÅÓÔ×Ï×ÁÔØ ×ÍÅÓÔÅ Ó ÄÒÕÇÉÍÉ,
-	  ÐÅÒÅÞÉÓÌÉÔÅ ÉÍÅÎÁ ÏÓÔÁÌØÎÙÈ ÐÁËÅÔÏ× × ÐÅÒÅÍÅÎÎÏÊ
-	  <makevar>CONFLICTS</makevar>.  úÄÅÓØ ×Ù ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÛÁÂÌÏÎÙ
-	  ËÏÍÁÎÄÎÏÇÏ ÉÎÔÅÒÐÒÅÔÁÔÏÒÁ, ÔÁËÉÅ ËÁË <literal>*</literal> É
-	  <literal>?</literal>.  éÍÅÎÁ ÐÁËÅÔÏ× ÄÏÌÖÎÙ ×ÙÇÌÑÄÅÔØ ÔÁË ÖÅ, ËÁË
-	  × <filename>/var/db/pkg</filename>.  ðÏÖÁÌÕÊÓÔÁ, ÕÂÅÄÉÔÅÓØ, ÞÔÏ
-	  <makevar>CONFLICTS</makevar> ÎÅ ÓÏÄÅÒÖÉÔ ÐÁËÅÔ ÓÁÍÏÇÏ ÜÔÏÇÏ ÐÏÒÔÁ.
-	  ÷ ÐÒÏÔÉ×ÎÏÍ ÓÌÕÞÁÅ ÎÅ ÂÕÄÅÔ ÒÁÂÏÔÁÔØ ÕÓÔÁÎÏ×ËÁ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ
-	  ÐÅÒÅÍÅÎÎÏÊ <makevar>FORCE_PKG_REGISTER</makevar>.  ðÒÏ×ÅÒËÁ
-	  CONFLICTS ×ÙÐÏÌÎÑÅÔÓÑ ÄÏ ÐÒÏÃÅÓÓÏ× ÓÂÏÒËÉ É ÕÓÔÁÎÏ×ËÉ.</para>
-      </sect2>
-    </sect1>
+	<para>ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ:</para>
 
-    <sect1 id="install">
-      <title>õÓÔÁÎÏ×ËÁ ÆÁÊÌÏ×</title>
+	<programlisting>OPTIONS_DEFINE=	OPT1
 
-      <sect2 id="install-macros">
-	<title>íÁËÒÏÓÙ INSTALL_*</title>
+.include <bsd.port.options.mk>
 
-	<para>éÓÐÏÌØÚÕÊÔÅ ÍÁËÒÏÓÙ, ËÏÔÏÒÙÅ ÅÓÔØ × ÆÁÊÌÅ
-	  <filename>bsd.port.mk</filename> ÄÌÑ ÏÂÅÓÐÅÞÅÎÉÑ ÐÒÁ×ÉÌØÎÙÈ ÐÒÁ×
-	  ÄÏÓÔÕÐÁ É ×ÌÁÄÅÎÉÑ ÆÁÊÌÏ× × Ó×ÏÉÈ ÃÅÌÑÈ
-	  <maketarget>*-install</maketarget>.</para>
+.if ${PORT_OPTIONS:MOPT1}
+CONFIGURE_ARGS+=	--add-test
+.endif</programlisting>
 
-	<itemizedlist>
-	  <listitem>
-	    <para><makevar>INSTALL_PROGRAM</makevar> - ÜÔÏ ËÏÍÁÎÄÁ ÄÌÑ
-	      ÕÓÔÁÎÏ×ËÉ ÂÉÎÁÒÎÙÈ ×ÙÐÏÌÎÉÍÙÈ ÆÁÊÌÏ×.</para>
-	  </listitem>
+	<para>úÎÁÞÅÎÉÅ ÐÅÒÅÍÅÎÎÏÊ <makevar>X_CONFIGURE_OFF</makevar>
+	  ÂÕÄÅÔ ÄÏÐÉÓÁÎÏ × <makevar>CONFIGURE_ARGS</makevar> ×
+	  ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÓÏÓÔÏÑÎÉÅÍ <makevar>X</makevar>.  óÌÅÄÕÀÝÁÑ
+	  ÚÁÐÉÓØ:</para>
 
-	  <listitem>
-	    <para><makevar>INSTALL_SCRIPT</makevar> - ÜÔÏ ËÏÍÁÎÄÁ ÄÌÑ ÕÓÔÁÎÏ×ËÉ
-	      ×ÙÐÏÌÎÉÍÙÈ ÓËÒÉÐÔÏ×.</para>
-	  </listitem>
+	<programlisting>OPTIONS_DEFINE=	OPT1
+OPT1_CONFIGURE_OFF=	--no-test</programlisting>
 
-	  <listitem>
-	    <para><makevar>INSTALL_LIB</makevar> - ÜÔÏ ËÏÍÁÎÄÁ ÄÌÑ ÕÓÔÁÎÏ×ËÉ
-	      ÄÉÎÁÍÉÞÅÓËÉÈ ÂÉÂÌÉÏÔÅË.</para>
-	  </listitem>
+	<para>ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ:</para>
+
+	<programlisting>OPTIONS_DEFINE=	OPT1
+.include <bsd.port.options.mk>
+.if ! ${PORT_OPTIONS:MOPT1}
+CONFIGURE_ARGS+=	--no-test
+.endif</programlisting>
+
+	<para>úÎÁÞÅÎÉÅ ÐÅÒÅÍÅÎÎÏÊ <makevar>X_CMAKE_ON</makevar> ÂÕÄÅÔ
+	  ÄÏÐÉÓÁÎÏ × <makevar>CMAKE_ARGS</makevar> × ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó
+	  ÓÏÓÔÏÑÎÉÅÍ <makevar>X</makevar>.  óÌÅÄÕÀÝÁÑ ÚÁÐÉÓØ:</para>
+
+	<programlisting>OPTIONS_DEFINE=	OPT1
+OPT1_CMAKE_ON=	-DTEST:BOOL=true</programlisting>
+
+	<para>ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ:</para>
+
+	<programlisting>OPTIONS_DEFINE=	OPT1
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MOPT1}
+CMAKE_ARGS+=	-DTEST:BOOL=true
+.endif</programlisting>
+
+	<para>úÎÁÞÅÎÉÅ ÐÅÒÅÍÅÎÎÏÊ <makevar>X_CMAKE_OFF</makevar> ÂÕÄÅÔ
+	  ÄÏÐÉÓÁÎÏ × <makevar>CMAKE_ARGS</makevar> × ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó
+	  ÓÏÓÔÏÑÎÉÅÍ <makevar>X</makevar>.  óÌÅÄÕÀÝÁÑ ÚÁÐÉÓØ:</para>
+
+	<programlisting>OPTIONS_DEFINE=	OPT1
+OPT1_CMAKE_OFF=	-DTEST:BOOL=false</programlisting>
+
+	<para>ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ:</para>
+
+	<programlisting>OPTIONS_DEFINE=	OPT1
+
+.include <bsd.port.options.mk>
+
+.if ! ${PORT_OPTIONS:MOPT1}
+CMAKE_ARGS+=	-DTEST:BOOL=false
+.endif</programlisting>
+
+	<para>äÌÑ ÌÀÂÏÊ ÉÚ ÓÌÅÄÕÀÝÉÈ ÐÅÒÅÍÅÎÎÙÈ:</para>

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


More information about the svn-doc-all mailing list