Module Name:    src
Committed By:   mrg
Date:           Fri May 28 04:12:02 UTC 2010

Modified Files:
        src/distrib/sets/lists/xserver: md.amd64 md.i386
        src/external/mit/xorg/server/drivers: Makefile

Log Message:
enable xf86-video-openchrome for x86 and xf86-video-geode for i386.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.76 -r1.77 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.40 -r1.41 src/external/mit/xorg/server/drivers/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/xserver/md.amd64
diff -u src/distrib/sets/lists/xserver/md.amd64:1.58 src/distrib/sets/lists/xserver/md.amd64:1.59
--- src/distrib/sets/lists/xserver/md.amd64:1.58	Sun May 23 21:32:51 2010
+++ src/distrib/sets/lists/xserver/md.amd64	Fri May 28 04:12:02 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.58 2010/05/23 21:32:51 mrg Exp $
+# $NetBSD: md.amd64,v 1.59 2010/05/28 04:12:02 mrg Exp $
 ./usr/X11R6/bin/X					-unknown-	x11
 ./usr/X11R6/bin/XFree86					-unknown-	x11
 ./usr/X11R6/bin/gtf					-unknown-	x11
@@ -438,6 +438,8 @@
 ./usr/X11R7/lib/modules/drivers/nsc_drv.so.2		-unknown-	obsolete
 ./usr/X11R7/lib/modules/drivers/nv_drv.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/nv_drv.so.2		-unknown-	xorg
+./usr/X11R7/lib/modules/drivers/openchrome_drv.so	-unknown-	xorg
+./usr/X11R7/lib/modules/drivers/openchrome_drv.so.0	-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/r128_drv.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/r128_drv.so.6		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/radeon_drv.so		-unknown-	xorg
@@ -620,6 +622,7 @@
 ./usr/X11R7/man/cat4/neomagic.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/nsc.0				-unknown-	obsolete
 ./usr/X11R7/man/cat4/nv.0				-unknown-	.cat,xorg
+./usr/X11R7/man/cat4/openchrome.0			-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/r128.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/radeon.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/radeonhd.0				-unknown-	.cat,xorg
@@ -663,6 +666,7 @@
 ./usr/X11R7/man/html4/neomagic.html			-unknown-	html,xorg
 ./usr/X11R7/man/html4/nsc.html				-unknown-	obsolete
 ./usr/X11R7/man/html4/nv.html				-unknown-	html,xorg
+./usr/X11R7/man/html4/openchrome.html			-unknown-	html,xorg
 ./usr/X11R7/man/html4/r128.html				-unknown-	html,xorg
 ./usr/X11R7/man/html4/radeon.html			-unknown-	html,xorg
 ./usr/X11R7/man/html4/radeonhd.html			-unknown-	html,xorg
@@ -706,6 +710,7 @@
 ./usr/X11R7/man/man4/neomagic.4				-unknown-	.man,xorg
 ./usr/X11R7/man/man4/nsc.4				-unknown-	obsolete
 ./usr/X11R7/man/man4/nv.4				-unknown-	.man,xorg
+./usr/X11R7/man/man4/openchrome.4			-unknown-	.man,xorg
 ./usr/X11R7/man/man4/r128.4				-unknown-	.man,xorg
 ./usr/X11R7/man/man4/radeon.4				-unknown-	.man,xorg
 ./usr/X11R7/man/man4/radeonhd.4				-unknown-	.man,xorg

Index: src/distrib/sets/lists/xserver/md.i386
diff -u src/distrib/sets/lists/xserver/md.i386:1.76 src/distrib/sets/lists/xserver/md.i386:1.77
--- src/distrib/sets/lists/xserver/md.i386:1.76	Sun May 23 21:32:51 2010
+++ src/distrib/sets/lists/xserver/md.i386	Fri May 28 04:12:02 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.76 2010/05/23 21:32:51 mrg Exp $
+# $NetBSD: md.i386,v 1.77 2010/05/28 04:12:02 mrg Exp $
 ./usr/X11R6/bin/X					-unknown-	x11
 ./usr/X11R6/bin/XFree86					-unknown-	x11
 ./usr/X11R6/bin/gtf					-unknown-	x11
@@ -488,6 +488,8 @@
 ./usr/X11R7/lib/modules/drivers/elographics_drv.so.1	-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/glint_drv.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/glint_drv.so.1		-unknown-	xorg
