--- a/components/perl_modules/authen-pam/authen-pam-PERLVER.p5m	Fri Jan 23 17:31:40 2015 -0800
+++ b/components/perl_modules/authen-pam/authen-pam-PERLVER.p5m	Tue Feb 03 19:24:25 2015 -0800
@@ -18,7 +18,7 @@
 #
 # 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 depend pkg.debug.depend.path=usr.*/5.12-mt/bin ->  set pkg.debug.depend.file perl-threaded>
@@ -32,21 +32,19 @@
 <transform set name=pkg.fmri value=(.*)512-mt(.+) -> set value %<1>threaded-512%<2>>
 <transform depend fmri=(.*)512-mt(.*) -> set fmri %<1>threaded-512%<2>>
 <transform depend predicate=(.*)512-mt(.*) -> set predicate %<1>threaded-512%<2>>
-
-set name=pkg.fmri value=pkg:/library/perl-5/authen-pam-$(PLV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/library/perl-5/authen-pam-$(PLV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Authen::PAM - PAM Perl Module"
 set name=pkg.description value="the Authen::PAM Perl module for using PAM"
 set name=com.oracle.info.description value="the Authen::PAM Perl module"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
-    value="org.opensolaris.category.2008:Development/Perl"
+    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=PSARC/2013/345
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-license authen-pam.license license=Artistic
-
 #file path=usr/perl5/$(PERLVER)/lib/$(PERL_ARCH)/perllocal.pod
 file path=usr/perl5/$(PERLVER)/man/man3/Authen::PAM.3
 file path=usr/perl5/$(PERLVER)/man/man3/Authen::PAM::FAQ.3
@@ -55,11 +53,12 @@
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Authen/PAM/.packlist
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Authen/PAM/PAM.bs
 file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Authen/PAM/PAM.so
+license authen-pam.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
+depend type=require fmri=__TBD pkg.debug.depend.file=perl \
+    pkg.debug.depend.path=usr/perl5/$(PERLVER)/bin
 
 # force a dependency on the authen-pam package
-depend fmri=library/perl-5/authen-pam@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    type=require 
+depend type=require \
+    fmri=library/perl-5/authen-pam@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)