OS-2502 illumos-joyent manifest should be sorted20130919release-20130919

1 files changed, 71 insertions, 71 deletions

diff --git a/manifest b/manifest
index f2063da24c..a0df82bf28 100644
--- a/manifest
+++ b/manifest
@@ -22,6 +22,7 @@
 # Copyright (c) 2013, Joyent, Inc. All rights reserved.
 #
 # This lists all the files that illumos-joyent delivers as part of a build.
+# Keep this sorted as by LC_ALL=C sort -u -k2.
 #
 s bin=usr/bin
 d boot 0755 root sys
@@ -375,13 +376,12 @@ f etc/logadm.d/fmd.logadm.conf 0444 root sys
 f etc/logindevperm 0644 root sys
 f etc/mach 0644 root sys
 f etc/magic 0444 root bin
-f etc/mailcap 0644 root bin
 d etc/mail 0755 root sys
+f etc/mail/Mail.rc 0644 root mail
 f etc/mail/aliases 0644 root mail
 d etc/mail/cf 0755 root mail
 f etc/mail/helpfile 0644 root mail
 f etc/mail/local-host-names 0644 root mail
-f etc/mail/Mail.rc 0644 root mail
 f etc/mail/mailx.rc 0644 root mail
 s etc/mail/main.cf=sendmail.cf
 f etc/mail/sendmail.cf 0444 root mail
@@ -389,6 +389,7 @@ s etc/mail/sendmail.hf=helpfile
 f etc/mail/submit.cf 0444 root mail
 s etc/mail/subsidiary.cf=sendmail.cf
 f etc/mail/trusted-users 0644 root mail
+f etc/mailcap 0644 root bin
 f etc/mime.types 0644 root bin
 f etc/mnttab 0444 root root
 f etc/mpapi.conf 0644 root bin
@@ -1246,8 +1247,8 @@ f lib/amd64/libzdoor.so.1 0755 root bin
 s lib/amd64/libzdoor.so=libzdoor.so.1
 f lib/amd64/libzfs.so.1 0755 root bin
 s lib/amd64/libzfs.so=libzfs.so.1
-s lib/amd64/libzfs_core.so=../../usr/lib/amd64/libzfs_core.so
 s lib/amd64/libzfs_core.so.1=../../usr/lib/amd64/libzfs_core.so.1
+s lib/amd64/libzfs_core.so=../../usr/lib/amd64/libzfs_core.so
 f lib/amd64/nss_compat.so.1 0755 root bin
 f lib/amd64/nss_dns.so.1 0755 root bin
 f lib/amd64/nss_files.so.1 0755 root bin
@@ -1442,8 +1443,8 @@ f lib/libzdoor.so.1 0755 root bin
 s lib/libzdoor.so=libzdoor.so.1
 f lib/libzfs.so.1 0755 root bin
 s lib/libzfs.so=libzfs.so.1
-s lib/libzfs_core.so=../usr/lib/libzfs_core.so
 s lib/libzfs_core.so.1=../usr/lib/libzfs_core.so
+s lib/libzfs_core.so=../usr/lib/libzfs_core.so
 d lib/mpxio 0755 root bin
 f lib/mpxio/stmsboot_util 0555 root bin
 f lib/nss_compat.so.1 0755 root bin
@@ -1512,13 +1513,13 @@ f lib/svc/manifest/network/network-loopback.xml 0444 root sys
 f lib/svc/manifest/network/network-netmask.xml 0444 root sys
 f lib/svc/manifest/network/network-routing-setup.xml 0444 root sys
 f lib/svc/manifest/network/network-service.xml 0444 root sys
-f lib/svc/manifest/network/npiv_config.xml 0444 root sys
 d lib/svc/manifest/network/nfs 0755 root sys
 f lib/svc/manifest/network/nfs/client.xml 0444 root sys
 f lib/svc/manifest/network/nfs/mapid.xml 0444 root sys
 f lib/svc/manifest/network/nfs/nlockmgr.xml 0444 root sys
 f lib/svc/manifest/network/nfs/server.xml 0444 root sys
 f lib/svc/manifest/network/nfs/status.xml 0444 root sys
+f lib/svc/manifest/network/npiv_config.xml 0444 root sys
 f lib/svc/manifest/network/rarp.xml 0444 root sys
 f lib/svc/manifest/network/rexec.xml 0444 root sys
 d lib/svc/manifest/network/routing 0755 root sys
@@ -2124,9 +2125,9 @@ h usr/bin/i86pc=usr/bin/sun
 f usr/bin/iconv 0555 root bin
 f usr/bin/id 0555 root bin
 f usr/bin/infocmp 0555 root bin
-f usr/bin/ipcs 0555 root bin
-f usr/bin/ipcrm 0555 root bin
 f usr/bin/iostat 0555 root bin
+f usr/bin/ipcrm 0555 root bin
+f usr/bin/ipcs 0555 root bin
 f usr/bin/isainfo 0555 root bin
 f usr/bin/isalist 0555 root bin
 h usr/bin/jobs=usr/bin/alias
@@ -4713,8 +4714,8 @@ s usr/lib/amd64/ld.so.1=../../../lib/amd64/ld.so.1
 f usr/lib/amd64/lddstub 0555 root bin
 f usr/lib/amd64/libHBAAPI.so.1 0755 root bin
 s usr/lib/amd64/libHBAAPI.so=libHBAAPI.so.1
-s usr/lib/amd64/libMPAPI.so=../../../lib/amd64/libMPAPI.so.1
 s usr/lib/amd64/libMPAPI.so.1=../../../lib/amd64/libMPAPI.so.1
