--- a/components/php-5_3/apache-php53.p5m	Fri Jan 23 17:31:40 2015 -0800
+++ b/components/php-5_3/apache-php53.p5m	Tue Feb 03 19:24:25 2015 -0800
@@ -18,33 +18,32 @@
 #
 # 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/apache-php53@$(COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/web/server/apache-22/module/apache-php53@$(COMPONENT_VERSION),$(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.source-url value=http://us.php.net/get/php-$(COMPONENT_VERSION).tar.gz/from/this/mirror
+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-$(COMPONENT_VERSION).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-php53.license license='PHP, GPLv2, LGPLv2, Apache v2.0' \
+link path=etc/apache2/2.2/conf.d/php/php.conf target=php5.3.conf mediator=php \
+    mediator-version=5.3
+file path=etc/apache2/2.2/conf.d/php/php5.3.conf mode=0644 preserve=renamenew
+file path=usr/apache2/2.2/libexec/mod_php5.3.so
+license apache-php53.license license="PHP, GPLv2, LGPLv2, Apache v2.0" \
     com.oracle.info.description="the PHP module for the Apache web server" \
-    com.oracle.info.name=apache-php53 \
-    com.oracle.info.version=$(COMPONENT_VERSION) \
-    com.oracle.info.tpno=$(TPNO_PHP_5_3)
-
-file path=etc/apache2/2.2/conf.d/php/php5.3.conf mode=0644 preserve=renamenew
-link path=etc/apache2/2.2/conf.d/php/php.conf target=php5.3.conf \
-    mediator=php mediator-version=5.3
-file path=usr/apache2/2.2/libexec/mod_php5.3.so
-
-# need generic dependency on PHP itself
-depend fmri=web/php-53@$(COMPONENT_VERSION) type=require
+    com.oracle.info.name=apache-php53 com.oracle.info.tpno=$(TPNO_PHP_5_3) \
+    com.oracle.info.version=$(COMPONENT_VERSION)
 
 # if php5.2 apache is present drag forward because php.conf files
 # move around
-depend \
-    fmri=pkg:/web/server/apache-22/module/[email protected] \
-    type=optional
+depend type=optional \
+    fmri=pkg:/web/server/apache-22/module/[email protected]
+
+# need generic dependency on PHP itself
+depend type=require fmri=web/php-53@$(COMPONENT_VERSION)