Module Name:    src
Committed By:   wiz
Date:           Thu Jan 14 10:04:19 UTC 2010

Modified Files:
        src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64
            md.sparc64 mi rescue.mi shl.mi

Log Message:
Consistency: set for obsolete files should be "foo-obsolete",
tags only "obsolete".


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/base/ad.mips64eb \
    src/distrib/sets/lists/base/ad.mips64el
cvs rdiff -u -r1.82 -r1.83 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.75 -r1.76 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.850 -r1.851 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/base/rescue.mi
cvs rdiff -u -r1.514 -r1.515 src/distrib/sets/lists/base/shl.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/ad.mips64eb
diff -u src/distrib/sets/lists/base/ad.mips64eb:1.9 src/distrib/sets/lists/base/ad.mips64eb:1.10
--- src/distrib/sets/lists/base/ad.mips64eb:1.9	Mon Jan 11 16:30:26 2010
+++ src/distrib/sets/lists/base/ad.mips64eb	Thu Jan 14 10:04:18 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.9 2010/01/11 16:30:26 christos Exp $
+# $NetBSD: ad.mips64eb,v 1.10 2010/01/14 10:04:18 wiz Exp $
 ./libexec/ld.elf_so-64				base-compat-shlib	compat,pic
 ./libexec/ld.elf_so-o32				base-sysutil-bin	compat,pic
 ./usr/lib/64					base-compat-lib		compat
@@ -179,8 +179,8 @@
 ./usr/lib/64/librumpdev.so.0.0			base-compat-shlib	compat,pic
 ./usr/lib/64/librumpvfs.so.0			base-compat-shlib	compat,pic
 ./usr/lib/64/librumpvfs.so.0.0			base-compat-shlib	compat,pic
-./usr/lib/64/libsdp.so.2			base-compat-shlib	obsolete
-./usr/lib/64/libsdp.so.2.0			base-compat-shlib	obsolete
+./usr/lib/64/libsdp.so.2			base-obsolete		obsolete
+./usr/lib/64/libsdp.so.2.0			base-obsolete		obsolete
 ./usr/lib/64/libskey.so.2			base-compat-shlib	compat,pic
 ./usr/lib/64/libskey.so.2.0			base-compat-shlib	compat,pic
 ./usr/lib/64/libsl.so.4				base-compat-shlib	compat,pic
@@ -411,8 +411,8 @@
 ./usr/lib/o32/librumpdev.so.0.0			base-compat-shlib	compat,pic
 ./usr/lib/o32/librumpvfs.so.0			base-compat-shlib	compat,pic
 ./usr/lib/o32/librumpvfs.so.0.0			base-compat-shlib	compat,pic
-./usr/lib/o32/libsdp.so.2			base-compat-shlib	obsolete
-./usr/lib/o32/libsdp.so.2.0			base-compat-shlib	obsolete
+./usr/lib/o32/libsdp.so.2			base-obsolete		obsolete
+./usr/lib/o32/libsdp.so.2.0			base-obsolete		obsolete
 ./usr/lib/o32/libskey.so.2			base-compat-shlib	compat,pic
 ./usr/lib/o32/libskey.so.2.0			base-compat-shlib	compat,pic
 ./usr/lib/o32/libsl.so.4			base-compat-shlib	compat,pic
@@ -466,4 +466,4 @@
 ./usr/lib/o32/security/pam_unix.so.3		base-compat-shlib	compat,pic
 ./usr/libexec/ld.elf_so-64			base-compat-shlib	compat,pic
 ./usr/libexec/ld.elf_so-o32			base-sysutil-bin	compat,pic
-./usr/lkm/ldscript				base-sys-usr		obsolete
+./usr/lkm/ldscript				base-obsolete		obsolete
Index: src/distrib/sets/lists/base/ad.mips64el
diff -u src/distrib/sets/lists/base/ad.mips64el:1.9 src/distrib/sets/lists/base/ad.mips64el:1.10
--- src/distrib/sets/lists/base/ad.mips64el:1.9	Mon Jan 11 16:30:26 2010
+++ src/distrib/sets/lists/base/ad.mips64el	Thu Jan 14 10:04:18 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.9 2010/01/11 16:30:26 christos Exp $
+# $NetBSD: ad.mips64el,v 1.10 2010/01/14 10:04:18 wiz Exp $
 ./libexec/ld.elf_so-64				base-compat-shlib	compat,pic
 ./libexec/ld.elf_so-o32				base-sysutil-bin	compat,pic
 ./usr/lib/64					base-compat-lib		compat
