Regenerate these using mtree -cdinx -kuname,gname,mode on a very recently

built release after fixing all the wrong directory permissions in that release.

Then use diff -c -b to verify them against the old versions, nothing but
new directories added :-).  And a lot of alphabetizing done!

5 files changed, 346 insertions, 257 deletions

diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index 0c6a948..227f89f 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -1,52 +1,52 @@
-#	$Id$
+#	$Id: BSD.include.dist,v 1.1 1995/03/18 07:02:10 rgrimes Exp $
 #
 
 /set type=dir uname=bin gname=bin mode=0755
-.              
-    arpa           
+.
+    arpa
     ..
-    g++            
+    g++
     ..
-    kerberosIV     
+    kerberosIV
     ..
-    machine        
+    machine
     ..
-    net            
+    net
     ..
-    netccitt       
+    netccitt
     ..
-    netinet        
+    netinet
     ..
-    netiso         
+    netiso
     ..
-    netns          
+    netns
     ..
-    nfs            
+    nfs
     ..
-    objc           
+    objc
     ..
-    protocols      
+    protocols
     ..
-    readline       
+    readline
     ..
-    rpc            
+    rpc
     ..
-    rpcsvc         
+    rpcsvc
     ..
-    ss             
+    ss
     ..
-    sys            
+    sys
     ..
-    ufs            
-        ffs            
+    ufs
+        ffs
         ..
-        lfs            
+        lfs
         ..
-        mfs            
+        mfs
         ..
-        ufs            
+        ufs
         ..
     ..
-    vm             
+    vm
     ..
 ..
diff --git a/etc/mtree/BSD.local.dist b/etc/mtree/BSD.local.dist
index c0431e6..b3e36b8 100644
--- a/etc/mtree/BSD.local.dist
+++ b/etc/mtree/BSD.local.dist
@@ -1,21 +1,21 @@
-#	$Id: BSD.local.dist,v 1.9 1995/02/22 04:34:19 ache Exp $
+#     $Id: BSD.local.dist,v 1.10 1995/05/13 12:07:08 asami Exp $
 #
 
 /set type=dir uname=bin gname=bin mode=0755
 .               uname=root gname=wheel
-    bin            
+    bin
     ..
-    etc            
+    etc
     ..
     include
     ..
-    info           
+    info
     ..
-    lib            
+    lib
     ..
     libexec
     ..
-    man            
+    man
         cat1            uname=man
         ..
         cat2            uname=man
@@ -34,29 +34,29 @@
         ..
         catl            uname=man
         ..
-        man1           
+        man1
         ..
-        man2           
+        man2
         ..
-        man3           
+        man3
         ..
-        man4           
+        man4
         ..
-        man5           
+        man5
         ..
-        man6           
+        man6
         ..
-        man7           
+        man7
         ..
-        man8           
+        man8
         ..
-        manl           
+        manl
         ..
-        skel           
+        skel
         ..
     ..
-    share
-    ..
     sbin
     ..
+    share
+    ..
 ..
diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index 1588a06..c6c7b89 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -1,44 +1,44 @@
-#	$Id: BSD.root.dist,v 1.18 1994/09/19 01:40:37 rgrimes Exp $
+#	$Id: BSD.root.dist,v 1.19 1994/09/25 02:55:21 wollman Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
-.              
+.
     bin             uname=bin gname=bin
     ..
 /set type=dir uname=bin gname=bin mode=0555
     dev             uname=root gname=wheel mode=0755
-        fd             
+        fd
         ..
     ..
 /set type=dir uname=root gname=wheel mode=0755
-    etc            
-        gnats          
+    etc
+        gnats
         ..
-        kerberosIV     
+        kerberosIV
         ..
-        mtree          
+        mtree
         ..
-        namedb         
+        namedb
+        ..
+        ppp
         ..
-	ppp
-	..
         uucp            uname=uucp gname=uucp mode=0770
         ..
     ..
     lkm             uname=bin gname=bin
     ..
-    mnt            
+    mnt
     ..
     proc            mode=0555
     ..
-    root           
+    root
     ..
     sbin            uname=bin gname=bin
     ..
     tmp             uname=bin gname=bin mode=01777
     ..
-    usr            
+    usr
     ..
-    var            
+    var
     ..
 ..
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 1121b7c..120cb61 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -1,159 +1,231 @@
-#	$Id: BSD.usr.dist,v 1.38 1995/04/30 14:45:00 ache Exp $
+#	$Id: BSD.usr.dist,v 1.39 1995/05/09 23:06:59 jfieber Exp $
 #
 
 /set type=dir uname=bin gname=bin mode=0755
 .               uname=root gname=wheel
-    bin            
+    bin
     ..
 /set type=dir uname=games gname=bin mode=0700
     games           uname=bin mode=0755
-        hide           
+        hide
         ..
     ..
 /set type=dir uname=bin gname=bin mode=0755
-    include        
+    include
     ..
-    lib            
+    lib
     ..
-    libexec        
-        lpr            
+    libexec
+        lpr
         ..
-        uucp           
+        uucp
         ..
     ..
-    local          
+    local
     ..
-    mdec           
+    mdec
     ..
-    obj            
+    obj
     ..
-    sbin           
+    sbin
     ..
-    share          
-        calendar       
+    share
+        FAQ
+            FreeBSD-1.X
+            ..
+            Text
+            ..
+            extras
+            ..
+        ..
+        calendar
         ..
-        dict           
+        dict
+        ..
+        doc
+            papers
+            ..
+            psd
+                12.make
+                ..
+                18.gprof
+                ..
+                19.curses
+                ..
+                20.ipctut
+                ..
+                21.ipc
+                ..
+                22.rpcgen
+                ..
+                23.rpc
+                ..
+                24.xdr
+                ..
+                25.xdrrfc
+                ..
+                26.rpcrfc
+                ..
+                27.nfsrfc
+                ..
+            ..
+            smm
+                01.setup
+                ..
+                02.config
+                ..
+                03.fsck
+                ..
+                04.quotas
+                ..
+                05.fastfs
+                ..
+                06.nfs
+                ..
+                07.lpd
+                ..
+                08.sendmailop
+                ..
+                09.sendmail
+                ..
+                11.timedop
+                ..
+                12.timed
+                ..
+                18.net
+                ..
+            ..
+            usd
+                04.csh
+                ..
+                07.mail
+                ..
+                10.exref
+                ..
+                11.edit
+                ..
+                12.vi
+                ..
+                13.viref
+                ..
+                18.msdiffs
+                ..
+                19.memacros
+                ..
+                20.meref
+                ..
+                30.rogue
+                ..
+                31.trek
+                ..
+            ..
         ..
-	isdn
-	..
-        examples       
+        examples
             FreeBSD_version
             ..
-            cvs            
+            cvs
             ..
-            etc            
+            etc
             ..
             ibcs2
-	    ..
-	    lkm            
             ..
-            sunrpc         
+            lkm
+                misc
+                    module
+                    ..
+                    test
+                    ..
+                ..
+                syscall
+                    module
+                    ..
+                    test
+                    ..
+                ..
+            ..
+            sunrpc
+                dir
+                ..
+                msg
+                ..
+                sort
+                ..
+            ..
+            syscons
             ..
-	    syscons
-	    ..
         ..
 /set type=dir uname=games gname=bin mode=0755
         games           uname=bin
-            atc            
+            atc
             ..
-            boggle         
+            boggle
             ..
-            fortune        
+            fortune
             ..
-            larn           
+            larn
             ..
             quiz.db
-	    ..
+            ..
         ..
 /set type=dir uname=bin gname=bin mode=0755
-        groff_font     
-            devX100        
+        groff_font
+            devX100
             ..
-            devX100-12     
+            devX100-12
             ..
-            devX75         
+            devX75
             ..
-            devX75-12      
+            devX75-12
             ..
-            devascii       
+            devascii
             ..
-            devdvi         
-                generate       
+            devdvi
+                generate
                 ..
             ..
-	    devkoi8-r
+            devkoi8-r
             ..
-            devlatin1      
+            devlatin1
             ..
-            devps          
-                generate       
+            devps
+                generate
                 ..
             ..
         ..
-	info
-	..
-        sgml
-            FreeBSD
-                dtd
-                ..
-                lib
-                ..
-                rep
-                ..
+        info
+        ..
+        isdn
+        ..
+        locale
+            ja_JP.EUC
+            ..
+            lt_LN.ISO8859-1
+            ..
+            ru_SU.CP866
+            ..
+            ru_SU.KOI8-R
             ..
         ..
