Module Name: src
Committed By: snj
Date: Fri Sep 18 02:03:35 UTC 2009
Modified Files:
src/distrib/sets/lists/xserver [netbsd-5]: md.sparc64
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader [netbsd-5]:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos [netbsd-5]:
Makefile
Log Message:
Apply patch (requested by mrg in ticket #958):
Missed a few bits in sparc64 xserver setlist and reachover Makefiles.
To generate a diff of this commit:
cvs rdiff -u -r1.26.2.3 -r1.26.2.4 src/distrib/sets/lists/xserver/md.sparc64
cvs rdiff -u -r1.3.8.1 -r1.3.8.2 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
cvs rdiff -u -r1.10.2.2 -r1.10.2.3 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/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.sparc64
diff -u src/distrib/sets/lists/xserver/md.sparc64:1.26.2.3 src/distrib/sets/lists/xserver/md.sparc64:1.26.2.4
--- src/distrib/sets/lists/xserver/md.sparc64:1.26.2.3 Thu Sep 17 04:24:28 2009
+++ src/distrib/sets/lists/xserver/md.sparc64 Fri Sep 18 02:03:35 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.26.2.3 2009/09/17 04:24:28 snj Exp $ x11
+# $NetBSD: md.sparc64,v 1.26.2.4 2009/09/18 02:03:35 snj Exp $ x11
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/Xsun -unknown- x11
@@ -302,6 +302,8 @@
./usr/X11R7/lib/modules/dri/r300_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/radeon_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/radeon_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/ag10e_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/ag10e_drv.so.0 -unknown- xorg
./usr/X11R7/lib/modules/drivers/ati_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/ati_drv.so.6 -unknown- xorg
./usr/X11R7/lib/modules/drivers/glint_drv.so -unknown- xorg
@@ -409,11 +411,6 @@
./usr/X11R7/lib/modules/libi2c.so.0 -unknown- xorg
./usr/X11R7/lib/modules/libi2c_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/modules/libi2c_pic.a -unknown- xorg
-./usr/X11R7/lib/modules/libint10.a -unknown- xorg
-./usr/X11R7/lib/modules/libint10.so -unknown- xorg
-./usr/X11R7/lib/modules/libint10.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/libint10_g.a -unknown- debuglib,xorg
-./usr/X11R7/lib/modules/libint10_pic.a -unknown- xorg
./usr/X11R7/lib/modules/libpcidata.a -unknown- obsolete
./usr/X11R7/lib/modules/libpcidata.so -unknown- obsolete
./usr/X11R7/lib/modules/libpcidata.so.0 -unknown- obsolete
@@ -470,6 +467,7 @@
./usr/X11R7/man/cat1/pcitweak.0 -unknown- obsolete
./usr/X11R7/man/cat1/scanpci.0 -unknown- obsolete
./usr/X11R7/man/cat1/xorgconfig.0 -unknown- obsolete
+./usr/X11R7/man/cat4/ag10e.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/ati.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/exa.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/glint.0 -unknown- .cat,xorg
@@ -506,6 +504,7 @@
./usr/X11R7/man/man1/pcitweak.1 -unknown- obsolete
./usr/X11R7/man/man1/scanpci.1 -unknown- obsolete
./usr/X11R7/man/man1/xorgconfig.1 -unknown- obsolete
+./usr/X11R7/man/man4/ag10e.4 -unknown- .man,xorg
./usr/X11R7/man/man4/ati.4 -unknown- .man,xorg
./usr/X11R7/man/man4/exa.4 -unknown- .man,xorg
./usr/X11R7/man/man4/glint.4 -unknown- .man,xorg
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.3.8.1 src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.3.8.2
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.3.8.1 Thu Sep 17 04:24:40 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile Fri Sep 18 02:03:35 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3.8.1 2009/09/17 04:24:40 snj Exp $
+# $NetBSD: Makefile,v 1.3.8.2 2009/09/18 02:03:35 snj Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -10,7 +10,7 @@
extsym.c misym.c xf86sym.c
.if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
-SRCS+= SparcMulDiv.S
+#SRCS+= SparcMulDiv.S
.endif
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.10.2.2 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.10.2.3
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.10.2.2 Thu Sep 17 04:24:41 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Fri Sep 18 02:03:35 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10.2.2 2009/09/17 04:24:41 snj Exp $
+# $NetBSD: Makefile,v 1.10.2.3 2009/09/18 02:03:35 snj Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -47,7 +47,7 @@
.endif
.if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
-SRCS.bsd+= ppc_video.c bsdResource.c pm_noop.c agp_noop.c
+SRCS.bsd+= ppc_video.c stdResource.c pm_noop.c agp_noop.c
SRCS.bus+= netbsdSbus.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