@@ -179,8 +179,8 @@
 ./usr/lib/64/librumpdev.so.0.0			base-compat-shlib	compat,pic
 ./usr/lib/64/librumpvfs.so.0			base-compat-shlib	compat,pic
 ./usr/lib/64/librumpvfs.so.0.0			base-compat-shlib	compat,pic
-./usr/lib/64/libsdp.so.2			base-compat-shlib	obsolete
-./usr/lib/64/libsdp.so.2.0			base-compat-shlib	obsolete
+./usr/lib/64/libsdp.so.2			base-obsolete		obsolete
+./usr/lib/64/libsdp.so.2.0			base-obsolete		obsolete
 ./usr/lib/64/libskey.so.2			base-compat-shlib	compat,pic
 ./usr/lib/64/libskey.so.2.0			base-compat-shlib	compat,pic
 ./usr/lib/64/libsl.so.4				base-compat-shlib	compat,pic
@@ -411,8 +411,8 @@
 ./usr/lib/o32/librumpdev.so.0.0			base-compat-shlib	compat,pic
 ./usr/lib/o32/librumpvfs.so.0			base-compat-shlib	compat,pic
 ./usr/lib/o32/librumpvfs.so.0.0			base-compat-shlib	compat,pic
-./usr/lib/o32/libsdp.so.2			base-compat-shlib	obsolete
-./usr/lib/o32/libsdp.so.2.0			base-compat-shlib	obsolete
+./usr/lib/o32/libsdp.so.2			base-obsolete		obsolete
+./usr/lib/o32/libsdp.so.2.0			base-obsolete		obsolete
 ./usr/lib/o32/libskey.so.2			base-compat-shlib	compat,pic
 ./usr/lib/o32/libskey.so.2.0			base-compat-shlib	compat,pic
 ./usr/lib/o32/libsl.so.4			base-compat-shlib	compat,pic
@@ -466,4 +466,4 @@
 ./usr/lib/o32/security/pam_unix.so.3		base-compat-shlib	compat,pic
 ./usr/libexec/ld.elf_so-64			base-compat-shlib	compat,pic
 ./usr/libexec/ld.elf_so-o32			base-sysutil-bin	compat,pic
-./usr/lkm/ldscript				base-sys-usr		obsolete
+./usr/lkm/ldscript				base-obsolete		obsolete

Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.82 src/distrib/sets/lists/base/md.amd64:1.83
--- src/distrib/sets/lists/base/md.amd64:1.82	Mon Jan 11 16:30:26 2010
+++ src/distrib/sets/lists/base/md.amd64	Thu Jan 14 10:04:18 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.82 2010/01/11 16:30:26 christos Exp $
+# $NetBSD: md.amd64,v 1.83 2010/01/14 10:04:18 wiz Exp $
 ./dev/lms0					base-obsolete		obsolete
 ./dev/mms0					base-obsolete		obsolete
 ./libexec/ld.elf_so-i386			base-sys-shlib		compat,pic
@@ -196,8 +196,8 @@
 ./usr/lib/i386/libssl.so.8.1			base-compat-shlib	compat,pic
 ./usr/lib/i386/libstdc++.so.7			base-compat-shlib	compat,pic
 ./usr/lib/i386/libstdc++.so.7.0			base-compat-shlib	compat,pic
-./usr/lib/i386/libsupc++.so.1			base-compat-shlib	obsolete
-./usr/lib/i386/libsupc++.so.1.0			base-compat-shlib	obsolete
+./usr/lib/i386/libsupc++.so.1			base-obsolete		obsolete
+./usr/lib/i386/libsupc++.so.1.0			base-obsolete		obsolete
 ./usr/lib/i386/libtermcap.so.0			base-compat-shlib	compat,pic
 ./usr/lib/i386/libtermcap.so.0.6		base-compat-shlib	compat,pic
 ./usr/lib/i386/libtermlib.so.0			base-compat-shlib	compat,pic

Index: src/distrib/sets/lists/base/md.sparc64
diff -u src/distrib/sets/lists/base/md.sparc64:1.75 src/distrib/sets/lists/base/md.sparc64:1.76
--- src/distrib/sets/lists/base/md.sparc64:1.75	Mon Jan 11 16:30:26 2010
+++ src/distrib/sets/lists/base/md.sparc64	Thu Jan 14 10:04:18 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.75 2010/01/11 16:30:26 christos Exp $
+# $NetBSD: md.sparc64,v 1.76 2010/01/14 10:04:18 wiz Exp $
 ./libexec/ld.elf_so-sparc			base-sysutil-bin	compat,pic
 ./sbin/edlabel					base-sysutil-root
 ./usr/bin/fdformat				base-util-bin
