Module Name:    src
Committed By:   wiz
Date:           Thu Jan 14 13:47:42 UTC 2010

Modified Files:
        src/distrib/sets/lists/comp: mi shl.mi
        src/distrib/sets/lists/man: mi
        src/distrib/sets/lists/xetc: mi
        src/distrib/sets/lists/xfont: mi
        src/distrib/sets/lists/xserver: md.netwinder

Log Message:
More consistency with obsolete tag:
it should be only be accompanied by gcc={3,4} or {xorg,x11}, and only
if they are necessary, i.e. if the same line exists for the other setting
of gcc or xorg/x11.
Make it so.


To generate a diff of this commit:
cvs rdiff -u -r1.1361 -r1.1362 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.97 -r1.98 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.1182 -r1.1183 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/xetc/mi
cvs rdiff -u -r1.37 -r1.38 src/distrib/sets/lists/xfont/mi
cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/xserver/md.netwinder

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/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1361 src/distrib/sets/lists/comp/mi:1.1362
--- src/distrib/sets/lists/comp/mi:1.1361	Thu Jan 14 12:01:58 2010
+++ src/distrib/sets/lists/comp/mi	Thu Jan 14 13:47:41 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1361 2010/01/14 12:01:58 wiz Exp $
+#	$NetBSD: mi,v 1.1362 2010/01/14 13:47:41 wiz Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -2291,7 +2291,7 @@
 ./usr/lib/i18n/libmapper_zone.a			comp-i18n-lib
 ./usr/lib/i18n/libmapper_zone_g.a		-unknown-		debuglib
 ./usr/lib/libamu.a				comp-obsolete		obsolete
-./usr/lib/libamu_g.a				-obsolete		debuglib,obsolete
+./usr/lib/libamu_g.a				comp-obsolete		obsolete
 ./usr/lib/libamu_p.a				comp-obsolete		obsolete
 ./usr/lib/libamu_pic.a				comp-obsolete		obsolete
 ./usr/lib/libarchive.a				comp-c-lib
@@ -3280,7 +3280,7 @@
 ./usr/libdata/debug/usr/libexec/atf-cleanup.debug	comp-atf-debug		debug
 ./usr/libdata/debug/usr/libexec/atf-exec.debug	comp-atf-debug		debug
 ./usr/libdata/debug/usr/libexec/atf-format.debug	comp-atf-debug		debug
-./usr/libdata/debug/usr/libexec/atf-killpg.debug	comp-obsolete		debug,obsolete
+./usr/libdata/debug/usr/libexec/atf-killpg.debug	comp-obsolete		obsolete
 ./usr/libdata/debug/usr/libexec/atrun.debug	comp-cron-debug		debug
 ./usr/libdata/debug/usr/libexec/cc1.debug	comp-c-debug		gcccmds,debug
 ./usr/libdata/debug/usr/libexec/cc1obj.debug	comp-objc-debug		gcccmds,debug
@@ -3289,9 +3289,9 @@
 ./usr/libdata/debug/usr/libexec/ching/printching.debug	comp-games-debug	debug
 ./usr/libdata/debug/usr/libexec/comsat.debug	comp-mail-debug		debug
 ./usr/libdata/debug/usr/libexec/f771.debug	comp-fortran-debug	gcc=3,gcccmds,debug
-./usr/libdata/debug/usr/libexec/f771.debug	comp-obsolete		gcc=4,obsolete,debug
+./usr/libdata/debug/usr/libexec/f771.debug	comp-obsolete		gcc=4,obsolete
 ./usr/libdata/debug/usr/libexec/fingerd.debug	comp-netutil-debug	debug
-./usr/libdata/debug/usr/libexec/ftp-proxy.debug	comp-obsolete		pf,obsolete
+./usr/libdata/debug/usr/libexec/ftp-proxy.debug	comp-obsolete		obsolete
 ./usr/libdata/debug/usr/libexec/ftpd.debug	comp-netutil-debug	debug
 ./usr/libdata/debug/usr/libexec/getNAME.debug	comp-man-debug		debug
 ./usr/libdata/debug/usr/libexec/getty.debug	comp-sysutil-debug	debug

Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.97 src/distrib/sets/lists/comp/shl.mi:1.98
--- src/distrib/sets/lists/comp/shl.mi:1.97	Thu Jan 14 12:01:58 2010
+++ src/distrib/sets/lists/comp/shl.mi	Thu Jan 14 13:47:41 2010
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.97 2010/01/14 12:01:58 wiz Exp $
+# $NetBSD: shl.mi,v 1.98 2010/01/14 13:47:41 wiz Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -31,7 +31,7 @@
 ./usr/lib/libfetch_pic.a			comp-c-piclib
 ./usr/lib/libform_pic.a				comp-c-piclib
 ./usr/lib/libg2c_pic.a				comp-fortran-lib	gcc=3
-./usr/lib/libg2c_pic.a				comp-obsolete		obsolete,gcc=4
+./usr/lib/libg2c_pic.a				comp-obsolete		gcc=4,obsolete
 ./usr/lib/libgcc_eh.a				comp-c-lib
 ./usr/lib/libgcc_eh_p.a				comp-c-proflib		profile
 ./usr/lib/libgcc_eh_pic.a			comp-c-piclib

Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1182 src/distrib/sets/lists/man/mi:1.1183
--- src/distrib/sets/lists/man/mi:1.1182	Thu Jan 14 12:05:15 2010
+++ src/distrib/sets/lists/man/mi	Thu Jan 14 13:47:42 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1182 2010/01/14 12:05:15 wiz Exp $
+# $NetBSD: mi,v 1.1183 2010/01/14 13:47:42 wiz Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -55,7 +55,7 @@
 ./usr/share/man/cat1/atf-config.0		man-atf-catman		.cat,atf
 ./usr/share/man/cat1/atf-exec.0			man-atf-catman		.cat,atf
 ./usr/share/man/cat1/atf-format.0		man-atf-catman		.cat,atf
-./usr/share/man/cat1/atf-killpg.0		man-obsolete		.cat,obsolete
+./usr/share/man/cat1/atf-killpg.0		man-obsolete		obsolete
 ./usr/share/man/cat1/atf-report.0		man-atf-catman		.cat,atf
 ./usr/share/man/cat1/atf-run.0			man-atf-catman		.cat,atf
 ./usr/share/man/cat1/atf-test-program.0		man-atf-catman		.cat,atf
@@ -2769,7 +2769,7 @@
 ./usr/share/man/html1/atf-config.html		man-atf-htmlman		html,atf
 ./usr/share/man/html1/atf-exec.html		man-atf-htmlman		html,atf
 ./usr/share/man/html1/atf-format.html		man-atf-htmlman		html,atf
-./usr/share/man/html1/atf-killpg.html		man-obsolete		html,obsolete
+./usr/share/man/html1/atf-killpg.html		man-obsolete		obsolete
 ./usr/share/man/html1/atf-report.html		man-atf-htmlman		html,atf
 ./usr/share/man/html1/atf-run.html		man-atf-htmlman		html,atf
 ./usr/share/man/html1/atf-test-program.html	man-atf-htmlman		html,atf
@@ -5099,7 +5099,7 @@
 ./usr/share/man/man1/atf-config.1		man-atf-man		.man,atf
 ./usr/share/man/man1/atf-exec.1			man-atf-man		.man,atf
 ./usr/share/man/man1/atf-format.1		man-atf-man		.man,atf
-./usr/share/man/man1/atf-killpg.1		man-obsolete		.man,obsolete
+./usr/share/man/man1/atf-killpg.1		man-obsolete		obsolete
 ./usr/share/man/man1/atf-report.1		man-atf-man		.man,atf
 ./usr/share/man/man1/atf-run.1			man-atf-man		.man,atf
 ./usr/share/man/man1/atf-test-program.1		man-atf-man		.man,atf

