docs/125907: [patch] Update makefiles options section of Porter's Handbook

[Thomas Abthorpe]

The following reply was made to PR docs/125907; it has been noted by GNATS.

From: Thomas Abthorpe <tabthorpe at freebsd.org>
To: bug-followup at freebsd.org,
 tabthorpe at freebsd.org
Cc:  
Subject: Re: docs/125907: [patch] Update makefiles options section of Porter's Handbook
Date: Thu, 24 Jul 2008 10:57:34 -0400

 --Boundary-00=_fhJiIGQhMgAdMw3
 Content-Type: text/plain;
   charset="us-ascii"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 Courtesy of Pav's feedback, and a third cup of coffee, please find attached 
 replacement patch.
 
 
 Thomas
 -- 
 Thomas Abthorpe		| FreeBSD Committer
 tabthorpe at FreeBSD.org	| http://people.freebsd.org/~tabthorpe
 
 --Boundary-00=_fhJiIGQhMgAdMw3
 Content-Type: text/x-diff;
   charset="us-ascii";
   name="ph-makefileoptions.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
 	filename="ph-makefileoptions.patch"
 
 Index: book.sgml
 ===================================================================
 RCS file: /home/dcvs/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v
 retrieving revision 1.938
 diff -u -r1.938 book.sgml
 --- book.sgml	22 Jul 2008 13:48:03 -0000	1.938
 +++ book.sgml	24 Jul 2008 14:42:33 -0000
 @@ -3765,34 +3765,40 @@
  
  	      <tbody>
  	        <row>
 -		  <entry><makevar>WITH_APACHE2</makevar></entry>
 +		  <entry><makevar>USE_APACHE</makevar></entry>
  
 -		  <entry>If set, use
 +		  <entry>If set, uses
  		    <filename role="package">www/apache20</filename>
 -		    instead of the default of
 -		    <filename role="package">www/apache13</filename>.</entry>
 +		    as default.  It may be set with values
 +		    such as 13, 20, 21 or 22.
 +		   </entry>
  	        </row>
  
  	        <row>
 -		  <entry><makevar>WITH_BERKELEY_DB</makevar></entry>
 +		  <entry><makevar>USE_BDB</makevar></entry>
  
 -		  <entry>Define this variable to specify the ability to
 -		    use a variant of the Berkeley database package such as
 -		    <filename role="package">databases/db41</filename>.
 -		    An associated variable,
 +		  <entry>If set, uses
 +		    <filename role="package">databases/db41</filename>
 +		    as default.  An associated variable,
  		    <makevar>WITH_BDB_VER</makevar>, may be
 -		    set to values such as 2, 3, 4, 41 or 42.</entry>
 +		    set to values such as 2, 3, 40, 41 or 42, 43, 44, 45
 +		    46, or 47.  It is acceptable to set
 +		    <makevar>USE_BDB</makevar> with the
 +		    numeric values directly. You can declare
 +		    a range of acceptable values,
 +		    <makevar>USE_BDB</makevar>=42+ will find
 +		    the highest installed version, and fall back
 +		    to 42 if nothing else is installed.</entry>
  	        </row>
  
  	        <row>
 -		  <entry><makevar>WITH_MYSQL</makevar></entry>
 +		  <entry><makevar>USE_MYSQL</makevar></entry>
  
 -		  <entry>Define this variable to specify the ability to
 -		    use a variant of the MySQL database package such as
 -		    <filename role="package">databases/mysql40-server</filename>.
 -		    An associated variable,
 +		  <entry>If set, uses
 +		    <filename role="package">databases/mysql50-server</filename>
 +		    as default. An associated variable,
  		    <makevar>WANT_MYSQL_VER</makevar>, may be
 -		    set to values such as 323, 40, 41, or 50.</entry>
 +		    set to values such as 323, 40, 41, 50 or 51.</entry>
  	        </row>
  
  	        <row id="knobs-without-nls">
 @@ -3812,19 +3818,19 @@
  	        <row>
  		  <entry><makevar>WITH_OPENSSL_PORT</makevar></entry>
  
 -		  <entry>Use the version of OpenSSL from
 +		  <entry>Installs the version of OpenSSL from
  		    <filename role="package">security/openssl</filename>,
 -		    overwriting the version that was originally installed
 -		    in the base system.</entry>
 +		    even if the base is up to date.</entry>
  	        </row>
  
  	        <row>
 -		  <entry><makevar>WITH_POSTGRESQL</makevar></entry>
 +		  <entry><makevar>USE_PGSQL</makevar></entry>
  
 -		  <entry>Define this variable to specify the ability to
 -		    use a variant of the PostGreSQL database package such as
 -		    <filename role="package">databases/postgresql72</filename>.
 -		    </entry>
 +		  <entry>If set, uses
 +		    <filename role="package">databases/postgresql82</filename>
 +		    as default.  An associated variable,
 +		    <makevar>WANT_PGSQL_VER</makevar>, may be set to values
 +		    such as 73, 74, 80, 81, 82, or 83.</entry>
  	        </row>
  
  	        <row>
 
 --Boundary-00=_fhJiIGQhMgAdMw3--