--- a/components/gnupg/gnupg.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/gnupg/gnupg.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>
 <transform file path=usr/share/gnupg/help\.([^/]+)(\..+){0,1}(/.+){0,1}\.txt$ -> default facet.locale.%<\1> true>
@@ -36,79 +36,8 @@
 set name=org.opensolaris.arc-caseid value=PSARC/2009/397 value=PSARC/2014/012
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-dir path=usr
-dir path=usr/bin
-dir path=usr/sbin
-dir path=usr/share
-dir path=usr/share/doc
-dir path=usr/share/doc/gnupg
-dir path=usr/share/doc/gnupg/examples
-dir path=usr/share/gnupg
-dir path=usr/share/info
-dir path=usr/share/locale
-dir path=usr/share/locale/be
-dir path=usr/share/locale/be/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/da
-dir path=usr/share/locale/da/LC_MESSAGES
-dir path=usr/share/locale/de
-dir path=usr/share/locale/de/LC_MESSAGES
-dir path=usr/share/locale/el
-dir path=usr/share/locale/el/LC_MESSAGES
-dir path=usr/share/locale/en
-dir path=usr/share/locale/en/LC_MESSAGES
-dir path=usr/share/locale/en@boldquot
-dir path=usr/share/locale/en@boldquot/LC_MESSAGES
-dir path=usr/share/locale/en@quot
-dir path=usr/share/locale/en@quot/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/fi
-dir path=usr/share/locale/fi/LC_MESSAGES
-dir path=usr/share/locale/fr
-dir path=usr/share/locale/fr/LC_MESSAGES
-dir path=usr/share/locale/gl
-dir path=usr/share/locale/gl/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/it
-dir path=usr/share/locale/it/LC_MESSAGES
-dir path=usr/share/locale/ja
-dir path=usr/share/locale/ja/LC_MESSAGES
-dir path=usr/share/locale/nb
-dir path=usr/share/locale/nb/LC_MESSAGES
-dir path=usr/share/locale/pl
-dir path=usr/share/locale/pl/LC_MESSAGES
-dir path=usr/share/locale/pt
-dir path=usr/share/locale/pt/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/zh_CN
-dir path=usr/share/locale/zh_CN/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=usr/share/man/man1m
+dir  path=usr
+dir  path=usr/bin
 #
 file path=usr/bin/gnupg-pcsc-wrapper
 file path=usr/bin/gpg-agent
@@ -130,8 +59,12 @@
 file path=usr/bin/kbxutil
 file path=usr/bin/scdaemon
 file path=usr/bin/watchgnupg
+dir  path=usr/sbin
 file path=usr/sbin/addgnupghome
 file path=usr/sbin/applygnupgdefaults
+dir  path=usr/share
+dir  path=usr/share/doc
+dir  path=usr/share/doc/gnupg
 file path=usr/share/doc/gnupg/DETAILS
 file path=usr/share/doc/gnupg/FAQ
 file path=usr/share/doc/gnupg/HACKING
@@ -139,11 +72,13 @@
 file path=usr/share/doc/gnupg/OpenPGP
 file path=usr/share/doc/gnupg/README
 file path=usr/share/doc/gnupg/TRANSLATE
+dir  path=usr/share/doc/gnupg/examples
 file path=usr/share/doc/gnupg/examples/README
 file path=usr/share/doc/gnupg/examples/gpgconf.conf
 file path=usr/share/doc/gnupg/examples/pwpattern.list
 file path=usr/share/doc/gnupg/examples/scd-event
 file path=usr/share/doc/gnupg/examples/trustlist.txt
+dir  path=usr/share/gnupg
 file path=usr/share/gnupg/com-certs.pem
 file path=usr/share/gnupg/gpg-conf.skel
 file path=usr/share/gnupg/help.be.txt
@@ -175,40 +110,104 @@
 file path=usr/share/gnupg/help.zh_CN.txt
 file path=usr/share/gnupg/help.zh_TW.txt
 file path=usr/share/gnupg/qualified.txt
+dir  path=usr/share/info
 file path=usr/share/info/gnupg.info
 file path=usr/share/info/gnupg.info-1
 file path=usr/share/info/gnupg.info-2
+dir  path=usr/share/locale
+dir  path=usr/share/locale/be
+dir  path=usr/share/locale/be/LC_MESSAGES
 file path=usr/share/locale/be/LC_MESSAGES/gnupg2.mo
+dir  path=usr/share/locale/ca
+dir  path=usr/share/locale/ca/LC_MESSAGES
 file path=usr/share/locale/ca/LC_MESSAGES/gnupg2.mo
+dir  path=usr/share/locale/cs
+dir  path=usr/share/locale/cs/LC_MESSAGES
 file path=usr/share/locale/cs/LC_MESSAGES/gnupg2.mo
+dir  path=usr/share/locale/da
+dir  path=usr/share/locale/da/LC_MESSAGES
 file path=usr/share/locale/da/LC_MESSAGES/gnupg2.mo
+dir  path=usr/share/locale/de
+dir  path=usr/share/locale/de/LC_MESSAGES
 file path=usr/share/locale/de/LC_MESSAGES/gnupg2.mo
+dir  path=usr/share/locale/el
+dir  path=usr/share/locale/el/LC_MESSAGES
 file path=usr/share/locale/el/LC_MESSAGES/gnupg2.mo
+dir  path=usr/share/locale/en
+dir  path=usr/share/locale/en/LC_MESSAGES
 file path=usr/share/locale/en/LC_MESSAGES/gnupg2.mo
+dir  path=usr/share/locale/en@boldquot
+dir  path=usr/share/locale/en@boldquot/LC_MESSAGES
 file path=usr/share/locale/en@boldquot/LC_MESSAGES/gnupg2.mo
+dir  path=usr/share/locale/en@quot
+dir  path=usr/share/locale/en@quot/LC_MESSAGES
 file path=usr/share/locale/en@quot/LC_MESSAGES/gnupg2.mo
+dir  path=usr/share/locale/eo
+dir  path=usr/share/locale/eo/LC_MESSAGES
 file path=usr/share/locale/eo/LC_MESSAGES/gnupg2.mo
+dir  path=usr/share/locale/es
+dir  path=usr/share/locale/es/LC_MESSAGES
 file path=usr/share/locale/es/LC_MESSAGES/gnupg2.mo
+dir  path=usr/share/locale/et
+dir  path=usr/share/locale/et/LC_MESSAGES
 file path=usr/share/locale/et/LC_MESSAGES/gnupg2.mo
+dir  path=usr/share/locale/fi
+dir  path=usr/share/locale/fi/LC_MESSAGES
 file path=usr/share/locale/fi/LC_MESSAGES/gnupg2.mo
+dir  path=usr/share/locale/fr
+dir  path=usr/share/locale/fr/LC_MESSAGES
 file path=usr/share/locale/fr/LC_MESSAGES/gnupg2.mo
+dir  path=usr/share/locale/gl
+dir  path=usr/share/locale/gl/LC_MESSAGES
 file path=usr/share/locale/gl/LC_MESSAGES/gnupg2.mo
+dir  path=usr/share/locale/hu
+dir  path=usr/share/locale/hu/LC_MESSAGES
 file path=usr/share/locale/hu/LC_MESSAGES/gnupg2.mo
+dir  path=usr/share/locale/id
+dir  path=usr/share/locale/id/LC_MESSAGES
 file path=usr/share/locale/id/LC_MESSAGES/gnupg2.mo
+dir  path=usr/share/locale/it
+dir  path=usr/share/locale/it/LC_MESSAGES
 file path=usr/share/locale/it/LC_MESSAGES/gnupg2.mo
+dir  path=usr/share/locale/ja
+dir  path=usr/share/locale/ja/LC_MESSAGES
 file path=usr/share/locale/ja/LC_MESSAGES/gnupg2.mo
+dir  path=usr/share/locale/nb
+dir  path=usr/share/locale/nb/LC_MESSAGES
 file path=usr/share/locale/nb/LC_MESSAGES/gnupg2.mo
+dir  path=usr/share/locale/pl
+dir  path=usr/share/locale/pl/LC_MESSAGES
 file path=usr/share/locale/pl/LC_MESSAGES/gnupg2.mo
+dir  path=usr/share/locale/pt
+dir  path=usr/share/locale/pt/LC_MESSAGES
 file path=usr/share/locale/pt/LC_MESSAGES/gnupg2.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/gnupg2.mo
+dir  path=usr/share/locale/ro
+dir  path=usr/share/locale/ro/LC_MESSAGES
 file path=usr/share/locale/ro/LC_MESSAGES/gnupg2.mo
+dir  path=usr/share/locale/ru
+dir  path=usr/share/locale/ru/LC_MESSAGES
 file path=usr/share/locale/ru/LC_MESSAGES/gnupg2.mo
+dir  path=usr/share/locale/sk
+dir  path=usr/share/locale/sk/LC_MESSAGES
 file path=usr/share/locale/sk/LC_MESSAGES/gnupg2.mo
+dir  path=usr/share/locale/sv
+dir  path=usr/share/locale/sv/LC_MESSAGES
 file path=usr/share/locale/sv/LC_MESSAGES/gnupg2.mo
+dir  path=usr/share/locale/tr
+dir  path=usr/share/locale/tr/LC_MESSAGES
 file path=usr/share/locale/tr/LC_MESSAGES/gnupg2.mo
 file path=usr/share/locale/uk/LC_MESSAGES/gnupg2.mo
+dir  path=usr/share/locale/zh_CN
+dir  path=usr/share/locale/zh_CN/LC_MESSAGES
 file path=usr/share/locale/zh_CN/LC_MESSAGES/gnupg2.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/gnupg2.mo
+dir  path=usr/share/man
+dir  path=usr/share/man/man1
 file path=usr/share/man/man1/gpg-agent.1
 file path=usr/share/man/man1/gpg-connect-agent.1
 file path=usr/share/man/man1/gpg-preset-passphrase.1
@@ -222,6 +221,7 @@
 file path=usr/share/man/man1/scdaemon.1
 file path=usr/share/man/man1/symcryptrun.1
 file path=usr/share/man/man1/watchgnupg.1
+dir  path=usr/share/man/man1m
 file path=usr/share/man/man1m/addgnupghome.1m
 file path=usr/share/man/man1m/applygnupgdefaults.1m
 #