Index: src/distrib/sets/lists/xetc/mi
diff -u src/distrib/sets/lists/xetc/mi:1.16 src/distrib/sets/lists/xetc/mi:1.17
--- src/distrib/sets/lists/xetc/mi:1.16	Mon Sep  7 21:07:03 2009
+++ src/distrib/sets/lists/xetc/mi	Thu Jan 14 13:47:42 2010
@@ -1,11 +1,11 @@
-# $NetBSD: mi,v 1.16 2009/09/07 21:07:03 mrg Exp $
+# $NetBSD: mi,v 1.17 2010/01/14 13:47:42 wiz Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
 ./etc/X11/fs/config					-unknown-	x11
 ./etc/X11/fs/config					-unknown-	xorg
 ./etc/X11/lbxproxy/AtomControl				-unknown-	x11
-./etc/X11/lbxproxy/AtomControl				-obsolete-	xorg,obsolete
+./etc/X11/lbxproxy/AtomControl				-obsolete-	obsolete,xorg
 ./etc/X11/proxymngr/pmconfig				-unknown-	x11
 ./etc/X11/proxymngr/pmconfig				-unknown-	xorg
 ./etc/X11/rstart/commands/@List				-unknown-	x11

Index: src/distrib/sets/lists/xfont/mi
diff -u src/distrib/sets/lists/xfont/mi:1.37 src/distrib/sets/lists/xfont/mi:1.38
--- src/distrib/sets/lists/xfont/mi:1.37	Thu Jun 18 21:05:36 2009
+++ src/distrib/sets/lists/xfont/mi	Thu Jan 14 13:47:42 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.37 2009/06/18 21:05:36 mrg Exp $
+# $NetBSD: mi,v 1.38 2010/01/14 13:47:42 wiz Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -8435,7 +8435,7 @@
 ./usr/X11R7/lib/X11/fonts/misc/18x18ko.pcf.gz		xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/4x6-ISO8859-1.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/4x6-ISO8859-10.pcf.gz	xfont	share,xorg,x11fonts
-./usr/X11R7/lib/X11/fonts/misc/4x6-ISO8859-11.pcf.gz	xfont-obsolete	share,xorg,obsolete
+./usr/X11R7/lib/X11/fonts/misc/4x6-ISO8859-11.pcf.gz	xfont-obsolete	obsolete
 ./usr/X11R7/lib/X11/fonts/misc/4x6-ISO8859-13.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/4x6-ISO8859-14.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/4x6-ISO8859-15.pcf.gz	xfont	share,xorg,x11fonts
@@ -8451,7 +8451,7 @@
 ./usr/X11R7/lib/X11/fonts/misc/4x6.pcf.gz		xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/5x7-ISO8859-1.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/5x7-ISO8859-10.pcf.gz	xfont	share,xorg,x11fonts
-./usr/X11R7/lib/X11/fonts/misc/5x7-ISO8859-11.pcf.gz	xfont-obsolete	share,xorg,obsolete
+./usr/X11R7/lib/X11/fonts/misc/5x7-ISO8859-11.pcf.gz	xfont-obsolete	obsolete
 ./usr/X11R7/lib/X11/fonts/misc/5x7-ISO8859-13.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/5x7-ISO8859-14.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/5x7-ISO8859-15.pcf.gz	xfont	share,xorg,x11fonts
@@ -8467,7 +8467,7 @@
 ./usr/X11R7/lib/X11/fonts/misc/5x7.pcf.gz		xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/5x8-ISO8859-1.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/5x8-ISO8859-10.pcf.gz	xfont	share,xorg,x11fonts
-./usr/X11R7/lib/X11/fonts/misc/5x8-ISO8859-11.pcf.gz	xfont-obsolete	share,xorg,obsolete
+./usr/X11R7/lib/X11/fonts/misc/5x8-ISO8859-11.pcf.gz	xfont-obsolete	obsolete
 ./usr/X11R7/lib/X11/fonts/misc/5x8-ISO8859-13.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/5x8-ISO8859-14.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/5x8-ISO8859-15.pcf.gz	xfont	share,xorg,x11fonts
