# HG changeset patch
# User Craig Mohrman <craig.mohrman@oracle.com>
# Date 1346272513 25200
# Node ID 4e66174c21226002c43bf1fb4006ec8475d533a3
# Parent  f5d86984feecfd40cf6b8d0177e496970e6d3241
7189377 mediated link /etc/apache2/2.2/conf.d/php/php.conf missing

diff -r f5d86984feec -r 4e66174c2122 components/php-5_2/php-52.p5m
--- a/components/php-5_2/php-52.p5m	Thu Aug 23 22:53:50 2012 -0700
+++ b/components/php-5_2/php-52.p5m	Wed Aug 29 13:35:13 2012 -0700
@@ -464,3 +464,9 @@
 
 # force web/php-common onto the disk in case this package is installed/updated
 depend fmri=pkg:/web/php-common type=require
+
+# if php5.3's apache module is present then make sure
+# php5.2's apache module is installed
+depend type=conditional \
+    predicate=web/server/apache-22/module/apache-php53 \
+         fmri=web/server/apache-22/module/apache-php52
diff -r f5d86984feec -r 4e66174c2122 components/php-5_3/php-53.p5m
--- a/components/php-5_3/php-53.p5m	Thu Aug 23 22:53:50 2012 -0700
+++ b/components/php-5_3/php-53.p5m	Wed Aug 29 13:35:13 2012 -0700
@@ -498,3 +498,9 @@
 
 # if php5.2 is present drag forward because of /usr/php/* mediated links
 depend fmri=pkg:/web/php-52@5.2.17,$(BUILD_VERSION) type=optional
+
+# if php5.2's apache module is present then make sure
+# php5.3's apache module is installed
+depend type=conditional \
+    predicate=web/server/apache-22/module/apache-php52 \
+         fmri=web/server/apache-22/module/apache-php53
diff -r f5d86984feec -r 4e66174c2122 components/php-common/php.1.sunman
--- a/components/php-common/php.1.sunman	Thu Aug 23 22:53:50 2012 -0700
+++ b/components/php-common/php.1.sunman	Wed Aug 29 13:35:13 2012 -0700
@@ -110,6 +110,11 @@
 .PP
 pkg install web/php-53/documentation
 .PP
+Before and after installing check or set the value of PHP's pkg
+mediator to the default version desired:
+.PP
+pkg mediator
+.PP
 To set the default version of PHP change the pkg mediator value:
 .PP
 pkg set-mediator -V 5.3 php