@@ -192,8 +192,8 @@
 ./usr/lib/sparc/libssl.so.8.1			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libstdc++.so.7			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libstdc++.so.7.0		base-compat-shlib	compat,pic
-./usr/lib/sparc/libsupc++.so.1			base-compat-shlib	obsolete
-./usr/lib/sparc/libsupc++.so.1.0		base-compat-shlib	obsolete
+./usr/lib/sparc/libsupc++.so.1			base-obsolete		obsolete
+./usr/lib/sparc/libsupc++.so.1.0		base-obsolete		obsolete
 ./usr/lib/sparc/libtermcap.so.0			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libtermcap.so.0.6		base-compat-shlib	compat,pic
 ./usr/lib/sparc/libtermlib.so.0			base-compat-shlib	compat,pic

Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.850 src/distrib/sets/lists/base/mi:1.851
--- src/distrib/sets/lists/base/mi:1.850	Tue Dec 15 03:01:15 2009
+++ src/distrib/sets/lists/base/mi	Thu Jan 14 10:04:19 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.850 2009/12/15 03:01:15 mrg Exp $
+# $NetBSD: mi,v 1.851 2010/01/14 10:04:19 wiz Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -114,7 +114,7 @@
 ./etc/skel					base-sys-root
 ./etc/sliphome					base-slip-root
 ./etc/ssh					base-sys-root
-./etc/systrace					base-util-root		obsolete
+./etc/systrace					base-obsolete		obsolete
 ./etc/uucp					base-obsolete		obsolete
 ./etc/zfs					base-zfs-root
 ./lib						base-sys-root
@@ -140,9 +140,9 @@
 ./libdata/firmware/if_iwn/README.iwlwifi-5000-ucode	base-firmware-root
 ./libdata/firmware/if_iwn/iwlwifi-5000-1.ucode	base-firmware-root
 ./libdata/firmware/if_wpi			base-firmware-root
-./libdata/firmware/if_wpi/LICENSE.ipw3945-ucode	base-sys-root obsolete
-./libdata/firmware/if_wpi/README.ipw3945-ucode	base-sys-root obsolete
-./libdata/firmware/if_wpi/ipw3945.ucode		base-sys-root obsolete
+./libdata/firmware/if_wpi/LICENSE.ipw3945-ucode	base-obsolete	obsolete
+./libdata/firmware/if_wpi/README.ipw3945-ucode	base-obsolete	obsolete
+./libdata/firmware/if_wpi/ipw3945.ucode		base-obsolete	obsolete
 ./libdata/firmware/if_wpi/LICENSE.iwlwifi-3945-ucode	base-firmware-root
 ./libdata/firmware/if_wpi/README.iwlwifi-3945-ucode	base-firmware-root
 ./libdata/firmware/if_wpi/iwlwifi-3945.ucode		base-firmware-root
@@ -155,7 +155,7 @@
 ./libdata/firmware/rum/rum-license		base-firmware-root
 ./libdata/firmware/rum/rum-rt2573		base-firmware-root
 ./libdata/firmware/zyd				base-firmware-root
-./libdata/firmware/zyd/zd1211-licence		base-firmware-root obsolete
+./libdata/firmware/zyd/zd1211-licence		base-obsolete	obsolete
 ./libdata/firmware/zyd/zd1211-license		base-firmware-root
 ./libdata/firmware/zyd/zyd-zd1211		base-firmware-root
 ./libdata/firmware/zyd/zyd-zd1211b		base-firmware-root
@@ -865,7 +865,7 @@
 ./usr/libexec/atf-cleanup			base-atf-bin		atf
 ./usr/libexec/atf-exec				base-atf-bin		atf
 ./usr/libexec/atf-format			base-atf-bin		atf
-./usr/libexec/atf-killpg			base-atf-bin		obsolete
+./usr/libexec/atf-killpg			base-obsolete		obsolete
 ./usr/libexec/atrun				base-cron-bin
 ./usr/libexec/ching				base-games-usr
 ./usr/libexec/comsat				base-mail-bin
@@ -873,7 +873,7 @@
 ./usr/libexec/cpp0				base-obsolete		obsolete
 ./usr/libexec/dnskeygen				base-obsolete		obsolete
 ./usr/libexec/fingerd				base-netutil-bin
