--- a/components/autoconf/autoconf.p5m Tue Feb 03 12:52:16 2015 -0800
+++ b/components/autoconf/autoconf.p5m Tue Feb 03 13:01:27 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,29 +27,13 @@
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)
-dir path=usr
-dir path=usr/bin
-dir path=usr/sfw
-dir path=usr/sfw/bin
-dir path=usr/share
-dir path=usr/share/autoconf
-dir path=usr/share/autoconf/Autom4te
-dir path=usr/share/autoconf/autoconf
-dir path=usr/share/autoconf/autoscan
-dir path=usr/share/autoconf/autotest
-dir path=usr/share/autoconf/m4sugar
-dir path=usr/share/emacs
-dir path=usr/share/emacs/site-lisp
-dir path=usr/share/info
-dir path=usr/share/man
-dir path=usr/share/man/man1
+dir path=usr
+dir path=usr/bin
file path=usr/bin/autoconf
file path=usr/bin/autoheader
file path=usr/bin/autom4te
@@ -57,6 +41,18 @@
file path=usr/bin/autoscan
file path=usr/bin/autoupdate
file path=usr/bin/ifnames
+dir path=usr/sfw
+dir path=usr/sfw/bin
+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
+dir path=usr/share
+dir path=usr/share/autoconf
+dir path=usr/share/autoconf/Autom4te
file path=usr/share/autoconf/Autom4te/C4che.pm
file path=usr/share/autoconf/Autom4te/ChannelDefs.pm
file path=usr/share/autoconf/Autom4te/Channels.pm
@@ -67,6 +63,7 @@
file path=usr/share/autoconf/Autom4te/Struct.pm
file path=usr/share/autoconf/Autom4te/XFile.pm
file path=usr/share/autoconf/INSTALL
+dir path=usr/share/autoconf/autoconf
file path=usr/share/autoconf/autoconf/autoconf.m4
file path=usr/share/autoconf/autoconf/autoconf.m4f
file path=usr/share/autoconf/autoconf/autoheader.m4
@@ -87,23 +84,31 @@
file path=usr/share/autoconf/autoconf/status.m4
file path=usr/share/autoconf/autoconf/types.m4
file path=usr/share/autoconf/autom4te.cfg
+dir path=usr/share/autoconf/autoscan
file path=usr/share/autoconf/autoscan/autoscan.list
+dir path=usr/share/autoconf/autotest
file path=usr/share/autoconf/autotest/autotest.m4
file path=usr/share/autoconf/autotest/autotest.m4f
file path=usr/share/autoconf/autotest/general.m4
file path=usr/share/autoconf/autotest/specific.m4
+dir path=usr/share/autoconf/m4sugar
file path=usr/share/autoconf/m4sugar/foreach.m4
file path=usr/share/autoconf/m4sugar/m4sh.m4
file path=usr/share/autoconf/m4sugar/m4sh.m4f
file path=usr/share/autoconf/m4sugar/m4sugar.m4
file path=usr/share/autoconf/m4sugar/m4sugar.m4f
file path=usr/share/autoconf/m4sugar/version.m4
+dir path=usr/share/emacs
+dir path=usr/share/emacs/site-lisp
file path=usr/share/emacs/site-lisp/autoconf-mode.el
file path=usr/share/emacs/site-lisp/autoconf-mode.elc
file path=usr/share/emacs/site-lisp/autotest-mode.el
file path=usr/share/emacs/site-lisp/autotest-mode.elc
+dir path=usr/share/info
file path=usr/share/info/autoconf.info
file path=usr/share/info/standards.info
+dir path=usr/share/man
+dir path=usr/share/man/man1
file path=usr/share/man/man1/autoconf.1
file path=usr/share/man/man1/autoheader.1
file path=usr/share/man/man1/autom4te.1
@@ -114,12 +119,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