-	locale
-		ja_JP.EUC
-		..
-		lt_LN.ISO8859-1
-		..
-		da_DK.ISO8859-1	type=link link=lt_LN.ISO8859-1
-		de_AT.ISO8859-1	type=link link=lt_LN.ISO8859-1
-		de_CH.ISO8859-1	type=link link=lt_LN.ISO8859-1
-		de_DE.ISO8859-1	type=link link=lt_LN.ISO8859-1
-		en_AU.ISO8859-1	type=link link=lt_LN.ISO8859-1
-		en_CA.ISO8859-1	type=link link=lt_LN.ISO8859-1
-		en_GB.ISO8859-1	type=link link=lt_LN.ISO8859-1
-		en_US.ISO8859-1	type=link link=lt_LN.ISO8859-1
-		es_ES.ISO8859-1	type=link link=lt_LN.ISO8859-1
-		fi_FI.ISO8859-1	type=link link=lt_LN.ISO8859-1
-		fr_BE.ISO8859-1	type=link link=lt_LN.ISO8859-1
-		fr_CA.ISO8859-1	type=link link=lt_LN.ISO8859-1
-		fr_CH.ISO8859-1	type=link link=lt_LN.ISO8859-1
-		fr_FR.ISO8859-1	type=link link=lt_LN.ISO8859-1
-		is_IS.ISO8859-1	type=link link=lt_LN.ISO8859-1
-		it_CH.ISO8859-1	type=link link=lt_LN.ISO8859-1
-		it_IT.ISO8859-1	type=link link=lt_LN.ISO8859-1
-		nl_BE.ISO8859-1	type=link link=lt_LN.ISO8859-1
-		nl_NL.ISO8859-1	type=link link=lt_LN.ISO8859-1
-		no_NO.ISO8859-1	type=link link=lt_LN.ISO8859-1
-		pt_PT.ISO8859-1	type=link link=lt_LN.ISO8859-1
-		sv_SE.ISO8859-1	type=link link=lt_LN.ISO8859-1
-		ru_SU.CP866
-		..
-		ru_SU.KOI8-R
-		..
-	..
 /set type=dir uname=man gname=bin mode=0755
         man             uname=bin
-            cat1           
+            cat1
             ..
-            cat2           
+            cat2
             ..
-            cat3           
+            cat3
             ..
-            cat4           
-                i386           
+            cat4
+                i386
                 ..
             ..
-            cat5           
+            cat5
             ..
-            cat6           
+            cat6
             ..
-            cat7           
+            cat7
             ..
-            cat8           
-                i386           
+            cat8
+                i386
                 ..
             ..
             man1            uname=bin
@@ -163,124 +235,138 @@
             man3            uname=bin
             ..
 /set type=dir uname=bin gname=bin mode=0755
-            man4           
-                i386           
+            man4
+                i386
                 ..
             ..
-            man5           
+            man5
             ..
-            man6           
+            man6
             ..
-            man7           
+            man7
             ..
-            man8           
-                i386           
+            man8
+                i386
                 ..
             ..
         ..
-        me             
+        me
         ..
-        misc           
-	    pkg_manage
-	    ..
-            fonts          
+        misc
+            fonts
+            ..
+            pcvtfonts
+            ..
+            pkg_manage
             ..
         ..
-        mk             
+        mk
         ..
-	nls
-		ja_JP.EUC
-		..
-		lt_LN.ISO8859-1
-		..
-		da_DK.ISO8859-1
-		..
-		de_AT.ISO8859-1
-		..
-		de_CH.ISO8859-1
-		..
-		de_DE.ISO8859-1
-		..
-		en_AU.ISO8859-1
-		..
-		en_CA.ISO8859-1
-		..
-		en_GB.ISO8859-1
-		..
-		en_US.ISO8859-1
-		..
-		es_ES.ISO8859-1
-		..
-		fi_FI.ISO8859-1
-		..
-		fr_BE.ISO8859-1
-		..
-		fr_CA.ISO8859-1
-		..
-		fr_CH.ISO8859-1
-		..
-		fr_FR.ISO8859-1
-		..
-		is_IS.ISO8859-1
-		..
-		it_CH.ISO8859-1
-		..
-		it_IT.ISO8859-1
-		..
-		nl_BE.ISO8859-1
-		..
-		nl_NL.ISO8859-1
-		..
-		no_NO.ISO8859-1
-		..
-		pt_PT.ISO8859-1
-		..
-		sv_SE.ISO8859-1
-		..
-		ru_SU.KOI8-R
-		..
+        nls
+            da_DK.ISO8859-1
+            ..
+            de_AT.ISO8859-1
+            ..
+            de_CH.ISO8859-1
+            ..
+            de_DE.ISO8859-1
+            ..
+            en_AU.ISO8859-1
+            ..
+            en_CA.ISO8859-1
+            ..
+            en_GB.ISO8859-1
+            ..
+            en_US.ISO8859-1
+            ..
+            es_ES.ISO8859-1
+            ..
+            fi_FI.ISO8859-1
+            ..
+            fr_BE.ISO8859-1
+            ..
+            fr_CA.ISO8859-1
+            ..
+            fr_CH.ISO8859-1
+            ..
+            fr_FR.ISO8859-1
+            ..
+            is_IS.ISO8859-1
+            ..
+            it_CH.ISO8859-1
+            ..
+            it_IT.ISO8859-1
+            ..
+            ja_JP.EUC
+            ..
+            lt_LN.ISO8859-1
+            ..
+            nl_BE.ISO8859-1
+            ..
+            nl_NL.ISO8859-1
+            ..
+            no_NO.ISO8859-1
+            ..
+            pt_PT.ISO8859-1
+            ..
+            ru_SU.KOI8-R
+            ..
+            sv_SE.ISO8859-1
+            ..
         ..
