--- a/components/php-5_3/php-xdebug.p5m	Fri Jan 23 17:31:40 2015 -0800
+++ b/components/php-5_3/php-xdebug.p5m	Tue Feb 03 19:24:25 2015 -0800
@@ -18,34 +18,31 @@
 #
 # 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/php-53/extension/[email protected],$(BUILD_VERSION)
-set name=pkg.description \
-    value="PHP-XDebug extension for debugging PHP"
+set name=pkg.fmri \
+    value=pkg:/web/php-53/extension/[email protected],$(BUILD_VERSION)
 set name=pkg.summary value="XDebug extension module for PHP"
-set name=info.classification \
-    value="org.opensolaris.category.2008:Development/PHP"
+set name=pkg.description value="PHP-XDebug extension for debugging 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://xdebug.org/files/xdebug-2.2.0.tgz
 set name=info.upstream-url value=http://xdebug.org/
 set name=org.opensolaris.arc-caseid value=PSARC/2012/067
 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-xdebug.license license='PHP, Xdebug' \
-    com.oracle.info.description="the XDebug extension module for PHP" \
-    com.oracle.info.name=php-xdebug \
-    com.oracle.info.version=2.2.0 \
-    com.oracle.info.tpno=$(TPNO_PHP_XDEBUG)
-
 file path=etc/php/5.3/conf.d/xdebug.ini mode=0644 preserve=renamenew
 file path=etc/php/5.3/zts-conf.d/xdebug.ini mode=0644 preserve=renamenew
 file path=usr/php/5.3/modules/xdebug.so
 file path=usr/php/5.3/zts-modules/xdebug.so
 
+
+license php-xdebug.license license="PHP, Xdebug" \
+    com.oracle.info.description="the XDebug extension module for PHP" \
+    com.oracle.info.name=php-xdebug com.oracle.info.tpno=$(TPNO_PHP_XDEBUG) \
+    com.oracle.info.version=2.2.0
+
 # need generic dependency on PHP itself
-depend fmri=web/php-53@$(COMPONENT_VERSION) type=require
+depend type=require fmri=web/php-53@$(COMPONENT_VERSION)