+s usr/lib/amd64/libMPAPI.so=../../../lib/amd64/libMPAPI.so.1
 f usr/lib/amd64/libSMHBAAPI.so.1 0755 root bin
 s usr/lib/amd64/libSMHBAAPI.so=libSMHBAAPI.so.1
 s usr/lib/amd64/libadm.so.1=../../../lib/amd64/libadm.so.1
@@ -4758,8 +4759,8 @@ s usr/lib/amd64/libcrypt_d.so.1=libcrypt.so.1
 s usr/lib/amd64/libcrypt_d.so=libcrypt.so
 s usr/lib/amd64/libcrypt_i.so.1=libcrypt.so.1
 s usr/lib/amd64/libcrypt_i.so=libcrypt.so
-s usr/lib/amd64/libcryptoutil.so=../../../lib/amd64/libcryptoutil.so.1
 s usr/lib/amd64/libcryptoutil.so.1=../../../lib/amd64/libcryptoutil.so.1
+s usr/lib/amd64/libcryptoutil.so=../../../lib/amd64/libcryptoutil.so.1
 s usr/lib/amd64/libctf.so.1=../../../lib/amd64/libctf.so.1
 s usr/lib/amd64/libctf.so=../../../lib/amd64/libctf.so.1
 s usr/lib/amd64/libcurses.so.1=../../../lib/amd64/libcurses.so.1
@@ -4778,8 +4779,8 @@ f usr/lib/amd64/libdiskmgt.so.1 0755 root bin
 s usr/lib/amd64/libdiskmgt.so=libdiskmgt.so.1
 s usr/lib/amd64/libdl.so.1=../../../lib/amd64/libdl.so.1
 s usr/lib/amd64/libdl.so=../../../lib/amd64/libdl.so.1
-s usr/lib/amd64/libdladm.so=../../../lib/amd64/libdladm.so.1
 s usr/lib/amd64/libdladm.so.1=../../../lib/amd64/libdladm.so.1
+s usr/lib/amd64/libdladm.so=../../../lib/amd64/libdladm.so.1
 f usr/lib/amd64/libdll.so.1 0755 root bin
 s usr/lib/amd64/libdll.so=libdll.so.1
 s usr/lib/amd64/libdlpi.so.1=../../../lib/amd64/libdlpi.so.1
@@ -4842,8 +4843,8 @@ f usr/lib/amd64/libiscsit.so.1 0755 root bin
 s usr/lib/amd64/libiscsit.so=libiscsit.so.1
 f usr/lib/amd64/libjdns_sd.so.1 0755 root bin
 s usr/lib/amd64/libjdns_sd.so=libjdns_sd.so.1
-s usr/lib/amd64/libkmfberder.so=../../../lib/amd64/libkmfberder.so.1
 s usr/lib/amd64/libkmfberder.so.1=../../../lib/amd64/libkmfberder.so.1
+s usr/lib/amd64/libkmfberder.so=../../../lib/amd64/libkmfberder.so.1
 f usr/lib/amd64/libkrb5.so.1 0755 root bin
 s usr/lib/amd64/libkrb5.so=libkrb5.so.1
 s usr/lib/amd64/libkstat.so.1=../../../lib/amd64/libkstat.so.1
@@ -4875,8 +4876,8 @@ f usr/lib/amd64/libmenu.so.1 0755 root bin
 s usr/lib/amd64/libmenu.so=libmenu.so.1
 s usr/lib/amd64/libmp.so.2=../../../lib/amd64/libmp.so.2
 s usr/lib/amd64/libmp.so=../../../lib/amd64/libmp.so.2
-s usr/lib/amd64/libmpscsi_vhci.so=../../../lib/amd64/libmpscsi_vhci.so.1
 s usr/lib/amd64/libmpscsi_vhci.so.1=../../../lib/amd64/libmpscsi_vhci.so.1
+s usr/lib/amd64/libmpscsi_vhci.so=../../../lib/amd64/libmpscsi_vhci.so.1
 f usr/lib/amd64/libmtmalloc.so.1 0755 root bin
 s usr/lib/amd64/libmtmalloc.so=libmtmalloc.so.1
 f usr/lib/amd64/libndmp.so.1 0755 root bin
@@ -4999,10 +5000,10 @@ f usr/lib/amd64/libtnfctl.so.1 0755 root bin
 s usr/lib/amd64/libtnfctl.so=libtnfctl.so.1
 f usr/lib/amd64/libtnfprobe.so.1 0755 root bin
 s usr/lib/amd64/libtnfprobe.so=libtnfprobe.so.1
-s usr/lib/amd64/libtsnet.so=../../../lib/amd64/libtsnet.so.1
 s usr/lib/amd64/libtsnet.so.1=../../../lib/amd64/libtsnet.so.1
-s usr/lib/amd64/libtsol.so=../../../lib/amd64/libtsol.so.2
+s usr/lib/amd64/libtsnet.so=../../../lib/amd64/libtsnet.so.1
 s usr/lib/amd64/libtsol.so.2=../../../lib/amd64/libtsol.so.2
+s usr/lib/amd64/libtsol.so=../../../lib/amd64/libtsol.so.2
 s usr/lib/amd64/libumem.so.1=../../../lib/amd64/libumem.so.1
 s usr/lib/amd64/libumem.so=../../../lib/amd64/libumem.so.1
 s usr/lib/amd64/libumem_trampoline.so.1=../../../lib/amd64/libumem_trampoline.so.1
@@ -5025,8 +5026,8 @@ s usr/lib/amd64/libzdoor.so.1=../../../lib/amd64/libzdoor.so.1
 s usr/lib/amd64/libzdoor.so=../../../lib/amd64/libzdoor.so.1
 s usr/lib/amd64/libzfs.so.1=../../../lib/amd64/libzfs.so.1
 s usr/lib/amd64/libzfs.so=../../../lib/amd64/libzfs.so.1
-s usr/lib/amd64/libzfs_core.so=libzfs_core.so.1
 f usr/lib/amd64/libzfs_core.so.1 755 root bin
