From ohauer@FreeBSD.org  Sun Jul  8 13:23:10 2012
Return-Path: <ohauer@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id F025E1065674
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  8 Jul 2012 13:23:09 +0000 (UTC)
	(envelope-from ohauer@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id DA7F98FC0A
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  8 Jul 2012 13:23:09 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q68DN9aJ092767
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 8 Jul 2012 13:23:09 GMT
	(envelope-from ohauer@freefall.freebsd.org)
Received: (from ohauer@localhost)
	by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q68DN9E8092766;
	Sun, 8 Jul 2012 13:23:09 GMT
	(envelope-from ohauer)
Message-Id: <201207081323.q68DN9E8092766@freefall.freebsd.org>
Date: Sun, 8 Jul 2012 13:23:09 GMT
From: Olli Hauer <ohauer@freebsd.org>
Reply-To: Olli Hauer <ohauer@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] porters-handbook ru_RU.KOI8-R apache section
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         169710
>Category:       docs
>Synopsis:       [patch] porters-handbook ru_RU.KOI8-R apache section
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pluknet
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 08 13:30:01 UTC 2012
>Closed-Date:    Tue Jul 24 09:14:44 UTC 2012
>Last-Modified:  Tue Jul 24 09:20:11 UTC 2012
>Originator:     Olli Hauer <ohauer@FreeBSD.org>
>Release:        
>Organization:
>Environment:

>Description:
Apache13 is gone, and bsd.apache.mk doesn't support values containing '.'

I placed an addition marker to an entry which I cannot fix.



>How-To-Repeat:

>Fix:
http://people.freebsd.org/~ohauer/diffs/porters-handbook/ru_RU.KOI8-R.diff


--- ru_RU.KOI8-R.diff begins here ---
Index: ru_RU.KOI8-R/books/porters-handbook/book.sgml
===================================================================
--- ru_RU.KOI8-R/books/porters-handbook/book.sgml	(revision 39183)
+++ ru_RU.KOI8-R/books/porters-handbook/book.sgml	(working copy)
@@ -6742,15 +6742,17 @@
 
 		<entry>  Apache.   :
 		  <literal>yes</literal> (ң  ),
-		  <literal>1.3</literal>, <literal>2.0</literal>,
-		  <literal>2.2</literal>, <literal>2.0+</literal>
+		  <literal>20</literal>, <literal>22</literal>,
+		  <literal>20-22</literal>, <literal>20+</literal>
 		    .     
-		  <literal>1.3</literal>.</entry>
+		  <literal>22</literal>.</entry>
 	      </row>
 
 	      <row>
 		<entry><makevar>WITH_APACHE2</makevar></entry>
-
+<!--
+	Please review the following entry.
+-->
 		<entry>  Apache 2.0.     
 		     Apache 1.3.    
 		       .</entry>
@@ -6776,8 +6778,8 @@
 		<entry>  Apache (  
 		  ).       
 		  <filename>bsd.port.pre.mk</filename>.   :
-		  <literal>13</literal>, <literal>20</literal>,
-		  <literal>22</literal>.</entry>
+		  <literal>20</literal>, <literal>22</literal>.
+		  </entry>
 	      </row>
 
 	      <row>
--- ru_RU.KOI8-R.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-doc->pluknet 
Responsible-Changed-By: pluknet 
Responsible-Changed-When: Mon Jul 9 09:07:17 UTC 2012 
Responsible-Changed-Why:  
Take. I'm working on syncing porters-handbook. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=169710 
State-Changed-From-To: open->closed 
State-Changed-By: pluknet 
State-Changed-When: Tue Jul 24 09:14:29 UTC 2012 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=169710 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/169710: commit references a PR
Date: Tue, 24 Jul 2012 09:14:04 +0000 (UTC)

 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 ***
 _______________________________________________
 svn-doc-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-doc-all
 To unsubscribe, send any mail to "svn-doc-all-unsubscribe@freebsd.org"
 
>Unformatted:
