Module Name: src
Committed By: mrg
Date: Wed Jun 10 02:20:13 UTC 2009
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/xbase: md.amd64 md.i386
src/etc/mtree: NetBSD.dist
src/external/mit/xorg/server/xorg-server/hw/xfree86/pcidata: Makefile
Log Message:
install pci.ids somewhere so that libpciaccess can find it.
To generate a diff of this commit:
cvs rdiff -u -r1.813 -r1.814 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/xbase/md.amd64
cvs rdiff -u -r1.19 -r1.20 src/distrib/sets/lists/xbase/md.i386
cvs rdiff -u -r1.403 -r1.404 src/etc/mtree/NetBSD.dist
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/pcidata/Makefile
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.813 src/distrib/sets/lists/base/mi:1.814
--- src/distrib/sets/lists/base/mi:1.813 Wed Jun 10 00:40:33 2009
+++ src/distrib/sets/lists/base/mi Wed Jun 10 02:20:13 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.813 2009/06/10 00:40:33 agc Exp $
+# $NetBSD: mi,v 1.814 2009/06/10 02:20:13 mrg Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -649,6 +649,7 @@
./usr/X11R7/share base-x11-root
./usr/X11R7/share/examples base-x11-root
./usr/X11R7/share/examples/ssh-askpass base-x11-root
+./usr/X11R7/share/pciids base-x11-root
./usr/bin base-sys-usr
./usr/bin/Mail base-mail-bin
./usr/bin/apply base-util-bin
Index: src/distrib/sets/lists/xbase/md.amd64
diff -u src/distrib/sets/lists/xbase/md.amd64:1.3 src/distrib/sets/lists/xbase/md.amd64:1.4
--- src/distrib/sets/lists/xbase/md.amd64:1.3 Tue Jun 9 04:39:50 2009
+++ src/distrib/sets/lists/xbase/md.amd64 Wed Jun 10 02:20:13 2009
@@ -1,4 +1,5 @@
-# $NetBSD: md.amd64,v 1.3 2009/06/09 04:39:50 mrg Exp $
+# $NetBSD: md.amd64,v 1.4 2009/06/10 02:20:13 mrg Exp $
+./usr/X11R7/share/pciids/pci.ids -unknown- xorg
./usr/X11R7/lib/libdrm_intel.so -unknown- xorg
./usr/X11R7/lib/libdrm_intel.so.0 -unknown- xorg
./usr/X11R7/lib/libdrm_intel.so.0.0 -unknown- xorg
Index: src/distrib/sets/lists/xbase/md.i386
diff -u src/distrib/sets/lists/xbase/md.i386:1.19 src/distrib/sets/lists/xbase/md.i386:1.20
--- src/distrib/sets/lists/xbase/md.i386:1.19 Tue Jun 9 04:39:50 2009
+++ src/distrib/sets/lists/xbase/md.i386 Wed Jun 10 02:20:13 2009
@@ -1,4 +1,5 @@
-# $NetBSD: md.i386,v 1.19 2009/06/09 04:39:50 mrg Exp $
+# $NetBSD: md.i386,v 1.20 2009/06/10 02:20:13 mrg Exp $
+./usr/X11R7/share/pciids/pci.ids -unknown- xorg
./usr/X11R7/lib/libdrm_intel.so -unknown- xorg
./usr/X11R7/lib/libdrm_intel.so.0 -unknown- xorg
./usr/X11R7/lib/libdrm_intel.so.0.0 -unknown- xorg
Index: src/etc/mtree/NetBSD.dist
diff -u src/etc/mtree/NetBSD.dist:1.403 src/etc/mtree/NetBSD.dist:1.404
--- src/etc/mtree/NetBSD.dist:1.403 Wed Jun 3 18:47:06 2009
+++ src/etc/mtree/NetBSD.dist Wed Jun 10 02:20:13 2009
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist,v 1.403 2009/06/03 18:47:06 bouyer Exp $
+# $NetBSD: NetBSD.dist,v 1.404 2009/06/10 02:20:13 mrg Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -415,6 +415,7 @@
./usr/X11R7/share
./usr/X11R7/share/examples
./usr/X11R7/share/examples/ssh-askpass
+./usr/X11R7/share/pciids
./usr/bin
./usr/games
./usr/games/hide gname=games mode=0750
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/pcidata/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/pcidata/Makefile:1.3 src/external/mit/xorg/server/xorg-server/hw/xfree86/pcidata/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/pcidata/Makefile:1.3 Sun Aug 24 13:47:05 2008
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/pcidata/Makefile Wed Jun 10 02:20:13 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/08/24 13:47:05 rtr Exp $
+# $NetBSD: Makefile,v 1.4 2009/06/10 02:20:13 mrg Exp $
# XXX this one is installed in modular-xorg-server
@@ -29,6 +29,11 @@
-I${X11SRCDIR.xorg-server}/rac \
-I.
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+FILES= pci.ids
+FILESDIR= ${X11ROOTDIR}/share/pciids
+.endif
+
.include <bsd.x11.mk>
LIBDIR= ${XMODULEDIR}
.include <bsd.lib.mk>