+s usr/lib/amd64/libzfs_core.so=libzfs_core.so.1
 f usr/lib/amd64/libzfs_jni.so.1 0755 root bin
 s usr/lib/amd64/libzfs_jni.so=libzfs_jni.so.1
 f usr/lib/amd64/libzonecfg.so.1 0755 root bin
@@ -5160,15 +5161,15 @@ f usr/lib/diffh 0555 root bin
 f usr/lib/dscfglockd 0555 root bin
 d usr/lib/dtrace 0755 root bin
 d usr/lib/dtrace/64 0755 root bin
-f usr/lib/dtrace/64/libdtrace_forceload.so 0644 root bin
 f usr/lib/dtrace/64/drti.o 0644 root bin
-f usr/lib/dtrace/libdtrace_forceload.so 0644 root bin
+f usr/lib/dtrace/64/libdtrace_forceload.so 0644 root bin
 f usr/lib/dtrace/drti.o 0644 root bin
 f usr/lib/dtrace/errno.d 0644 root bin
 f usr/lib/dtrace/fc.d 0644 root bin
 f usr/lib/dtrace/io.d 0644 root bin
 f usr/lib/dtrace/ip.d 0644 root bin
 f usr/lib/dtrace/iscsit.d 0644 root bin
+f usr/lib/dtrace/libdtrace_forceload.so 0644 root bin
 f usr/lib/dtrace/net.d 0644 root bin
 f usr/lib/dtrace/nfs.d 0644 root bin
 f usr/lib/dtrace/procfs.d 0644 root bin
@@ -6077,8 +6078,8 @@ f usr/lib/lddstub 0555 root bin
 f usr/lib/lib.b 0444 root bin
 f usr/lib/libHBAAPI.so.1 0755 root bin
 s usr/lib/libHBAAPI.so=libHBAAPI.so.1
-s usr/lib/libMPAPI.so=../../lib/libMPAPI.so.1
 s usr/lib/libMPAPI.so.1=../../lib/libMPAPI.so.1
+s usr/lib/libMPAPI.so=../../lib/libMPAPI.so.1
 f usr/lib/libSMHBAAPI.so.1 0755 root bin
 s usr/lib/libSMHBAAPI.so=libSMHBAAPI.so.1
 s usr/lib/libadm.so.1=../../lib/libadm.so.1
@@ -6128,8 +6129,8 @@ s usr/lib/libcrypt_d.so.1=libcrypt.so.1
 s usr/lib/libcrypt_d.so=libcrypt.so
 s usr/lib/libcrypt_i.so.1=libcrypt.so.1
 s usr/lib/libcrypt_i.so=libcrypt.so
-s usr/lib/libcryptoutil.so=../../lib/libcryptoutil.so.1
 s usr/lib/libcryptoutil.so.1=../../lib/libcryptoutil.so.1
+s usr/lib/libcryptoutil.so=../../lib/libcryptoutil.so.1
 s usr/lib/libctf.so.1=../../lib/libctf.so.1
 s usr/lib/libctf.so=../../lib/libctf.so.1
 s usr/lib/libcurses.so.1=../../lib/libcurses.so.1
@@ -6154,8 +6155,8 @@ f usr/lib/libdiskmgt.so.1 0755 root bin
 s usr/lib/libdiskmgt.so=libdiskmgt.so.1
 s usr/lib/libdl.so.1=../../lib/libdl.so.1
 s usr/lib/libdl.so=../../lib/libdl.so.1
-s usr/lib/libdladm.so=../../lib/libdladm.so.1
 s usr/lib/libdladm.so.1=../../lib/libdladm.so.1
+s usr/lib/libdladm.so=../../lib/libdladm.so.1
 f usr/lib/libdll.so.1 0755 root bin
 s usr/lib/libdll.so=libdll.so.1
 s usr/lib/libdlpi.so.1=../../lib/libdlpi.so.1
@@ -6174,8 +6175,8 @@ s usr/lib/libefi.so.1=../../lib/libefi.so.1
 s usr/lib/libefi.so=../../lib/libefi.so.1
 s usr/lib/libelf.so.1=../../lib/libelf.so.1
 s usr/lib/libelf.so=../../lib/libelf.so.1
-s usr/lib/libelfsign.so=../../lib/libelfsign.so.1
 s usr/lib/libelfsign.so.1=../../lib/libelfsign.so.1
+s usr/lib/libelfsign.so=../../lib/libelfsign.so.1
 f usr/lib/libexacct.so.1 0755 root bin
 s usr/lib/libexacct.so=libexacct.so.1
 f usr/lib/libfcoe.so.1 0755 root bin
@@ -6198,8 +6199,8 @@ f usr/lib/libfstyp.so.1 0755 root bin
 s usr/lib/libfstyp.so=libfstyp.so.1
 s usr/lib/libgen.so.1=../../lib/libgen.so.1
 s usr/lib/libgen.so=../../lib/libgen.so.1
-s usr/lib/libgrubmgmt.so=../../lib/libgrubmgmt.so.1
 s usr/lib/libgrubmgmt.so.1=../../lib/libgrubmgmt.so.1
+s usr/lib/libgrubmgmt.so=../../lib/libgrubmgmt.so.1
 f usr/lib/libgss.so.1 0755 root bin
 s usr/lib/libgss.so=libgss.so.1
 f usr/lib/libhotplug.so.1 0755 root bin
@@ -6220,14 +6221,14 @@ f usr/lib/libinstzones.so.1 0755 root bin
 s usr/lib/libinstzones.so=libinstzones.so.1
 s usr/lib/libintl.so.1=../../lib/libintl.so.1
 s usr/lib/libintl.so=../../lib/libintl.so.1
