From ohauer@FreeBSD.org  Fri Mar 29 22:07:30 2013
Return-Path: <ohauer@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id E0A864A2
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 29 Mar 2013 22:07:30 +0000 (UTC)
	(envelope-from ohauer@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87])
	by mx1.freebsd.org (Postfix) with ESMTP id D23B7D4D
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 29 Mar 2013 22:07:30 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r2TM7URk052269
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 29 Mar 2013 22:07:30 GMT
	(envelope-from ohauer@freefall.freebsd.org)
Received: (from ohauer@localhost)
	by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r2TM7UVa052268;
	Fri, 29 Mar 2013 22:07:30 GMT
	(envelope-from ohauer)
Message-Id: <201303292207.r2TM7UVa052268@freefall.freebsd.org>
Date: Fri, 29 Mar 2013 22:07:30 GMT
From: Olli Hauer <ohauer@FreeBSD.org>
Reply-To:
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] books/porters-handbook adjust apache versions
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         177484
>Category:       docs
>Synopsis:       [patch] books/porters-handbook adjust apache versions
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pluknet
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 29 22:10:02 UTC 2013
>Closed-Date:    Sat Jun 08 15:46:05 UTC 2013
>Last-Modified:  Sat Jun  8 15:50:00 UTC 2013
>Originator:     Olli Hauer
>Release:        
>Organization:
>Environment:

>Description:
- adjust apache version in PH and name in handbook
- remove deprecated USE_APACHE2

>How-To-Repeat:

>Fix:


--- apache.diff begins here ---
Index: en_US.ISO8859-1/books/handbook/ports/chapter.xml
===================================================================
--- en_US.ISO8859-1/books/handbook/ports/chapter.xml	(revision 41322)
+++ en_US.ISO8859-1/books/handbook/ports/chapter.xml	(working copy)
@@ -1701,8 +1701,8 @@
 ===>>> 7 root ports
 ...
 ===>>> Branch ports (Have dependencies, are depended on)
-===>>> apache-2.2.3
-        ===>>> New version available: apache-2.2.8
+===>>> apache22-2.2.3
+        ===>>> New version available: apache22-2.2.8
 ...
 ===>>> Leaf ports (Have dependencies, not depended on)
 ===>>> automake-1.9.6_2
Index: en_US.ISO8859-1/books/porters-handbook/book.xml
===================================================================
--- en_US.ISO8859-1/books/porters-handbook/book.xml	(revision 41322)
+++ en_US.ISO8859-1/books/porters-handbook/book.xml	(working copy)
@@ -7444,8 +7444,8 @@
 		<entry><makevar>USE_APACHE</makevar></entry>
 		<entry>The port requires Apache.  Possible values:
 		  <literal>yes</literal> (gets any version),
-		  <literal>20</literal>, <literal>22</literal>,
-		  <literal>20-22</literal>, <literal>20+</literal>,
+		  <literal>22</literal>, <literal>24</literal>,
+		  <literal>22-24</literal>, <literal>22+</literal>,
 		  etc.  The default APACHE version is
 		  <literal>22</literal>.  More details are available
 		  in <filename>ports/Mk/bsd.apache.mk</filename> and
@@ -7454,12 +7454,6 @@
 	      </row>
 
 	      <row>
-		<entry><makevar>WITH_APACHE2</makevar></entry>
-		<entry>This variable is deprecated and should
-		  not be used any more.</entry>
-	      </row>
-
-	      <row>
 		<entry><makevar>APXS</makevar></entry>
 		<entry>Full path to the <command>apxs</command>
 		  binary.  Can be overridden in your port.</entry>
@@ -7477,8 +7471,8 @@
 		  (read-only variable).  This variable is only
 		  available after inclusion of
 		  <filename>bsd.port.pre.mk</filename>.  Possible
-		  values: <literal>20</literal>,
-		  <literal>22</literal>.</entry>
+		  values: <literal>22</literal>,
+		  <literal>24</literal>.</entry>
 	      </row>
 
 	      <row>
Index: ru_RU.KOI8-R/books/porters-handbook/book.xml
===================================================================
--- ru_RU.KOI8-R/books/porters-handbook/book.xml	(revision 41322)
+++ ru_RU.KOI8-R/books/porters-handbook/book.xml	(working copy)
@@ -6952,8 +6952,8 @@
 
 		<entry>  Apache.   :
 		  <literal>yes</literal> (ң  ),
-		  <literal>20</literal>, <literal>22</literal>,
-		  <literal>20-22</literal>, <literal>20+</literal>
+		  <literal>22</literal>, <literal>24</literal>,
+		  <literal>22-24</literal>, <literal>22+</literal>
 		    .    
 		  <literal>22</literal>.    
 		    
@@ -6963,13 +6963,6 @@
 	      </row>
 
 	      <row>
-		<entry><makevar>WITH_APACHE2</makevar></entry>
-
-		<entry>  
-		       .</entry>
-	      </row>
-
-	      <row>
 		<entry><makevar>APXS</makevar></entry>
 
 		<entry>     <command>apxs</command>.
@@ -6989,7 +6982,7 @@
 		<entry>  Apache (  
 		  ).       
 		  <filename>bsd.port.pre.mk</filename>.   :
-		  <literal>20</literal>, <literal>22</literal>.</entry>
+		  <literal>22</literal>, <literal>24</literal>.</entry>
 	      </row>
 
 	      <row>
--- apache.diff ends here ---


>Release-Note:
>Audit-Trail:

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/177484: commit references a PR
Date: Sat,  8 Jun 2013 15:32:04 +0000 (UTC)

 Author: pluknet
 Date: Sat Jun  8 15:31:51 2013
 New Revision: 41876
 URL: http://svnweb.freebsd.org/changeset/doc/41876
 
 Log:
   Fix apache22 package name in portmaster example.
   
   PR:		docs/177484
   Submitted by:	ohauer
 
 Modified:
   head/en_US.ISO8859-1/books/handbook/ports/chapter.xml
 
 Modified: head/en_US.ISO8859-1/books/handbook/ports/chapter.xml
 ==============================================================================
 --- head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Sat Jun  8 14:33:04 2013	(r41875)
 +++ head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Sat Jun  8 15:31:51 2013	(r41876)
 @@ -1711,8 +1711,8 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/
  ===>>> 7 root ports
  ...
  ===>>> Branch ports (Have dependencies, are depended on)
 -===>>> apache-2.2.3
 -        ===>>> New version available: apache-2.2.8
 +===>>> apache22-2.2.3
 +        ===>>> New version available: apache22-2.2.8
  ...
  ===>>> Leaf ports (Have dependencies, not depended on)
  ===>>> automake-1.9.6_2
 _______________________________________________
 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"
 
State-Changed-From-To: open->closed 
State-Changed-By: pluknet 
State-Changed-When: Sat Jun 8 15:44:28 UTC 2013 
State-Changed-Why:  
Committed, thanks! I'll resync PH in ru_RU.KOI8-R later. 


Responsible-Changed-From-To: freebsd-doc->pluknet 
Responsible-Changed-By: pluknet 
Responsible-Changed-When: Sat Jun 8 15:44:28 UTC 2013 
Responsible-Changed-Why:  
Mine. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/177484: commit references a PR
Date: Sat,  8 Jun 2013 15:43:50 +0000 (UTC)

 Author: pluknet
 Date: Sat Jun  8 15:43:43 2013
 New Revision: 41877
 URL: http://svnweb.freebsd.org/changeset/doc/41877
 
 Log:
   - Adjust apache versions
   - Remove deprecated (and dead) USE_APACHE2
   
   PR:		docs/177484
   Submitted by:	ohauer
 
 Modified:
   head/en_US.ISO8859-1/books/porters-handbook/book.xml
 
 Modified: head/en_US.ISO8859-1/books/porters-handbook/book.xml
 ==============================================================================
 --- head/en_US.ISO8859-1/books/porters-handbook/book.xml	Sat Jun  8 15:31:51 2013	(r41876)
 +++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Sat Jun  8 15:43:43 2013	(r41877)
 @@ -7373,8 +7373,8 @@ USE_QT4=	moc_build qmake_build rcc_build
  		<entry><makevar>USE_APACHE</makevar></entry>
  		<entry>The port requires Apache.  Possible values:
  		  <literal>yes</literal> (gets any version),
 -		  <literal>20</literal>, <literal>22</literal>,
 -		  <literal>20-22</literal>, <literal>20+</literal>,
 +		  <literal>22</literal>, <literal>24</literal>,
 +		  <literal>22-24</literal>, <literal>22+</literal>,
  		  etc.  The default APACHE version is
  		  <literal>22</literal>.  More details are available
  		  in <filename>ports/Mk/bsd.apache.mk</filename> and
 @@ -7383,12 +7383,6 @@ USE_QT4=	moc_build qmake_build rcc_build
  	      </row>
  
  	      <row>
 -		<entry><makevar>WITH_APACHE2</makevar></entry>
 -		<entry>This variable is deprecated and should
 -		  not be used any more.</entry>
 -	      </row>
 -
 -	      <row>
  		<entry><makevar>APXS</makevar></entry>
  		<entry>Full path to the <command>apxs</command>
  		  binary.  Can be overridden in your port.</entry>
 @@ -7406,8 +7400,8 @@ USE_QT4=	moc_build qmake_build rcc_build
  		  (read-only variable).  This variable is only
  		  available after inclusion of
  		  <filename>bsd.port.pre.mk</filename>.  Possible
 -		  values: <literal>20</literal>,
 -		  <literal>22</literal>.</entry>
 +		  values: <literal>22</literal>,
 +		  <literal>24</literal>.</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:
