[src/trunk]: src/external/mit/xorg/server/drivers/xf86-video-vmware updates f...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/67998b31af0f
branches:  trunk
changeset: 787171:67998b31af0f
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Jun 05 06:27:27 2013 +0000

description:
updates for xf86-video-vmware 13.0.1.  just build the normal driver now.

diffstat:

 external/mit/xorg/server/drivers/xf86-video-vmware/Makefile           |  20 ++++++----
 external/mit/xorg/server/drivers/xf86-video-vmware/vmwlegacy/Makefile |  13 ------
 2 files changed, 12 insertions(+), 21 deletions(-)

diffs (50 lines):

diff -r 73400c9eee38 -r 67998b31af0f external/mit/xorg/server/drivers/xf86-video-vmware/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile       Wed Jun 05 05:19:11 2013 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile       Wed Jun 05 06:27:27 2013 +0000
@@ -1,17 +1,21 @@
-#      $NetBSD: Makefile,v 1.6 2010/05/23 06:37:32 mrg Exp $
+#      $NetBSD: Makefile,v 1.7 2013/06/05 06:27:27 mrg Exp $
 
 DRIVER=                xf86-video-vmware
-DRIVER_NAME=   vmware_drv
+DRIVER_NAME=   vmwware_drv
 
-SRCS=          vmwaremodule.c
-MAN=           vmware.4
+SRCS=  \
+       bits2pixels.c \
+       vmware.c \
+       vmwarecurs.c \
+       vmwarectrl.c \
+       vmwarexinerama.c \
+       vmwarevideo.c \
+       vmwaremodes.c \
+       vmware_bootstrap.c \
+       vmware_common.c
 
 CPPFLAGS+=     -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
 CPPFLAGS+=     -I${X11SRCDIR.${DRIVER}}/../include -DHAVE_CONFIG_H \
                -I${DESTDIR}${X11INCDIR}/libdrm
 
 .include "../Makefile.xf86-driver"
-
-SUBDIR= vmwlegacy
-
-.include <bsd.subdir.mk>
diff -r 73400c9eee38 -r 67998b31af0f external/mit/xorg/server/drivers/xf86-video-vmware/vmwlegacy/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-vmware/vmwlegacy/Makefile     Wed Jun 05 05:19:11 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-#      $NetBSD: Makefile,v 1.1 2010/05/23 06:37:32 mrg Exp $
-
-DRIVER=                xf86-video-vmware
-DRIVER_NAME=   vmwlegacy_drv
-
-SRCS=          bits2pixels.c vmware.c vmwarecurs.c vmwarectrl.c
-SRCS+=         vmwaremodes.c vmwarevideo.c vmwarexinerama.c 
-
-CPPFLAGS+=     -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
-CPPFLAGS+=     -I${X11SRCDIR.${DRIVER}}/../include -DHAVE_CONFIG_H \
-               -I${DESTDIR}${X11INCDIR}/libdrm
-
-.include "../../Makefile.xf86-driver"