Simplify these now that default owner is root.wheel.

Partially reviewed by: bde

6 files changed, 129 insertions, 126 deletions

diff --git a/etc/mtree/BSD.local.dist b/etc/mtree/BSD.local.dist
index 33ee02d..b6e5453 100644
--- a/etc/mtree/BSD.local.dist
+++ b/etc/mtree/BSD.local.dist
@@ -1,4 +1,4 @@
-#     $Id: BSD.local.dist,v 1.39 1998/08/10 09:49:37 phk Exp $
+#     $Id: BSD.local.dist,v 1.40 1998/08/17 16:17:08 bde Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -18,51 +18,53 @@
     libexec
     ..
     man
-        cat1            uname=man
+/set type=dir uname=man gname=wheel mode=0755
+        cat1
         ..
-        cat2            uname=man
+        cat2
         ..
-        cat3            uname=man
+        cat3
         ..
-        cat4            uname=man
+        cat4
         ..
-        cat5            uname=man
+        cat5
         ..
-        cat6            uname=man
+        cat6
         ..
-        cat7            uname=man
+        cat7
         ..
-        cat8            uname=man
+        cat8
         ..
-        cat9            uname=man
+        cat9
         ..
-        catl            uname=man
+        catl
         ..
-        catn            uname=man
+        catn
         ..
-        de_DE.ISO_8859-1
-            cat1            uname=man
+        de_DE.ISO_8859-1    uname=root
+            cat1
             ..
-            cat2            uname=man
+            cat2
             ..
-            cat3            uname=man
+            cat3
             ..
-            cat4            uname=man
+            cat4
             ..
-            cat5            uname=man
+            cat5
             ..
-            cat6            uname=man
+            cat6
             ..
-            cat7            uname=man
+            cat7
             ..
-            cat8            uname=man
+            cat8
             ..
-            cat9            uname=man
+            cat9
             ..
-            catl            uname=man
+            catl
             ..
-            catn            uname=man
+            catn
             ..
+/set type=dir uname=root gname=wheel mode=0755
             man1
             ..
             man2
@@ -87,28 +89,30 @@
             ..
 	..
         ja
-            cat1            uname=man
+/set type=dir uname=man gname=wheel mode=0755
+            cat1
             ..
-            cat2            uname=man
+            cat2
             ..
-            cat3            uname=man
+            cat3
             ..
-            cat4            uname=man
+            cat4
             ..
-            cat5            uname=man
+            cat5
             ..
-            cat6            uname=man
+            cat6
             ..
-            cat7            uname=man
+            cat7
             ..
-            cat8            uname=man
+            cat8
             ..
-            cat9            uname=man
+            cat9
             ..
-            catl            uname=man
+            catl
             ..
-            catn            uname=man
+            catn
             ..
+/set type=dir uname=root gname=wheel mode=0755
             man1
             ..
             man2
diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index 8146eb2..6cb0a2f 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -1,12 +1,12 @@
-#	$Id: BSD.root.dist,v 1.28 1997/10/20 00:35:38 jmb Exp $
+#	$Id: BSD.root.dist,v 1.29 1998/09/14 08:34:45 obrien Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
 .
-    bin             uname=root gname=wheel
+    bin
     ..
 /set type=dir uname=root gname=wheel mode=0555
-    dev             uname=root gname=wheel mode=0755
+    dev             mode=0755
         fd
         ..
     ..
@@ -37,7 +37,7 @@
         uucp            uname=uucp gname=uucp mode=0770
         ..
     ..
-    lkm             uname=root gname=wheel
+    lkm
     ..
     mnt
     ..
@@ -45,7 +45,7 @@
     ..
     root
     ..
-    sbin            uname=root gname=wheel
+    sbin
     ..
     tmp             uname=root gname=wheel mode=01777
     ..
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 1fa5c1b..e07a4dd 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -1,16 +1,14 @@
-#	$Id: BSD.usr.dist,v 1.129 1998/09/15 12:08:49 jkh Exp $
+#	$Id: BSD.usr.dist,v 1.130 1998/09/15 17:17:02 jkh Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
-.               uname=root gname=wheel
+.
     bin
     ..
-/set type=dir uname=games gname=games mode=0700
-    games           uname=root mode=0755
-        hide        gname=games uname=root mode=0550
+    games
+        hide        gname=games mode=0550
         ..
     ..
-/set type=dir uname=root gname=wheel mode=0755
     include
     ..
     lib
@@ -147,7 +145,7 @@
         uucp
         ..
     ..
-    local uname=root gname=wheel
+    local
     ..
     mdec
     ..
@@ -354,7 +352,7 @@
             worm
             ..
         ..
-/set type=dir uname=games gname=games mode=0755
+/set type=dir uname=games gname=wheel mode=0755
         games           uname=root
             atc
             ..
@@ -468,8 +466,8 @@
 	    zh_TW.BIG5
             ..
         ..
-/set type=dir uname=man gname=man mode=0755
-        man             uname=root
+        man
+/set type=dir uname=man gname=wheel mode=0755
             cat1
             ..
             cat1aout
@@ -498,7 +496,7 @@
             ..
 	    catn
 	    ..
-            ja          uname=root
+            ja          uname=root gname=wheel
                 cat1
                 ..
                 cat2
@@ -519,36 +517,36 @@
                 ..
                 catn
                 ..
-                man1            uname=root
+/set type=dir uname=root gname=wheel mode=0755
+                man1
                 ..
-                man2            uname=root
+                man2
                 ..
-                man3            uname=root
+                man3
                 ..
-                man4            uname=root
+                man4
                 ..
-                man5            uname=root
+                man5
                 ..
-                man6            uname=root
+                man6
                 ..
