sync with reality

1 files changed, 276 insertions, 122 deletions

diff --git a/etc/mtree/BSD.x11.dist b/etc/mtree/BSD.x11.dist
index 242d7fd03..12591f6f5 100644
--- a/etc/mtree/BSD.x11.dist
+++ b/etc/mtree/BSD.x11.dist
@@ -1,173 +1,327 @@
-#     $OpenBSD: BSD.x11.dist,v 1.3 2006/11/29 21:50:18 matthieu Exp $
-#     $FreeBSD: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp $
-#
+#     $OpenBSD: BSD.x11.dist,v 1.4 2006/12/17 21:36:43 matthieu Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
-.
-    bin
+.              
+    bin            
     ..
-    include
-	GL
-	..
-        X11
-            ICE
+    include        
+        GL             
+            internal       
             ..
-            PM
+        ..
+        X11            
+            ICE            
+            ..
+            PM             
+            ..
+            SM             
+            ..
+            Xaw            
+            ..
+            Xcursor        
+            ..
+            Xft            
+            ..
+            Xmu            
             ..
-            SM
+            XprintAppUtil  
             ..
-            Xaw
+            XprintUtil     
             ..
-	    Xcursor
-	    ..
-	    Xft
-	    ..
-            Xmu
-	    ..
-	    XprintAppUtil
-	    ..
-	    XprintUtil
+            Xtrans         
             ..
-            bitmaps
+            bitmaps        
             ..
-            extensions
+            extensions     
             ..
-            fonts
+            fonts          
             ..
-            pixmaps
+            pixmaps        
             ..
         ..
-	fontconfig
-	..
-	freetype2
-	    freetype
-		config
-		..
-		internal
-		    services
-		    ..
-		..
-	    ..
-	..
+        fontconfig     
+        ..
+        freetype2      
+            freetype       
+                config         
+                ..
+                internal       
+                    services       
+                    ..
+                ..
+            ..
+        ..
+        xorg           
+        ..
     ..
-    lib
-        X11
-            app-defaults
-	    ..
-            config
+    lib            
+        X11            
+            app-defaults   
             ..
-            fonts
-                100dpi
+            config         
+            ..
+            fonts          
+                100dpi         
+                ..
+                75dpi          
+                ..
+                OTF            
                 ..
-                75dpi
+                PEX            
                 ..
-                PEX
+                Speedo         
                 ..
-                Speedo
+                TTF            
                 ..
-                Type1
+                Type1          
                 ..
-                cyrillic
+                cyrillic       
                 ..
-                misc
+                encodings      
+                    large          
+                    ..
                 ..
+                misc           
+                ..
+                util           
+                ..
+            ..
+            fvwm           
             ..
-	    fvwm
-	    ..
-            locale
-                C
+            proxymngr      
+            ..
+            x11perfcomp    
+            ..
+            xedit          
+                lisp           
+                    progmodes      
+                    ..
                 ..
-                en_US.utf
+            ..
+            xserver        
+            ..
+        ..
+        modules        
+            drivers        
+            ..
+            extensions     
+            ..
+            fonts          
+            ..
+            input          
+            ..
+            linux          
+            ..
+            multimedia     
+            ..
+        ..
+        pkgconfig      
+        ..
+        xserver        
+        ..
+    ..
+    man            
+        cat1           
+        ..
+        cat3           
+        ..
+        cat4           
+        ..
+        cat5           
+        ..
+        cat7           
+        ..
+        man1           
+        ..
+        man3           
+        ..
+        man4           
+        ..
+        man5           
+        ..
+        man7           
+        ..
+    ..
+    share          
+        X11            
+            doc            
+            ..
+            locale         
+                C              
                 ..
-                iso8859-1
+                armscii-8      
                 ..
-                iso8859-2
+                el_GR.UTF-8    
                 ..
-                iso8859-3
+                en_US.UTF-8    
                 ..
-                iso8859-4
+                georgian-academy
                 ..
-                iso8859-5
+                georgian-ps    
                 ..
-                iso8859-6
+                ibm-cp1133     
                 ..
