--- a/components/autoconf/autoconf.p5m	Fri Jan 23 17:31:40 2015 -0800
+++ b/components/autoconf/autoconf.p5m	Tue Feb 03 19:24:25 2015 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,12 +27,10 @@
 set name=pkg.summary value="GNU autoconf utility"
 set name=com.oracle.info.description value="GNU autoconf"
 set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification \
-    value=org.opensolaris.category.2008:Development/GNU
+set name=info.classification value=org.opensolaris.category.2008:Development/GNU
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2007/424
+set name=org.opensolaris.arc-caseid value=PSARC/2007/424
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file path=usr/bin/autoconf
 file path=usr/bin/autoheader
@@ -41,6 +39,13 @@
 file path=usr/bin/autoscan
 file path=usr/bin/autoupdate
 file path=usr/bin/ifnames
+link path=usr/sfw/bin/autoconf target=../../bin/autoconf
+link path=usr/sfw/bin/autoheader target=../../bin/autoheader
+link path=usr/sfw/bin/autom4te target=../../bin/autom4te
+link path=usr/sfw/bin/autoreconf target=../../bin/autoreconf
+link path=usr/sfw/bin/autoscan target=../../bin/autoscan
+link path=usr/sfw/bin/autoupdate target=../../bin/autoupdate
+link path=usr/sfw/bin/ifnames target=../../bin/ifnames
 file path=usr/share/autoconf/Autom4te/C4che.pm
 file path=usr/share/autoconf/Autom4te/ChannelDefs.pm
 file path=usr/share/autoconf/Autom4te/Channels.pm
@@ -98,12 +103,4 @@
 file path=usr/share/man/man1/config.sub.1
 file path=usr/share/man/man1/ifnames.1
 license autoconf.license license="GPLv3, FDLv1.3"
-link path=usr/sfw/bin/autoconf target=../../bin/autoconf
-link path=usr/sfw/bin/autoheader target=../../bin/autoheader
-link path=usr/sfw/bin/autom4te target=../../bin/autom4te
-link path=usr/sfw/bin/autoreconf target=../../bin/autoreconf
-link path=usr/sfw/bin/autoscan target=../../bin/autoscan
-link path=usr/sfw/bin/autoupdate target=../../bin/autoupdate
-link path=usr/sfw/bin/ifnames target=../../bin/ifnames
-
-depend fmri=__TBD pkg.debug.depend.file=usr/bin/gm4 type=require
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/gm4