Module Name:    src
Committed By:   snj
Date:           Wed Mar 17 03:17:19 UTC 2010

Modified Files:
        src/distrib/sets/lists/comp [netbsd-5]: mi
        src/distrib/sets/lists/xcomp [netbsd-5]: md.macppc md.sgimips md.sparc
            md.sparc64 mi

Log Message:
Apply patch (requested by mrg in ticket #1342):
Fix some set list issues with MKDEBUG=yes.  Fixes PR toolchain/42938.


To generate a diff of this commit:
cvs rdiff -u -r1.1201.2.14 -r1.1201.2.15 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.13.2.1 -r1.13.2.2 src/distrib/sets/lists/xcomp/md.macppc
cvs rdiff -u -r1.3.2.2 -r1.3.2.3 src/distrib/sets/lists/xcomp/md.sgimips
cvs rdiff -u -r1.4.14.1 -r1.4.14.2 src/distrib/sets/lists/xcomp/md.sparc
cvs rdiff -u -r1.4.2.1 -r1.4.2.2 src/distrib/sets/lists/xcomp/md.sparc64
cvs rdiff -u -r1.71.2.6 -r1.71.2.7 src/distrib/sets/lists/xcomp/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/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1201.2.14 src/distrib/sets/lists/comp/mi:1.1201.2.15
--- src/distrib/sets/lists/comp/mi:1.1201.2.14	Fri Mar 12 21:58:43 2010
+++ src/distrib/sets/lists/comp/mi	Wed Mar 17 03:17:18 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1201.2.14 2010/03/12 21:58:43 riz Exp $
+#	$NetBSD: mi,v 1.1201.2.15 2010/03/17 03:17:18 snj Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -3197,7 +3197,7 @@
 ./usr/libdata/debug/usr/sbin/amd.debug		comp-amd-debug		debug
 ./usr/libdata/debug/usr/sbin/amq.debug		comp-amd-debug		debug
 ./usr/libdata/debug/usr/sbin/arp.debug		comp-netutil-debug	debug
-./usr/libdata/debug/usr/sbin/audit-packages.debug	comp-pkgutil-debug	debug
+./usr/libdata/debug/usr/sbin/audit-packages.debug	comp-obsolete		obsolete
 ./usr/libdata/debug/usr/sbin/authpf.debug	comp-pf-debug		pf,debug
 ./usr/libdata/debug/usr/sbin/bootpd.debug	comp-bootserver-debug	debug
 ./usr/libdata/debug/usr/sbin/bootpef.debug	comp-bootserver-debug	debug
@@ -3243,6 +3243,7 @@
 ./usr/libdata/debug/usr/sbin/getencstat.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/gpioctl.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/gspa.debug		comp-util-debug		debug
+./usr/libdata/debug/usr/sbin/hdaudioctl.debug	comp-util-debug		debug
 ./usr/libdata/debug/usr/sbin/hlfsd.debug	comp-amd-debug		debug
 ./usr/libdata/debug/usr/sbin/hostapd.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/hostapd_cli.debug	comp-sysutil-debug	debug

Index: src/distrib/sets/lists/xcomp/md.macppc
diff -u src/distrib/sets/lists/xcomp/md.macppc:1.13.2.1 src/distrib/sets/lists/xcomp/md.macppc:1.13.2.2
--- src/distrib/sets/lists/xcomp/md.macppc:1.13.2.1	Thu Sep 17 04:24:27 2009
+++ src/distrib/sets/lists/xcomp/md.macppc	Wed Mar 17 03:17:19 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.macppc,v 1.13.2.1 2009/09/17 04:24:27 snj Exp $
+# $NetBSD: md.macppc,v 1.13.2.2 2010/03/17 03:17:19 snj Exp $
 ./usr/X11R6/include/X11/extensions/xf86dga.h		-unknown-	x11
 ./usr/X11R6/include/X11/extensions/xf86dga1.h		-unknown-	x11
 ./usr/X11R6/include/X11/extensions/xf86dga1str.h	-unknown-	x11
@@ -161,8 +161,6 @@
 ./usr/libdata/debug/usr/X11R7/bin/Xmacppc.debug		-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/Xvfb.debug		-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug		-unknown-	debug,xorg
-./usr/libdata/debug/usr/X11R7/bin/mmapr.debug		-unknown-	debug,xorg
-./usr/libdata/debug/usr/X11R7/bin/mmapw.debug		-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/pcitweak.debug	-unknown-	obsolete
 ./usr/libdata/debug/usr/X11R7/bin/scanpci.debug		-unknown-	obsolete
 ./usr/libdata/debug/usr/X11R7/bin/xf86cfg.debug		-unknown-	obsolete

Index: src/distrib/sets/lists/xcomp/md.sgimips
diff -u src/distrib/sets/lists/xcomp/md.sgimips:1.3.2.2 src/distrib/sets/lists/xcomp/md.sgimips:1.3.2.3
--- src/distrib/sets/lists/xcomp/md.sgimips:1.3.2.2	Thu Sep 17 04:24:27 2009
+++ src/distrib/sets/lists/xcomp/md.sgimips	Wed Mar 17 03:17:19 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.sgimips,v 1.3.2.2 2009/09/17 04:24:27 snj Exp $
+# $NetBSD: md.sgimips,v 1.3.2.3 2010/03/17 03:17:19 snj Exp $
 ./usr/X11R6/include/xf86Optrec.h			-unknown-	x11
 ./usr/X11R6/include/xf86Parser.h			-unknown-	x11
 ./usr/X11R7/man/cat3/XF86VM.0				-unknown-	.cat,xorg
@@ -67,12 +67,8 @@
 ./usr/X11R7/man/man3/XF86VidModeSwitchMode.3		-unknown-	.man,xorg
 ./usr/X11R7/man/man3/XF86VidModeSwitchToMode.3		-unknown-	.man,xorg
 ./usr/X11R7/man/man3/XF86VidModeValidateModeLine.3	-unknown-	.man,xorg
-./usr/libdata/debug/usr/X11R7/bin/XFree86.debug		-unknown-	debug,xorg
-./usr/libdata/debug/usr/X11R7/bin/Xmacppc.debug		-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/Xvfb.debug		-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug		-unknown-	debug,xorg
-./usr/libdata/debug/usr/X11R7/bin/mmapr.debug		-unknown-	debug,xorg
-./usr/libdata/debug/usr/X11R7/bin/mmapw.debug		-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/pcitweak.debug	-unknown-	obsolete
 ./usr/libdata/debug/usr/X11R7/bin/scanpci.debug		-unknown-	obsolete
 ./usr/libdata/debug/usr/X11R7/bin/xf86cfg.debug		-unknown-	obsolete

Index: src/distrib/sets/lists/xcomp/md.sparc
diff -u src/distrib/sets/lists/xcomp/md.sparc:1.4.14.1 src/distrib/sets/lists/xcomp/md.sparc:1.4.14.2
--- src/distrib/sets/lists/xcomp/md.sparc:1.4.14.1	Thu Sep 17 04:24:27 2009
+++ src/distrib/sets/lists/xcomp/md.sparc	Wed Mar 17 03:17:19 2010
@@ -1,10 +1,6 @@
-#	$NetBSD: md.sparc,v 1.4.14.1 2009/09/17 04:24:27 snj Exp $
-./usr/libdata/debug/usr/X11R7/bin/XFree86.debug		-unknown-	debug,xorg
-./usr/libdata/debug/usr/X11R7/bin/Xmacppc.debug		-unknown-	debug,xorg
+#	$NetBSD: md.sparc,v 1.4.14.2 2010/03/17 03:17:19 snj Exp $
 ./usr/libdata/debug/usr/X11R7/bin/Xvfb.debug		-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug		-unknown-	debug,xorg
-./usr/libdata/debug/usr/X11R7/bin/mmapr.debug		-unknown-	debug,xorg
-./usr/libdata/debug/usr/X11R7/bin/mmapw.debug		-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/pcitweak.debug	-unknown-	obsolete
 ./usr/libdata/debug/usr/X11R7/bin/scanpci.debug		-unknown-	obsolete
 ./usr/libdata/debug/usr/X11R7/bin/xf86cfg.debug		-unknown-	obsolete

Index: src/distrib/sets/lists/xcomp/md.sparc64
diff -u src/distrib/sets/lists/xcomp/md.sparc64:1.4.2.1 src/distrib/sets/lists/xcomp/md.sparc64:1.4.2.2
--- src/distrib/sets/lists/xcomp/md.sparc64:1.4.2.1	Thu Sep 17 04:24:27 2009
+++ src/distrib/sets/lists/xcomp/md.sparc64	Wed Mar 17 03:17:19 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: md.sparc64,v 1.4.2.1 2009/09/17 04:24:27 snj Exp $
+#	$NetBSD: md.sparc64,v 1.4.2.2 2010/03/17 03:17:19 snj Exp $
 ./usr/X11R6/include/X11/extensions/dpms.h		-unknown-	x11
 ./usr/X11R6/include/X11/extensions/dpmsstr.h		-unknown-	x11
 ./usr/X11R6/include/X11/extensions/xf86misc.h		-unknown-	x11
@@ -76,12 +76,8 @@
 ./usr/X11R7/man/man3/XF86VidModeSwitchMode.3		-unknown-	.man,xorg
 ./usr/X11R7/man/man3/XF86VidModeSwitchToMode.3		-unknown-	.man,xorg
 ./usr/X11R7/man/man3/XF86VidModeValidateModeLine.3	-unknown-	.man,xorg
-./usr/libdata/debug/usr/X11R7/bin/XFree86.debug		-unknown-	debug,xorg
-./usr/libdata/debug/usr/X11R7/bin/Xmacppc.debug		-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/Xvfb.debug		-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug		-unknown-	debug,xorg
-./usr/libdata/debug/usr/X11R7/bin/mmapr.debug		-unknown-	debug,xorg
-./usr/libdata/debug/usr/X11R7/bin/mmapw.debug		-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/pcitweak.debug	-unknown-	obsolete
 ./usr/libdata/debug/usr/X11R7/bin/scanpci.debug		-unknown-	obsolete
 ./usr/libdata/debug/usr/X11R7/bin/xf86cfg.debug		-unknown-	obsolete

Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.71.2.6 src/distrib/sets/lists/xcomp/mi:1.71.2.7
--- src/distrib/sets/lists/xcomp/mi:1.71.2.6	Sat Oct 10 19:53:24 2009
+++ src/distrib/sets/lists/xcomp/mi	Wed Mar 17 03:17:19 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.71.2.6 2009/10/10 19:53:24 sborrill Exp $
+# $NetBSD: mi,v 1.71.2.7 2010/03/17 03:17:19 snj Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -9009,6 +9009,7 @@
 ./usr/libdata/debug/usr/X11R7/bin/appres.debug		-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/atobm.debug		-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/bdftopcf.debug	-unknown-	debug,xorg
+./usr/libdata/debug/usr/X11R7/bin/bdftruncate.debug	-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/beforelight.debug	-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/bitmap.debug		-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/bmtoa.debug		-unknown-	debug,xorg

Reply via email to