Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src - do not create X11 subdirs always anymore
details: https://anonhg.NetBSD.org/src/rev/12f9e69db0e8
branches: trunk
changeset: 747269:12f9e69db0e8
user: mrg <mrg%NetBSD.org@localhost>
date: Mon Sep 07 19:34:29 2009 +0000
description:
- do not create X11 subdirs always anymore
- we now only create them when building X11, and only create the ones
we need (X11R6 xor X11R7)
- all these subdirs are now in the xbase set
- move the logic for running mtree into etc/mtree/Makefile
- split NetBSD.dist into 3 files, and have the build and postinstall handle
creating a possibly merged one. we still have a single installed file
called "NetBSD.dist".
diffstat:
distrib/sets/lists/base/mi | 372 +---------
distrib/sets/lists/xbase/mi | 394 +++++++++-
etc/Makefile | 27 +-
etc/mtree/Makefile | 43 +-
etc/mtree/NetBSD.dist | 1537 --------------------------------------
etc/mtree/NetBSD.dist.XFree86 | 177 ++++
etc/mtree/NetBSD.dist.Xorg | 175 ++++
etc/mtree/NetBSD.dist.base | 1189 +++++++++++++++++++++++++++++
usr.sbin/postinstall/postinstall | 18 +-
9 files changed, 1985 insertions(+), 1947 deletions(-)
diffs (truncated from 4898 to 300 lines):
diff -r 816a10614572 -r 12f9e69db0e8 distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi Mon Sep 07 18:23:06 2009 +0000
+++ b/distrib/sets/lists/base/mi Mon Sep 07 19:34:29 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.826 2009/09/06 21:03:27 pooka Exp $
+# $NetBSD: mi,v 1.827 2009/09/07 19:34:29 mrg Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -303,370 +303,6 @@
./stand base-sys-root
./tmp base-sys-root
./usr base-sys-root
-./usr/X11R6 base-x11-root
-./usr/X11R6/bin base-x11-root
-./usr/X11R6/include base-x11-root
-./usr/X11R6/include/DPS base-x11-root
-./usr/X11R6/include/GL base-x11-root
-./usr/X11R6/include/GL/internal base-x11-root
-./usr/X11R6/include/X11 base-x11-root
-./usr/X11R6/include/X11/dri base-x11-root
-./usr/X11R6/include/X11/drm base-x11-root
-./usr/X11R6/include/X11/ICE base-x11-root
-./usr/X11R6/include/X11/PM base-x11-root
-./usr/X11R6/include/X11/SM base-x11-root
-./usr/X11R6/include/X11/Xaw base-x11-root
-./usr/X11R6/include/X11/Xcursor base-x11-root
-./usr/X11R6/include/X11/Xft base-x11-root
-./usr/X11R6/include/X11/Xmu base-x11-root
-./usr/X11R6/include/X11/XprintAppUtil base-x11-root
-./usr/X11R6/include/X11/XprintUtil base-x11-root
-./usr/X11R6/include/X11/Xtrans base-x11-root
-./usr/X11R6/include/X11/bitmaps base-x11-root
-./usr/X11R6/include/X11/extensions base-x11-root
-./usr/X11R6/include/X11/fonts base-x11-root
-./usr/X11R6/include/X11/fonts/codeconv base-obsolete obsolete
-./usr/X11R6/include/X11/pixmaps base-x11-root
-./usr/X11R6/include/fontconfig base-x11-root
-./usr/X11R6/include/freetype2 base-x11-root
-./usr/X11R6/include/freetype2/freetype base-x11-root
-./usr/X11R6/include/freetype2/freetype/cache base-x11-root
-./usr/X11R6/include/freetype2/freetype/config base-x11-root
-./usr/X11R6/include/freetype2/freetype/internal base-x11-root
-./usr/X11R6/include/freetype2/freetype/internal/services base-x11-root
-./usr/X11R6/include/pixman-1 base-x11-root
-./usr/X11R6/include/xorg base-x11-root
-./usr/X11R6/lib base-x11-root
-./usr/X11R6/lib/X11 base-x11-root
-./usr/X11R6/lib/X11/app-defaults base-x11-root
-./usr/X11R6/lib/X11/config base-x11-root
-./usr/X11R6/lib/X11/doc base-x11-root
-./usr/X11R6/lib/X11/etc base-x11-root
-./usr/X11R6/lib/X11/fonts base-x11-root
-./usr/X11R6/lib/X11/fonts/100dpi base-x11-root
-./usr/X11R6/lib/X11/fonts/75dpi base-x11-root
-./usr/X11R6/lib/X11/fonts/CID base-x11-root
-./usr/X11R6/lib/X11/fonts/Speedo base-x11-root
-./usr/X11R6/lib/X11/fonts/TTF base-x11-root
-./usr/X11R6/lib/X11/fonts/Type1 base-x11-root
-./usr/X11R6/lib/X11/fonts/cyrillic base-x11-root
-./usr/X11R6/lib/X11/fonts/encodings base-x11-root
-./usr/X11R6/lib/X11/fonts/encodings/large base-x11-root
-./usr/X11R6/lib/X11/fonts/local base-x11-root
-./usr/X11R6/lib/X11/fonts/misc base-x11-root
-./usr/X11R6/lib/X11/fonts/util base-x11-root
-./usr/X11R6/lib/X11/locale base-x11-root
-./usr/X11R6/lib/X11/locale/C base-x11-root
-./usr/X11R6/lib/X11/locale/am_ET.UTF-8 base-x11-root
-./usr/X11R6/lib/X11/locale/armscii-8 base-x11-root
-./usr/X11R6/lib/X11/locale/el_GR.UTF-8 base-x11-root
-./usr/X11R6/lib/X11/locale/en_US.UTF-8 base-x11-root
-./usr/X11R6/lib/X11/locale/georgian-academy base-x11-root
-./usr/X11R6/lib/X11/locale/georgian-ps base-x11-root
-./usr/X11R6/lib/X11/locale/ibm-cp1133 base-x11-root
-./usr/X11R6/lib/X11/locale/iscii-dev base-x11-root
-./usr/X11R6/lib/X11/locale/isiri-3342 base-x11-root
-./usr/X11R6/lib/X11/locale/iso8859-1 base-x11-root
-./usr/X11R6/lib/X11/locale/iso8859-10 base-x11-root
-./usr/X11R6/lib/X11/locale/iso8859-11 base-x11-root
-./usr/X11R6/lib/X11/locale/iso8859-13 base-x11-root
-./usr/X11R6/lib/X11/locale/iso8859-14 base-x11-root
-./usr/X11R6/lib/X11/locale/iso8859-15 base-x11-root
-./usr/X11R6/lib/X11/locale/iso8859-2 base-x11-root
-./usr/X11R6/lib/X11/locale/iso8859-3 base-x11-root
-./usr/X11R6/lib/X11/locale/iso8859-4 base-x11-root
-./usr/X11R6/lib/X11/locale/iso8859-5 base-x11-root
-./usr/X11R6/lib/X11/locale/iso8859-6 base-x11-root
-./usr/X11R6/lib/X11/locale/iso8859-7 base-x11-root
-./usr/X11R6/lib/X11/locale/iso8859-8 base-x11-root
-./usr/X11R6/lib/X11/locale/iso8859-9 base-x11-root
-./usr/X11R6/lib/X11/locale/iso8859-9e base-x11-root
-./usr/X11R6/lib/X11/locale/ja base-x11-root
-./usr/X11R6/lib/X11/locale/ja.JIS base-x11-root
-./usr/X11R6/lib/X11/locale/ja.S90 base-x11-root
-./usr/X11R6/lib/X11/locale/ja.SJIS base-x11-root
-./usr/X11R6/lib/X11/locale/ja.U90 base-x11-root
-./usr/X11R6/lib/X11/locale/ja_JP.UTF-8 base-x11-root
-./usr/X11R6/lib/X11/locale/ko base-x11-root
-./usr/X11R6/lib/X11/locale/ko_KR.UTF-8 base-x11-root
-./usr/X11R6/lib/X11/locale/koi8-c base-x11-root
-./usr/X11R6/lib/X11/locale/koi8-r base-x11-root
-./usr/X11R6/lib/X11/locale/koi8-u base-x11-root
-./usr/X11R6/lib/X11/locale/lib base-x11-root
-./usr/X11R6/lib/X11/locale/lib/common base-x11-root
-./usr/X11R6/lib/X11/locale/microsoft-cp1251 base-x11-root
-./usr/X11R6/lib/X11/locale/microsoft-cp1255 base-x11-root
-./usr/X11R6/lib/X11/locale/microsoft-cp1256 base-x11-root
-./usr/X11R6/lib/X11/locale/mulelao-1 base-x11-root
-./usr/X11R6/lib/X11/locale/nokhchi-1 base-x11-root
-./usr/X11R6/lib/X11/locale/pt_BR.UTF-8 base-x11-root
-./usr/X11R6/lib/X11/locale/tatar-cyr base-x11-root
-./usr/X11R6/lib/X11/locale/th_TH base-x11-root
-./usr/X11R6/lib/X11/locale/th_TH.UTF-8 base-x11-root
-./usr/X11R6/lib/X11/locale/tscii-0 base-x11-root
-./usr/X11R6/lib/X11/locale/vi_VN.tcvn base-x11-root
-./usr/X11R6/lib/X11/locale/vi_VN.viscii base-x11-root
-./usr/X11R6/lib/X11/locale/zh_CN base-x11-root
-./usr/X11R6/lib/X11/locale/zh_CN.UTF-8 base-x11-root
-./usr/X11R6/lib/X11/locale/zh_CN.gb18030 base-x11-root
-./usr/X11R6/lib/X11/locale/zh_CN.gbk base-x11-root
-./usr/X11R6/lib/X11/locale/zh_HK.UTF-8 base-x11-root
-./usr/X11R6/lib/X11/locale/zh_HK.big5 base-x11-root
-./usr/X11R6/lib/X11/locale/zh_HK.big5hkscs base-x11-root
-./usr/X11R6/lib/X11/locale/zh_TW base-x11-root
-./usr/X11R6/lib/X11/locale/zh_TW.UTF-8 base-x11-root
-./usr/X11R6/lib/X11/locale/zh_TW.big5 base-x11-root
-./usr/X11R6/lib/X11/x11perfcomp base-x11-root
-./usr/X11R6/lib/X11/xedit base-x11-root
-./usr/X11R6/lib/X11/xedit/lisp base-x11-root
-./usr/X11R6/lib/X11/xedit/lisp/progmodes base-x11-root
-./usr/X11R6/lib/X11/xkb base-x11-root
-./usr/X11R6/lib/X11/xkb/compat base-x11-root
-./usr/X11R6/lib/X11/xkb/compiled base-x11-root
-./usr/X11R6/lib/X11/xkb/geometry base-x11-root
-./usr/X11R6/lib/X11/xkb/geometry/digital base-x11-root
-./usr/X11R6/lib/X11/xkb/geometry/ibm base-x11-root
-./usr/X11R6/lib/X11/xkb/geometry/sgi base-x11-root
-./usr/X11R6/lib/X11/xkb/keycodes base-x11-root
-./usr/X11R6/lib/X11/xkb/keycodes/digital base-x11-root
-./usr/X11R6/lib/X11/xkb/keycodes/sgi base-x11-root
-./usr/X11R6/lib/X11/xkb/keymap base-x11-root
-./usr/X11R6/lib/X11/xkb/keymap/digital base-x11-root
-./usr/X11R6/lib/X11/xkb/keymap/sgi base-x11-root
-./usr/X11R6/lib/X11/xkb/keymap/sun base-x11-root
-./usr/X11R6/lib/X11/xkb/rules base-x11-root
-./usr/X11R6/lib/X11/xkb/semantics base-x11-root
-./usr/X11R6/lib/X11/xkb/symbols base-x11-root
-./usr/X11R6/lib/X11/xkb/symbols/digital base-x11-root
-./usr/X11R6/lib/X11/xkb/symbols/fujitsu base-x11-root
-./usr/X11R6/lib/X11/xkb/symbols/hp base-x11-root
-./usr/X11R6/lib/X11/xkb/symbols/macintosh base-x11-root
-./usr/X11R6/lib/X11/xkb/symbols/nec base-x11-root
-./usr/X11R6/lib/X11/xkb/symbols/pc base-x11-root
-./usr/X11R6/lib/X11/xkb/symbols/sgi base-x11-root
-./usr/X11R6/lib/X11/xkb/symbols/sharp base-x11-root
-./usr/X11R6/lib/X11/xkb/symbols/sony base-x11-root
-./usr/X11R6/lib/X11/xkb/symbols/sun base-x11-root
-./usr/X11R6/lib/X11/xkb/symbols/xfree68 base-x11-root
-./usr/X11R6/lib/X11/xkb/torture base-x11-root
-./usr/X11R6/lib/X11/xkb/types base-x11-root
-./usr/X11R6/lib/modules base-x11-root
-./usr/X11R6/lib/modules/codeconv base-obsolete obsolete
-./usr/X11R6/lib/modules/drivers base-x11-root
-./usr/X11R6/lib/modules/extensions base-x11-root
-./usr/X11R6/lib/modules/fonts base-x11-root
-./usr/X11R6/lib/modules/input base-x11-root
-./usr/X11R6/lib/pkgconfig base-x11-root
-./usr/X11R6/libexec base-x11-root
-./usr/X11R6/man base-x11-root
-./usr/X11R6/man/cat1 base-x11-root
-./usr/X11R6/man/cat3 base-x11-root
-./usr/X11R6/man/cat4 base-x11-root
-./usr/X11R6/man/cat5 base-x11-root
-./usr/X11R6/man/cat7 base-x11-root
-./usr/X11R6/man/html1 base-x11-root
-./usr/X11R6/man/html3 base-x11-root
-./usr/X11R6/man/html4 base-x11-root
-./usr/X11R6/man/html5 base-x11-root
-./usr/X11R6/man/html7 base-x11-root
-./usr/X11R6/man/man1 base-x11-root
-./usr/X11R6/man/man3 base-x11-root
-./usr/X11R6/man/man4 base-x11-root
-./usr/X11R6/man/man5 base-x11-root
-./usr/X11R6/man/man7 base-x11-root
-./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-obsolete obsolete
-./usr/X11R7/include/X11/XprintUtil base-obsolete obsolete
-./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/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
Home |
Main Index |
Thread Index |
Old Index