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

[Thomas Abthorpe]

>Number:         125907
>Category:       docs
>Synopsis:       Update makefiles options section of Porter's Handbook
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-doc
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 23 20:40:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Thomas Abthorpe
>Release:        FreeBSD 7.0-RELEASE-p2 i386
>Organization:
FreeBSD.GoodKing.Ca
>Environment:
System: FreeBSD goodking.goodking.ca 7.0-RELEASE-p2 FreeBSD 7.0-RELEASE-p2 #0: Wed Jun 18 07:33:20 UTC 2008 root at i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386


>Description:

- Update Table 5.2, WITH_APACHE, USE_BDB, WITH_MYSQL, WITH_OPENSSL_PORT and
  USE_PGSQL

>How-To-Repeat:
>Fix:

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	23 Jul 2008 20:15:35 -0000
@@ -3765,34 +3765,36 @@
 
 	      <tbody>
 	        <row>
-		  <entry><makevar>WITH_APACHE2</makevar></entry>
+		  <entry><makevar>WITH_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.  An associated variable,
+		    <makevar>APACHE_PORT</makevar>, may be set with values
+		    such as www/apache13, www/apache20, www/apache21,
+		    www/apache22.
+		   </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.</entry>
 	        </row>
 
 	        <row>
 		  <entry><makevar>WITH_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 +3814,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>

>Release-Note:
>Audit-Trail:
>Unformatted: