--- a/components/p7zip/p7zip.p5m	Wed Sep 07 00:15:35 2016 -0700
+++ b/components/p7zip/p7zip.p5m	Wed Jul 27 11:32:28 2016 -0700
@@ -19,7 +19,7 @@
 #
 
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -40,66 +40,95 @@
 file usr/lib/p7zip/7za path=usr/bin/7za
 file usr/lib/p7zip/7zr path=usr/bin/7zr
 file contrib/gzip-like_CLI_wrapper_for_7z/p7zip path=usr/bin/p7zip
-dir  path=usr/lib/7z
-file usr/lib/p7zip/7z.so path=usr/lib/7z/7z.so
-dir  path=usr/lib/7z/Codecs
-file usr/lib/p7zip/Codecs/Rar29.so path=usr/lib/7z/Codecs/Rar29.so
-dir  path=usr/share/doc/p7zip
+# Prevent "64-bit binary in 32-bit path" errors, which don't apply here.
+file usr/lib/p7zip/7z.so path=usr/lib/7z/7z.so \
+    pkg.linted.userland.action001.2=true
+file usr/lib/p7zip/Codecs/Rar.so path=usr/lib/7z/Codecs/Rar.so \
+    pkg.linted.userland.action001.2=true
 file path=usr/share/doc/p7zip/ChangeLog
-dir  path=usr/share/doc/p7zip/DOCS
-file path=usr/share/doc/p7zip/DOCS/7zC.txt
-file path=usr/share/doc/p7zip/DOCS/7zFormat.txt
-file path=usr/share/doc/p7zip/DOCS/License.txt
-dir  path=usr/share/doc/p7zip/DOCS/MANUAL
-dir  path=usr/share/doc/p7zip/DOCS/MANUAL/commands
-file path=usr/share/doc/p7zip/DOCS/MANUAL/commands/add.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/commands/bench.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/commands/delete.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/commands/extract.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/commands/extract_full.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/commands/index.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/commands/list.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/commands/style.css
-file path=usr/share/doc/p7zip/DOCS/MANUAL/commands/test.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/commands/update.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/exit_codes.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/index.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/style.css
-dir  path=usr/share/doc/p7zip/DOCS/MANUAL/switches
-file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/ar_exclude.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/ar_include.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/ar_no.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/charset.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/exclude.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/include.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/index.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/large_pages.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/list_tech.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/method.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/output_dir.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/overwrite.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/password.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/recurse.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/sfx.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/ssc.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/stdin.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/stdout.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/stop_switch.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/style.css
-file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/type.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/update.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/volume.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/working_dir.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/yes.htm
-file path=usr/share/doc/p7zip/DOCS/MANUAL/syntax.htm
-file path=usr/share/doc/p7zip/DOCS/Methods.txt
-file path=usr/share/doc/p7zip/DOCS/copying.txt
-file path=usr/share/doc/p7zip/DOCS/history.txt
-file path=usr/share/doc/p7zip/DOCS/lzma.txt
-file path=usr/share/doc/p7zip/DOCS/readme.txt
-file path=usr/share/doc/p7zip/DOCS/unRarLicense.txt
+file path=usr/share/doc/p7zip/DOC/7zC.txt
+file path=usr/share/doc/p7zip/DOC/7zFormat.txt
+file path=usr/share/doc/p7zip/DOC/License.txt
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/add.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/bench.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/delete.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/extract.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/extract_full.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/hash.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/index.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/list.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/rename.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/style.css
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/test.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/update.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/exit_codes.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/index.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/style.css
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/ar_exclude.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/ar_include.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/ar_no.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/bb.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/bs.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/charset.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/email.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/exclude.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/include.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/index.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/large_pages.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/list_tech.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/method.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/output_dir.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/overwrite.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/password.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/recurse.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/sa.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/scc.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/scrc.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/sdel.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/sfx.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/shared.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/sni.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/sns.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/spf.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/ssc.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/stdin.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/stdout.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/stl.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/stop_switch.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/stx.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/style.css
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/type.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/update.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/volume.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/working_dir.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/yes.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/cmdline/syntax.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/fm/about.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/fm/benchmark.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/fm/index.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/fm/menu.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/fm/options.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip/add.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip/extract.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip/index.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip/style.css
+file path=usr/share/doc/p7zip/DOC/MANUAL/fm/style.css
+file path=usr/share/doc/p7zip/DOC/MANUAL/general/7z.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/general/faq.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/general/formats.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/general/index.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/general/performance.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/general/style.css
+file path=usr/share/doc/p7zip/DOC/MANUAL/general/thanks.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/start.htm
+file path=usr/share/doc/p7zip/DOC/MANUAL/style.css
+file path=usr/share/doc/p7zip/DOC/Methods.txt
+file path=usr/share/doc/p7zip/DOC/copying.txt
+file path=usr/share/doc/p7zip/DOC/lzma.txt
+file path=usr/share/doc/p7zip/DOC/readme.txt
+file path=usr/share/doc/p7zip/DOC/src-history.txt
+file path=usr/share/doc/p7zip/DOC/unRarLicense.txt
 file path=usr/share/doc/p7zip/README
-dir  path=usr/share/man/man1
 file usr/man/man1/7z.1 path=usr/share/man/man1/7z.1 \
     mangler.man.stability=Committed
 file usr/man/man1/7za.1 path=usr/share/man/man1/7za.1