MFH r289384-r293170

Sponsored by:	The FreeBSD Foundation

8 files changed, 167 insertions, 71 deletions

diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist
index 8df0a72..4a499ea 100644
--- a/etc/mtree/BSD.debug.dist
+++ b/etc/mtree/BSD.debug.dist
@@ -27,7 +27,7 @@
             ..
             lib
                 clang
-                    3.7.0
+                    3.7.1
                         lib
                             freebsd
                             ..
@@ -41,12 +41,6 @@
                 private
                 ..
             ..
-            lib32
-                i18n
-                ..
-                private
-                ..
-            ..
             libexec
                 bsdinstall
                 ..
diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index 48ec8b4..bb0b26d 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -241,6 +241,8 @@
     ..
     krb5
     ..
+    lib80211
+    ..
     libmilter
     ..
     libxo
diff --git a/etc/mtree/BSD.lib32.dist b/etc/mtree/BSD.lib32.dist
new file mode 100644
index 0000000..a82368f
--- /dev/null
+++ b/etc/mtree/BSD.lib32.dist
@@ -0,0 +1,14 @@
+# $FreeBSD$
+#
+# Please see the file src/etc/mtree/README before making changes to this file.
+#
+
+/set type=dir uname=root gname=wheel mode=0755
+.
+    lib32
+        dtrace
+        ..
+        i18n
+        ..
+    ..
+..
diff --git a/etc/mtree/BSD.libsoft.dist b/etc/mtree/BSD.libsoft.dist
new file mode 100644
index 0000000..69026a7
--- /dev/null
+++ b/etc/mtree/BSD.libsoft.dist
@@ -0,0 +1,14 @@
+# $FreeBSD$
+#
+# Please see the file src/etc/mtree/README before making changes to this file.
+#
+
+/set type=dir uname=root gname=wheel mode=0755
+.
+    libsoft
+        dtrace
+        ..
+        i18n
+        ..
+    ..
+..
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index 9e3d08c..ad76402 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -12,6 +12,8 @@
         ..
         date
         ..
+        dd
+        ..
         expr
         ..
         ls
@@ -269,10 +271,16 @@
                     ..
                 ..
             ..
+            nss
+            ..
             regex
                 data
                 ..
             ..
+            resolv
+            ..
+            rpc
+            ..
             ssp
             ..
             stdio
@@ -360,6 +368,8 @@
         ..
     ..
     sys
+        acl
+        ..
         aio
         ..
         fifo
@@ -367,11 +377,21 @@
         file
         ..
         kern
+            acct
+            ..
             execve
             ..
+            pipe
+            ..
         ..
         kqueue
         ..
+        mac
+            bsdextended
+            ..
+            portacl
+            ..
+        ..
         mqueue
         ..
         netinet
@@ -410,6 +430,8 @@
             unlink
             ..
         ..
+        posixshm
+        ..
         vfs
         ..
         vm
@@ -546,6 +568,8 @@
         ..
         lastcomm
         ..
+        limits
+        ..
         m4
         ..
         mkimg
@@ -590,6 +614,8 @@
         ..
         fstyp
         ..
+        makefs
+        ..
         newsyslog
         ..
         nmtree
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index f786438..1a5835b 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -19,8 +19,10 @@
         aout
         ..
         clang
-            3.7.0
+            3.7.1
                 include
+                    sanitizer
+                    ..
                 ..
                 lib
                     freebsd
@@ -43,12 +45,6 @@
             ..
         ..
     ..
-    lib32
-        dtrace
-        ..
-        i18n
-        ..
-    ..
     libdata
         gcc
         ..
@@ -190,12 +186,6 @@
             atm
             ..
             legal
-                intel_ipw
-                ..
-                intel_iwi
-                ..
-                intel_wpi
-                ..
             ..
             llvm
                 clang
@@ -298,6 +288,14 @@
                 ..
                 07.mail
                 ..
+                10.exref
+                ..
+                11.edit
+                ..
+                12.vi
+                ..
+                13.viref
+                ..
                 18.msdiffs
                 ..
                 19.memacros
