From 0adaa94e400e9a83b0e91c20322b7e4ecb6ded1c Mon Sep 17 00:00:00 2001
From: Daniel Gerzo <danger@FreeBSD.org>
Date: Fri, 25 Aug 2006 21:04:34 +0000
Subject: [PATCH] Update instructions for mod_php integration with apache web
 server.

Approved by: trhodes (mentor), keramida (mentor)
PR: 99723
---
 .../handbook/network-servers/chapter.sgml     | 36 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml b/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml
index 2013b83364..a2af2263af 100644
--- a/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml
@@ -4091,9 +4091,38 @@ DocumentRoot /www/someotherdomain.tld
 	<para>To gain support for <acronym>PHP</acronym>5 for the
 	  <application>Apache</application> web server, begin by
 	  installing the
-	  <filename role="package">www/mod_php5</filename>
+	  <filename role="package">lang/php5</filename>
 	  port.</para>
 
+	<para>If the <filename role="package">lang/php5</filename> port
+	  is being installed for the first time, available
+	  <literal>OPTIONS</literal> will be displayed automatically.
+	  If a menu is not displayed, i.e. because the <filename
+	  role="package">lang/php5</filename> port has been installed
+	  some time in the past, it is always possible to bring the
+	  options dialog up again by running:</para>
+
+	<screen>&prompt.root; <userinput>make config</userinput></screen>
+
+	<para>in the port directory.</para>
+
+	<para>In the options dialog, check the
+	  <literal>APACHE</literal> option to build
+	  <application>mod_php5</application> as a loadable module for
+	  the <application>Apache</application> web server.</para>
+
+	<note>
+	  <para>A lot of sites are still using <acronym>PHP</acronym>4
+	    for various reasons (i.e. compatibility issues or already
+	    deployed web applications).  If the
+	    <application>mod_php4</application> is needed instead of
+	    <application>mod_php5</application>, then please use the
+	    <filename role="package">lang/php4</filename> port.  The
+	    <filename role="package">lang/php4</filename> port supports
+	    many of the configuration and build-time options of the
+	    <filename role="package">lang/php5</filename> port.</para>
+	</note>
+
 	<para>This will install and configure the modules required
           to support dynamic <acronym>PHP</acronym> applications.  Check
           to ensure the following sections have been added to
@@ -4117,6 +4146,11 @@ DocumentRoot /www/someotherdomain.tld
 
 	<screen>&prompt.root; <userinput>apachectl graceful</userinput></screen>
 
+	<para>For future upgrades of <acronym>PHP</acronym>, the
+	  <command>make config</command> command will not be required;
+	  the selected <literal>OPTIONS</literal> are saved
+	  automatically by the &os; Ports framework.</para>
+
           <para>The <acronym>PHP</acronym> support in &os; is extremely
             modular so the base install is very limited.  It is very easy
             to add support using the