docs/177484: [patch] books/porters-handbook adjust apache versions

[Olli Hauer]

>Number:         177484
>Category:       docs
>Synopsis:       [patch] books/porters-handbook adjust apache versions
>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:   Fri Mar 29 22:10:02 UTC 2013
>Closed-Date:
>Last-Modified:
>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:
>Unformatted: