diff -r 7b09b73a67a4 -r 0f62cc221c7e components/perl_modules/DBI/DBI-PERLVER.p5m
--- a/components/perl_modules/DBI/DBI-PERLVER.p5m	Fri Jan 23 17:31:40 2015 -0800
+++ b/components/perl_modules/DBI/DBI-PERLVER.p5m	Tue Feb 03 19:24:25 2015 -0800
@@ -18,33 +18,25 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
 <transform file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/DBI/.*\.h$ -> default facet.devel all>
-
-set name=pkg.fmri value=pkg:/library/perl-5/database-$(PLV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/library/perl-5/database-$(PLV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Perl Database Independent Interface"
-set name=pkg.description value="The DBI is the standard database interface module for Perl."
-set name=com.oracle.info.description value="the Perl Database Independent interface"
+set name=pkg.description \
+    value="The DBI is the standard database interface module for Perl."
+set name=com.oracle.info.description \
+    value="the Perl Database Independent interface"
 set name=com.oracle.info.tpno value=$(TPNO)
-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.arc-caseid value=LSARC/2007/431
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license DBI.license license="Artistic"
-
-# force a dependency on the Perl runtime
-depend fmri=__TBD pkg.debug.depend.file=perl \
-	pkg.debug.depend.path=usr/perl5/$(PERLVER)/bin type=require
-
-# force a dependency on the DBI package
-depend fmri=library/perl-5/database@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    type=require
-
 file path=usr/perl5/$(PERLVER)/bin/dbilogstrip
 file path=usr/perl5/$(PERLVER)/bin/dbiprof
 file path=usr/perl5/$(PERLVER)/bin/dbiproxy
@@ -164,3 +156,12 @@
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/DBI/dbivport.h
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/DBI/dbixs_rev.h
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/dbixs_rev.pl
+license DBI.license license=Artistic
+
+# force a dependency on the Perl runtime
+depend type=require fmri=__TBD pkg.debug.depend.file=perl \
+    pkg.debug.depend.path=usr/perl5/$(PERLVER)/bin
+
+# force a dependency on the DBI package
+depend type=require \
+    fmri=library/perl-5/database@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)