From ohauer@FreeBSD.org  Sun Jul  8 12:57:10 2012
Return-Path: <ohauer@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 827441065670
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  8 Jul 2012 12:57:10 +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 6C65C8FC0C
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  8 Jul 2012 12:57:10 +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 q68CvAFi089474
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 8 Jul 2012 12:57:10 GMT
	(envelope-from ohauer@freefall.freebsd.org)
Received: (from ohauer@localhost)
	by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q68CvAZK089473;
	Sun, 8 Jul 2012 12:57:10 GMT
	(envelope-from ohauer)
Message-Id: <201207081257.q68CvAZK089473@freefall.freebsd.org>
Date: Sun, 8 Jul 2012 12:57:10 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 apache section
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         169708
>Category:       docs
>Synopsis:       [patch] porters-handbook apache section
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gjb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 08 13:00:19 UTC 2012
>Closed-Date:    Sun Jul 08 13:29:08 UTC 2012
>Last-Modified:  Sun Jul  8 13:30:06 UTC 2012
>Originator:     Olli Hauer <ohauer@FreeBSD.org>
>Release:        
>Organization:
>Environment:

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

>How-To-Repeat:

>Fix:
http://people.freebsd.org/~ohauer/diffs/porters-handbook/en_US.ISO8859-1.diff


--- en_US.ISO8859-1.diff begins here ---
Index: en_US.ISO8859-1/books/porters-handbook/book.sgml
===================================================================
--- en_US.ISO8859-1/books/porters-handbook/book.sgml	(revision 39183)
+++ en_US.ISO8859-1/books/porters-handbook/book.sgml	(working copy)
@@ -6987,17 +6987,20 @@
 		<entry><makevar>USE_APACHE</makevar></entry>
 		<entry>The port requires Apache.  Possible values:
 		  <literal>yes</literal> (gets any version),
-		  <literal>2.0</literal>, <literal>2.2</literal>,
-		  <literal>2.0+</literal>, etc.
-		  Default dependency is on version
-		  <literal>2.2</literal>.</entry>
+		  <literal>20</literal>, <literal>22</literal>,
+		  <literal>20-22</literal>, <literal>20+</literal>,
+		  etc. Default APACHE version is
+		  <literal>22</literal>.</entry>
+		<entry>More details are available in
+		  <filename>bsd.apache.mk</filename> and on
+		  <ulink url="http://wiki.freebsd.org/Apache/"></ulink>
+		</entry>
 	      </row>
 
 	      <row>
 		<entry><makevar>WITH_APACHE2</makevar></entry>
 		<entry>This variable is deprecated and should
-		  not be used
-		  any more.</entry>
+		  not be used any more.</entry>
 	      </row>
 
 	      <row>
--- en_US.ISO8859-1.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-doc->gjb 
Responsible-Changed-By: gjb 
Responsible-Changed-When: Sun Jul 8 13:07:20 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=169708 
State-Changed-From-To: open->closed 
State-Changed-By: gjb 
State-Changed-When: Sun Jul 8 13:28:49 UTC 2012 
State-Changed-Why:  
Committed, thanks! 


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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/169708: commit references a PR
Date: Sun,  8 Jul 2012 13:28:25 +0000 (UTC)

 Author: gjb
 Date: Sun Jul  8 13:28:10 2012
 New Revision: 39184
 URL: http://svn.freebsd.org/changeset/doc/39184
 
 Log:
   - Update _APACHE examples with erroneous '.' in version number.
   - Reference bsd.apache.mk and the Wiki page.
   
   PR:		169708
   Submitted by:	ohauer
 
 Modified:
   head/en_US.ISO8859-1/books/porters-handbook/book.sgml
 
 Modified: head/en_US.ISO8859-1/books/porters-handbook/book.sgml
 ==============================================================================
 --- head/en_US.ISO8859-1/books/porters-handbook/book.sgml	Fri Jul  6 23:54:47 2012	(r39183)
 +++ head/en_US.ISO8859-1/books/porters-handbook/book.sgml	Sun Jul  8 13:28:10 2012	(r39184)
 @@ -6987,10 +6987,14 @@ QT_COMPONENTS=	moc_build qmake_build rcc
  		<entry><makevar>USE_APACHE</makevar></entry>
  		<entry>The port requires Apache.  Possible values:
  		  <literal>yes</literal> (gets any version),
 -		  <literal>2.0</literal>, <literal>2.2</literal>,
 -		  <literal>2.0+</literal>, etc.
 -		  Default dependency is on version
 -		  <literal>2.2</literal>.</entry>
 +		  <literal>20</literal>, <literal>22</literal>,
 +		  <literal>20-22</literal>, <literal>20+</literal>,
 +		  etc. The default APACHE version is
 +		  <literal>22</literal>.</entry>
 +		<entry>More details are available in
 +		  <filename>ports/Mk/bsd.apache.mk</filename> and at
 +		  <ulink
 +		    url="http://wiki.freebsd.org/Apache/">.</ulink></entry>
  	      </row>
  
  	      <row>
 _______________________________________________
 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"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/169708: commit references a PR
Date: Sun,  8 Jul 2012 13:28:51 +0000 (UTC)

 Author: gjb
 Date: Sun Jul  8 13:28:37 2012
 New Revision: 39185
 URL: http://svn.freebsd.org/changeset/doc/39185
 
 Log:
   Wrap line, followup from previous commit.
   
   Translators, please ignore.
   
   PR:		169708
   Submitted by:	ohauer
 
 Modified:
   head/en_US.ISO8859-1/books/porters-handbook/book.sgml
 
 Modified: head/en_US.ISO8859-1/books/porters-handbook/book.sgml
 ==============================================================================
 --- head/en_US.ISO8859-1/books/porters-handbook/book.sgml	Sun Jul  8 13:28:10 2012	(r39184)
 +++ head/en_US.ISO8859-1/books/porters-handbook/book.sgml	Sun Jul  8 13:28:37 2012	(r39185)
 @@ -7000,8 +7000,7 @@ QT_COMPONENTS=	moc_build qmake_build rcc
  	      <row>
  		<entry><makevar>WITH_APACHE2</makevar></entry>
  		<entry>This variable is deprecated and should
 -		  not be used
 -		  any more.</entry>
 +		  not be used any more.</entry>
  	      </row>
  
  	      <row>
 _______________________________________________
 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:
