[src/trunk]: src/external/mit/xorg Define PCVT_SUPPORT for cats.

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

details:   https://anonhg.NetBSD.org/src/rev/11b024a23ce9
branches:  trunk
changeset: 759111:11b024a23ce9
user:      skrll <skrll%NetBSD.org@localhost>
date:      Mon Nov 29 09:34:40 2010 +0000

description:
Define PCVT_SUPPORT for cats.

diffstat:

 external/mit/xorg/bin/xdm/config/Makefile                                 |  4 ++--
 external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile             |  4 ++--
 external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile           |  6 +++++-
 external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile             |  6 +++++-
 external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig/Makefile |  4 ++--
 external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile           |  5 ++++-
 6 files changed, 20 insertions(+), 9 deletions(-)

diffs (110 lines):

diff -r a21b06d98e6c -r 11b024a23ce9 external/mit/xorg/bin/xdm/config/Makefile
--- a/external/mit/xorg/bin/xdm/config/Makefile Mon Nov 29 06:22:20 2010 +0000
+++ b/external/mit/xorg/bin/xdm/config/Makefile Mon Nov 29 09:34:40 2010 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: Makefile,v 1.9 2010/05/23 21:35:35 veego Exp $
+#      $NetBSD: Makefile,v 1.10 2010/11/29 09:34:40 skrll Exp $
 
 .include <bsd.own.mk>
 
 # native only gives DEFAULTVT for i386 and amd64.
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "cats"
 DEFAULTVT=vt05
 .else
 DEFAULTVT=     # defined empty
diff -r a21b06d98e6c -r 11b024a23ce9 external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile
--- a/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile     Mon Nov 29 06:22:20 2010 +0000
+++ b/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile     Mon Nov 29 09:34:40 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2009/06/11 15:32:38 mrg Exp $
+#      $NetBSD: Makefile,v 1.11 2010/11/29 09:34:40 skrll Exp $
 
 DRIVER=                xf86-input-keyboard
 DRIVER_NAME=   kbd_drv
@@ -6,7 +6,7 @@
 SRCS=          kbd.c bsd_KbdMap.c bsd_kbd.c at_scancode.c
 MAN=           kbd.4
 
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "Xcats"
 CPPFLAGS+=     -DPCVT_SUPPORT
 .endif
 CPPFLAGS+=     -DWSCONS_SUPPORT
diff -r a21b06d98e6c -r 11b024a23ce9 external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile   Mon Nov 29 06:22:20 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile   Mon Nov 29 09:34:40 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.14 2010/11/23 08:22:31 mrg Exp $
+#      $NetBSD: Makefile,v 1.15 2010/11/29 09:34:41 skrll Exp $
 
 .include <bsd.sys.mk> # for HOST_SH
 
@@ -89,6 +89,10 @@
 CPPFLAGS+=     -DPCCONS_SUPPORT -DPCVT_SUPPORT
 .endif
 
+.if ${MACHINE} == "cats"
+CPPFLAGS+=     -DPCVT_SUPPORT
+.endif
+
 OS_RELEASE!=   ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
 
 DRIVERS=       mga glint nv tga s3 s3virge sis rendition neomagic \
diff -r a21b06d98e6c -r 11b024a23ce9 external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile     Mon Nov 29 06:22:20 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile     Mon Nov 29 09:34:40 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2010/11/23 08:22:33 mrg Exp $
+#      $NetBSD: Makefile,v 1.7 2010/11/29 09:34:41 skrll Exp $
 
 .include <bsd.sys.mk> # for HOST_SH
 
@@ -51,6 +51,10 @@
 CPPFLAGS+=     -DPCCONS_SUPPORT -DPCVT_SUPPORT
 .endif
 
+.if ${MACHINE} == "cats"
+CPPFLAGS+=     -DPCVT_SUPPORT
+.endif
+
 CPPFLAGS.xf86Init.c=   -DOSNAME='"NetBSD/${MACHINE} ${OS_RELEASE} -"' \
                        -DXORG_RELEASE='"Release 1.4.2"' \
                        -DBUILDERADDR='"xorg%xorg.org@localhost"' \
diff -r a21b06d98e6c -r 11b024a23ce9 external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig/Makefile Mon Nov 29 06:22:20 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig/Makefile Mon Nov 29 09:34:40 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2009/02/14 13:32:13 abs Exp $
+#      $NetBSD: Makefile,v 1.7 2010/11/29 09:34:41 skrll Exp $
 
 .include <bsd.own.mk>
 
@@ -22,7 +22,7 @@
                -DFILEMANSUFFIX=\"5\" \
                -DXVERSIONSTRING=\"1.4.2\"
 
-.if ${MACHINE_ARCH} == "i386"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE} == "cats"
 CPPFLAGS+=     -DPCVT_SUPPORT
 .endif
 
diff -r a21b06d98e6c -r 11b024a23ce9 external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile   Mon Nov 29 06:22:20 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile   Mon Nov 29 09:34:40 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.25 2010/11/23 08:22:35 mrg Exp $
+#      $NetBSD: Makefile,v 1.26 2010/11/29 09:34:41 skrll Exp $
 
 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
@@ -70,6 +70,9 @@
 SRCS.bsd+=      ppc_video.c pm_noop.c agp_noop.c
 .for _FN in ${SRCS.bsd}
 CPPFLAGS.${_FN}=        -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
+.if ${MACHINE} == "cats"
+CPPFLAGS.${_FN}+=      -DPCVT_SUPPORT
+.endif
 .endfor
 .endif