@@ -8483,7 +8483,7 @@
 ./usr/X11R7/lib/X11/fonts/misc/5x8.pcf.gz		xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/6x10-ISO8859-1.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/6x10-ISO8859-10.pcf.gz	xfont	share,xorg,x11fonts
-./usr/X11R7/lib/X11/fonts/misc/6x10-ISO8859-11.pcf.gz	xfont-obsolete	share,xorg,obsolete
+./usr/X11R7/lib/X11/fonts/misc/6x10-ISO8859-11.pcf.gz	xfont-obsolete	obsolete
 ./usr/X11R7/lib/X11/fonts/misc/6x10-ISO8859-13.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/6x10-ISO8859-14.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/6x10-ISO8859-15.pcf.gz	xfont	share,xorg,x11fonts
@@ -8499,7 +8499,7 @@
 ./usr/X11R7/lib/X11/fonts/misc/6x10.pcf.gz		xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/6x12-ISO8859-1.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/6x12-ISO8859-10.pcf.gz	xfont	share,xorg,x11fonts
-./usr/X11R7/lib/X11/fonts/misc/6x12-ISO8859-11.pcf.gz	xfont-obsolete	share,xorg,obsolete
+./usr/X11R7/lib/X11/fonts/misc/6x12-ISO8859-11.pcf.gz	xfont-obsolete	obsolete
 ./usr/X11R7/lib/X11/fonts/misc/6x12-ISO8859-13.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/6x12-ISO8859-14.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/6x12-ISO8859-15.pcf.gz	xfont	share,xorg,x11fonts
@@ -8531,7 +8531,7 @@
 ./usr/X11R7/lib/X11/fonts/misc/6x13.pcf.gz		xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/6x13B-ISO8859-1.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/6x13B-ISO8859-10.pcf.gz	xfont	share,xorg,x11fonts
-./usr/X11R7/lib/X11/fonts/misc/6x13B-ISO8859-11.pcf.gz	xfont-obsolete	share,xorg,obsolete
+./usr/X11R7/lib/X11/fonts/misc/6x13B-ISO8859-11.pcf.gz	xfont-obsolete	obsolete
 ./usr/X11R7/lib/X11/fonts/misc/6x13B-ISO8859-13.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/6x13B-ISO8859-14.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/6x13B-ISO8859-15.pcf.gz	xfont	share,xorg,x11fonts
@@ -8543,11 +8543,11 @@
 ./usr/X11R7/lib/X11/fonts/misc/6x13B-ISO8859-7.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/6x13B-ISO8859-8.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/6x13B-ISO8859-9.pcf.gz	xfont	share,xorg,x11fonts
-./usr/X11R7/lib/X11/fonts/misc/6x13B-KOI8-R.pcf.gz	xfont-obsolete	share,xorg,obsolete
+./usr/X11R7/lib/X11/fonts/misc/6x13B-KOI8-R.pcf.gz	xfont-obsolete	obsolete
 ./usr/X11R7/lib/X11/fonts/misc/6x13B.pcf.gz		xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/6x13O-ISO8859-1.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/6x13O-ISO8859-10.pcf.gz	xfont	share,xorg,x11fonts
-./usr/X11R7/lib/X11/fonts/misc/6x13O-ISO8859-11.pcf.gz	xfont-obsolete	share,xorg,obsolete
+./usr/X11R7/lib/X11/fonts/misc/6x13O-ISO8859-11.pcf.gz	xfont-obsolete	obsolete
 ./usr/X11R7/lib/X11/fonts/misc/6x13O-ISO8859-13.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/6x13O-ISO8859-14.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/6x13O-ISO8859-15.pcf.gz	xfont	share,xorg,x11fonts
@@ -8557,13 +8557,13 @@
 ./usr/X11R7/lib/X11/fonts/misc/6x13O-ISO8859-4.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/6x13O-ISO8859-5.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/6x13O-ISO8859-7.pcf.gz	xfont	share,xorg,x11fonts
-./usr/X11R7/lib/X11/fonts/misc/6x13O-ISO8859-8.pcf.gz	xfont-obsolete	share,xorg,obsolete
+./usr/X11R7/lib/X11/fonts/misc/6x13O-ISO8859-8.pcf.gz	xfont-obsolete	obsolete
 ./usr/X11R7/lib/X11/fonts/misc/6x13O-ISO8859-9.pcf.gz	xfont	share,xorg,x11fonts
-./usr/X11R7/lib/X11/fonts/misc/6x13O-KOI8-R.pcf.gz	xfont-obsolete	share,xorg,obsolete
+./usr/X11R7/lib/X11/fonts/misc/6x13O-KOI8-R.pcf.gz	xfont-obsolete	obsolete
 ./usr/X11R7/lib/X11/fonts/misc/6x13O.pcf.gz		xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/6x9-ISO8859-1.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/6x9-ISO8859-10.pcf.gz	xfont	share,xorg,x11fonts
-./usr/X11R7/lib/X11/fonts/misc/6x9-ISO8859-11.pcf.gz	xfont-obsolete	share,xorg,obsolete
+./usr/X11R7/lib/X11/fonts/misc/6x9-ISO8859-11.pcf.gz	xfont-obsolete	obsolete
 ./usr/X11R7/lib/X11/fonts/misc/6x9-ISO8859-13.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/6x9-ISO8859-14.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/6x9-ISO8859-15.pcf.gz	xfont	share,xorg,x11fonts
@@ -8607,7 +8607,7 @@
 ./usr/X11R7/lib/X11/fonts/misc/7x13B-ISO8859-7.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/7x13B-ISO8859-8.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/7x13B-ISO8859-9.pcf.gz	xfont	share,xorg,x11fonts
-./usr/X11R7/lib/X11/fonts/misc/7x13B-KOI8-R.pcf.gz	xfont-obsolete	share,xorg,obsolete
+./usr/X11R7/lib/X11/fonts/misc/7x13B-KOI8-R.pcf.gz	xfont-obsolete	obsolete
 ./usr/X11R7/lib/X11/fonts/misc/7x13B.pcf.gz		xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/7x13O-ISO8859-1.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/7x13O-ISO8859-10.pcf.gz	xfont	share,xorg,x11fonts
@@ -8621,9 +8621,9 @@
 ./usr/X11R7/lib/X11/fonts/misc/7x13O-ISO8859-4.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/7x13O-ISO8859-5.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/7x13O-ISO8859-7.pcf.gz	xfont	share,xorg,x11fonts
-./usr/X11R7/lib/X11/fonts/misc/7x13O-ISO8859-8.pcf.gz	xfont-obsolete	share,xorg,obsolete
+./usr/X11R7/lib/X11/fonts/misc/7x13O-ISO8859-8.pcf.gz	xfont-obsolete	obsolete
 ./usr/X11R7/lib/X11/fonts/misc/7x13O-ISO8859-9.pcf.gz	xfont	share,xorg,x11fonts
-./usr/X11R7/lib/X11/fonts/misc/7x13O-KOI8-R.pcf.gz	xfont-obsolete	share,xorg,obsolete
+./usr/X11R7/lib/X11/fonts/misc/7x13O-KOI8-R.pcf.gz	xfont-obsolete	obsolete
 ./usr/X11R7/lib/X11/fonts/misc/7x13O.pcf.gz		xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/7x14-ISO8859-1.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/7x14-ISO8859-10.pcf.gz	xfont	share,xorg,x11fonts
@@ -8656,11 +8656,11 @@
 ./usr/X11R7/lib/X11/fonts/misc/7x14B-ISO8859-7.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/7x14B-ISO8859-8.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/7x14B-ISO8859-9.pcf.gz	xfont	share,xorg,x11fonts
-./usr/X11R7/lib/X11/fonts/misc/7x14B-KOI8-R.pcf.gz	xfont-obsolete	share,xorg,obsolete
+./usr/X11R7/lib/X11/fonts/misc/7x14B-KOI8-R.pcf.gz	xfont-obsolete	obsolete
 ./usr/X11R7/lib/X11/fonts/misc/7x14B.pcf.gz		xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/8x13-ISO8859-1.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/8x13-ISO8859-10.pcf.gz	xfont	share,xorg,x11fonts
