Index: stable/10/etc/mtree/BSD.tests.dist
===================================================================
--- stable/10/etc/mtree/BSD.tests.dist	(revision 313742)
+++ stable/10/etc/mtree/BSD.tests.dist	(revision 313743)
@@ -1,652 +1,652 @@
 # $FreeBSD$
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
 
 /set type=dir uname=root gname=wheel mode=0755
 .
     bin
         cat
         ..
         chown
         ..
         date
         ..
         dd
         ..
         expr
         ..
         ls
         ..
         mv
         ..
         pax
         ..
         pkill
         ..
         sh
             builtins
             ..
             errors
             ..
             execution
             ..
             expansion
             ..
             parameters
             ..
             parser
             ..
             set-e
             ..
         ..
         sleep
         ..
         test
         ..
     ..
     cddl
         lib
         ..
         sbin
         ..
         usr.bin
         ..
         usr.sbin
             dtrace
                 common
                     aggs
                     ..
                     arithmetic
                     ..
                     arrays
                     ..
                     assocs
                     ..
                     begin
                     ..
                     bitfields
                     ..
                     buffering
                     ..
                     builtinvar
                     ..
                     cg
                     ..
                     clauses
                     ..
                     cpc
                     ..
                     decls
                     ..
                     drops
                     ..
                     dtraceUtil
                     ..
                     end
                     ..
                     enum
                     ..
                     error
                     ..
                     exit
                     ..
                     fbtprovider
                     ..
                     funcs
                     ..
                     grammar
                     ..
                     include
                     ..
                     inline
                     ..
                     io
                     ..
                     ip
                     ..
                     java_api
                     ..
                     json
                     ..
                     lexer
                     ..
                     llquantize
                     ..
                     mdb
                     ..
                     mib
                     ..
                     misc
                     ..
                     multiaggs
                     ..
                     offsetof
                     ..
                     operators
                     ..
                     pid
                     ..
                     plockstat
                     ..
                     pointers
                     ..
                     pragma
                     ..
                     predicates
                     ..
                     preprocessor
                     ..
                     print
                     ..
                     printa
                     ..
                     printf
                     ..
                     privs
                     ..
                     probes
                     ..
                     proc
                     ..
                     profile-n
                     ..
                     providers
                     ..
                     raise
                     ..
                     rates
                     ..
                     safety
                     ..
                     scalars
                     ..
                     sched
                     ..
                     scripting
                     ..
                     sdt
                     ..
                     sizeof
                     ..
                     speculation
                     ..
                     stability
                     ..
                     stack
                     ..
                     stackdepth
                     ..
                     stop
                     ..
                     strlen
                     ..
                     strtoll
                     ..
                     struct
                     ..
                     syscall
                     ..
                     sysevent
                     ..
                     tick-n
                     ..
                     trace
                     ..
                     tracemem
                     ..
                     translators
                     ..
                     typedef
                     ..
                     types
                     ..
                     uctf
                     ..
                     union
                     ..
                     usdt
                     ..
                     ustack
                     ..
                     vars
                     ..
                     version
                     ..
                 ..
             ..
         ..
     ..
     etc
         rc.d
         ..
     ..
     games
     ..
     gnu
         lib
         ..
         usr.bin
             diff
             ..
         ..
     ..
     lib
         atf
             libatf-c
                 detail
                 ..
             ..
             libatf-c++
                 detail
                 ..
             ..
             test-programs
             ..
         ..
         libarchive
         ..
         libc
             c063
             ..
             db
             ..
             gen
                 execve
                 ..
                 posix_spawn
                 ..
             ..
             hash
                 data
                 ..
             ..
             iconv
             ..
             inet
             ..
             locale
             ..
             net
                 getaddrinfo
                     data
                     ..
                 ..
             ..
             nss
             ..
             regex
                 data
                 ..
             ..
             resolv
             ..
             rpc
             ..
             ssp
             ..
             setjmp
             ..
             stdio
             ..
             stdlib
             ..
             string
             ..
             sys
             ..
             time
             ..
             tls
                 dso
                 ..
             ..
             termios
             ..
             ttyio
             ..
         ..
         libcrypt
         ..
         libmp
         ..
         libnv
         ..
         libpam
         ..
         librt
         ..
         libthr
             dlopen
             ..
         ..
         libutil
         ..
         msun
         ..
     ..
     libexec
         atf
             atf-check
             ..
             atf-sh
             ..
         ..
     ..
     sbin
         dhclient
         ..
         devd
         ..
         growfs
         ..
         mdconfig
         ..
     ..
     secure
         lib
         ..
         libexec
         ..
         usr.bin
         ..
         usr.sbin
         ..
     ..
     share
         examples
             tests
                 atf
                 ..
                 plain
                 ..
             ..
         ..
     ..
     sys
         acl
         ..
         aio
         ..
         fifo
         ..
         file
         ..
         fs
             tmpfs
             ..
         ..
         geom
             class
                 concat
                 ..
                 eli
                 ..
                 gate
                 ..
                 gpt
                 ..
                 mirror
                 ..
                 nop
                 ..
                 raid3
                 ..
                 shsec
                 ..
                 stripe
                 ..
                 uzip
                     etalon
                     ..
                 ..
             ..
         ..
         kern
             acct
             ..
             execve
             ..
             pipe
             ..
         ..
         kqueue
             libkqueue
             ..
         ..
         mac
             bsdextended
             ..
             portacl
             ..
         ..
         mqueue
         ..
         netinet
         ..
         pjdfstest
             chflags
             ..
             chmod
             ..
             chown
             ..
             ftruncate
             ..
             granular
             ..
             link
             ..
             mkdir
             ..
             mkfifo
             ..
             mknod
             ..
             open
             ..
             rename
             ..
             rmdir
             ..
             symlink
             ..
             truncate
             ..
             unlink
             ..
         ..
         posixshm
         ..
         vfs
         ..
         vm
         ..
     ..
     usr.bin
         apply
         ..
         basename
         ..
         bmake
             archives
                 fmt_44bsd
                 ..
                 fmt_44bsd_mod
                 ..
                 fmt_oldbsd
                 ..
             ..
             basic
                 t0
                 ..
                 t1
                 ..
                 t2
                 ..
                 t3
                 ..
             ..
             execution
                 ellipsis
                 ..
                 empty
                 ..
                 joberr
                 ..
                 plus
                 ..
             ..
             shell
                 builtin
                 ..
                 meta
                 ..
                 path
                 ..
                 path_select
                 ..
                 replace
                 ..
                 select
                 ..
             ..
             suffixes
                 basic
                 ..
                 src_wild1
                 ..
                 src_wild2
                 ..
             ..
             syntax
                 directive-t0
                 ..
                 enl
                 ..
                 funny-targets
                 ..
                 semi
                 ..
             ..
             sysmk
                 t0
                     2
                         1
                         ..
                     ..
                     mk
                     ..
                 ..
                 t1
                     2
                         1
                         ..
                     ..
                     mk
                     ..
                 ..
                 t2
                     2
                         1
                         ..
                     ..
                     mk
                     ..
                 ..
             ..
             variables
                 modifier_M
                 ..
                 modifier_t
                 ..
                 opt_V
                 ..
                 t0
                 ..
             ..
         ..
-	bsdcat
-	..
+        bsdcat
+        ..
         calendar
         ..
         cmp
         ..
         cpio
         ..
         col
         ..
         comm
         ..
         cut
         ..
         dirname
         ..
         file2c
         ..
         grep
         ..
         gzip
         ..
         join
         ..
         jot
         ..
         lastcomm
         ..
         limits
         ..
         m4
         ..
         ncal
         ..
         opensm
         ..
         printf
         ..
         sed
             regress.multitest.out
             ..
         ..
         tar
         ..
         timeout
         ..
         tr
         ..
         truncate
         ..
         uudecode
         ..
         uuencode
         ..
         xargs
         ..
         yacc
             yacc
             ..
         ..
     ..
     usr.sbin
         etcupdate
         ..
         extattr
         ..
         fstyp
         ..
         makefs
         ..
         newsyslog
         ..
         nmtree
         ..
         pw
         ..
         rpcbind
         ..
         sa
         ..
     ..
 ..
 
 # vim: set expandtab ts=4 sw=4:
Index: stable/10/etc/mtree/BSD.var.dist
===================================================================
--- stable/10/etc/mtree/BSD.var.dist	(revision 313742)
+++ stable/10/etc/mtree/BSD.var.dist	(revision 313743)
@@ -1,106 +1,106 @@
 # $FreeBSD$
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
 
 /set type=dir uname=root gname=wheel mode=0755
 .
     account
     ..
     at
 /set uname=daemon
         jobs
         ..
         spool
         ..
 /set uname=root
     ..
 /set mode=0750
 /set gname=audit
     audit
         dist            uname=auditdistd gname=audit mode=0770
         ..
         remote          uname=auditdistd gname=wheel mode=0700
         ..
     ..
     authpf              uname=root gname=authpf mode=0770
     ..
 /set gname=wheel
     backups
     ..
-    cache		mode=0755
+    cache               mode=0755
     ..
     crash
     ..
     cron
         tabs            mode=0700
         ..
     ..
 /set mode=0755
     db
         entropy         uname=operator gname=operator mode=0700
         ..
         freebsd-update  mode=0700
         ..
         hyperv          mode=0700
         ..
         ipf             mode=0700
         ..
         ntp             mode=0700
         ..
         pkg
         ..
         ports
         ..
         portsnap
         ..
     ..
     empty           mode=0555 flags=schg
     ..
     games           gname=games mode=0775
     ..
     heimdal         mode=0700
     ..
     log
     ..
     mail            gname=mail mode=0775
     ..
     msgs            uname=daemon
     ..
     preserve
     ..
     run
         ppp             gname=network mode=0770
         ..
         wpa_supplicant
         ..
     ..
     rwho            gname=daemon mode=0775
     ..
     spool
         lock            uname=uucp gname=dialer mode=0775
         ..
 /set gname=daemon
         lpd
         ..
         mqueue
         ..
         opielocks       mode=0700
         ..
         output
             lpd
             ..
         ..
 /set gname=wheel
     ..
     tmp             mode=01777
         vi.recover      mode=01777
         ..
     ..
     unbound         uname=unbound gname=unbound mode=0755
         conf.d          uname=unbound gname=unbound mode=0755
         ..
     ..
     yp
     ..
 ..
Index: stable/10
===================================================================
--- stable/10	(revision 313742)
+++ stable/10	(revision 313743)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r311349,311445