From owner-freebsd-doc@FreeBSD.ORG Fri Mar 29 22:10:02 2013 Return-Path: Delivered-To: freebsd-doc@smarthost.ysv.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 889294DC for ; Fri, 29 Mar 2013 22:10:02 +0000 (UTC) (envelope-from gnats@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 6C3D8D5F for ; Fri, 29 Mar 2013 22:10:02 +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 r2TMA2Yf052379 for ; Fri, 29 Mar 2013 22:10:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r2TMA2dF052378; Fri, 29 Mar 2013 22:10:02 GMT (envelope-from gnats) Resent-Date: Fri, 29 Mar 2013 22:10:02 GMT Resent-Message-Id: <201303292210.r2TMA2dF052378@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-doc@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Olli Hauer 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 ; 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 ; 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 ; 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 To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: docs/177484: [patch] books/porters-handbook adjust apache versions X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Mar 2013 22:10:02 -0000 >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 @@ USE_APACHE The port requires Apache. Possible values: yes (gets any version), - 20, 22, - 20-22, 20+, + 22, 24, + 22-24, 22+, etc. The default APACHE version is 22. More details are available in ports/Mk/bsd.apache.mk and @@ -7454,12 +7454,6 @@ - WITH_APACHE2 - This variable is deprecated and should - not be used any more. - - - APXS Full path to the apxs binary. Can be overridden in your port. @@ -7477,8 +7471,8 @@ (read-only variable). This variable is only available after inclusion of bsd.port.pre.mk. Possible - values: 20, - 22. + values: 22, + 24. 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 @@ Порт требует Apache. Возможные значения: yes (берёт любую версию), - 20, 22, - 20-22, 20+ + 22, 24, + 22-24, 22+ и так далее. Версия по умолчанию 22. Более подробная информация содержится в файле @@ -6963,13 +6963,6 @@ - WITH_APACHE2 - - Эта переменная является - устаревшей и не должна больше использоваться. - - - APXS Полный путь к исполняемому файлу apxs. @@ -6989,7 +6982,7 @@ Версия установленного Apache (переменная только для чтения). Эта переменная доступна только после подключения bsd.port.pre.mk. Возможные значения: - 20, 22. + 22, 24. --- apache.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: