Sat Aug 2 04:39:41 2008 UTC ()
add X11R6/include/{pixman-1,xorg} entries.

(probably will move to X11R7 ... later, but before native xorg is done.)


(mrg)
diff -r1.762 -r1.763 src/distrib/sets/lists/base/mi
diff -r1.376 -r1.377 src/etc/mtree/NetBSD.dist
cvs diff -r1.762 -r1.763 src/distrib/sets/lists/base/mi (expand / switch to unified diff)

--- src/distrib/sets/lists/base/mi 2008/07/29 14:59:26 1.762
+++ src/distrib/sets/lists/base/mi 2008/08/02 04:39:41 1.763
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mi,v 1.762 2008/07/29 14:59:26 he Exp $ 1# $NetBSD: mi,v 1.763 2008/08/02 04:39:41 mrg Exp $
2# 2#
3# Note: Don't delete entries from here - mark them as "obsolete" instead, 3# Note: Don't delete entries from here - mark them as "obsolete" instead,
4# unless otherwise stated below. 4# unless otherwise stated below.
5# 5#
6# Note: Do not mark "old" major and major.minor shared libraries as 6# Note: Do not mark "old" major and major.minor shared libraries as
7# "obsolete"; just remove the entry, as third-party applications 7# "obsolete"; just remove the entry, as third-party applications
8# may be linked against the old major shared library, and 8# may be linked against the old major shared library, and
9# that is a symlink to the old major.minor shared library. 9# that is a symlink to the old major.minor shared library.
10# e.g., "lib<name>.so.<N>" and "lib<name>.so.<N>.<M>" 10# e.g., "lib<name>.so.<N>" and "lib<name>.so.<N>.<M>"
11# Exceptions to this rule may include shared libraries that 11# Exceptions to this rule may include shared libraries that
12# are dlopen()ed at run-time, such as extra locales, etc. 12# are dlopen()ed at run-time, such as extra locales, etc.
13# 13#
14. base-sys-root 14. base-sys-root
@@ -295,26 +295,28 @@ @@ -295,26 +295,28 @@
295./usr/X11R6/include/X11/Xtrans base-x11-root 295./usr/X11R6/include/X11/Xtrans base-x11-root
296./usr/X11R6/include/X11/bitmaps base-x11-root 296./usr/X11R6/include/X11/bitmaps base-x11-root
297./usr/X11R6/include/X11/extensions base-x11-root 297./usr/X11R6/include/X11/extensions base-x11-root
298./usr/X11R6/include/X11/fonts base-x11-root 298./usr/X11R6/include/X11/fonts base-x11-root
299./usr/X11R6/include/X11/fonts/codeconv base-obsolete obsolete 299./usr/X11R6/include/X11/fonts/codeconv base-obsolete obsolete
300./usr/X11R6/include/X11/pixmaps base-x11-root 300./usr/X11R6/include/X11/pixmaps base-x11-root
301./usr/X11R6/include/fontconfig base-x11-root 301./usr/X11R6/include/fontconfig base-x11-root
302./usr/X11R6/include/freetype2 base-x11-root 302./usr/X11R6/include/freetype2 base-x11-root
303./usr/X11R6/include/freetype2/freetype base-x11-root 303./usr/X11R6/include/freetype2/freetype base-x11-root
304./usr/X11R6/include/freetype2/freetype/cache base-x11-root 304./usr/X11R6/include/freetype2/freetype/cache base-x11-root
305./usr/X11R6/include/freetype2/freetype/config base-x11-root 305./usr/X11R6/include/freetype2/freetype/config base-x11-root
306./usr/X11R6/include/freetype2/freetype/internal base-x11-root 306./usr/X11R6/include/freetype2/freetype/internal base-x11-root
307./usr/X11R6/include/freetype2/freetype/internal/services base-x11-root 307./usr/X11R6/include/freetype2/freetype/internal/services base-x11-root
 308./usr/X11R6/include/pixman-1 base-x11-root
 309./usr/X11R6/include/xorg base-x11-root
308./usr/X11R6/lib base-x11-root 310./usr/X11R6/lib base-x11-root
309./usr/X11R6/lib/X11 base-x11-root 311./usr/X11R6/lib/X11 base-x11-root
310./usr/X11R6/lib/X11/app-defaults base-x11-root 312./usr/X11R6/lib/X11/app-defaults base-x11-root
311./usr/X11R6/lib/X11/config base-x11-root 313./usr/X11R6/lib/X11/config base-x11-root
312./usr/X11R6/lib/X11/doc base-x11-root 314./usr/X11R6/lib/X11/doc base-x11-root
313./usr/X11R6/lib/X11/etc base-x11-root 315./usr/X11R6/lib/X11/etc base-x11-root
314./usr/X11R6/lib/X11/fonts base-x11-root 316./usr/X11R6/lib/X11/fonts base-x11-root
315./usr/X11R6/lib/X11/fonts/100dpi base-x11-root 317./usr/X11R6/lib/X11/fonts/100dpi base-x11-root
316./usr/X11R6/lib/X11/fonts/75dpi base-x11-root 318./usr/X11R6/lib/X11/fonts/75dpi base-x11-root
317./usr/X11R6/lib/X11/fonts/CID base-x11-root 319./usr/X11R6/lib/X11/fonts/CID base-x11-root
318./usr/X11R6/lib/X11/fonts/Speedo base-x11-root 320./usr/X11R6/lib/X11/fonts/Speedo base-x11-root
319./usr/X11R6/lib/X11/fonts/TTF base-x11-root 321./usr/X11R6/lib/X11/fonts/TTF base-x11-root
320./usr/X11R6/lib/X11/fonts/Type1 base-x11-root 322./usr/X11R6/lib/X11/fonts/Type1 base-x11-root
cvs diff -r1.376 -r1.377 src/etc/mtree/Attic/NetBSD.dist (expand / switch to unified diff)

--- src/etc/mtree/Attic/NetBSD.dist 2008/07/29 13:17:40 1.376
+++ src/etc/mtree/Attic/NetBSD.dist 2008/08/02 04:39:41 1.377
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: NetBSD.dist,v 1.376 2008/07/29 13:17:40 pooka Exp $ 1# $NetBSD: NetBSD.dist,v 1.377 2008/08/02 04:39:41 mrg Exp $
2# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 2# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
3 3
4# Do not customize this file as it may be overwritten on upgrades. 4# Do not customize this file as it may be overwritten on upgrades.
5# Put your custom specifications in /etc/mtree/special.local. 5# Put your custom specifications in /etc/mtree/special.local.
6# See security.conf(5) for details. 6# See security.conf(5) for details.
7 7
8/set type=dir uname=root gname=wheel mode=0755 8/set type=dir uname=root gname=wheel mode=0755
9 9
10. 10.
11./altroot 11./altroot
12./bin 12./bin
13./dev 13./dev
14./dev/altq 14./dev/altq
@@ -87,26 +87,28 @@ @@ -87,26 +87,28 @@
87./usr/X11R6/include/X11/XprintUtil 87./usr/X11R6/include/X11/XprintUtil
88./usr/X11R6/include/X11/Xtrans 88./usr/X11R6/include/X11/Xtrans
89./usr/X11R6/include/X11/bitmaps 89./usr/X11R6/include/X11/bitmaps
90./usr/X11R6/include/X11/extensions 90./usr/X11R6/include/X11/extensions
91./usr/X11R6/include/X11/fonts 91./usr/X11R6/include/X11/fonts
92./usr/X11R6/include/X11/pixmaps 92./usr/X11R6/include/X11/pixmaps
93./usr/X11R6/include/fontconfig 93./usr/X11R6/include/fontconfig
94./usr/X11R6/include/freetype2 94./usr/X11R6/include/freetype2
95./usr/X11R6/include/freetype2/freetype 95./usr/X11R6/include/freetype2/freetype
96./usr/X11R6/include/freetype2/freetype/cache 96./usr/X11R6/include/freetype2/freetype/cache
97./usr/X11R6/include/freetype2/freetype/config 97./usr/X11R6/include/freetype2/freetype/config
98./usr/X11R6/include/freetype2/freetype/internal 98./usr/X11R6/include/freetype2/freetype/internal
99./usr/X11R6/include/freetype2/freetype/internal/services 99./usr/X11R6/include/freetype2/freetype/internal/services
 100./usr/X11R6/include/pixman-1
 101./usr/X11R6/include/xorg
100./usr/X11R6/lib 102./usr/X11R6/lib
101./usr/X11R6/lib/X11 103./usr/X11R6/lib/X11
102./usr/X11R6/lib/X11/app-defaults 104./usr/X11R6/lib/X11/app-defaults
103./usr/X11R6/lib/X11/config 105./usr/X11R6/lib/X11/config
104./usr/X11R6/lib/X11/doc 106./usr/X11R6/lib/X11/doc
105./usr/X11R6/lib/X11/etc 107./usr/X11R6/lib/X11/etc
106./usr/X11R6/lib/X11/fonts 108./usr/X11R6/lib/X11/fonts
107./usr/X11R6/lib/X11/fonts/100dpi 109./usr/X11R6/lib/X11/fonts/100dpi
108./usr/X11R6/lib/X11/fonts/75dpi 110./usr/X11R6/lib/X11/fonts/75dpi
109./usr/X11R6/lib/X11/fonts/CID 111./usr/X11R6/lib/X11/fonts/CID
110./usr/X11R6/lib/X11/fonts/Speedo 112./usr/X11R6/lib/X11/fonts/Speedo
111./usr/X11R6/lib/X11/fonts/TTF 113./usr/X11R6/lib/X11/fonts/TTF
112./usr/X11R6/lib/X11/fonts/Type1 114./usr/X11R6/lib/X11/fonts/Type1