--- a/components/libtool/libtool.p5m	Fri Jan 23 17:31:40 2015 -0800
+++ b/components/libtool/libtool.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/share/man/.+$ -> set mangler.man.stability 'uncommitted (obsolete)' >
@@ -27,12 +27,10 @@
 set name=pkg.summary value="GNU libtool"
 set name=com.oracle.info.description value="GNU libtool"
 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/557
+set name=org.opensolaris.arc-caseid value=PSARC/2007/557
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 
@@ -46,11 +44,11 @@
 file path=usr/include/ltdl.h
 file path=usr/share/aclocal/argz.m4
 file path=usr/share/aclocal/libtool.m4
-file path=usr/share/aclocal/lt~obsolete.m4
 file path=usr/share/aclocal/ltdl.m4
 file path=usr/share/aclocal/ltoptions.m4
 file path=usr/share/aclocal/ltsugar.m4
 file path=usr/share/aclocal/ltversion.m4
+file path=usr/share/aclocal/lt~obsolete.m4
 file path=usr/share/info/libtool.info
 file path=usr/share/info/libtool.info-1
 file path=usr/share/info/libtool.info-2
@@ -61,13 +59,17 @@
 file path=usr/share/libtool/config/install-sh
 file path=usr/share/libtool/config/ltmain.sh
 file path=usr/share/libtool/config/missing
+file path=usr/share/libtool/libltdl/COPYING.LIB
+file path=usr/share/libtool/libltdl/Makefile.am
+file path=usr/share/libtool/libltdl/Makefile.in
+file path=usr/share/libtool/libltdl/Makefile.inc
+file path=usr/share/libtool/libltdl/README
 file path=usr/share/libtool/libltdl/aclocal.m4
+file path=usr/share/libtool/libltdl/argz.c
 file path=usr/share/libtool/libltdl/argz_.h
-file path=usr/share/libtool/libltdl/argz.c
 file path=usr/share/libtool/libltdl/config-h.in
 file path=usr/share/libtool/libltdl/configure
 file path=usr/share/libtool/libltdl/configure.ac
-file path=usr/share/libtool/libltdl/COPYING.LIB
 file path=usr/share/libtool/libltdl/libltdl/lt__alloc.h
 file path=usr/share/libtool/libltdl/libltdl/lt__dirent.h
 file path=usr/share/libtool/libltdl/libltdl/lt__glibc.h
@@ -91,18 +93,12 @@
 file path=usr/share/libtool/libltdl/lt_error.c
 file path=usr/share/libtool/libltdl/ltdl.c
 file path=usr/share/libtool/libltdl/ltdl.h
-file path=usr/share/libtool/libltdl/Makefile.am
-file path=usr/share/libtool/libltdl/Makefile.in
-file path=usr/share/libtool/libltdl/Makefile.inc
-file path=usr/share/libtool/libltdl/README
 file path=usr/share/libtool/libltdl/slist.c
 file path=usr/share/man/man1/libtool.1
 file path=usr/share/man/man1/libtoolize.1
-
-depend fmri=__TBD pkg.debug.depend.file=usr/bin/ggrep type=require
-depend fmri=__TBD pkg.debug.depend.file=usr/bin/gsed type=require
-depend fmri=__TBD pkg.debug.depend.file=usr/bin/ld type=require
-depend fmri=__TBD pkg.debug.depend.file=usr/bin/nm type=require
-depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/echo type=require
-
 license libtool.license license="GPLv2, FDLv1.3"
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/ggrep
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/gsed
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/ld
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/nm
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/echo