-./usr/X11R7/lib/X11/fonts/misc/8x13-ISO8859-11.pcf.gz	xfont-obsolete	share,xorg,obsolete
+./usr/X11R7/lib/X11/fonts/misc/8x13-ISO8859-11.pcf.gz	xfont-obsolete	obsolete
 ./usr/X11R7/lib/X11/fonts/misc/8x13-ISO8859-13.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/8x13-ISO8859-14.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/8x13-ISO8859-15.pcf.gz	xfont	share,xorg,x11fonts
@@ -8676,7 +8676,7 @@
 ./usr/X11R7/lib/X11/fonts/misc/8x13.pcf.gz		xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/8x13B-ISO8859-1.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/8x13B-ISO8859-10.pcf.gz	xfont	share,xorg,x11fonts
-./usr/X11R7/lib/X11/fonts/misc/8x13B-ISO8859-11.pcf.gz	xfont-obsolete	share,xorg,obsolete
+./usr/X11R7/lib/X11/fonts/misc/8x13B-ISO8859-11.pcf.gz	xfont-obsolete	obsolete
 ./usr/X11R7/lib/X11/fonts/misc/8x13B-ISO8859-13.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/8x13B-ISO8859-14.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/8x13B-ISO8859-15.pcf.gz	xfont	share,xorg,x11fonts
@@ -8688,11 +8688,11 @@
 ./usr/X11R7/lib/X11/fonts/misc/8x13B-ISO8859-7.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/8x13B-ISO8859-8.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/8x13B-ISO8859-9.pcf.gz	xfont	share,xorg,x11fonts
-./usr/X11R7/lib/X11/fonts/misc/8x13B-KOI8-R.pcf.gz	xfont-obsolete	share,xorg,obsolete
+./usr/X11R7/lib/X11/fonts/misc/8x13B-KOI8-R.pcf.gz	xfont-obsolete	obsolete
 ./usr/X11R7/lib/X11/fonts/misc/8x13B.pcf.gz		xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/8x13O-ISO8859-1.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/8x13O-ISO8859-10.pcf.gz	xfont	share,xorg,x11fonts
-./usr/X11R7/lib/X11/fonts/misc/8x13O-ISO8859-11.pcf.gz	xfont-obsolete	share,xorg,obsolete
+./usr/X11R7/lib/X11/fonts/misc/8x13O-ISO8859-11.pcf.gz	xfont-obsolete	obsolete
 ./usr/X11R7/lib/X11/fonts/misc/8x13O-ISO8859-13.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/8x13O-ISO8859-14.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/8x13O-ISO8859-15.pcf.gz	xfont	share,xorg,x11fonts
@@ -8702,9 +8702,9 @@
 ./usr/X11R7/lib/X11/fonts/misc/8x13O-ISO8859-4.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/8x13O-ISO8859-5.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/8x13O-ISO8859-7.pcf.gz	xfont	share,xorg,x11fonts
-./usr/X11R7/lib/X11/fonts/misc/8x13O-ISO8859-8.pcf.gz	xfont-obsolete	share,xorg,obsolete
+./usr/X11R7/lib/X11/fonts/misc/8x13O-ISO8859-8.pcf.gz	xfont-obsolete	obsolete
 ./usr/X11R7/lib/X11/fonts/misc/8x13O-ISO8859-9.pcf.gz	xfont	share,xorg,x11fonts
-./usr/X11R7/lib/X11/fonts/misc/8x13O-KOI8-R.pcf.gz	xfont-obsolete	share,xorg,obsolete
+./usr/X11R7/lib/X11/fonts/misc/8x13O-KOI8-R.pcf.gz	xfont-obsolete	obsolete
 ./usr/X11R7/lib/X11/fonts/misc/8x13O.pcf.gz		xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/8x16.pcf.gz		xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/8x16rk.pcf.gz		xfont	share,xorg,x11fonts
