From tabthorpe@goodking.goodking.ca  Wed Jul 23 20:35:29 2008
Return-Path: <tabthorpe@goodking.goodking.ca>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 03DF41065677;
	Wed, 23 Jul 2008 20:35:29 +0000 (UTC)
	(envelope-from tabthorpe@goodking.goodking.ca)
Received: from rex.goodking.ca (cl-345.qas-01.us.sixxs.net [IPv6:2001:4830:1600:158::2])
	by mx1.freebsd.org (Postfix) with ESMTP id A179E8FC23;
	Wed, 23 Jul 2008 20:35:28 +0000 (UTC)
	(envelope-from tabthorpe@goodking.goodking.ca)
Received: from goodking.goodking.ca (goodking-rex-tun.goodking.ca [172.31.17.1])
	by rex.goodking.ca (8.14.3/8.14.3) with ESMTP id m6NKZOX8053244;
	Wed, 23 Jul 2008 16:35:25 -0400 (EDT)
	(envelope-from tabthorpe@goodking.goodking.ca)
Received: from goodking.goodking.ca (localhost [127.0.0.1])
	by goodking.goodking.ca (8.14.3/8.14.3) with ESMTP id m6NKZHq7059324;
	Wed, 23 Jul 2008 16:35:17 -0400 (EDT)
	(envelope-from tabthorpe@goodking.goodking.ca)
Received: (from tabthorpe@localhost)
	by goodking.goodking.ca (8.14.3/8.14.3/Submit) id m6NKZGSW059321;
	Wed, 23 Jul 2008 16:35:16 -0400 (EDT)
	(envelope-from tabthorpe)
Message-Id: <200807232035.m6NKZGSW059321@goodking.goodking.ca>
Date: Wed, 23 Jul 2008 16:35:16 -0400 (EDT)
From: Thomas Abthorpe <tabthorpe@freebsd.org>
Reply-To: Thomas Abthorpe <tabthorpe@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: miwi@freebsd.org
Subject: Update makefiles options section of Porter's Handbook
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         125907
>Category:       docs
>Synopsis:       [patch] Update makefiles options section of Porter's Handbook
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-doc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 23 20:40:00 UTC 2008
>Closed-Date:    Thu Jul 24 18:50:13 UTC 2008
>Last-Modified:  Thu Jul 24 19:00:13 UTC 2008
>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@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:

From: Pav Lucistnik <pav@FreeBSD.org>
To: bug-followup@FreeBSD.org, tabthorpe@FreeBSD.org
Cc:  
Subject: Re: docs/125907: [patch] Update makefiles options section of
	Porter's Handbook
