diff -r 1cc872b933c9 -r 24181f5eb463 components/php-5_2/php-tcpwrap.p5m
--- a/components/php-5_2/php-tcpwrap.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/php-5_2/php-tcpwrap.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -18,43 +18,39 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/web/php-52/extension/php-tcpwrap@1.1.3,$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/web/php-52/extension/php-tcpwrap@1.1.3,$(BUILD_VERSION)
 set name=pkg.summary value="Tcpwrap extension module for PHP"
-set name=info.classification \
-    value="org.opensolaris.category.2008:Development/PHP"
+set name=info.classification value=org.opensolaris.category.2008:Development/PHP
 set name=info.source-url value=http://pecl.php.net/get/tcpwrap-1.1.3.tgz
 set name=info.upstream-url value=http://pecl.php.net/package/tcpwrap
-set name=org.opensolaris.arc-caseid \
-    value=LSARC/2008/538
+set name=org.opensolaris.arc-caseid value=LSARC/2008/538
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license php-tcpwrap.license license='PHP' \
-    com.oracle.info.description="the Tcpwrap extension module for PHP" \
-    com.oracle.info.name=php-tcpwrap \
-    com.oracle.info.version=1.1.3 \
-    com.oracle.info.tpno=$(TPNO_PHP_TCPWRAP)
-
-dir path=etc
-dir path=etc/php
-dir path=etc/php/5.2
-dir path=etc/php/5.2/conf.d
-dir path=etc/php/5.2/zts-conf.d
-dir path=usr
-dir path=usr/php
-dir path=usr/php/5.2
-dir path=usr/php/5.2/modules
-dir path=usr/php/5.2/zts-modules
+dir  path=etc
+dir  path=etc/php
+dir  path=etc/php/5.2
+dir  path=etc/php/5.2/conf.d
 file path=etc/php/5.2/conf.d/tcpwrap.ini mode=0644 \
     original_name=SUNWphp52-tcpwrap:etc/php/5.2/conf.d/tcpwrap.ini \
     preserve=renamenew
+dir  path=etc/php/5.2/zts-conf.d
 file path=etc/php/5.2/zts-conf.d/tcpwrap.ini mode=0644 \
     original_name=SUNWphp52-tcpwrap:etc/php/5.2/zts-conf.d/tcpwrap.ini \
     preserve=renamenew
+dir  path=usr
+dir  path=usr/php
+dir  path=usr/php/5.2
+dir  path=usr/php/5.2/modules
 file path=usr/php/5.2/modules/tcpwrap.so
+dir  path=usr/php/5.2/zts-modules
 file path=usr/php/5.2/zts-modules/tcpwrap.so
+license php-tcpwrap.license license=PHP \
+    com.oracle.info.description="the Tcpwrap extension module for PHP" \
+    com.oracle.info.name=php-tcpwrap com.oracle.info.tpno=$(TPNO_PHP_TCPWRAP) \
+    com.oracle.info.version=1.1.3
 
 # need generic dependency on PHP itself
-depend fmri=web/php-52@5.2.17 type=require
+depend type=require fmri=web/php-52@5.2.17