-./usr/libexec/ftp-proxy				base-pf-bin		obsolete
+./usr/libexec/ftp-proxy				base-obsolete		obsolete
 ./usr/libexec/ftpd				base-netutil-bin
 ./usr/libexec/getNAME				base-man-bin
 ./usr/libexec/getty				base-sysutil-bin
@@ -885,7 +885,7 @@
 ./usr/libexec/kdc				base-obsolete		obsolete
 ./usr/libexec/kfd				base-obsolete		obsolete
 ./usr/libexec/kpasswdd				base-krb5-bin		kerberos
-./usr/libexec/lfs_cleanerd			base-sysutil-bin	obsolete
+./usr/libexec/lfs_cleanerd			base-obsolete		obsolete
 ./usr/libexec/locate.bigram			base-sysutil-bin
 ./usr/libexec/locate.code			base-sysutil-bin
 ./usr/libexec/locate.updatedb			base-sysutil-bin
@@ -1347,7 +1347,7 @@
 ./usr/share					base-sys-share
 ./usr/share/atf					base-atf-share		
 ./usr/share/atf/atf-run.hooks			base-atf-bin		share,atf
-./usr/share/atf/atf.config.subr			base-atf-share		share,obsolete,atf
+./usr/share/atf/atf.config.subr			base-obsolete		obsolete
 ./usr/share/atf/atf.footer.subr			base-atf-share		share,atf
 ./usr/share/atf/atf.header.subr			base-atf-share		share,atf
 ./usr/share/atf/atf.init.subr			base-atf-share		share,atf

Index: src/distrib/sets/lists/base/rescue.mi
diff -u src/distrib/sets/lists/base/rescue.mi:1.29 src/distrib/sets/lists/base/rescue.mi:1.30
--- src/distrib/sets/lists/base/rescue.mi:1.29	Sat Dec  5 20:11:01 2009
+++ src/distrib/sets/lists/base/rescue.mi	Thu Jan 14 10:04:19 2010
@@ -1,4 +1,4 @@
-# $NetBSD: rescue.mi,v 1.29 2009/12/05 20:11:01 pooka Exp $
+# $NetBSD: rescue.mi,v 1.30 2010/01/14 10:04:19 wiz Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -65,7 +65,7 @@
 ./rescue/ldd					base-rescue-root
 ./rescue/less					base-rescue-root
 ./rescue/lfs_cleanerd				base-rescue-root
-./rescue/lmcctl					base-rescue-root	obsolete
+./rescue/lmcctl					base-obsolete	obsolete
 ./rescue/lmcconfig				base-rescue-root
 ./rescue/ln					base-rescue-root
 ./rescue/ls					base-rescue-root
@@ -141,7 +141,7 @@
 ./rescue/swapon					base-rescue-root
 ./rescue/sync					base-rescue-root
 ./rescue/sysctl					base-rescue-root
-./rescue/systrace				base-rescue-root	obsolete
+./rescue/systrace				base-obsolete		obsolete
 ./rescue/tar					base-rescue-root
 ./rescue/test					base-rescue-root
 ./rescue/tetris					base-rescue-root

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.514 src/distrib/sets/lists/base/shl.mi:1.515
--- src/distrib/sets/lists/base/shl.mi:1.514	Mon Jan 11 16:30:26 2010
+++ src/distrib/sets/lists/base/shl.mi	Thu Jan 14 10:04:19 2010
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.514 2010/01/11 16:30:26 christos Exp $
+# $NetBSD: shl.mi,v 1.515 2010/01/14 10:04:19 wiz Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -176,7 +176,7 @@
 ./usr/lib/libzfs.so.0.0				base-zfs-shlib		zfs,dynamicroot
 ./usr/lib/libzpool.so.0.0			base-zfs-shlib		zfs,dynamicroot
 ./usr/lib/libzpool_pic.a			base-zfs-shlib		zfs,dynamicroot
-./usr/lib/nss_mdns.so.0				base-mdns-shlib		mdns,obsolete
+./usr/lib/nss_mdns.so.0				base-obsolete		obsolete
 ./usr/lib/nss_mdnsd.so.0			base-mdns-shlib		mdns
 ./usr/lib/nss_multicast_dns.so.0		base-mdns-shlib		mdns
 ./usr/lib/security/pam_afslog.so.3		base-sys-shlib		kerberos,pam

Reply via email to