Module Name: src
Committed By: mrg
Date: Sun Aug 23 18:28:41 UTC 2015
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/debug: mi
src/distrib/sets/lists/etc: mi
src/distrib/sets/lists/games: mi
src/distrib/sets/lists/man: mi
src/distrib/sets/lists/misc: mi
src/distrib/sets/lists/tests: mi
src/distrib/sets/lists/text: mi
src/distrib/sets/lists/xbase: mi
src/distrib/sets/lists/xcomp: mi
src/distrib/sets/lists/xetc: mi
src/distrib/sets/lists/xfont: mi
src/distrib/sets/lists/xserver: mi
Log Message:
move the obsolete list files into their respective sets. this means
that if you install a new set and run "postinstall fix obsolete"
the expected things happen.
(hi 12.5 year old me who thought base was better than etc set, which
it really was, but this is better again :-)
To generate a diff of this commit:
cvs rdiff -u -r1.1111 -r1.1112 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1984 -r1.1985 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.127 -r1.128 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.237 -r1.238 src/distrib/sets/lists/etc/mi
cvs rdiff -u -r1.53 -r1.54 src/distrib/sets/lists/games/mi
cvs rdiff -u -r1.1505 -r1.1506 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.195 -r1.196 src/distrib/sets/lists/misc/mi
cvs rdiff -u -r1.641 -r1.642 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.44 -r1.45 src/distrib/sets/lists/text/mi
cvs rdiff -u -r1.126 -r1.127 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.173 -r1.174 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/lists/xetc/mi
cvs rdiff -u -r1.40 -r1.41 src/distrib/sets/lists/xfont/mi
cvs rdiff -u -r1.35 -r1.36 src/distrib/sets/lists/xserver/mi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1111 src/distrib/sets/lists/base/mi:1.1112
--- src/distrib/sets/lists/base/mi:1.1111 Fri Aug 21 10:44:43 2015
+++ src/distrib/sets/lists/base/mi Sun Aug 23 18:28:40 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1111 2015/08/21 10:44:43 roy Exp $
+# $NetBSD: mi,v 1.1112 2015/08/23 18:28:40 mrg Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -5887,14 +5887,6 @@
./var/db/ns base-sys-root
./var/db/obsolete base-sys-root
./var/db/obsolete/base base-sys-root
-./var/db/obsolete/comp base-sys-root
-./var/db/obsolete/debug base-sys-root debug
-./var/db/obsolete/etc base-sys-root
-./var/db/obsolete/games base-sys-root
-./var/db/obsolete/man base-sys-root
-./var/db/obsolete/misc base-sys-root
-./var/db/obsolete/tests base-sys-root atf
-./var/db/obsolete/text base-sys-root
./var/db/postfix base-postfix-root
./var/db/xdm base-sys-root
./var/db/xkb base-sys-root
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1984 src/distrib/sets/lists/comp/mi:1.1985
--- src/distrib/sets/lists/comp/mi:1.1984 Thu Aug 20 10:06:20 2015
+++ src/distrib/sets/lists/comp/mi Sun Aug 23 18:28:40 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1984 2015/08/20 10:06:20 joerg Exp $
+# $NetBSD: mi,v 1.1985 2015/08/23 18:28:40 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -24673,3 +24673,4 @@
./usr/share/misc/operator comp-c-share share
./usr/share/misc/style comp-c-share share
./var/db/libc.tags comp-c-root
+./var/db/obsolete/comp base-sys-root
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.127 src/distrib/sets/lists/debug/mi:1.128
--- src/distrib/sets/lists/debug/mi:1.127 Mon Aug 17 06:42:46 2015
+++ src/distrib/sets/lists/debug/mi Sun Aug 23 18:28:40 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.127 2015/08/17 06:42:46 knakahara Exp $
+# $NetBSD: mi,v 1.128 2015/08/23 18:28:40 mrg Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
@@ -2259,3 +2259,4 @@
./usr/tests/libexec/ld.elf_so/libh_helper_dso1_g.a comp-c-debuglib atf,debuglib,compattestfile
./usr/tests/libexec/ld.elf_so/libh_helper_dso2_g.a comp-c-debuglib atf,debuglib,compattestfile
./usr/tests/libexec/ld.elf_so/libh_helper_ifunc_dso_g.a comp-c-debuglib atf,debuglib,compattestfile
+./var/db/obsolete/debug base-sys-root debug
Index: src/distrib/sets/lists/etc/mi
diff -u src/distrib/sets/lists/etc/mi:1.237 src/distrib/sets/lists/etc/mi:1.238
--- src/distrib/sets/lists/etc/mi:1.237 Mon Mar 30 10:58:37 2015
+++ src/distrib/sets/lists/etc/mi Sun Aug 23 18:28:40 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.237 2015/03/30 10:58:37 chopps Exp $
+# $NetBSD: mi,v 1.238 2015/08/23 18:28:40 mrg Exp $
#
# Note: end-user configuration files that are moved to another location
# should not be marked "obsolete"; they should just be removed from
@@ -348,6 +348,7 @@
./var/crash/minfree etc-sys-root
./var/cron/tabs/root etc-cron-root
./var/db/locate.database etc-sys-root
+./var/db/obsolete/etc base-sys-root
./var/games/atc_score etc-games-scores
./var/games/battlestar.log etc-games-scores
./var/games/cfscores etc-games-scores
Index: src/distrib/sets/lists/games/mi
diff -u src/distrib/sets/lists/games/mi:1.53 src/distrib/sets/lists/games/mi:1.54
--- src/distrib/sets/lists/games/mi:1.53 Fri Aug 22 10:51:38 2014
+++ src/distrib/sets/lists/games/mi Sun Aug 23 18:28:40 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.53 2014/08/22 10:51:38 apb Exp $
+# $NetBSD: mi,v 1.54 2015/08/23 18:28:40 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -366,6 +366,7 @@
./usr/share/man/man8/dm.8 games-games-man .man
./usr/share/man/man8/strfile.8 games-utils-man .man
./usr/share/man/man8/unstr.8 games-utils-man .man
+./var/db/obsolete/games base-sys-root
./var/games/atc_scores games-obsolete obsolete
./var/games/hackdir/data games-games-root
./var/games/hackdir/help games-games-root
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1505 src/distrib/sets/lists/man/mi:1.1506
--- src/distrib/sets/lists/man/mi:1.1505 Tue Aug 18 15:54:20 2015
+++ src/distrib/sets/lists/man/mi Sun Aug 23 18:28:40 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1505 2015/08/18 15:54:20 phx Exp $
+# $NetBSD: mi,v 1.1506 2015/08/23 18:28:40 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -9082,3 +9082,4 @@
./usr/share/man/man9lua/pmf.9lua man-sys-man .man
./usr/share/man/man9lua/systm.9lua man-sys-man .man
./usr/share/man/style.css man-mdocml-htmlman html
+./var/db/obsolete/man base-sys-root
Index: src/distrib/sets/lists/misc/mi
diff -u src/distrib/sets/lists/misc/mi:1.195 src/distrib/sets/lists/misc/mi:1.196
--- src/distrib/sets/lists/misc/mi:1.195 Fri Aug 22 10:51:38 2014
+++ src/distrib/sets/lists/misc/mi Sun Aug 23 18:28:40 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.195 2014/08/22 10:51:38 apb Exp $
+# $NetBSD: mi,v 1.196 2015/08/23 18:28:40 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1635,3 +1635,4 @@
./usr/share/xsl/atf misc-atf-share
./usr/share/xsl/atf/tests-results.xsl misc-atf-share share,atf,!kyua
./usr/share/xsl/atf/tests-results.xsl misc-obsolete share,kyua,obsolete
+./var/db/obsolete/misc base-sys-root
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.641 src/distrib/sets/lists/tests/mi:1.642
--- src/distrib/sets/lists/tests/mi:1.641 Mon Aug 10 03:21:44 2015
+++ src/distrib/sets/lists/tests/mi Sun Aug 23 18:28:40 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.641 2015/08/10 03:21:44 mrg Exp $
+# $NetBSD: mi,v 1.642 2015/08/23 18:28:40 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -4098,3 +4098,4 @@
./usr/tests/util/xlint/lint1/d_typename_as_var.c tests-obsolete obsolete
./usr/tests/util/xlint/lint1/d_zero_sized_arrays.c tests-obsolete obsolete
./usr/tests/util/xlint/lint1/t_integration tests-obsolete obsolete
+./var/db/obsolete/tests base-sys-root atf
Index: src/distrib/sets/lists/text/mi
diff -u src/distrib/sets/lists/text/mi:1.44 src/distrib/sets/lists/text/mi:1.45
--- src/distrib/sets/lists/text/mi:1.44 Sat Jul 5 19:25:58 2014
+++ src/distrib/sets/lists/text/mi Sun Aug 23 18:28:40 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.44 2014/07/05 19:25:58 dholland Exp $
+# $NetBSD: mi,v 1.45 2015/08/23 18:28:40 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -747,3 +747,4 @@
./usr/share/tmac/unicode.tmac text-groff-share share,groff
./usr/share/tmac/vgrind.tmac text-groff-share share
./usr/share/tmac/www.tmac text-groff-share share,groff
+./var/db/obsolete/text base-sys-root
Index: src/distrib/sets/lists/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.126 src/distrib/sets/lists/xbase/mi:1.127
--- src/distrib/sets/lists/xbase/mi:1.126 Sat Jun 27 16:21:07 2015
+++ src/distrib/sets/lists/xbase/mi Sun Aug 23 18:28:40 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.126 2015/06/27 16:21:07 matt Exp $
+# $NetBSD: mi,v 1.127 2015/08/23 18:28:40 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2946,13 +2946,4 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers base-sys-usr xorg
./usr/libdata/debug/usr/X11R7/lib/modules/extensions base-sys-usr xorg
./usr/libdata/debug/usr/X11R7/libexec base-sys-usr xorg
-./var/db/obsolete/xbase xbase-sys-root x11
./var/db/obsolete/xbase xbase-sys-root xorg
-./var/db/obsolete/xcomp xbase-sys-root x11
-./var/db/obsolete/xcomp xbase-sys-root xorg
-./var/db/obsolete/xetc xbase-sys-root x11
-./var/db/obsolete/xetc xbase-sys-root xorg
-./var/db/obsolete/xfont xbase-sys-root x11
-./var/db/obsolete/xfont xbase-sys-root xorg
-./var/db/obsolete/xserver xbase-sys-root x11
-./var/db/obsolete/xserver xbase-sys-root xorg
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.173 src/distrib/sets/lists/xcomp/mi:1.174
--- src/distrib/sets/lists/xcomp/mi:1.173 Thu Jul 23 05:46:39 2015
+++ src/distrib/sets/lists/xcomp/mi Sun Aug 23 18:28:40 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.173 2015/07/23 05:46:39 mrg Exp $
+# $NetBSD: mi,v 1.174 2015/08/23 18:28:40 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -9376,3 +9376,4 @@
./usr/libdata/lint/llib-lxkbfile.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lxkbui.ln -unknown- lint,x11
./usr/libdata/lint/llib-lxkbui.ln -unknown- lint,xorg
+./var/db/obsolete/xcomp xbase-sys-root xorg
Index: src/distrib/sets/lists/xetc/mi
diff -u src/distrib/sets/lists/xetc/mi:1.24 src/distrib/sets/lists/xetc/mi:1.25
--- src/distrib/sets/lists/xetc/mi:1.24 Thu Dec 18 06:24:28 2014
+++ src/distrib/sets/lists/xetc/mi Sun Aug 23 18:28:41 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.24 2014/12/18 06:24:28 mrg Exp $
+# $NetBSD: mi,v 1.25 2015/08/23 18:28:41 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -114,3 +114,4 @@
./etc/rc.d/xdm etc-x11-rc xorg
./etc/rc.d/xfs etc-x11-rc x11
./etc/rc.d/xfs etc-x11-rc xorg
+./var/db/obsolete/xetc xbase-sys-root xorg
Index: src/distrib/sets/lists/xfont/mi
diff -u src/distrib/sets/lists/xfont/mi:1.40 src/distrib/sets/lists/xfont/mi:1.41
--- src/distrib/sets/lists/xfont/mi:1.40 Mon Aug 20 15:38:59 2012
+++ src/distrib/sets/lists/xfont/mi Sun Aug 23 18:28:41 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.40 2012/08/20 15:38:59 tron Exp $
+# $NetBSD: mi,v 1.41 2015/08/23 18:28:41 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -8827,3 +8827,4 @@
./usr/X11R7/lib/X11/fonts/util/map-ISO8859-9 xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/util/map-JISX0201.1976-0 xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/util/map-KOI8-R xfont share,xorg,x11fonts
+./var/db/obsolete/xfont xbase-sys-root xorg
Index: src/distrib/sets/lists/xserver/mi
diff -u src/distrib/sets/lists/xserver/mi:1.35 src/distrib/sets/lists/xserver/mi:1.36
--- src/distrib/sets/lists/xserver/mi:1.35 Mon Jan 5 03:45:31 2015
+++ src/distrib/sets/lists/xserver/mi Sun Aug 23 18:28:41 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.35 2015/01/05 03:45:31 mrg Exp $
+# $NetBSD: mi,v 1.36 2015/08/23 18:28:41 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -81,3 +81,4 @@
./usr/X11R7/man/man1/Xserver.1 -unknown- .man,xorg
./usr/X11R7/man/man1/Xvfb.1 -unknown- .man,xorg
./usr/X11R7/man/man5/SecurityPolicy.5 -unknown- obsolete
+./var/db/obsolete/xserver xbase-sys-root xorg