@@ -517,14 +515,24 @@
             ..
         ..
         locale
-            UTF-8
-            ..
             af_ZA.ISO8859-1
             ..
             af_ZA.ISO8859-15
             ..
             af_ZA.UTF-8
             ..
+            ar_AE.UTF-8
+            ..
+            ar_EG.UTF-8
+            ..
+            ar_JO.UTF-8
+            ..
+            ar_MA.UTF-8
+            ..
+            ar_QA.UTF-8
+            ..
+            ar_SA.UTF-8
+            ..
             am_ET.UTF-8
             ..
             be_BY.CP1131
@@ -543,24 +551,24 @@
             ..
             ca_AD.ISO8859-15
             ..
-            ca_AD.UTF-8
-            ..
             ca_ES.ISO8859-1
             ..
             ca_ES.ISO8859-15
             ..
-            ca_ES.UTF-8
-            ..
             ca_FR.ISO8859-1
             ..
             ca_FR.ISO8859-15
             ..
-            ca_FR.UTF-8
-            ..
             ca_IT.ISO8859-1
             ..
             ca_IT.ISO8859-15
             ..
+            ca_AD.UTF-8
+            ..
+            ca_ES.UTF-8
+            ..
+            ca_FR.UTF-8
+            ..
             ca_IT.UTF-8
             ..
             cs_CZ.ISO8859-2
@@ -619,6 +627,14 @@
             ..
             en_GB.UTF-8
             ..
+            en_HK.ISO8859-1
+            ..
+            en_HK.UTF-8
+            ..
+            en_IE.ISO8859-1
+            ..
+            en_IE.ISO8859-15
+            ..
             en_IE.UTF-8
             ..
             en_NZ.ISO8859-1
@@ -629,6 +645,12 @@
             ..
             en_NZ.UTF-8
             ..
+            en_PH.UTF-8
+            ..
+            en_SG.ISO8859-1
+            ..
+            en_SG.UTF-8
+            ..
             en_US.ISO8859-1
             ..
             en_US.ISO8859-15
@@ -637,12 +659,32 @@
             ..
             en_US.UTF-8
             ..
+            en_ZA.ISO8859-1
+            ..
+            en_ZA.ISO8859-15
+            ..
+            en_ZA.US-ASCII
+            ..
+            en_ZA.UTF-8
+            ..
+            es_AR.ISO8859-1
+            ..
+            es_AR.UTF-8
+            ..
+            es_CR.UTF-8
+            ..
             es_ES.ISO8859-1
             ..
             es_ES.ISO8859-15
             ..
             es_ES.UTF-8
             ..
+            es_MX.ISO8859-1
+            ..
+            es_MX.UTF-8
+            ..
+            et_EE.ISO8859-1
+            ..
             et_EE.ISO8859-15
             ..
             et_EE.UTF-8
@@ -687,6 +729,8 @@
             ..
             hi_IN.ISCII-DEV
             ..
+            hi_IN.UTF-8
+            ..
             hr_HR.ISO8859-2
             ..
             hr_HR.UTF-8
@@ -725,39 +769,21 @@
             ..
             kk_Cyrl_KZ.UTF-8
             ..
-            kk_KZ.PT154
-            ..
-            kk_KZ.UTF-8
-            ..
             ko_KR.CP949
             ..
             ko_KR.UTF-8
             ..
             ko_KR.eucKR
             ..
-            la_LN.ISO8859-1
-            ..
-            la_LN.ISO8859-13
-            ..
-            la_LN.ISO8859-15
-            ..
-            la_LN.ISO8859-2
-            ..
-            la_LN.ISO8859-4
-            ..
-            la_LN.US-ASCII
-            ..
             lt_LT.ISO8859-13
             ..
-            lt_LT.ISO8859-4
-            ..
             lt_LT.UTF-8
             ..
             lv_LV.ISO8859-13
             ..
             lv_LV.UTF-8
             ..
-            mn_MN.UTF-8
+            mn_Cyrl_MN.UTF-8
             ..
             nb_NO.ISO8859-1
             ..