-                man7            uname=root
+                man7
                 ..
-                man8            uname=root
+                man8
                 ..
-                man9            uname=root
+                man9
                 ..
-                mann            uname=root
+                mann
                 ..
             ..
-            man1            uname=root
+            man1
             ..
-            man1aout        uname=root
+            man1aout
             ..
-            man2            uname=root
+            man2
             ..
-            man3            uname=root
+            man3
             ..
-/set type=dir uname=root gname=wheel mode=0755
             man4
                 i386
                 ..
@@ -663,15 +661,13 @@
 	    ..
 	..
 	perl
-/set type=dir uname=root gname=wheel mode=0755
-	    man			uname=root
-		cat3
+	    man
+		cat3		uname=man
 		..
-		man3		uname=root
+		man3
 		..
 	    ..
 	..
-/set type=dir uname=root gname=wheel mode=0755
         skel
         ..
         syscons
@@ -698,8 +694,7 @@
 	    tcl
 	    ..
 	..
-/set type=dir uname=root gname=wheel mode=0555
-        zoneinfo        mode=0755
+        zoneinfo
             Africa
             ..
             America
diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist
index 6288974..3bf3141 100644
--- a/etc/mtree/BSD.var.dist
+++ b/etc/mtree/BSD.var.dist
@@ -1,8 +1,8 @@
-#	$Id: BSD.var.dist,v 1.35 1997/10/01 13:06:31 ache Exp $
+#	$Id: BSD.var.dist,v 1.36 1998/09/14 08:34:45 obrien Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
-.               uname=root gname=wheel
+.
     account
     ..
 /set type=dir uname=daemon gname=wheel mode=0755
@@ -34,15 +34,15 @@
         phantasia        gname=games mode=0775
         ..
     ..
-    log             uname=root
+    log
     ..
     mail            uname=root gname=mail mode=0775
     ..
     msgs            uname=daemon
     ..
-    preserve        uname=root
+    preserve
     ..
-    run             uname=root
+    run
     ..
     rwho            uname=root gname=daemon mode=0775
     ..
diff --git a/etc/mtree/BSD.x11-4.dist b/etc/mtree/BSD.x11-4.dist
index cb6be31..fd70b71 100644
--- a/etc/mtree/BSD.x11-4.dist
+++ b/etc/mtree/BSD.x11-4.dist
@@ -1,4 +1,4 @@
-#     $Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp $
+#     $Id: BSD.x11.dist,v 1.3 1998/03/20 16:53:03 itojun Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -186,51 +186,53 @@
     libexec
     ..
     man
-        cat1            uname=man
+/set type=dir uname=man gname=wheel mode=0755
+        cat1
         ..
-        cat2            uname=man
+        cat2
         ..
-        cat3            uname=man
+        cat3
         ..
-        cat4            uname=man
+        cat4
         ..
-        cat5            uname=man
+        cat5
         ..
-        cat6            uname=man
+        cat6
         ..
-        cat7            uname=man
+        cat7
         ..
-        cat8            uname=man
+        cat8
         ..
-        cat9            uname=man
+        cat9
         ..
-        catl            uname=man
+        catl
         ..
-        catn            uname=man
+        catn
         ..
-        ja
-            cat1            uname=man
+        ja              uname=root
+            cat1
             ..
-            cat2            uname=man
+            cat2
             ..
-            cat3            uname=man
+            cat3
             ..
-            cat4            uname=man
+            cat4
             ..
-            cat5            uname=man
+            cat5
             ..
-            cat6            uname=man
+            cat6
             ..
-            cat7            uname=man
+            cat7
             ..
-            cat8            uname=man
+            cat8
             ..
-            cat9            uname=man
+            cat9
             ..
-            catl            uname=man
+            catl
             ..
-            catn            uname=man
+            catn
             ..
+/set type=dir uname=root gname=wheel mode=0755
             man1
             ..
             man2
diff --git a/etc/mtree/BSD.x11.dist b/etc/mtree/BSD.x11.dist
index cb6be31..fd70b71 100644
--- a/etc/mtree/BSD.x11.dist
+++ b/etc/mtree/BSD.x11.dist
@@ -1,4 +1,4 @@
-#     $Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp $
+#     $Id: BSD.x11.dist,v 1.3 1998/03/20 16:53:03 itojun Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -186,51 +186,53 @@
     libexec
     ..
     man
-        cat1            uname=man
+/set type=dir uname=man gname=wheel mode=0755
+        cat1
         ..
-        cat2            uname=man
+        cat2
         ..
-        cat3            uname=man
+        cat3
         ..
-        cat4            uname=man
+        cat4
         ..
-        cat5            uname=man
+        cat5
         ..
-        cat6            uname=man
+        cat6
         ..
-        cat7            uname=man
+        cat7
         ..
-        cat8            uname=man
+        cat8
         ..
-        cat9            uname=man
+        cat9
         ..
-        catl            uname=man
+        catl
         ..
-        catn            uname=man
+        catn
         ..
-        ja
-            cat1            uname=man
+        ja              uname=root
+            cat1
             ..
-            cat2            uname=man
+            cat2
             ..
-            cat3            uname=man
+            cat3
             ..
-            cat4            uname=man
+            cat4
             ..
-            cat5            uname=man
+            cat5
             ..
-            cat6            uname=man
+            cat6
             ..
-            cat7            uname=man
+            cat7
             ..
-            cat8            uname=man
+            cat8
             ..
-            cat9            uname=man
+            cat9
             ..
-            catl            uname=man
+            catl
             ..
-            catn            uname=man
+            catn
             ..
+/set type=dir uname=root gname=wheel mode=0755
             man1
             ..
             man2