--- a/components/perl_modules/xml-parser/xml-parser.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/perl_modules/xml-parser/xml-parser.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -18,29 +18,32 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 # The version is specifically set to 5.8.4 until there is a version that it
 # greater than this due to the way xml-parser was originally delivered from
 # the desktop consolidation.
 set name=pkg.fmri value=pkg:/library/perl-5/[email protected],$(BUILD_VERSION)
-set name=pkg.summary value="XML::Parser - A perl module for parsing XML documents"
-set name=pkg.description value="This module provides ways to parse XML documents. It is built on top of XML::Parser::Expat."
+set name=pkg.summary \
+    value="XML::Parser - A perl module for parsing XML documents"
+set name=pkg.description \
+    value="This module provides ways to parse XML documents. It is built on top of XML::Parser::Expat."
 set name=com.oracle.info.description value="the XML::Parser Perl module"
-set name=info.classification value="org.opensolaris.category.2008:Development/Perl"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Perl
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+legacy pkg=SUNWperl-xml-parser \
+    desc="Perl XML::Parser and XML::Simple PERL modules - development files" \
+    name="Perl XML::Parser and XML::Simple PERL modules"
+# perl 5.12
+depend type=conditional fmri=library/perl-5/xml-parser-512 \
+    predicate=runtime/perl-512
 # perl 5.8.4
-depend fmri=library/perl-5/xml-parser-584 predicate=runtime/perl-584 \
-    type=conditional
-# perl 5.12
-depend fmri=library/perl-5/xml-parser-512 predicate=runtime/perl-512 \
-    type=conditional
+depend type=conditional fmri=library/perl-5/xml-parser-584 \
+    predicate=runtime/perl-584
 # perl 5.12 threaded
-depend fmri=library/perl-5/xml-parser-threaded-512 predicate=runtime/perl-threaded-512 \
-    type=conditional
-legacy pkg=SUNWperl-xml-parser \
-	desc="Perl XML::Parser and XML::Simple PERL modules - development files" \
-	name="Perl XML::Parser and XML::Simple PERL modules"
+depend type=conditional fmri=library/perl-5/xml-parser-threaded-512 \
+    predicate=runtime/perl-threaded-512