--- a/components/bash/bash.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/bash/bash.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 volatile>
@@ -30,83 +30,29 @@
 set name=info.classification value=org.opensolaris.category.2008:System/Shells
 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/1999/555
+set name=org.opensolaris.arc-caseid value=PSARC/1999/555
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-dir path=etc
-dir path=etc/bash
-dir path=etc/bash/bash_completion.d
-dir path=etc/skel
-dir path=usr
-dir path=usr/bin
-dir path=usr/gnu
-dir path=usr/gnu/bin
-dir path=usr/share
-dir path=usr/share/bash
-dir path=usr/share/info
-dir path=usr/share/locale
-dir path=usr/share/locale/af
-dir path=usr/share/locale/af/LC_MESSAGES
-dir path=usr/share/locale/bg
-dir path=usr/share/locale/bg/LC_MESSAGES
-dir path=usr/share/locale/ca
-dir path=usr/share/locale/ca/LC_MESSAGES
-dir path=usr/share/locale/cs
-dir path=usr/share/locale/cs/LC_MESSAGES
-dir path=usr/share/locale/de
-dir path=usr/share/locale/de/LC_MESSAGES
-dir path=usr/share/locale/en
-dir path=usr/share/locale/en/LC_MESSAGES
-dir path=usr/share/locale/en_CA
-dir path=usr/share/locale/en_CA/LC_MESSAGES
-dir path=usr/share/locale/en_GB
-dir path=usr/share/locale/en_GB/LC_MESSAGES
-dir path=usr/share/locale/eo
-dir path=usr/share/locale/eo/LC_MESSAGES
-dir path=usr/share/locale/es
-dir path=usr/share/locale/es/LC_MESSAGES
-dir path=usr/share/locale/et
-dir path=usr/share/locale/et/LC_MESSAGES
-dir path=usr/share/locale/fr
-dir path=usr/share/locale/fr/LC_MESSAGES
-dir path=usr/share/locale/hu
-dir path=usr/share/locale/hu/LC_MESSAGES
-dir path=usr/share/locale/id
-dir path=usr/share/locale/id/LC_MESSAGES
-dir path=usr/share/locale/ja
-dir path=usr/share/locale/ja/LC_MESSAGES
-dir path=usr/share/locale/lt
-dir path=usr/share/locale/lt/LC_MESSAGES
-dir path=usr/share/locale/nl
-dir path=usr/share/locale/nl/LC_MESSAGES
-dir path=usr/share/locale/pl
-dir path=usr/share/locale/pl/LC_MESSAGES
-dir path=usr/share/locale/pt_BR
-dir path=usr/share/locale/pt_BR/LC_MESSAGES
-dir path=usr/share/locale/ro
-dir path=usr/share/locale/ro/LC_MESSAGES
-dir path=usr/share/locale/ru
-dir path=usr/share/locale/ru/LC_MESSAGES
-dir path=usr/share/locale/sk
-dir path=usr/share/locale/sk/LC_MESSAGES
-dir path=usr/share/locale/sv
-dir path=usr/share/locale/sv/LC_MESSAGES
-dir path=usr/share/locale/tr
-dir path=usr/share/locale/tr/LC_MESSAGES
-dir path=usr/share/locale/vi
-dir path=usr/share/locale/vi/LC_MESSAGES
-dir path=usr/share/locale/zh_TW
-dir path=usr/share/locale/zh_TW/LC_MESSAGES
-dir path=usr/share/man
-dir path=usr/share/man/man1
+dir  path=etc
+dir  path=etc/bash
+dir  path=etc/bash/bash_completion.d
 file etc.bash.bash_completion path=etc/bash/bash_completion.example
 #
 file etc.bash.bashrc path=etc/bash/bashrc.example
 file etc.bash.inputrc path=etc/bash/inputrc.example
+dir  path=etc/skel
 file etc.skel.bashrc path=etc/skel/.bashrc
+dir  path=usr
+dir  path=usr/bin
 file usr/bin/$(MACH64)/bash path=usr/bin/bash
 file usr/bin/$(MACH64)/bashbug path=usr/bin/bashbug
+#
+link path=usr/bin/rbash target=./bash
+dir  path=usr/gnu
+dir  path=usr/gnu/bin
+link path=usr/gnu/bin/sh target=../../bin/bash
+dir  path=usr/share
+dir  path=usr/share/bash
 file path=usr/share/bash/alias
 file path=usr/share/bash/arith
 file path=usr/share/bash/arith_for
@@ -183,35 +129,91 @@
 file path=usr/share/bash/variable_help
 file path=usr/share/bash/wait
 file path=usr/share/bash/while
+dir  path=usr/share/info
 file path=usr/share/info/bash.info
+dir  path=usr/share/locale
+dir  path=usr/share/locale/af
+dir  path=usr/share/locale/af/LC_MESSAGES
 file path=usr/share/locale/af/LC_MESSAGES/bash.mo
+dir  path=usr/share/locale/bg
+dir  path=usr/share/locale/bg/LC_MESSAGES
 file path=usr/share/locale/bg/LC_MESSAGES/bash.mo