-s usr/lib/libipadm.so=../../lib/libipadm.so.1
 s usr/lib/libipadm.so.1=../../lib/libipadm.so.1
+s usr/lib/libipadm.so=../../lib/libipadm.so.1
 f usr/lib/libipd.so.1 0755 root bin
 s usr/lib/libipd.so=libipd.so.1
 f usr/lib/libipmi.so.1 0755 root bin
 s usr/lib/libipmi.so=libipmi.so.1
-s usr/lib/libipmp.so=../../lib/libipmp.so.1
 s usr/lib/libipmp.so.1=../../lib/libipmp.so.1
+s usr/lib/libipmp.so=../../lib/libipmp.so.1
 f usr/lib/libipp.so.1 0755 root bin
 s usr/lib/libipp.so=libipp.so.1
 f usr/lib/libipsecutil.so.1 0755 root bin
@@ -6236,12 +6237,12 @@ f usr/lib/libiscsit.so.1 0755 root bin
 s usr/lib/libiscsit.so=libiscsit.so.1
 f usr/lib/libjdns_sd.so.1 0755 root bin
 s usr/lib/libjdns_sd.so=libjdns_sd.so.1
-s usr/lib/libkcfd.so=../../lib/libkcfd.so.1
 s usr/lib/libkcfd.so.1=../../lib/libkcfd.so.1
-s usr/lib/libkmf.so=../../lib/libkmf.so.1
+s usr/lib/libkcfd.so=../../lib/libkcfd.so.1
 s usr/lib/libkmf.so.1=../../lib/libkmf.so.1
-s usr/lib/libkmfberder.so=../../lib/libkmfberder.so.1
+s usr/lib/libkmf.so=../../lib/libkmf.so.1
 s usr/lib/libkmfberder.so.1=../../lib/libkmfberder.so.1
+s usr/lib/libkmfberder.so=../../lib/libkmfberder.so.1
 f usr/lib/libkrb5.so.1 0755 root bin
 s usr/lib/libkrb5.so=libkrb5.so.1
 s usr/lib/libkstat.so.1=../../lib/libkstat.so.1
@@ -6276,8 +6277,8 @@ s usr/lib/libmilter.so=libmilter.so.1
 s usr/lib/libmp.so.1=../../lib/libmp.so.1
 s usr/lib/libmp.so.2=../../lib/libmp.so.2
 s usr/lib/libmp.so=../../lib/libmp.so.2
-s usr/lib/libmpscsi_vhci.so=../../lib/libmpscsi_vhci.so.1
 s usr/lib/libmpscsi_vhci.so.1=../../lib/libmpscsi_vhci.so.1
+s usr/lib/libmpscsi_vhci.so=../../lib/libmpscsi_vhci.so.1
 f usr/lib/libmtmalloc.so.1 0755 root bin
 s usr/lib/libmtmalloc.so=libmtmalloc.so.1
 f usr/lib/libndmp.so.1 0755 root bin
@@ -6296,8 +6297,8 @@ f usr/lib/libnvfru.so.1 0755 root bin
 s usr/lib/libnvfru.so=libnvfru.so.1
 s usr/lib/libnvpair.so.1=../../lib/libnvpair.so.1
 s usr/lib/libnvpair.so=../../lib/libnvpair.so.1
-s usr/lib/libnwam.so=../../lib/libnwam.so.1
 s usr/lib/libnwam.so.1=../../lib/libnwam.so.1
+s usr/lib/libnwam.so=../../lib/libnwam.so.1
 d usr/lib/libp 0755 root bin
 s usr/lib/libp/32=.
 s usr/lib/libp/64=amd64
@@ -6433,10 +6434,10 @@ f usr/lib/libtnfctl.so.1 0755 root bin
 s usr/lib/libtnfctl.so=libtnfctl.so.1
 f usr/lib/libtnfprobe.so.1 0755 root bin
 s usr/lib/libtnfprobe.so=libtnfprobe.so.1
-s usr/lib/libtsnet.so=../../lib/libtsnet.so.1
 s usr/lib/libtsnet.so.1=../../lib/libtsnet.so.1
-s usr/lib/libtsol.so=../../lib/libtsol.so.2
+s usr/lib/libtsnet.so=../../lib/libtsnet.so.1
 s usr/lib/libtsol.so.2=../../lib/libtsol.so.2
+s usr/lib/libtsol.so=../../lib/libtsol.so.2
 s usr/lib/libumem.so.1=../../lib/libumem.so.1
 s usr/lib/libumem.so=../../lib/libumem.so.1
 s usr/lib/libumem_trampoline.so.1=../../lib/libumem_trampoline.so.1
@@ -6466,8 +6467,8 @@ s usr/lib/libzdoor.so.1=../../lib/libzdoor.so.1
 s usr/lib/libzdoor.so=../../lib/libzdoor.so.1
 s usr/lib/libzfs.so.1=../../lib/libzfs.so.1
 s usr/lib/libzfs.so=../../lib/libzfs.so.1
-s usr/lib/libzfs_core.so=libzfs_core.so.1
 f usr/lib/libzfs_core.so.1 755 root bin
+s usr/lib/libzfs_core.so=libzfs_core.so.1
 f usr/lib/libzfs_jni.so.1 0755 root bin
 s usr/lib/libzfs_jni.so=libzfs_jni.so.1
 f usr/lib/libzonecfg.so.1 0755 root bin
@@ -6488,6 +6489,15 @@ f usr/lib/link_audit/truss.so.1 0755 root bin
 f usr/lib/link_audit/who.so.1 0755 root bin
 f usr/lib/lms 0555 root bin
 d usr/lib/locale 0755 root bin