-	perl
+        perl
             sys
             ..
-	..
-        skel           
         ..
-        syscons        
-            fonts          
+        sgml
+            FreeBSD
+                dtd
+                ..
+                lib
+                ..
+                rep
+                ..
+            ..
+        ..
+        skel
+        ..
+        syscons
+            fonts
             ..
-            keymaps        
+            keymaps
             ..
-            scrnmaps       
+            scrnmaps
             ..
         ..
-        tabset         
+        tabset
         ..
-        tmac           
-	    mdoc
+        tmac
+            mdoc
             ..
-            mm             
+            mm
             ..
         ..
 /set type=dir uname=bin gname=bin mode=0555
         zoneinfo        mode=0755
-            Africa         
+            Africa
+            ..
+            America
             ..
-            America        
+            Asia
             ..
-            Asia           
+            Atlantic
             ..
-            Atlantic       
+            Australia
             ..
-            Australia      
+            Etc
             ..
-            Etc            
+            Europe
             ..
-            Europe         
+            Indian
             ..
-            Pacific        
+            Pacific
             ..
-            SystemV        
+            SystemV
             ..
         ..
     ..
diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist
index f1795ef..1e44092 100644
--- a/etc/mtree/BSD.var.dist
+++ b/etc/mtree/BSD.var.dist
@@ -1,33 +1,33 @@
-#	$Id: BSD.var.dist,v 1.21 1995/02/15 01:51:18 jkh Exp $
+#	$Id: BSD.var.dist,v 1.22 1995/04/12 03:02:01 ache Exp $
 #
 
 /set type=dir uname=bin gname=bin mode=0755
 .               uname=root gname=wheel
-    account        
+    account
     ..
-/set type=dir uname=root gname=wheel mode=0755
-    at             
-	jobs		uname=daemon
-	..
-	spool		uname=daemon
+/set type=dir uname=daemon gname=wheel mode=0755
+    at              uname=root
+        jobs
+        ..
+        spool
         ..
     ..
-    backups         mode=0750
+    backups         uname=root mode=0750
     ..
-    crash           mode=0750
+    crash           uname=root mode=0750
     ..
 /set type=dir uname=root gname=wheel mode=0700
     cron            mode=0750
-        tabs           
+        tabs
         ..
     ..
     db              uname=bin gname=bin mode=0755
     ..
 /set type=dir uname=games gname=bin mode=0755
-    games          
-        hackdir        
+    games
+        hackdir
         ..
-        phantasia      
+        phantasia
         ..
     ..
     log             uname=bin
@@ -42,8 +42,6 @@
     ..
     rwho            uname=bin
     ..
-    yp		    uname=bin
-    ..
 /set type=dir uname=uucp gname=daemon mode=0755
     spool           uname=bin gname=bin
         lock            gname=dialer mode=0775
@@ -55,21 +53,26 @@
         output          uname=bin
         ..
 /set type=dir uname=uucp gname=uucp mode=0775
-        uucp           
-            .Preserve      
+        uucp
+            .Preserve
             ..
-            .Sequence      
+            .Sequence
             ..
-            .Status        
+            .Status
             ..
-            .Temp          
+            .Temp
             ..
-            .Xqtdir        
+            .Xqtdir
             ..
         ..
         uucppublic      mode=0777
         ..
     ..
-    tmp             uname=bin gname=bin mode=01777
+/set type=dir uname=bin gname=bin mode=01777
+    tmp
+        vi.recover
+        ..
+    ..
+    yp              mode=0755
     ..
 ..