--- a/components/php-5_2/apache-php52.p5m	Fri Jan 23 17:31:40 2015 -0800
+++ b/components/php-5_2/apache-php52.p5m	Tue Feb 03 19:24:25 2015 -0800
@@ -18,36 +18,33 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
     value=pkg:/web/server/apache-22/module/[email protected],$(BUILD_VERSION)
 set name=pkg.summary value="PHP Server for Apache Web Server"
-set name=info.classification value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.source-url \
     value=http://us.php.net/get/php-5.2.17.tar.gz/from/this/mirror
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2012/067
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license apache-php52.license license='PHP, GPLv2, LGPLv2, Apache v2.0' \
-    com.oracle.info.description="the PHP 5.2 module for the Apache web server" \
-    com.oracle.info.name=apache-php52 \
-    com.oracle.info.version=5.2.17 \
-    com.oracle.info.tpno=$(TPNO_PHP_5_2)
-
+link path=etc/apache2/2.2/conf.d/php/php.conf target=php5.2.conf mediator=php \
+    mediator-version=5.2
 file path=etc/apache2/2.2/conf.d/php/php5.2.conf mode=0644 \
     original_name=SUNWapch22-php52:etc/apache2/2.2/conf.d/php5.2.conf \
     preserve=renamenew
-link path=etc/apache2/2.2/conf.d/php/php.conf target=php5.2.conf \
-    mediator=php mediator-version=5.2
-
 file path=usr/apache2/2.2/libexec/mod_php5.2.so
 link path=usr/apache2/2.2/libexec/mod_php5.so target=mod_php5.2.so
+license apache-php52.license license="PHP, GPLv2, LGPLv2, Apache v2.0" \
+    com.oracle.info.description="the PHP 5.2 module for the Apache web server" \
+    com.oracle.info.name=apache-php52 com.oracle.info.tpno=$(TPNO_PHP_5_2) \
+    com.oracle.info.version=5.2.17
 
 # depend on apache-php5 because this content came from there
-depend fmri=web/server/apache-22/module/[email protected] \
-    type=optional
+depend type=optional \
+    fmri=web/server/apache-22/module/[email protected]
 # need generic dependency on PHP itself
-depend fmri=web/[email protected] type=require
+depend type=require fmri=web/[email protected]