+./usr/X11R7/lib/modules/drivers/geode_drv.so		-unknown-	xorg
+./usr/X11R7/lib/modules/drivers/geode_drv.so.0		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/i128_drv.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/i128_drv.so.1		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/i740_drv.so		-unknown-	xorg
@@ -512,6 +514,8 @@
 ./usr/X11R7/lib/modules/drivers/nsc_drv.so.2		-unknown-	obsolete
 ./usr/X11R7/lib/modules/drivers/nv_drv.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/nv_drv.so.2		-unknown-	xorg
+./usr/X11R7/lib/modules/drivers/openchrome_drv.so	-unknown-	xorg
+./usr/X11R7/lib/modules/drivers/openchrome_drv.so.0	-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/r128_drv.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/r128_drv.so.6		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/radeon_drv.so		-unknown-	xorg
@@ -722,6 +726,7 @@
 ./usr/X11R7/man/cat4/neomagic.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/nsc.0				-unknown-	obsolete
 ./usr/X11R7/man/cat4/nv.0				-unknown-	.cat,xorg
+./usr/X11R7/man/cat4/openchrome.0			-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/r128.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/radeon.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/radeonhd.0				-unknown-	.cat,xorg
@@ -766,6 +771,7 @@
 ./usr/X11R7/man/html4/neomagic.html			-unknown-	html,xorg
 ./usr/X11R7/man/html4/nsc.html				-unknown-	obsolete
 ./usr/X11R7/man/html4/nv.html				-unknown-	html,xorg
+./usr/X11R7/man/html4/openchrome.html			-unknown-	html,xorg
 ./usr/X11R7/man/html4/r128.html				-unknown-	html,xorg
 ./usr/X11R7/man/html4/radeon.html			-unknown-	html,xorg
 ./usr/X11R7/man/html4/radeonhd.html			-unknown-	html,xorg
@@ -810,6 +816,7 @@
 ./usr/X11R7/man/man4/neomagic.4				-unknown-	.man,xorg
 ./usr/X11R7/man/man4/nsc.4				-unknown-	obsolete
 ./usr/X11R7/man/man4/nv.4				-unknown-	.man,xorg
+./usr/X11R7/man/man4/openchrome.4			-unknown-	.man,xorg
 ./usr/X11R7/man/man4/r128.4				-unknown-	.man,xorg
 ./usr/X11R7/man/man4/radeon.4				-unknown-	.man,xorg
 ./usr/X11R7/man/man4/radeonhd.4				-unknown-	.man,xorg

Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.40 src/external/mit/xorg/server/drivers/Makefile:1.41
--- src/external/mit/xorg/server/drivers/Makefile:1.40	Sat May 22 21:12:19 2010
+++ src/external/mit/xorg/server/drivers/Makefile	Fri May 28 04:12:02 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.40 2010/05/22 21:12:19 mrg Exp $
+#	$NetBSD: Makefile,v 1.41 2010/05/28 04:12:02 mrg Exp $
 
 SUBDIR= \
 	xf86-input-keyboard \
@@ -8,6 +8,7 @@
 .if ${MACHINE_ARCH} == "i386"
 SUBDIR+= \
 	xf86-input-elographics
+	xf86-video-geode
 .endif
 
 .if ${MACHINE_ARCH} == "i386" || \
@@ -133,11 +134,6 @@
 	xf86-video-cirrus \
 	xf86-video-cirrus_alpine \
 	xf86-video-cirrus_laguna \
-
-# replace with xf86-video-geode
-#	xf86-video-cyrix \
-
-SUBDIR+= \
 	xf86-video-glint \
 	xf86-video-i128 \
 	xf86-video-i740 \
@@ -151,6 +147,7 @@
 	xf86-video-mga \
 	xf86-video-neomagic \
 	xf86-video-nv \
+	xf86-video-openchrome \
 	xf86-video-r128 \
 	xf86-video-radeon \
 	xf86-video-radeonhd \
@@ -164,8 +161,6 @@
 	xf86-video-trident \
 	xf86-video-tseng \
 
-# replace with xf86-video-openchrome
-#	xf86-video-via
 .elif ${MACHINE} == "zaurus"
 SUBDIR+= \
 	xf86-video-wsfb

Reply via email to