These are mtree generated versions of these files using the

new mtree options.

I will be updating these shortly to remove some old stuff and add some
new stuff.  These currently produce the exact same trees as they did.

5 files changed, 361 insertions, 404 deletions

diff --git a/etc/mtree/BSD.local.dist b/etc/mtree/BSD.local.dist
index 90e7719..ed4433f 100644
--- a/etc/mtree/BSD.local.dist
+++ b/etc/mtree/BSD.local.dist
@@ -1,58 +1,54 @@
-#	$Id: BSD.local.dist,v 1.5 1994/05/20 22:50:36 jkh Exp $
+#	$Id$
 #
 
-.	type=dir uname=root gname=wheel mode=0755
-..
-
-/set type=file uname=bin gname=bin mode=0755
-bin	type=dir uname=bin gname=bin mode=0755
-..
-
-etc	type=dir uname=bin gname=bin mode=0755
-..
-
-info	type=dir uname=bin gname=bin mode=0755
-..
-
-lib	type=dir uname=bin gname=bin mode=0755
-..
-
-man	type=dir uname=bin gname=bin mode=0755
-	cat1	type=dir uname=man gname=bin mode=0755
-	..
-	cat2	type=dir uname=man gname=bin mode=0755
-	..
-	cat3	type=dir uname=man gname=bin mode=0755
-	..
-	cat4	type=dir uname=man gname=bin mode=0755
-	..
-	cat5	type=dir uname=man gname=bin mode=0755
-	..
-	cat6	type=dir uname=man gname=bin mode=0755
-	..
-	cat7	type=dir uname=man gname=bin mode=0755
-	..
-	cat8	type=dir uname=man gname=bin mode=0755
-	..
-	catl	type=dir uname=man gname=bin mode=0755
-	..
-	man1	type=dir uname=bin gname=bin mode=0755
-	..
-	man2	type=dir uname=bin gname=bin mode=0755
-	..
-	man3	type=dir uname=bin gname=bin mode=0755
-	..
-	man4	type=dir uname=bin gname=bin mode=0755
-	..
-	man5	type=dir uname=bin gname=bin mode=0755
-	..
-	man6	type=dir uname=bin gname=bin mode=0755
-	..
-	man7	type=dir uname=bin gname=bin mode=0755
-	..
-	man8	type=dir uname=bin gname=bin mode=0755
-	..
-	manl	type=dir uname=bin gname=bin mode=0755
-..
-skel	type=dir uname=bin gname=bin mode=0755
+/set type=dir uname=bin gname=bin mode=0755
+.               uname=root gname=wheel
+    bin            
+    ..
+    etc            
+    ..
+    info           
+    ..
+    lib            
+    ..
+    man            
+        cat1            uname=man
+        ..
+        cat2            uname=man
+        ..
+        cat3            uname=man
+        ..
+        cat4            uname=man
+        ..
+        cat5            uname=man
+        ..
+        cat6            uname=man
+        ..
+        cat7            uname=man
+        ..
+        cat8            uname=man
+        ..
+        catl            uname=man
+        ..
+        man1           
+        ..
+        man2           
+        ..
+        man3           
+        ..
+        man4           
+        ..
+        man5           
+        ..
+        man6           
+        ..
+        man7           
+        ..
+        man8           
+        ..
+        manl           
+        ..
+        skel           
+        ..
+    ..
 ..
diff --git a/etc/mtree/BSD.release.dist b/etc/mtree/BSD.release.dist
index 576a6db..7dcb262 100644
--- a/etc/mtree/BSD.release.dist
+++ b/etc/mtree/BSD.release.dist
@@ -2,23 +2,19 @@
 #
 
 /set type=dir uname=root gname=wheel mode=0755
-
-.
-..
-
-filesys
-..
-
-floppies
-..
-
-tarballs
-	bindist
-	..
-	objdist	
-	..
-	secrdist
-	..
-	srcdist	
-	..
+.              
+    filesys        
+    ..
+    floppies       
+    ..
+    tarballs       
+        bindist        
+        ..
+        objdist        
+        ..
+        secrdist       
+        ..
+        srcdist        
+        ..
+    ..
 ..
diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index 9f2d6b1..ceb05d3 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -1,57 +1,42 @@
-#	$Id: BSD.root.dist,v 1.16 1994/09/13 22:04:53 wollman Exp $
+#	$Id$
 #
 
-# top-level files are owned by root.wheel
-# (else too easy to get root by compromising these)
-
-/set type=file uname=root gname=wheel mode=0755
-
-.	type=dir
-..
-
-sys	type=link size=12 link=usr/src/sys
-
-dev	type=dir
-	fd	type=dir uname=bin gname=bin mode=0555
-	..
-..
-
-etc	type=dir
-	mtree	type=dir
-	..
-	namedb	type=dir
-	..
-	uucp    type=dir uname=uucp gname=uucp mode=0770
-	..
-	kerberosIV	type=dir
-	..
-	gnats		type=dir
-	..
-..
-
-mnt	type=dir
-..
-
-proc	type=dir uname=root gname=wheel mode=0555
-..
-
-root	type=dir
-..
-
-tmp	type=dir uname=bin gname=bin mode=01777
-..
-
-usr	type=dir
-..
-
-var	type=dir
-..
-
-# binary directories:
-/set uname=bin gname=bin mode=0755
-bin	type=dir
-..
-lkm	type=dir
-..
-sbin	type=dir
+/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             
+        ..
+    ..
+/set type=dir uname=root gname=wheel mode=0755
+    etc            
+        gnats          
+        ..
+        kerberosIV     
+        ..
+        mtree          
+        ..
+        namedb         
+        ..
+        uucp            uname=uucp gname=uucp mode=0770
+        ..
+    ..
+    lkm             uname=bin gname=bin
+    ..
+    mnt            
+    ..
+    proc            mode=0555
+    ..
+    root           
+    ..
+    sbin            uname=bin gname=bin
+    ..
+    tmp             uname=bin gname=bin mode=01777
+    ..
+    usr            
+    ..
+    var            
+    ..
 ..
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index a42c082..60fde2e 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -1,206 +1,191 @@
-#	$Id: BSD.usr.dist,v 1.20 1994/09/13 02:14:57 wollman Exp $
+#	$Id$
 #
 
-.	type=dir uname=root gname=wheel mode=0755
-..
-
-/set type=file uname=bin gname=bin mode=0755
-bin	type=dir uname=bin gname=bin mode=0755
-..
-
-/set type=file uname=games gname=bin mode=0700
-games	type=dir uname=bin gname=bin mode=0755
-	hide	type=dir uname=games gname=bin mode=0700
-	..
-..
-
-/set type=file uname=bin gname=bin mode=0755
-include	type=dir uname=bin gname=bin mode=0755
-	arpa		type=dir uname=bin gname=bin mode=0755
-	..
-	g++		type=dir uname=bin gname=bin mode=0755
-		gen	type=dir uname=bin gname=bin mode=0755
-		..
-		sys	type=dir uname=bin gname=bin mode=0755
-		..
-	..
-	md		type=dir uname=bin gname=bin mode=0755
-	..
-	objc		type=dir uname=bin gname=bin mode=0755
-	..
-	protocols	type=dir uname=bin gname=bin mode=0755
-	..
-	rpc		type=dir uname=bin gname=bin mode=0755
-	..
-	kerberosIV	type=dir uname=bin gname=bin mode=0755
-	..
-..
-
-/set type=file uname=bin gname=bin mode=0755
-lib	type=dir uname=bin gname=bin mode=0755
-..
-
-/set type=file uname=bin gname=bin mode=0755
-libexec	type=dir uname=bin gname=bin mode=0755
-	lpr	type=dir uname=bin gname=bin mode=0755
-	..
-	uucp    type=dir uname=bin gname=bin mode=0755
-	..
-..
-
-local	type=dir uname=bin gname=bin mode=0755
-..
-
-mdec	type=dir uname=bin gname=bin mode=0755
-..
-
-obj	type=dir uname=bin gname=bin mode=0755
-..
-
-sbin	type=dir uname=bin gname=bin mode=0755
-..
-
-share	type=dir uname=bin gname=bin mode=0755
-	calendar	type=dir uname=bin gname=bin mode=0755
-	..
-
-	dict		type=dir uname=bin gname=bin mode=0755
-	..
-
-	examples	type=dir uname=bin gname=bin mode=0755
-		etc	type=dir uname=bin gname=bin mode=0755
-		..
-		FreeBSD_version	type=dir uname=bin gname=bin mode=0755
-		..
-		lkm	type=dir uname=bin gname=bin mode=0755
-		..
-		sunrpc	type=dir uname=bin gname=bin mode=0755
-		..
-	..
-
-	/set type=file uname=games gname=bin mode=0755
-	games	type=dir uname=bin
-		atc	type=dir uname=games gname=bin mode=0755
-		..
-		boggle	type=dir uname=games gname=bin mode=0755
-		..
-		fortune	type=dir uname=games gname=bin mode=0755
-		..
-		larn	type=dir uname=games gname=bin mode=0755
-		..
-	..
-
-	/set type=file uname=bin gname=bin mode=0755
-	groff_font			type=dir uname=bin gname=bin mode=0755
-		devX100			type=dir uname=bin gname=bin mode=0755
-		..
-		devX100-12		type=dir uname=bin gname=bin mode=0755
-		..
-		devX75			type=dir uname=bin gname=bin mode=0755
-		..
-		devX75-12		type=dir uname=bin gname=bin mode=0755
-		..
-		devascii		type=dir uname=bin gname=bin mode=0755
-		..
-		devdvi			type=dir uname=bin gname=bin mode=0755
-			generate	type=dir uname=bin gname=bin mode=0755
-			..
-		..
-		devlatin1		type=dir uname=bin gname=bin mode=0755
-		..
-		devps			type=dir uname=bin gname=bin mode=0755
-			generate	type=dir uname=bin gname=bin mode=0755
-			..
-		..
-	..
-
-	/set type=file uname=bin gname=bin mode=0755
-	man	type=dir uname=bin gname=bin mode=0755
-		cat1	type=dir uname=man gname=bin mode=0755
-		..
-		cat2	type=dir uname=man gname=bin mode=0755
-		..
-		cat3	type=dir uname=man gname=bin mode=0755
-		..
-		cat4	type=dir uname=man gname=bin mode=0755
-			i386	type=dir uname=man gname=bin mode=0755
-			..
-		..
-		cat5	type=dir uname=man gname=bin mode=0755
-		..
-		cat6	type=dir uname=man gname=bin mode=0755
-		..
-		cat7	type=dir uname=man gname=bin mode=0755
-		..
-		cat8	type=dir uname=man gname=bin mode=0755
-			i386	type=dir uname=man gname=bin mode=0755
-			..
-		..
-		man1	type=dir uname=bin gname=bin mode=0755
-		..
-		man2	type=dir uname=bin gname=bin mode=0755
-		..
-		man3	type=dir uname=bin gname=bin mode=0755
-		..
-		man4	type=dir uname=bin gname=bin mode=0755
-			i386	type=dir uname=bin gname=bin mode=0755
-			..
-		..
-		man5	type=dir uname=bin gname=bin mode=0755
-		..
-		man6	type=dir uname=bin gname=bin mode=0755
-		..
-		man7	type=dir uname=bin gname=bin mode=0755
-		..
-		man8	type=dir uname=bin gname=bin mode=0755
-			i386	type=dir uname=bin gname=bin mode=0755
-			..
-		..
-	..
-	me	type=dir uname=bin gname=bin mode=0755
-	..
-	misc	type=dir uname=bin gname=bin mode=0755
-		fonts	type=dir uname=bin gname=bin mode=0755
-		..
-	..
-	mk	type=dir uname=bin gname=bin mode=0755
-	..
-	skel	type=dir uname=bin gname=bin mode=0755
-	..
-	syscons	type=dir uname=bin gname=bin mode=0755
-		fonts	type=dir uname=bin gname=bin mode=0755
-		..
-		keymaps	type=dir uname=bin gname=bin mode=0755
-		..
-		scrnmaps type=dir uname=bin gname=bin mode=0755
-		..
-	..
-	tabset	type=dir uname=bin gname=bin mode=0755
-	..
-	tmac	type=dir uname=bin gname=bin mode=0755
-		mm	type=dir uname=bin gname=bin mode=0755
-		..
-	..
-	zoneinfo	type=dir uname=bin gname=bin mode=0755
-		Africa		type=dir uname=bin gname=bin mode=0555
-		..
-		America		type=dir uname=bin gname=bin mode=0555
-		..
-		Asia		type=dir uname=bin gname=bin mode=0555
-		..
-		Atlantic	type=dir uname=bin gname=bin mode=0555
-		..
-		Australia	type=dir uname=bin gname=bin mode=0555
-		..
-		Etc		type=dir uname=bin gname=bin mode=0555
-		..
-		Europe		type=dir uname=bin gname=bin mode=0555
-		..
-		Pacific		type=dir uname=bin gname=bin mode=0555
-		..
-		SystemV		type=dir uname=bin gname=bin mode=0555
-		..
-	..
-..
-src type=dir uname=bin gname=bin mode=0755
+/set type=dir uname=bin gname=bin mode=0755
+.               uname=root gname=wheel
+    bin            
+    ..
+/set type=dir uname=games gname=bin mode=0700
+    games           uname=bin mode=0755
+        hide           
+        ..
+    ..
+/set type=dir uname=bin gname=bin mode=0755
+    include        
+        arpa           
+        ..
+        g++            
+            gen            
+            ..
+            sys            
+            ..
+        ..
+        kerberosIV     
+        ..
+        md             
+        ..
+        objc           
+        ..
+        protocols      
+        ..
+        rpc            
+        ..
+    ..
+    lib            
+    ..
+    libexec        
+        lpr            
+        ..
+        uucp           
+        ..
+    ..
+    local          
+    ..
+    mdec           
+    ..
+    obj            
+    ..
+    sbin           
+    ..
+    share          
+        calendar       
+        ..
+        dict           
+        ..
+        examples       
+            FreeBSD_version
+            ..
+            etc            
+            ..
+            lkm            
+            ..
+            sunrpc         
+            ..
+        ..
+/set type=dir uname=games gname=bin mode=0755
+        games           uname=bin
+            atc            
+            ..
+            boggle         
+            ..
+            fortune        
+            ..
+            larn           
+            ..
+        ..
+/set type=dir uname=bin gname=bin mode=0755
+        groff_font     
+            devX100        
+            ..
+            devX100-12     
+            ..
+            devX75         
+            ..
+            devX75-12      
+            ..
+            devascii       
+            ..
+            devdvi         
+                generate       
+                ..
+            ..
+            devlatin1      
+            ..
+            devps          
+                generate       
+                ..
+            ..
+        ..
+/set type=dir uname=man gname=bin mode=0755
+        man             uname=bin
+            cat1           
+            ..
+            cat2           
+            ..
+            cat3           
+            ..
+            cat4           
+                i386           
+                ..
+            ..
+            cat5           
+            ..
+            cat6           
+            ..
+            cat7           
+            ..
+            cat8           
+                i386           
+                ..
+            ..
+            man1            uname=bin
+            ..
+            man2            uname=bin
+            ..
+            man3            uname=bin
+            ..
+/set type=dir uname=bin gname=bin mode=0755
+            man4           
+                i386           
+                ..
+            ..
+            man5           
+            ..
+            man6           
+            ..
+            man7           
+            ..
+            man8           
+                i386           
+                ..
+            ..
+        ..
+        me             
+        ..
+        misc           
+            fonts          
+            ..
+        ..
+        mk             
+        ..
+        skel           
+        ..
+        syscons        
+            fonts          
+            ..
+            keymaps        
+            ..
+            scrnmaps       
+            ..
+        ..
+        tabset         
+        ..
+        tmac           
+            mm             
+            ..
+        ..
+/set type=dir uname=bin gname=bin mode=0555
+        zoneinfo        mode=0755
+            Africa         
+            ..
+            America        
+            ..
+            Asia           
+            ..
+            Atlantic       
+            ..
+            Australia      
+            ..
+            Etc            
+            ..
+            Europe         
+            ..
+            Pacific        
+            ..
+            SystemV        
+            ..
+        ..
+    ..
+    src             mode=0755
+    ..
 ..
diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist
index 4de86eb..c71c9bd 100644
--- a/etc/mtree/BSD.var.dist
+++ b/etc/mtree/BSD.var.dist
@@ -1,78 +1,73 @@
-#	$Id: BSD.var.dist,v 1.18 1994/09/09 13:43:21 rgrimes Exp $
+#	$Id$
 #
 
-.	type=dir uname=root gname=wheel mode=0755
-..
-
 /set type=dir uname=bin gname=bin mode=0755
-account
-..
+.               uname=root gname=wheel
+    account        
+    ..
 /set type=dir uname=root gname=wheel mode=0755
-at
-	jobs
-	..
-	spool
-	..
-..
-/set type=dir uname=root gname=wheel mode=0750
-backups
-..
-crash
-..
-cron
-	tabs	uname=root gname=wheel mode=0700
-	..
-..
-/set type=dir uname=bin gname=bin mode=0755
-db
-..
-log
-..
-mail
-..
-msgs
-..
-preserve
-..
-run
-..
-rwho
-..
-spool
-	/set type=dir uname=bin gname=daemon mode=0755
-	lock    uname=uucp gname=dialer mode=0775
-	..
-	lpd
-	..
-	mqueue	uname=root gname=daemon
-	..
-	output
-	..
-	/set type=dir uname=uucp gname=uucp mode=0775
-	uucp
-		.Preserve	
-		..
-		.Sequence
-		..
-		.Status
-		..
-		.Temp
-		..
-		.Xqtdir
-		..
-	..
-	/set type=dir uname=uucp gname=uucp mode=0777
-	uucppublic
-	..
-..
-/set type=dir uname=bin gname=bin mode=0755
-tmp	mode=01777
-..
-
-/set type=file uname=games gname=bin mode=0755
-games	type=dir
-	hackdir	type=dir
-	..
-	phantasia type=dir
-	..
+    at             
+        jobs           
+        ..
+        spool          
+        ..
+    ..
+    backups         mode=0750
+    ..
+    crash           mode=0750
+    ..
+/set type=dir uname=root gname=wheel mode=0700
+    cron            mode=0750
+        tabs           
+        ..
+    ..
+    db              uname=bin gname=bin mode=0755
+    ..
+/set type=dir uname=games gname=bin mode=0755
+    games          
+        hackdir        
+        ..
+        phantasia      
+        ..
+    ..
+    log             uname=bin
+    ..
+    mail            uname=bin
+    ..
+    msgs            uname=bin
+    ..
+    preserve        uname=bin
+    ..
+    run             uname=bin
+    ..
+    rwho            uname=bin
+    ..
+/set type=dir uname=uucp gname=daemon mode=0755
+    spool           uname=bin gname=bin
+        lock            gname=dialer mode=0775
+        ..
+        lpd             uname=bin
+        ..
+        mqueue          uname=root
+        ..
+        output          uname=bin
+        ..
+/set type=dir uname=uucp gname=uucp mode=0775
+        uucp           
+            .Preserve      
+            ..
+            .Sequence      
+            ..
+            .Status        
+            ..
+            .Temp          
+            ..
+            .Xqtdir        
+            ..
+        ..
+        uucppublic      mode=0777
+        ..
+    ..
+    tmp             uname=bin gname=bin mode=01777
+    ..
 ..