Date: Thu, 24 Jul 2008 01:08:13 +0200

 I fear some of the changes in this patch are incorrect:
 
 - no WITH_APACHE recognized in Mk/*, I think WITH_APACHE2 was correct
 - USE_BDB can grok values directly, ie. USE_BDB=42 instead of
   USE_BDB=yes and WITH_BDB_VERSION=42. Also please mention ranges, ie.
   USE_BDB=45+
 - WITH_MYSQL should be replaced by USE_MYSQL
 
 -- 
 Pav Lucistnik <pav@oook.cz>
               <pav@FreeBSD.org>
 The answer to the all-encompassing question on life, the universe and
 everything: close windows and reboot.
 

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

 On Wednesday 23 July 2008 19:08:13 Pav Lucistnik wrote:
 > I fear some of the changes in this patch are incorrect:
 >
 > - no WITH_APACHE recognized in Mk/*, I think WITH_APACHE2 was correct
 > - USE_BDB can grok values directly, ie. USE_BDB=3D42 instead of
 > =A0 USE_BDB=3Dyes and WITH_BDB_VERSION=3D42. Also please mention ranges, =
 ie.
 > =A0 USE_BDB=3D45+
 > - WITH_MYSQL should be replaced by USE_MYSQL
 
 Thanks for the feedback, Pav. Looks that I need to wipe the sleep out of my=
 =20
 eyes before I hit the send button. Updated patch to follow.
 
 Thomas
 
 =2D-=20
 Thomas Abthorpe		| FreeBSD Committer
 tabthorpe@FreeBSD.org	| http://people.freebsd.org/~tabthorpe

From: Thomas Abthorpe <tabthorpe@freebsd.org>
To: bug-followup@freebsd.org,
 tabthorpe@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@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--

From: Pav Lucistnik <pav@FreeBSD.org>
To: Thomas Abthorpe <tabthorpe@FreeBSD.org>, bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/125907: [patch] Update makefiles options section of
	Porter's Handbook
Date: Thu, 24 Jul 2008 17:07:26 +0200

 More complaining below
 
 >  +		  <entry>If set, uses
 >   		    <filename role="package">www/apache20</filename>
 >  +		    as default.  It may be set with values
 >  +		    such as 13, 20, 21 or 22.
 
 "Uses www/apache20 as default." Default for what? Also, this accepts
 ranges so please document these. Especially 2.0+ is useful.
 (This accepts both 13, 20, and 1.3, 2.0, but I can't tell which is
 supposed to be preferred.)
 
 >  +		  <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, 40, 41 or 42, 43, 44, 45
 >  +		    46, or 47.  It is acceptable to set
 >  +		    <makevar>USE_BDB</makevar> with the
 >  +		    numeric values directly. 
 
 Please remove mentions of WITH_BDB_VER completely, it's deprecated way
 of doing things.
 
 -- 
 Pav Lucistnik <pav@oook.cz>
               <pav@FreeBSD.org>
 
 Video games don't affect kids, I mean if Pac Man affected us as kids,
 we'd all run around in a darkened room munching pills and listening to
 repetitive music.
   -- Kristian Wilson, CEO at Nintendo Gaming Corporation Inc

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

 --Boundary-00=_5WMiIoytvjBzMiH
 Content-Type: text/plain;
   charset="us-ascii"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 With more feedback, and further deliberation, take a slightly different 
 approach.
 
 - Highlight defaults if MYSQL/BDB/APACHE options are unset
 - Incorporate information regarding ports ranges for BDB/APACHE
 
 Please find attached my current patch
 
 
 Thomas
 -- 
 Thomas Abthorpe		| FreeBSD Committer
 tabthorpe@FreeBSD.org	| http://people.freebsd.org/~tabthorpe
 
 --Boundary-00=_5WMiIoytvjBzMiH
 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 17:32:08 -0000
 @@ -3765,34 +3765,38 @@
  
  	      <tbody>
  	        <row>
 -		  <entry><makevar>WITH_APACHE2</makevar></entry>
 +		  <entry><makevar>USE_APACHE</makevar></entry>
  
 -		  <entry>If set, use
 +		  <entry>If variable is not 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 1.3, 13,
 +		    2.0, 20, 2.1, 21 2.2 or 22. You can declare a range of
 +		    acceptable values, <makevar>USE_APACHE</makevar>=2.0+
 +		    will find the highest installed version, and fall back
 +		    to 2.0 if nothing else is installed.</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,
 -		    <makevar>WITH_BDB_VER</makevar>, may be
 -		    set to values such as 2, 3, 4, 41 or 42.</entry>
 +		  <entry>If variable is not set, uses
 +		    <filename role="package">databases/db41</filename>
 +		    as default.  It  may be set to values such as 2, 3, 
 +		    40, 41 or 42, 43, 44, 45 46, or 47.
 +		    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 variable is not 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 +3816,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=_5WMiIoytvjBzMiH--
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Thu Jul 24 18:47:05 UTC 2008 
State-Changed-Why:  
Committed with modifications, thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/125907: commit references a PR
Date: Thu, 24 Jul 2008 18:50:08 +0000 (UTC)

 pav         2008-07-24 18:50:00 UTC
 
   FreeBSD doc repository
 
   Modified files:
     en_US.ISO8859-1/books/porters-handbook book.sgml 
   Log:
   - Overhaul Makefile options section, and split USE_* flags into their own Using
     databases section under chapter 6.
   
   PR:             docs/125907 (based on)
   Submitted by:   tabthorpe
   
   Revision  Changes    Path
   1.939     +64 -48    doc/en_US.ISO8859-1/books/porters-handbook/book.sgml
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
