--- a/components/php-5_2/php-suhosin.p5m	Fri Jan 23 17:31:40 2015 -0800
+++ b/components/php-5_2/php-suhosin.p5m	Tue Feb 03 19:24:25 2015 -0800
@@ -18,29 +18,21 @@
 #
 # 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.fmri \
+    value=pkg:/web/php-52/extension/[email protected],$(BUILD_VERSION)
+set name=pkg.summary value="Suhosin extension module for PHP"
 set name=pkg.description value="PHP-Suhosin extension to secure PHP"
-set name=pkg.summary value="Suhosin extension module for PHP"
-set name=info.classification value="org.opensolaris.category.2008:Development/PHP"
+
+# This package name has known conflicts with other packages in the WOS
+set name=pkg.linted.pkglint.manifest004 value=true
+set name=info.classification value=org.opensolaris.category.2008:Development/PHP
 set name=info.source-url value=http://download.suhosin.org/suhosin-0.9.29.tgz
 set name=info.upstream-url value=http://www.hardened-php.net/suhosin/index.html
-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)
-
-# This package name has known conflicts with other packages in the WOS
-set pkg.linted.pkglint.manifest004=true
-
-
-license php-suhosin.license license='PHP, Apache v2.0' \
-    com.oracle.info.description="the Suhosin extension module for PHP" \
-    com.oracle.info.name=php-suhosin \
-    com.oracle.info.version=0.9.29 \
-    com.oracle.info.tpno=$(TPNO_PHP_SUHOSIN)
-
 file path=etc/php/5.2/conf.d/suhosin.ini mode=0644 \
     original_name=SUNWphp52-suhosin:etc/php/5.2/conf.d/suhosin.ini \
     preserve=renamenew
@@ -50,5 +42,11 @@
 file path=usr/php/5.2/modules/suhosin.so
 file path=usr/php/5.2/zts-modules/suhosin.so
 
+
+license php-suhosin.license license="PHP, Apache v2.0" \
+    com.oracle.info.description="the Suhosin extension module for PHP" \
+    com.oracle.info.name=php-suhosin com.oracle.info.tpno=$(TPNO_PHP_SUHOSIN) \
+    com.oracle.info.version=0.9.29
+
 # need generic dependency on PHP itself
-depend fmri=web/[email protected] type=require
+depend type=require fmri=web/[email protected]