From 644d129f6734d5484c50510cf96d1f6cf3e4f253 Mon Sep 17 00:00:00 2001 From: mrg Date: Thu, 28 Aug 2008 09:01:23 +0000 Subject: [PATCH] add /usr/X11R7 dirs. --- distrib/sets/lists/base/mi | 174 ++++++++++++++++++++++++++++++++++++- etc/mtree/NetBSD.dist | 172 +++++++++++++++++++++++++++++++++++- 2 files changed, 344 insertions(+), 2 deletions(-) diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi index 099f78548069..9ebfaece2811 100644 --- a/distrib/sets/lists/base/mi +++ b/distrib/sets/lists/base/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.764 2008/08/17 13:26:36 plunky Exp $ +# $NetBSD: mi,v 1.765 2008/08/28 09:01:23 mrg Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -443,6 +443,175 @@ ./usr/X11R6/share base-x11-root ./usr/X11R6/share/examples base-x11-root ./usr/X11R6/share/examples/ssh-askpass base-x11-root +./usr/X11R7 base-x11-root +./usr/X11R7/bin base-x11-root +./usr/X11R7/include base-x11-root +./usr/X11R7/include/DPS base-x11-root +./usr/X11R7/include/GL base-x11-root +./usr/X11R7/include/GL/internal base-x11-root +./usr/X11R7/include/X11 base-x11-root +./usr/X11R7/include/X11/dri base-x11-root +./usr/X11R7/include/X11/drm base-x11-root +./usr/X11R7/include/X11/ICE base-x11-root +./usr/X11R7/include/X11/PM base-x11-root +./usr/X11R7/include/X11/SM base-x11-root +./usr/X11R7/include/X11/Xaw base-x11-root +./usr/X11R7/include/X11/Xcursor base-x11-root +./usr/X11R7/include/X11/Xft base-x11-root +./usr/X11R7/include/X11/Xmu base-x11-root +./usr/X11R7/include/X11/XprintAppUtil base-x11-root +./usr/X11R7/include/X11/XprintUtil base-x11-root +./usr/X11R7/include/X11/Xtrans base-x11-root +./usr/X11R7/include/X11/bitmaps base-x11-root +./usr/X11R7/include/X11/extensions base-x11-root +./usr/X11R7/include/X11/fonts base-x11-root +./usr/X11R7/include/X11/fonts/codeconv base-obsolete obsolete +./usr/X11R7/include/X11/pixmaps base-x11-root +./usr/X11R7/include/fontconfig base-x11-root +./usr/X11R7/include/freetype2 base-x11-root +./usr/X11R7/include/freetype2/freetype base-x11-root +./usr/X11R7/include/freetype2/freetype/cache base-x11-root +./usr/X11R7/include/freetype2/freetype/config base-x11-root +./usr/X11R7/include/freetype2/freetype/internal base-x11-root +./usr/X11R7/include/freetype2/freetype/internal/services base-x11-root +./usr/X11R7/include/pixman-1 base-x11-root +./usr/X11R7/include/xorg base-x11-root +./usr/X11R7/lib base-x11-root +./usr/X11R7/lib/X11 base-x11-root +./usr/X11R7/lib/X11/app-defaults base-x11-root +./usr/X11R7/lib/X11/config base-x11-root +./usr/X11R7/lib/X11/doc base-x11-root +./usr/X11R7/lib/X11/etc base-x11-root +./usr/X11R7/lib/X11/fonts base-x11-root +./usr/X11R7/lib/X11/fonts/100dpi base-x11-root +./usr/X11R7/lib/X11/fonts/75dpi base-x11-root +./usr/X11R7/lib/X11/fonts/CID base-x11-root +./usr/X11R7/lib/X11/fonts/Speedo base-x11-root +./usr/X11R7/lib/X11/fonts/TTF base-x11-root +./usr/X11R7/lib/X11/fonts/Type1 base-x11-root +./usr/X11R7/lib/X11/fonts/cyrillic base-x11-root +./usr/X11R7/lib/X11/fonts/encodings base-x11-root +./usr/X11R7/lib/X11/fonts/encodings/large base-x11-root +./usr/X11R7/lib/X11/fonts/local base-x11-root +./usr/X11R7/lib/X11/fonts/misc base-x11-root +./usr/X11R7/lib/X11/fonts/util base-x11-root +./usr/X11R7/lib/X11/locale base-x11-root +./usr/X11R7/lib/X11/locale/C base-x11-root +./usr/X11R7/lib/X11/locale/am_ET.UTF-8 base-x11-root +./usr/X11R7/lib/X11/locale/armscii-8 base-x11-root +./usr/X11R7/lib/X11/locale/el_GR.UTF-8 base-x11-root +./usr/X11R7/lib/X11/locale/en_US.UTF-8 base-x11-root +./usr/X11R7/lib/X11/locale/georgian-academy base-x11-root +./usr/X11R7/lib/X11/locale/georgian-ps base-x11-root +./usr/X11R7/lib/X11/locale/ibm-cp1133 base-x11-root +./usr/X11R7/lib/X11/locale/iscii-dev base-x11-root +./usr/X11R7/lib/X11/locale/isiri-3342 base-x11-root +./usr/X11R7/lib/X11/locale/iso8859-1 base-x11-root +./usr/X11R7/lib/X11/locale/iso8859-10 base-x11-root +./usr/X11R7/lib/X11/locale/iso8859-11 base-x11-root +./usr/X11R7/lib/X11/locale/iso8859-13 base-x11-root +./usr/X11R7/lib/X11/locale/iso8859-14 base-x11-root +./usr/X11R7/lib/X11/locale/iso8859-15 base-x11-root +./usr/X11R7/lib/X11/locale/iso8859-2 base-x11-root +./usr/X11R7/lib/X11/locale/iso8859-3 base-x11-root +./usr/X11R7/lib/X11/locale/iso8859-4 base-x11-root +./usr/X11R7/lib/X11/locale/iso8859-5 base-x11-root +./usr/X11R7/lib/X11/locale/iso8859-6 base-x11-root +./usr/X11R7/lib/X11/locale/iso8859-7 base-x11-root +./usr/X11R7/lib/X11/locale/iso8859-8 base-x11-root +./usr/X11R7/lib/X11/locale/iso8859-9 base-x11-root +./usr/X11R7/lib/X11/locale/iso8859-9e base-x11-root +./usr/X11R7/lib/X11/locale/ja base-x11-root +./usr/X11R7/lib/X11/locale/ja.JIS base-x11-root +./usr/X11R7/lib/X11/locale/ja.S90 base-x11-root +./usr/X11R7/lib/X11/locale/ja.SJIS base-x11-root +./usr/X11R7/lib/X11/locale/ja.U90 base-x11-root +./usr/X11R7/lib/X11/locale/ja_JP.UTF-8 base-x11-root +./usr/X11R7/lib/X11/locale/ko base-x11-root +./usr/X11R7/lib/X11/locale/ko_KR.UTF-8 base-x11-root +./usr/X11R7/lib/X11/locale/koi8-c base-x11-root +./usr/X11R7/lib/X11/locale/koi8-r base-x11-root +./usr/X11R7/lib/X11/locale/koi8-u base-x11-root +./usr/X11R7/lib/X11/locale/lib base-x11-root +./usr/X11R7/lib/X11/locale/lib/common base-x11-root +./usr/X11R7/lib/X11/locale/microsoft-cp1251 base-x11-root +./usr/X11R7/lib/X11/locale/microsoft-cp1255 base-x11-root +./usr/X11R7/lib/X11/locale/microsoft-cp1256 base-x11-root +./usr/X11R7/lib/X11/locale/mulelao-1 base-x11-root +./usr/X11R7/lib/X11/locale/nokhchi-1 base-x11-root +./usr/X11R7/lib/X11/locale/pt_BR.UTF-8 base-x11-root +./usr/X11R7/lib/X11/locale/tatar-cyr base-x11-root +./usr/X11R7/lib/X11/locale/th_TH base-x11-root +./usr/X11R7/lib/X11/locale/th_TH.UTF-8 base-x11-root +./usr/X11R7/lib/X11/locale/tscii-0 base-x11-root +./usr/X11R7/lib/X11/locale/vi_VN.tcvn base-x11-root +./usr/X11R7/lib/X11/locale/vi_VN.viscii base-x11-root +./usr/X11R7/lib/X11/locale/zh_CN base-x11-root +./usr/X11R7/lib/X11/locale/zh_CN.UTF-8 base-x11-root +./usr/X11R7/lib/X11/locale/zh_CN.gb18030 base-x11-root +./usr/X11R7/lib/X11/locale/zh_CN.gbk base-x11-root +./usr/X11R7/lib/X11/locale/zh_HK.UTF-8 base-x11-root +./usr/X11R7/lib/X11/locale/zh_HK.big5 base-x11-root +./usr/X11R7/lib/X11/locale/zh_HK.big5hkscs base-x11-root +./usr/X11R7/lib/X11/locale/zh_TW base-x11-root +./usr/X11R7/lib/X11/locale/zh_TW.UTF-8 base-x11-root +./usr/X11R7/lib/X11/locale/zh_TW.big5 base-x11-root +./usr/X11R7/lib/X11/x11perfcomp base-x11-root +./usr/X11R7/lib/X11/xedit base-x11-root +./usr/X11R7/lib/X11/xedit/lisp base-x11-root +./usr/X11R7/lib/X11/xedit/lisp/progmodes base-x11-root +./usr/X11R7/lib/X11/xkb base-x11-root +./usr/X11R7/lib/X11/xkb/compat base-x11-root +./usr/X11R7/lib/X11/xkb/compiled base-x11-root +./usr/X11R7/lib/X11/xkb/geometry base-x11-root +./usr/X11R7/lib/X11/xkb/geometry/digital base-x11-root +./usr/X11R7/lib/X11/xkb/geometry/ibm base-x11-root +./usr/X11R7/lib/X11/xkb/geometry/sgi base-x11-root +./usr/X11R7/lib/X11/xkb/keycodes base-x11-root +./usr/X11R7/lib/X11/xkb/keycodes/digital base-x11-root +./usr/X11R7/lib/X11/xkb/keycodes/sgi base-x11-root +./usr/X11R7/lib/X11/xkb/keymap base-x11-root +./usr/X11R7/lib/X11/xkb/keymap/digital base-x11-root +./usr/X11R7/lib/X11/xkb/keymap/sgi base-x11-root +./usr/X11R7/lib/X11/xkb/keymap/sun base-x11-root +./usr/X11R7/lib/X11/xkb/rules base-x11-root +./usr/X11R7/lib/X11/xkb/semantics base-x11-root +./usr/X11R7/lib/X11/xkb/symbols base-x11-root +./usr/X11R7/lib/X11/xkb/symbols/digital base-x11-root +./usr/X11R7/lib/X11/xkb/symbols/fujitsu base-x11-root +./usr/X11R7/lib/X11/xkb/symbols/hp base-x11-root +./usr/X11R7/lib/X11/xkb/symbols/macintosh base-x11-root +./usr/X11R7/lib/X11/xkb/symbols/nec base-x11-root +./usr/X11R7/lib/X11/xkb/symbols/pc base-x11-root +./usr/X11R7/lib/X11/xkb/symbols/sgi base-x11-root +./usr/X11R7/lib/X11/xkb/symbols/sharp base-x11-root +./usr/X11R7/lib/X11/xkb/symbols/sony base-x11-root +./usr/X11R7/lib/X11/xkb/symbols/sun base-x11-root +./usr/X11R7/lib/X11/xkb/symbols/xfree68 base-x11-root +./usr/X11R7/lib/X11/xkb/torture base-x11-root +./usr/X11R7/lib/X11/xkb/types base-x11-root +./usr/X11R7/lib/modules base-x11-root +./usr/X11R7/lib/modules/codeconv base-obsolete obsolete +./usr/X11R7/lib/modules/drivers base-x11-root +./usr/X11R7/lib/modules/extensions base-x11-root +./usr/X11R7/lib/modules/fonts base-x11-root +./usr/X11R7/lib/modules/input base-x11-root +./usr/X11R7/lib/pkgconfig base-x11-root +./usr/X11R7/libexec base-x11-root +./usr/X11R7/man base-x11-root +./usr/X11R7/man/cat1 base-x11-root +./usr/X11R7/man/cat3 base-x11-root +./usr/X11R7/man/cat4 base-x11-root +./usr/X11R7/man/cat5 base-x11-root +./usr/X11R7/man/cat7 base-x11-root +./usr/X11R7/man/man1 base-x11-root +./usr/X11R7/man/man3 base-x11-root +./usr/X11R7/man/man4 base-x11-root +./usr/X11R7/man/man5 base-x11-root +./usr/X11R7/man/man7 base-x11-root +./usr/X11R7/share base-x11-root +./usr/X11R7/share/examples base-x11-root +./usr/X11R7/share/examples/ssh-askpass base-x11-root ./usr/bin base-sys-usr ./usr/bin/Mail base-mail-bin ./usr/bin/apply base-util-bin @@ -969,6 +1138,9 @@ ./usr/libdata/debug/usr/X11R6 base-sys-usr ./usr/libdata/debug/usr/X11R6/bin base-sys-usr ./usr/libdata/debug/usr/X11R6/libexec base-sys-usr +./usr/libdata/debug/usr/X11R7 base-sys-usr +./usr/libdata/debug/usr/X11R7/bin base-sys-usr +./usr/libdata/debug/usr/X11R7/libexec base-sys-usr ./usr/libdata/debug/usr/bin base-sys-usr ./usr/libdata/debug/usr/games base-sys-usr ./usr/libdata/debug/usr/libexec base-sys-usr diff --git a/etc/mtree/NetBSD.dist b/etc/mtree/NetBSD.dist index ed326e18ca24..29bfcdcd4663 100644 --- a/etc/mtree/NetBSD.dist +++ b/etc/mtree/NetBSD.dist @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist,v 1.377 2008/08/02 04:39:41 mrg Exp $ +# $NetBSD: NetBSD.dist,v 1.378 2008/08/28 09:01:23 mrg Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -234,6 +234,173 @@ ./usr/X11R6/share ./usr/X11R6/share/examples ./usr/X11R6/share/examples/ssh-askpass +./usr/X11R7 +./usr/X11R7/bin +./usr/X11R7/include +./usr/X11R7/include/DPS +./usr/X11R7/include/GL +./usr/X11R7/include/GL/internal +./usr/X11R7/include/X11 +./usr/X11R7/include/X11/drm +./usr/X11R7/include/X11/dri +./usr/X11R7/include/X11/ICE +./usr/X11R7/include/X11/PM +./usr/X11R7/include/X11/SM +./usr/X11R7/include/X11/Xaw +./usr/X11R7/include/X11/Xcursor +./usr/X11R7/include/X11/Xft +./usr/X11R7/include/X11/Xmu +./usr/X11R7/include/X11/XprintAppUtil +./usr/X11R7/include/X11/XprintUtil +./usr/X11R7/include/X11/Xtrans +./usr/X11R7/include/X11/bitmaps +./usr/X11R7/include/X11/extensions +./usr/X11R7/include/X11/fonts +./usr/X11R7/include/X11/pixmaps +./usr/X11R7/include/fontconfig +./usr/X11R7/include/freetype2 +./usr/X11R7/include/freetype2/freetype +./usr/X11R7/include/freetype2/freetype/cache +./usr/X11R7/include/freetype2/freetype/config +./usr/X11R7/include/freetype2/freetype/internal +./usr/X11R7/include/freetype2/freetype/internal/services +./usr/X11R7/include/pixman-1 +./usr/X11R7/include/xorg +./usr/X11R7/lib +./usr/X11R7/lib/X11 +./usr/X11R7/lib/X11/app-defaults +./usr/X11R7/lib/X11/config +./usr/X11R7/lib/X11/doc +./usr/X11R7/lib/X11/etc +./usr/X11R7/lib/X11/fonts +./usr/X11R7/lib/X11/fonts/100dpi +./usr/X11R7/lib/X11/fonts/75dpi +./usr/X11R7/lib/X11/fonts/CID +./usr/X11R7/lib/X11/fonts/Speedo +./usr/X11R7/lib/X11/fonts/TTF +./usr/X11R7/lib/X11/fonts/Type1 +./usr/X11R7/lib/X11/fonts/cyrillic +./usr/X11R7/lib/X11/fonts/encodings +./usr/X11R7/lib/X11/fonts/encodings/large +./usr/X11R7/lib/X11/fonts/local +./usr/X11R7/lib/X11/fonts/misc +./usr/X11R7/lib/X11/fonts/util +./usr/X11R7/lib/X11/locale +./usr/X11R7/lib/X11/locale/C +./usr/X11R7/lib/X11/locale/am_ET.UTF-8 +./usr/X11R7/lib/X11/locale/armscii-8 +./usr/X11R7/lib/X11/locale/el_GR.UTF-8 +./usr/X11R7/lib/X11/locale/en_US.UTF-8 +./usr/X11R7/lib/X11/locale/georgian-academy +./usr/X11R7/lib/X11/locale/georgian-ps +./usr/X11R7/lib/X11/locale/ibm-cp1133 +./usr/X11R7/lib/X11/locale/iscii-dev +./usr/X11R7/lib/X11/locale/isiri-3342 +./usr/X11R7/lib/X11/locale/iso8859-1 +./usr/X11R7/lib/X11/locale/iso8859-10 +./usr/X11R7/lib/X11/locale/iso8859-11 +./usr/X11R7/lib/X11/locale/iso8859-13 +./usr/X11R7/lib/X11/locale/iso8859-14 +./usr/X11R7/lib/X11/locale/iso8859-15 +./usr/X11R7/lib/X11/locale/iso8859-2 +./usr/X11R7/lib/X11/locale/iso8859-3 +./usr/X11R7/lib/X11/locale/iso8859-4 +./usr/X11R7/lib/X11/locale/iso8859-5 +./usr/X11R7/lib/X11/locale/iso8859-6 +./usr/X11R7/lib/X11/locale/iso8859-7 +./usr/X11R7/lib/X11/locale/iso8859-8 +./usr/X11R7/lib/X11/locale/iso8859-9 +./usr/X11R7/lib/X11/locale/iso8859-9e +./usr/X11R7/lib/X11/locale/ja +./usr/X11R7/lib/X11/locale/ja.JIS +./usr/X11R7/lib/X11/locale/ja.SJIS +./usr/X11R7/lib/X11/locale/ja.S90 +./usr/X11R7/lib/X11/locale/ja.U90 +./usr/X11R7/lib/X11/locale/ja_JP.UTF-8 +./usr/X11R7/lib/X11/locale/ko +./usr/X11R7/lib/X11/locale/ko_KR.UTF-8 +./usr/X11R7/lib/X11/locale/koi8-c +./usr/X11R7/lib/X11/locale/koi8-r +./usr/X11R7/lib/X11/locale/koi8-u +./usr/X11R7/lib/X11/locale/lib +./usr/X11R7/lib/X11/locale/lib/common +./usr/X11R7/lib/X11/locale/microsoft-cp1251 +./usr/X11R7/lib/X11/locale/microsoft-cp1255 +./usr/X11R7/lib/X11/locale/microsoft-cp1256 +./usr/X11R7/lib/X11/locale/mulelao-1 +./usr/X11R7/lib/X11/locale/nokhchi-1 +./usr/X11R7/lib/X11/locale/pt_BR.UTF-8 +./usr/X11R7/lib/X11/locale/tatar-cyr +./usr/X11R7/lib/X11/locale/th_TH +./usr/X11R7/lib/X11/locale/th_TH.UTF-8 +./usr/X11R7/lib/X11/locale/tscii-0 +./usr/X11R7/lib/X11/locale/vi_VN.tcvn +./usr/X11R7/lib/X11/locale/vi_VN.viscii +./usr/X11R7/lib/X11/locale/zh_CN +./usr/X11R7/lib/X11/locale/zh_CN.UTF-8 +./usr/X11R7/lib/X11/locale/zh_CN.gb18030 +./usr/X11R7/lib/X11/locale/zh_CN.gbk +./usr/X11R7/lib/X11/locale/zh_HK.UTF-8 +./usr/X11R7/lib/X11/locale/zh_HK.big5 +./usr/X11R7/lib/X11/locale/zh_HK.big5hkscs +./usr/X11R7/lib/X11/locale/zh_TW +./usr/X11R7/lib/X11/locale/zh_TW.UTF-8 +./usr/X11R7/lib/X11/locale/zh_TW.big5 +./usr/X11R7/lib/X11/x11perfcomp +./usr/X11R7/lib/X11/xedit +./usr/X11R7/lib/X11/xedit/lisp +./usr/X11R7/lib/X11/xedit/lisp/progmodes +./usr/X11R7/lib/X11/xkb +./usr/X11R7/lib/X11/xkb/compat +./usr/X11R7/lib/X11/xkb/compiled +./usr/X11R7/lib/X11/xkb/geometry +./usr/X11R7/lib/X11/xkb/geometry/digital +./usr/X11R7/lib/X11/xkb/geometry/ibm +./usr/X11R7/lib/X11/xkb/geometry/sgi +./usr/X11R7/lib/X11/xkb/keycodes +./usr/X11R7/lib/X11/xkb/keycodes/digital +./usr/X11R7/lib/X11/xkb/keycodes/sgi +./usr/X11R7/lib/X11/xkb/keymap +./usr/X11R7/lib/X11/xkb/keymap/digital +./usr/X11R7/lib/X11/xkb/keymap/sgi +./usr/X11R7/lib/X11/xkb/keymap/sun +./usr/X11R7/lib/X11/xkb/rules +./usr/X11R7/lib/X11/xkb/semantics +./usr/X11R7/lib/X11/xkb/symbols +./usr/X11R7/lib/X11/xkb/symbols/digital +./usr/X11R7/lib/X11/xkb/symbols/fujitsu +./usr/X11R7/lib/X11/xkb/symbols/hp +./usr/X11R7/lib/X11/xkb/symbols/macintosh +./usr/X11R7/lib/X11/xkb/symbols/nec +./usr/X11R7/lib/X11/xkb/symbols/pc +./usr/X11R7/lib/X11/xkb/symbols/sgi +./usr/X11R7/lib/X11/xkb/symbols/sharp +./usr/X11R7/lib/X11/xkb/symbols/sony +./usr/X11R7/lib/X11/xkb/symbols/sun +./usr/X11R7/lib/X11/xkb/symbols/xfree68 +./usr/X11R7/lib/X11/xkb/torture +./usr/X11R7/lib/X11/xkb/types +./usr/X11R7/lib/modules +./usr/X11R7/lib/modules/extensions +./usr/X11R7/lib/modules/fonts +./usr/X11R7/lib/modules/drivers +./usr/X11R7/lib/modules/input +./usr/X11R7/lib/pkgconfig +./usr/X11R7/libexec +./usr/X11R7/man +./usr/X11R7/man/cat1 +./usr/X11R7/man/cat3 +./usr/X11R7/man/cat4 +./usr/X11R7/man/cat5 +./usr/X11R7/man/cat7 +./usr/X11R7/man/man1 +./usr/X11R7/man/man3 +./usr/X11R7/man/man4 +./usr/X11R7/man/man5 +./usr/X11R7/man/man7 +./usr/X11R7/share +./usr/X11R7/share/examples +./usr/X11R7/share/examples/ssh-askpass ./usr/bin ./usr/games ./usr/games/hide gname=games mode=0750 @@ -341,6 +508,9 @@ ./usr/libdata/debug/usr/X11R6 ./usr/libdata/debug/usr/X11R6/bin ./usr/libdata/debug/usr/X11R6/libexec +./usr/libdata/debug/usr/X11R7 +./usr/libdata/debug/usr/X11R7/bin +./usr/libdata/debug/usr/X11R7/libexec ./usr/libdata/debug/usr/bin ./usr/libdata/debug/usr/games ./usr/libdata/debug/usr/libexec