@@ -8738,7 +8738,7 @@
 ./usr/X11R7/lib/X11/fonts/misc/9x15B-ISO8859-7.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/9x15B-ISO8859-8.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/9x15B-ISO8859-9.pcf.gz	xfont	share,xorg,x11fonts
-./usr/X11R7/lib/X11/fonts/misc/9x15B-KOI8-R.pcf.gz	xfont-obsolete	share,xorg,obsolete
+./usr/X11R7/lib/X11/fonts/misc/9x15B-KOI8-R.pcf.gz	xfont-obsolete	obsolete
 ./usr/X11R7/lib/X11/fonts/misc/9x15B.pcf.gz		xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/9x18-ISO8859-1.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/9x18-ISO8859-10.pcf.gz	xfont	share,xorg,x11fonts
@@ -8758,7 +8758,7 @@
 ./usr/X11R7/lib/X11/fonts/misc/9x18.pcf.gz		xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/9x18B-ISO8859-1.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/9x18B-ISO8859-10.pcf.gz	xfont	share,xorg,x11fonts
-./usr/X11R7/lib/X11/fonts/misc/9x18B-ISO8859-11.pcf.gz	xfont-obsolete	share,xorg,obsolete
+./usr/X11R7/lib/X11/fonts/misc/9x18B-ISO8859-11.pcf.gz	xfont-obsolete	obsolete
 ./usr/X11R7/lib/X11/fonts/misc/9x18B-ISO8859-13.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/9x18B-ISO8859-14.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/9x18B-ISO8859-15.pcf.gz	xfont	share,xorg,x11fonts
@@ -8770,7 +8770,7 @@
 ./usr/X11R7/lib/X11/fonts/misc/9x18B-ISO8859-7.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/9x18B-ISO8859-8.pcf.gz	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/9x18B-ISO8859-9.pcf.gz	xfont	share,xorg,x11fonts
-./usr/X11R7/lib/X11/fonts/misc/9x18B-KOI8-R.pcf.gz	xfont-obsolete	share,xorg,obsolete
+./usr/X11R7/lib/X11/fonts/misc/9x18B-KOI8-R.pcf.gz	xfont-obsolete	obsolete
 ./usr/X11R7/lib/X11/fonts/misc/9x18B.pcf.gz		xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/cu-alt12.pcf.gz		xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/cu-arabic12.pcf.gz	xfont	share,xorg,x11fonts

Index: src/distrib/sets/lists/xserver/md.netwinder
diff -u src/distrib/sets/lists/xserver/md.netwinder:1.22 src/distrib/sets/lists/xserver/md.netwinder:1.23
--- src/distrib/sets/lists/xserver/md.netwinder:1.22	Fri Dec 11 22:34:30 2009
+++ src/distrib/sets/lists/xserver/md.netwinder	Thu Jan 14 13:47:42 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.netwinder,v 1.22 2009/12/11 22:34:30 snj Exp $
+# $NetBSD: md.netwinder,v 1.23 2010/01/14 13:47:42 wiz Exp $
 ./usr/X11R6/bin/X					-unknown-	x11
 ./usr/X11R6/bin/XFree86					-unknown-	x11
 ./usr/X11R6/bin/gtf					-unknown-	x11
@@ -357,7 +357,7 @@
 ./usr/X11R7/lib/modules/libint10.a			-unknown-	obsolete
 ./usr/X11R7/lib/modules/libint10.so			-unknown-	obsolete
 ./usr/X11R7/lib/modules/libint10.so.0			-unknown-	obsolete
-./usr/X11R7/lib/modules/libint10_g.a			-unknown-	obsolete,xorg
+./usr/X11R7/lib/modules/libint10_g.a			-unknown-	obsolete
 ./usr/X11R7/lib/modules/libint10_pic.a			-unknown-	obsolete
 ./usr/X11R7/lib/modules/libpcidata.a			-unknown-	obsolete
 ./usr/X11R7/lib/modules/libpcidata.so			-unknown-	obsolete

Reply via email to