--- a/components/php-5_2/php-idn.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/php-5_2/php-idn.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -18,42 +18,37 @@
 #
 # 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/[email protected],$(BUILD_VERSION)
 set name=pkg.summary value="IDN 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/idn-0.2.0.tgz
 set name=info.upstream-url value=http://pecl.php.net/package/idn
-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-idn.license license='PHP, GPLv2, LGPLv2, Apache v2.0' \
-    com.oracle.info.description="the IDN extension module for PHP" \
-    com.oracle.info.name=php-idn \
-    com.oracle.info.version=0.2.0 \
-    com.oracle.info.tpno=$(TPNO_PHP_IDN)
-
-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/idn.ini mode=0644 \
     original_name=SUNWphp52-idn:etc/php/5.2/conf.d/idn.ini preserve=renamenew
+dir  path=etc/php/5.2/zts-conf.d
 file path=etc/php/5.2/zts-conf.d/idn.ini mode=0644 \
     original_name=SUNWphp52-idn:etc/php/5.2/zts-conf.d/idn.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/idn.so
+dir  path=usr/php/5.2/zts-modules
 file path=usr/php/5.2/zts-modules/idn.so
+license php-idn.license license="PHP, GPLv2, LGPLv2, Apache v2.0" \
+    com.oracle.info.description="the IDN extension module for PHP" \
+    com.oracle.info.name=php-idn com.oracle.info.tpno=$(TPNO_PHP_IDN) \
+    com.oracle.info.version=0.2.0
 
 # need generic dependency on PHP itself
-depend fmri=web/[email protected] type=require
+depend type=require fmri=web/[email protected]