+dir  path=usr/share/locale/ca
+dir  path=usr/share/locale/ca/LC_MESSAGES
 file path=usr/share/locale/ca/LC_MESSAGES/bash.mo
+dir  path=usr/share/locale/cs
+dir  path=usr/share/locale/cs/LC_MESSAGES
 file path=usr/share/locale/cs/LC_MESSAGES/bash.mo
+dir  path=usr/share/locale/de
+dir  path=usr/share/locale/de/LC_MESSAGES
 file path=usr/share/locale/de/LC_MESSAGES/bash.mo
+dir  path=usr/share/locale/en
+dir  path=usr/share/locale/en/LC_MESSAGES
 file path=usr/share/locale/en/LC_MESSAGES/bash.mo
 file path=usr/share/locale/en@boldquot/LC_MESSAGES/bash.mo
 file path=usr/share/locale/en@quot/LC_MESSAGES/bash.mo
+dir  path=usr/share/locale/en_CA
+dir  path=usr/share/locale/en_CA/LC_MESSAGES
 file path=usr/share/locale/en_CA/LC_MESSAGES/bash.mo
+dir  path=usr/share/locale/en_GB
+dir  path=usr/share/locale/en_GB/LC_MESSAGES
 file path=usr/share/locale/en_GB/LC_MESSAGES/bash.mo
+dir  path=usr/share/locale/eo
+dir  path=usr/share/locale/eo/LC_MESSAGES
 file path=usr/share/locale/eo/LC_MESSAGES/bash.mo
+dir  path=usr/share/locale/es
+dir  path=usr/share/locale/es/LC_MESSAGES
 file path=usr/share/locale/es/LC_MESSAGES/bash.mo
+dir  path=usr/share/locale/et
+dir  path=usr/share/locale/et/LC_MESSAGES
 file path=usr/share/locale/et/LC_MESSAGES/bash.mo
+dir  path=usr/share/locale/fr
+dir  path=usr/share/locale/fr/LC_MESSAGES
 file path=usr/share/locale/fr/LC_MESSAGES/bash.mo
+dir  path=usr/share/locale/hu
+dir  path=usr/share/locale/hu/LC_MESSAGES
 file path=usr/share/locale/hu/LC_MESSAGES/bash.mo
+dir  path=usr/share/locale/id
+dir  path=usr/share/locale/id/LC_MESSAGES
 file path=usr/share/locale/id/LC_MESSAGES/bash.mo
+dir  path=usr/share/locale/ja
+dir  path=usr/share/locale/ja/LC_MESSAGES
 file path=usr/share/locale/ja/LC_MESSAGES/bash.mo
+dir  path=usr/share/locale/lt
+dir  path=usr/share/locale/lt/LC_MESSAGES
 file path=usr/share/locale/lt/LC_MESSAGES/bash.mo
+dir  path=usr/share/locale/nl
+dir  path=usr/share/locale/nl/LC_MESSAGES
 file path=usr/share/locale/nl/LC_MESSAGES/bash.mo
+dir  path=usr/share/locale/pl
+dir  path=usr/share/locale/pl/LC_MESSAGES
 file path=usr/share/locale/pl/LC_MESSAGES/bash.mo
+dir  path=usr/share/locale/pt_BR
+dir  path=usr/share/locale/pt_BR/LC_MESSAGES
 file path=usr/share/locale/pt_BR/LC_MESSAGES/bash.mo
+dir  path=usr/share/locale/ro
+dir  path=usr/share/locale/ro/LC_MESSAGES
 file path=usr/share/locale/ro/LC_MESSAGES/bash.mo
+dir  path=usr/share/locale/ru
+dir  path=usr/share/locale/ru/LC_MESSAGES
 file path=usr/share/locale/ru/LC_MESSAGES/bash.mo
+dir  path=usr/share/locale/sk
+dir  path=usr/share/locale/sk/LC_MESSAGES
 file path=usr/share/locale/sk/LC_MESSAGES/bash.mo
+dir  path=usr/share/locale/sv
+dir  path=usr/share/locale/sv/LC_MESSAGES
 file path=usr/share/locale/sv/LC_MESSAGES/bash.mo
+dir  path=usr/share/locale/tr
+dir  path=usr/share/locale/tr/LC_MESSAGES
 file path=usr/share/locale/tr/LC_MESSAGES/bash.mo
+dir  path=usr/share/locale/vi
+dir  path=usr/share/locale/vi/LC_MESSAGES
 file path=usr/share/locale/vi/LC_MESSAGES/bash.mo
+dir  path=usr/share/locale/zh_TW
+dir  path=usr/share/locale/zh_TW/LC_MESSAGES
 file path=usr/share/locale/zh_TW/LC_MESSAGES/bash.mo
+dir  path=usr/share/man
+dir  path=usr/share/man/man1
 file path=usr/share/man/man1/bash.1
 file path=usr/share/man/man1/bashbug.1
 file rbash.1 path=usr/share/man/man1/rbash.1
@@ -220,7 +222,4 @@
     name="GNU Bourne-Again shell (bash)"
 #
 license bash.license license="GPLv3, FDLv1.3"
-#
-link path=usr/bin/rbash target=./bash
-link path=usr/gnu/bin/sh target=../../bin/bash