-                iso8859-7
+                iscii-dev      
                 ..
-                iso8859-8
+                isiri-3342     
                 ..
-                iso8859-9
+                iso8859-1      
                 ..
-                ja
+                iso8859-10     
                 ..
-                ja.JIS
+                iso8859-11     
                 ..
-                ja.SJIS
+                iso8859-13     
                 ..
-                ko
+                iso8859-14     
                 ..
-                koi8-r
+                iso8859-15     
                 ..
-                tbl_data
+                iso8859-2      
                 ..
-                th_TH.TACTIS
+                iso8859-3      
                 ..
-                zh
+                iso8859-4      
                 ..
-                zh_TW
+                iso8859-5      
+                ..
+                iso8859-6      
+                ..
+                iso8859-7      
+                ..
+                iso8859-8      
+                ..
+                iso8859-9      
+                ..
+                iso8859-9e     
+                ..
+                ja             
+                ..
+                ja.JIS         
+                ..
+                ja.S90         
+                ..
+                ja.SJIS        
+                ..
+                ja.U90         
+                ..
+                ja_JP.UTF-8    
+                ..
+                ko             
+                ..
+                ko_KR.UTF-8    
+                ..
+                koi8-c         
+                ..
+                koi8-r         
+                ..
+                koi8-u         
+                ..
+                microsoft-cp1251
+                ..
+                microsoft-cp1255
+                ..
+                microsoft-cp1256
+                ..
+                mulelao-1      
+                ..
+                nokhchi-1      
+                ..
+                pt_BR.UTF-8    
+                ..
+                tatar-cyr      
+                ..
+                th_TH          
+                ..
+                th_TH.UTF-8    
+                ..
+                tscii-0        
+                ..
+                vi_VN.tcvn     
+                ..
+                vi_VN.viscii   
+                ..
+                zh_CN          
+                ..
+                zh_CN.UTF-8    
+                ..
+                zh_CN.gb18030  
+                ..
+                zh_CN.gbk      
+                ..
+                zh_HK.UTF-8    
+                ..
+                zh_HK.big5     
+                ..
+                zh_HK.big5hkscs
+                ..
+                zh_TW          
+                ..
+                zh_TW.UTF-8    
+                ..
+                zh_TW.big5     
                 ..
             ..
-            proxymngr
-            ..
-            x11perfcomp
+            xkb            
+                compiled       
+                ..
             ..
-            xserver
+            xserver        
+                C              
+                    print          
+                        attributes     
+                        ..
+                        ddx-config     
+                            raster         
+                            ..
+                        ..
+                        models         
+                            CANONBJ10E-GS  
+                            ..
+                            CANONC3200-PS  
+                                fonts          
+                                ..
+                            ..
+                            GSdefault      
+                            ..
+                            HPDJ1600C      
+                                fonts          
+                                ..
+                            ..
+                            HPLJ4050-PS    
+                                fonts          
+                                ..
+                            ..
+                            HPLJ4family    
+                                fonts          
+                                ..
+                            ..
+                            PS2PDFspooldir-GS
+                            ..
+                            PSdefault      
+                                fonts          
+                                ..
+                            ..
+                            PSspooldir     
+                            ..
+                            SPSPARC2       
+                                fonts          
+                                ..
+                            ..
+                        ..
+                    ..
+                ..
+                en_US          
+                    print          
+                        attributes     
+                        ..
+                    ..
+                ..
             ..
         ..
-	modules
-	    drivers
-	    ..
-	    extensions
-	    ..
-	    fonts
-	    ..
-	    input
-	    ..
-	    linux
-	    ..
-	    multimedia
-	    ..
-	..
-	pkgconfig
-	..
-    ..
-    man
-        cat1
-        ..
-        cat3
-        ..
-        cat4
-        ..
-        cat5
+        aclocal        
         ..
-        cat7
+        mk             
         ..
-        man1
-        ..
-        man3
-        ..
-        man4
-        ..
-        man5
-        ..
-        man7
-        ..
-    ..
-    share
-	X11
-	..
-	aclocal
-	..
-	mk
-	..
     ..
 ..