@@ -783,12 +809,6 @@
             ..
             nn_NO.UTF-8
             ..
-            no_NO.ISO8859-1
-            ..
-            no_NO.ISO8859-15
-            ..
-            no_NO.UTF-8
-            ..
             pl_PL.ISO8859-2
             ..
             pl_PL.UTF-8
@@ -817,6 +837,10 @@
             ..
             ru_RU.UTF-8
             ..
+            se_FI.UTF-8
+            ..
+            se_NO.UTF-8
+            ..
             sk_SK.ISO8859-2
             ..
             sk_SK.UTF-8
@@ -825,11 +849,19 @@
             ..
             sl_SI.UTF-8
             ..
-            sr_YU.ISO8859-2
+            sr_Cyrl_RS.ISO8859-5
             ..
-            sr_YU.ISO8859-5
+            sr_Cyrl_RS.UTF-8
             ..
-            sr_YU.UTF-8
+            sr_Latn_RS.ISO8859-2
+            ..
+            sr_Latn_RS.UTF-8
+            ..
+            sv_FI.ISO8859-1
+            ..
+            sv_FI.ISO8859-15
+            ..
+            sv_FI.UTF-8
             ..
             sv_SE.ISO8859-1
             ..
@@ -855,9 +887,27 @@
             ..
             zh_CN.GBK
             ..
+            zh_CN.eucCN
+            ..
             zh_CN.UTF-8
             ..
-            zh_CN.eucCN
+            zh_Hans_CN.GB18030
+            ..
+            zh_Hans_CN.GB2312
+            ..
+            zh_Hans_CN.GBK
+            ..
+            zh_Hans_CN.UTF-8
+            ..
+            zh_Hans_CN.eucCN
+            ..
+            zh_Hant_HK.Big5HKSCS
+            ..
+            zh_Hant_HK.UTF-8
+            ..
+            zh_Hant_TW.Big5
+            ..
+            zh_Hant_TW.UTF-8
             ..
             zh_HK.Big5HKSCS
             ..
@@ -1259,22 +1309,8 @@
             ..
             ko_KR.eucKR
             ..
-            la_LN.ISO8859-1
-            ..
-            la_LN.ISO8859-13
-            ..
-            la_LN.ISO8859-15
-            ..
-            la_LN.ISO8859-2
-            ..
-            la_LN.ISO8859-4
-            ..
-            la_LN.US-ASCII
-            ..
             lt_LT.ISO8859-13
             ..
-            lt_LT.ISO8859-4
-            ..
             lt_LT.UTF-8
             ..
             lv_LV.ISO8859-13
diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist
index d12e415..46b8dcd 100644
--- a/etc/mtree/BSD.var.dist
+++ b/etc/mtree/BSD.var.dist
@@ -46,6 +46,8 @@
         ..
         ipf             mode=0700
         ..
+        ntp             mode=0700
+        ..
         pkg
         ..
         ports
diff --git a/etc/mtree/Makefile b/etc/mtree/Makefile
index afed370..d8df25d 100644
--- a/etc/mtree/Makefile
+++ b/etc/mtree/Makefile
@@ -5,6 +5,8 @@
 FILES=	${_BSD.debug.dist} \
 	BSD.include.dist \
 	BSD.root.dist \
+	${_BSD.lib32.dist} \
+	${_BSD.libsoft.dist} \
 	${_BSD.sendmail.dist} \
 	${_BSD.tests.dist} \
 	BSD.usr.dist \
@@ -16,6 +18,12 @@ _BSD.debug.dist=	BSD.debug.dist
 .if ${MK_GROFF} != "no"
 _BSD.groff.dist=	BSD.groff.dist
 .endif
+.if ${MK_LIB32} != "no"
+_BSD.lib32.dist=	BSD.lib32.dist
+.endif
+.if ${MK_LIBSOFT} != "no"
+_BSD.libsoft.dist=	BSD.libsoft.dist
+.endif
 .if ${MK_SENDMAIL} != "no"
 _BSD.sendmail.dist=	BSD.sendmail.dist
 .endif