+d usr/lib/locale/C 0755 root bin
+d usr/lib/locale/C/LC_COLLATE 0755 root bin
+d usr/lib/locale/C/LC_CTYPE 0755 root bin
+d usr/lib/locale/C/LC_MESSAGES 0755 root bin
+d usr/lib/locale/C/LC_MONETARY 0755 root bin
+d usr/lib/locale/C/LC_NUMERIC 0755 root bin
+d usr/lib/locale/C/LC_TIME 0755 root bin
+f usr/lib/locale/C/LC_TIME/SUNW_OST_OSCMD.po 0644 root bin
+s usr/lib/locale/POSIX=C
 d usr/lib/locale/af_ZA.UTF-8 0755 root bin
 d usr/lib/locale/af_ZA.UTF-8/LC_COLLATE 0755 root bin
 f usr/lib/locale/af_ZA.UTF-8/LC_COLLATE/LCL_DATA 0755 root bin
@@ -6826,14 +6836,6 @@ d usr/lib/locale/bs_BA.UTF-8/LC_NUMERIC 0755 root bin
 f usr/lib/locale/bs_BA.UTF-8/LC_NUMERIC/LCL_DATA 0755 root bin
 d usr/lib/locale/bs_BA.UTF-8/LC_TIME 0755 root bin
 f usr/lib/locale/bs_BA.UTF-8/LC_TIME/LCL_DATA 0755 root bin
-d usr/lib/locale/C 0755 root bin
-d usr/lib/locale/C/LC_COLLATE 0755 root bin
-d usr/lib/locale/C/LC_CTYPE 0755 root bin
-d usr/lib/locale/C/LC_MESSAGES 0755 root bin
-d usr/lib/locale/C/LC_MONETARY 0755 root bin
-d usr/lib/locale/C/LC_NUMERIC 0755 root bin
-d usr/lib/locale/C/LC_TIME 0755 root bin
-f usr/lib/locale/C/LC_TIME/SUNW_OST_OSCMD.po 0644 root bin
 d usr/lib/locale/ca_ES.ISO8859-15 0755 root bin
 d usr/lib/locale/ca_ES.ISO8859-15/LC_COLLATE 0755 root bin
 f usr/lib/locale/ca_ES.ISO8859-15/LC_COLLATE/LCL_DATA 0755 root bin
@@ -8849,7 +8851,6 @@ d usr/lib/locale/pl_PL.UTF-8/LC_NUMERIC 0755 root bin
 f usr/lib/locale/pl_PL.UTF-8/LC_NUMERIC/LCL_DATA 0755 root bin
 d usr/lib/locale/pl_PL.UTF-8/LC_TIME 0755 root bin
 f usr/lib/locale/pl_PL.UTF-8/LC_TIME/LCL_DATA 0755 root bin
-s usr/lib/locale/POSIX=C
 d usr/lib/locale/pt_BR.UTF-8 0755 root bin
 d usr/lib/locale/pt_BR.UTF-8/LC_COLLATE 0755 root bin
 f usr/lib/locale/pt_BR.UTF-8/LC_COLLATE/LCL_DATA 0755 root bin
@@ -10107,25 +10108,24 @@ f usr/perl5/5.12/lib/i86pc-solaris-64int/auto/Sun/Solaris/Ucred/Ucred.so 0555 ro
 d usr/perl5/5.12/lib/i86pc-solaris-64int/auto/Sun/Solaris/Utils 0755 root bin
 f usr/perl5/5.12/lib/i86pc-solaris-64int/auto/Sun/Solaris/Utils/Utils.bs 0444 root bin
 f usr/perl5/5.12/lib/i86pc-solaris-64int/auto/Sun/Solaris/Utils/Utils.so 0555 root bin
-
 d usr/platform 0755 root sys
 d usr/platform/i86pc 0755 root sys
 d usr/platform/i86pc/lib 0755 root sys
 d usr/platform/i86pc/lib/fm 0755 root sys
 d usr/platform/i86pc/lib/fm/eft 0755 root sys
 f usr/platform/i86pc/lib/fm/eft/amd64.eft 0444 root sys
-f usr/platform/i86pc/lib/fm/eft/gcpu_amd.eft 0444 root sys
 f usr/platform/i86pc/lib/fm/eft/gcpu.eft 0444 root sys
+f usr/platform/i86pc/lib/fm/eft/gcpu_amd.eft 0444 root sys
 f usr/platform/i86pc/lib/fm/eft/intel.eft 0444 root sys
 d usr/platform/i86pc/lib/fm/topo 0755 root sys
 d usr/platform/i86pc/lib/fm/topo/maps 0755 root sys
+f usr/platform/i86pc/lib/fm/topo/maps/Joyent-Compute-Platform-1101-disk-hc-topology.xml 0444 root sys
 f usr/platform/i86pc/lib/fm/topo/maps/chassis-hc-topology.xml 0444 root sys
 f usr/platform/i86pc/lib/fm/topo/maps/chip-hc-topology.xml 0444 root sys
 f usr/platform/i86pc/lib/fm/topo/maps/fan-hc-topology.xml 0444 root sys
 f usr/platform/i86pc/lib/fm/topo/maps/i86pc-hc-topology.xml 0444 root sys
 f usr/platform/i86pc/lib/fm/topo/maps/i86pc-legacy-hc-topology.xml 0444 root sys
 f usr/platform/i86pc/lib/fm/topo/maps/psu-hc-topology.xml 0444 root sys
-f usr/platform/i86pc/lib/fm/topo/maps/Joyent-Compute-Platform-1101-disk-hc-topology.xml 0444 root sys
 d usr/platform/i86pc/lib/fm/topo/plugins 0755 root sys
 f usr/platform/i86pc/lib/fm/topo/plugins/chip.so 0555 root sys
 f usr/platform/i86pc/lib/fm/topo/plugins/hostbridge.so 0555 root sys
@@ -10706,8 +10706,8 @@ f usr/share/lib/terminfo/a/ansi+arrows 0644 root bin
 f usr/share/lib/terminfo/a/at386 0644 root bin
 d usr/share/lib/terminfo/s 0755 root bin
 f usr/share/lib/terminfo/s/screen 0644 root bin
-f usr/share/lib/terminfo/s/screen-w 0644 root bin
 f usr/share/lib/terminfo/s/screen-256color 0644 root bin
+f usr/share/lib/terminfo/s/screen-w 0644 root bin
 f usr/share/lib/terminfo/s/sun 0644 root bin
 f usr/share/lib/terminfo/s/sun-color 0644 root bin
 d usr/share/lib/terminfo/u 0755 root bin
@@ -11601,8 +11601,8 @@ f usr/share/man/man1/machid.1 0444 root bin
 f usr/share/man/man1/mail.1 0444 root bin
 f usr/share/man/man1/mailx.1 0444 root bin
 f usr/share/man/man1/man.1 0444 root bin
-f usr/share/man/man1/mdb.1 0444 root bin
 f usr/share/man/man1/mcs.1 0444 root bin
+f usr/share/man/man1/mdb.1 0444 root bin
 f usr/share/man/man1/mesg.1 0444 root bin
 f usr/share/man/man1/mkdir.1 0444 root bin
 f usr/share/man/man1/mkmsgs.1 0444 root bin
@@ -11956,15 +11956,16 @@ f usr/share/man/man1m/mkdevalloc.1m 0444 root bin
 f usr/share/man/man1m/mkdevmaps.1m 0444 root bin
 f usr/share/man/man1m/mkfifo.1m 0444 root bin
 f usr/share/man/man1m/mkfile.1m 0444 root bin
+f usr/share/man/man1m/mkfs.1m 0444 root bin
 f usr/share/man/man1m/mkfs_pcfs.1m 0444 root bin
-f usr/share/man/man1m/mkfs_ufs.1m 0444 root bin
 f usr/share/man/man1m/mkfs_udfs.1m 0444 root bin
-f usr/share/man/man1m/mkfs.1m 0444 root bin
+f usr/share/man/man1m/mkfs_ufs.1m 0444 root bin
 f usr/share/man/man1m/mknod.1m 0444 root bin
 f usr/share/man/man1m/mkpwdict.1m 0444 root bin
 f usr/share/man/man1m/modinfo.1m 0444 root bin
 f usr/share/man/man1m/modload.1m 0444 root bin
 f usr/share/man/man1m/modunload.1m 0444 root bin
+f usr/share/man/man1m/mount.1m 0444 root bin
 f usr/share/man/man1m/mount_hsfs.1m 0444 root bin
 f usr/share/man/man1m/mount_nfs.1m 0444 root bin
 f usr/share/man/man1m/mount_pcfs.1m 0444 root bin
@@ -11972,7 +11973,6 @@ f usr/share/man/man1m/mount_smbfs.1m 0444 root bin
 f usr/share/man/man1m/mount_tmpfs.1m 0444 root bin
 f usr/share/man/man1m/mount_udfs.1m 0444 root bin
 f usr/share/man/man1m/mount_ufs.1m 0444 root bin
-f usr/share/man/man1m/mount.1m 0444 root bin
 f usr/share/man/man1m/mountall.1m 0444 root bin
 f usr/share/man/man1m/mpathadm.1m 0444 root bin
 f usr/share/man/man1m/mpstat.1m 0444 root bin
@@ -12047,10 +12047,10 @@ f usr/share/man/man1m/sbdadm.1m 0444 root bin
 f usr/share/man/man1m/sendmail.1m 0444 root bin
 f usr/share/man/man1m/setuname.1m 0444 root bin
 f usr/share/man/man1m/share.1m 0444 root bin
+f usr/share/man/man1m/share_nfs.1m 0444 root bin
 f usr/share/man/man1m/shareall.1m 0444 root bin
 f usr/share/man/man1m/sharectl.1m 0444 root bin
 f usr/share/man/man1m/sharemgr.1m 0444 root bin
-f usr/share/man/man1m/share_nfs.1m 0444 root bin
 f usr/share/man/man1m/showmount.1m 0444 root bin
 f usr/share/man/man1m/shutdown.1m 0444 root bin
 f usr/share/man/man1m/smbadm.1m 0444 root bin
@@ -12058,8 +12058,8 @@ f usr/share/man/man1m/smbios.1m 0444 root bin
 f usr/share/man/man1m/smbstat.1m 0444 root bin
 f usr/share/man/man1m/snoop.1m 0444 root bin
 f usr/share/man/man1m/soconfig.1m 0444 root bin
-f usr/share/man/man1m/spray.1m 0444 root bin
 f usr/share/man/man1m/sppptun.1m 0444 root bin
+f usr/share/man/man1m/spray.1m 0444 root bin
 f usr/share/man/man1m/sshd.1m 0444 root bin
 f usr/share/man/man1m/stmfadm.1m 0444 root bin
 f usr/share/man/man1m/stmsboot.1m 0444 root bin
@@ -12098,8 +12098,8 @@ s usr/share/man/man1m/umount.1m=mount.1m
 s usr/share/man/man1m/umountall.1m=mountall.1m
 s usr/share/man/man1m/unlink.1m=link.1m
 f usr/share/man/man1m/unshare.1m 0444 root bin
-s usr/share/man/man1m/unshareall.1m=shareall.1m
 f usr/share/man/man1m/unshare_nfs.1m 0444 root bin
+s usr/share/man/man1m/unshareall.1m=shareall.1m
 f usr/share/man/man1m/update_drv.1m 0444 root bin
 f usr/share/man/man1m/useradd.1m 0444 root bin
 f usr/share/man/man1m/userdel.1m 0444 root bin
@@ -12123,23 +12123,23 @@ f usr/share/man/man1m/zpool.1m 0444 root bin
 f usr/share/man/man1m/zstreamdump.1m 0444 root bin
 d usr/share/man/man2 0755 root bin
 f usr/share/man/man2/Intro.2 0444 root bin
-s usr/share/man/man2/_exit.2=exit.2
 s usr/share/man/man2/_Exit.2=exit.2
+s usr/share/man/man2/_exit.2=exit.2
 s usr/share/man/man2/_lwp_cond_broadcast.2=_lwp_cond_signal.2
 s usr/share/man/man2/_lwp_cond_reltimedwait.2=_lwp_cond_wait.2
+f usr/share/man/man2/_lwp_cond_signal.2 0444 root bin
 s usr/share/man/man2/_lwp_cond_timedwait.2=_lwp_cond_wait.2
+f usr/share/man/man2/_lwp_cond_wait.2 0444 root bin
 s usr/share/man/man2/_lwp_continue.2=_lwp_suspend.2
+f usr/share/man/man2/_lwp_info.2 0444 root bin
+f usr/share/man/man2/_lwp_kill.2 0444 root bin
+f usr/share/man/man2/_lwp_mutex_lock.2 0444 root bin
 s usr/share/man/man2/_lwp_mutex_trylock.2=_lwp_mutex_lock.2
 s usr/share/man/man2/_lwp_mutex_unlock.2=_lwp_mutex_lock.2
+f usr/share/man/man2/_lwp_self.2 0444 root bin
 s usr/share/man/man2/_lwp_sema_init.2=_lwp_sema_wait.2
 s usr/share/man/man2/_lwp_sema_post.2=_lwp_sema_wait.2
 s usr/share/man/man2/_lwp_sema_trywait.2=_lwp_sema_wait.2
-f usr/share/man/man2/_lwp_cond_signal.2 0444 root bin
-f usr/share/man/man2/_lwp_cond_wait.2 0444 root bin
-f usr/share/man/man2/_lwp_info.2 0444 root bin
-f usr/share/man/man2/_lwp_kill.2 0444 root bin
-f usr/share/man/man2/_lwp_mutex_lock.2 0444 root bin
-f usr/share/man/man2/_lwp_self.2 0444 root bin
 f usr/share/man/man2/_lwp_sema_wait.2 0444 root bin
 f usr/share/man/man2/_lwp_suspend.2 0444 root bin
 f usr/share/man/man2/access.2 0444 root bin
@@ -12184,8 +12184,8 @@ s usr/share/man/man2/fstatat.2=stat.2
 s usr/share/man/man2/fstatvfs.2=statvfs.2
 s usr/share/man/man2/futimesat.2=utimes.2
 f usr/share/man/man2/getacct.2 0444 root bin
-s usr/share/man/man2/getaudit_addr.2=getaudit.2
 f usr/share/man/man2/getaudit.2 0444 root bin
+s usr/share/man/man2/getaudit_addr.2=getaudit.2
 f usr/share/man/man2/getauid.2 0444 root bin
 f usr/share/man/man2/getcontext.2 0444 root bin
 f usr/share/man/man2/getdents.2 0444 root bin
@@ -12277,8 +12277,8 @@ f usr/share/man/man2/semget.2 0444 root bin
 f usr/share/man/man2/semids.2 0444 root bin
 f usr/share/man/man2/semop.2 0444 root bin
 s usr/share/man/man2/semtimedop.2=semop.2
-s usr/share/man/man2/setaudit_addr.2=getaudit.2
 s usr/share/man/man2/setaudit.2=getaudit.2
+s usr/share/man/man2/setaudit_addr.2=getaudit.2
 s usr/share/man/man2/setauid.2=getauid.2
 s usr/share/man/man2/setcontext.2=getcontext.2
 s usr/share/man/man2/setegid.2=setuid.2
@@ -13785,9 +13785,9 @@ s usr/share/man/man3curses/field_index.3curses=form_page.3curses
 s usr/share/man/man3curses/field_info.3curses=form_field_info.3curses
 s usr/share/man/man3curses/field_init.3curses=form_hook.3curses
 s usr/share/man/man3curses/field_just.3curses=form_field_just.3curses
+s usr/share/man/man3curses/field_opts.3curses=form_field_opts.3curses
 s usr/share/man/man3curses/field_opts_off.3curses=form_field_opts.3curses
 s usr/share/man/man3curses/field_opts_on.3curses=form_field_opts.3curses
-s usr/share/man/man3curses/field_opts.3curses=form_field_opts.3curses
 s usr/share/man/man3curses/field_pad.3curses=form_field_attributes.3curses
 s usr/share/man/man3curses/field_status.3curses=form_field_buffer.3curses
 s usr/share/man/man3curses/field_term.3curses=form_hook.3curses
@@ -13799,6 +13799,7 @@ s usr/share/man/man3curses/flushinp.3curses=curs_util.3curses
 f usr/share/man/man3curses/form_cursor.3curses 0444 root bin
 f usr/share/man/man3curses/form_data.3curses 0444 root bin
 f usr/share/man/man3curses/form_driver.3curses 0444 root bin
+f usr/share/man/man3curses/form_field.3curses 0444 root bin
 f usr/share/man/man3curses/form_field_attributes.3curses 0444 root bin
 f usr/share/man/man3curses/form_field_buffer.3curses 0444 root bin
 f usr/share/man/man3curses/form_field_info.3curses 0444 root bin
@@ -13807,16 +13808,15 @@ f usr/share/man/man3curses/form_field_new.3curses 0444 root bin
 f usr/share/man/man3curses/form_field_opts.3curses 0444 root bin
 f usr/share/man/man3curses/form_field_userptr.3curses 0444 root bin
 f usr/share/man/man3curses/form_field_validation.3curses 0444 root bin
-f usr/share/man/man3curses/form_field.3curses 0444 root bin
 s usr/share/man/man3curses/form_fields.3curses=form_field.3curses
 f usr/share/man/man3curses/form_fieldtype.3curses 0444 root bin
 f usr/share/man/man3curses/form_hook.3curses 0444 root bin
 s usr/share/man/man3curses/form_init.3curses=form_hook.3curses
-f usr/share/man/man3curses/form_new_page.3curses 0444 root bin
 f usr/share/man/man3curses/form_new.3curses 0444 root bin
+f usr/share/man/man3curses/form_new_page.3curses 0444 root bin
+f usr/share/man/man3curses/form_opts.3curses 0444 root bin
 s usr/share/man/man3curses/form_opts_off.3curses=form_opts.3curses
 s usr/share/man/man3curses/form_opts_on.3curses=form_opts.3curses
-f usr/share/man/man3curses/form_opts.3curses 0444 root bin
 f usr/share/man/man3curses/form_page.3curses 0444 root bin
 f usr/share/man/man3curses/form_post.3curses 0444 root bin
 s usr/share/man/man3curses/form_sub.3curses=form_win.3curses
@@ -13878,9 +13878,9 @@ s usr/share/man/man3curses/item_description.3curses=menu_item_name.3curses
 s usr/share/man/man3curses/item_index.3curses=menu_item_current.3curses
 s usr/share/man/man3curses/item_init.3curses=menu_hook.3curses
 s usr/share/man/man3curses/item_name.3curses=menu_item_name.3curses
+s usr/share/man/man3curses/item_opts.3curses=menu_item_opts.3curses
 s usr/share/man/man3curses/item_opts_off.3curses=menu_item_opts.3curses
 s usr/share/man/man3curses/item_opts_on.3curses=menu_item_opts.3curses
-s usr/share/man/man3curses/item_opts.3curses=menu_item_opts.3curses
 s usr/share/man/man3curses/item_term.3curses=menu_hook.3curses
 s usr/share/man/man3curses/item_userptr.3curses=menu_item_userptr.3curses
 s usr/share/man/man3curses/item_value.3curses=menu_item_value.3curses
@@ -13911,9 +13911,9 @@ f usr/share/man/man3curses/menu_item_visible.3curses 0444 root bin
 f usr/share/man/man3curses/menu_items.3curses 0444 root bin
 f usr/share/man/man3curses/menu_mark.3curses 0444 root bin
 f usr/share/man/man3curses/menu_new.3curses 0444 root bin
+f usr/share/man/man3curses/menu_opts.3curses 0444 root bin
 s usr/share/man/man3curses/menu_opts_off.3curses=menu_opts.3curses
 s usr/share/man/man3curses/menu_opts_on.3curses=menu_opts.3curses
-f usr/share/man/man3curses/menu_opts.3curses 0444 root bin
 s usr/share/man/man3curses/menu_pad.3curses=menu_attributes.3curses
 f usr/share/man/man3curses/menu_pattern.3curses 0444 root bin
 f usr/share/man/man3curses/menu_post.3curses 0444 root bin
@@ -13923,9 +13923,9 @@ f usr/share/man/man3curses/menu_userptr.3curses 0444 root bin
 f usr/share/man/man3curses/menu_win.3curses 0444 root bin
 f usr/share/man/man3curses/menus.3curses 0444 root bin
 s usr/share/man/man3curses/meta.3curses=curs_inopts.3curses
+s usr/share/man/man3curses/move.3curses=curs_move.3curses
 s usr/share/man/man3curses/move_field.3curses=form_field.3curses
 s usr/share/man/man3curses/move_panel.3curses=panel_move.3curses
-s usr/share/man/man3curses/move.3curses=curs_move.3curses
 s usr/share/man/man3curses/movenextch.3curses=curs_alecompat.3curses
 s usr/share/man/man3curses/moveprevch.3curses=curs_alecompat.3curses
 s usr/share/man/man3curses/mvaddch.3curses=curs_addch.3curses
@@ -14703,8 +14703,8 @@ f usr/share/man/man3lgrp/lgrp_cpus.3lgrp 0444 root bin
 f usr/share/man/man3lgrp/lgrp_fini.3lgrp 0444 root bin
 f usr/share/man/man3lgrp/lgrp_home.3lgrp 0444 root bin
 f usr/share/man/man3lgrp/lgrp_init.3lgrp 0444 root bin
-s usr/share/man/man3lgrp/lgrp_latency_cookie.3lgrp=lgrp_latency.3lgrp
 f usr/share/man/man3lgrp/lgrp_latency.3lgrp 0444 root bin
+s usr/share/man/man3lgrp/lgrp_latency_cookie.3lgrp=lgrp_latency.3lgrp
 f usr/share/man/man3lgrp/lgrp_mem_size.3lgrp 0444 root bin
 f usr/share/man/man3lgrp/lgrp_nlgrps.3lgrp 0444 root bin
 f usr/share/man/man3lgrp/lgrp_parents.3lgrp 0444 root bin
@@ -17323,10 +17323,10 @@ d usr/ucblib 0755 root bin
 s usr/ucblib/32=.
 s usr/ucblib/64=amd64
 d usr/ucblib/amd64 0755 root bin
-s usr/ucblib/amd64/libucb.so=libucb.so.1
 f usr/ucblib/amd64/libucb.so.1 0755 root bin
-s usr/ucblib/libucb.so=libucb.so.1
+s usr/ucblib/amd64/libucb.so=libucb.so.1
 f usr/ucblib/libucb.so.1 0755 root bin
+s usr/ucblib/libucb.so=libucb.so.1
 d usr/xpg4 0755 root bin
 d usr/xpg4/bin 0755 root bin
 s usr/xpg4/bin/alias=../../bin/alias