--- a/components/perl_modules/xml-parser/xml-parser-512thread.p5m	Fri Jan 17 11:50:07 2014 -0800
+++ b/components/perl_modules/xml-parser/xml-parser-512thread.p5m	Fri Jan 17 16:32:15 2014 -0800
@@ -18,25 +18,25 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
-set name=pkg.fmri value=pkg:/library/perl-5/xml-parser-threaded-512@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="XML::Parser Threaded - A Threaded 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.  Threaded version."
-set name=info.classification value="org.opensolaris.category.2008:Development/Perl"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=pkg.fmri \
+    value=pkg:/library/perl-5/xml-parser-threaded-512@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="XML::Parser Threaded - A Threaded 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.  Threaded version."
+set name=com.oracle.info.description \
+    value="the Perl-5.12-threaded XML::Parser module"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Perl
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
-    value=LSARC/2004/251
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=LSARC/2004/251
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-license xml-parser.license license='Artistic'
-
-# This is additional support to base perl 5.12
-depend fmri=library/perl-5/xml-parser-512 type=require
-
 
 #file path=usr/perl5/5.12/lib/$(PERL_A)-solaris-thread-multi-64int/perllocal.pod
 file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/XML/Parser.pm
@@ -73,11 +73,15 @@
 file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/auto/XML/Parser/.packlist
 file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/auto/XML/Parser/Expat/Expat.bs
 file path=usr/perl5/vendor_perl/5.12/$(PERL_A)-solaris-thread-multi-64int/auto/XML/Parser/Expat/Expat.so
+license xml-parser.license license=Artistic
 
 # force a dependency on the Perl runtime
 depend type=require fmri=__TBD pkg.debug.depend.file=perl-threaded \
     pkg.debug.depend.path=usr/perl5/5.12/bin
 
+# This is additional support to base perl 5.12
+depend type=require fmri=library/perl-5/xml-parser-512
+
 # force a dependency on the xml-parser package
 depend type=require \
     fmri=library/perl-5/xml-parser@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)