Module Name: src
Committed By: skrll
Date: Mon Nov 29 09:34:42 UTC 2010
Modified Files:
src/external/mit/xorg/bin/xdm/config: Makefile
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/init: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
Log Message:
Define PCVT_SUPPORT for cats.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/bin/xdm/config/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig/Makefile
cvs rdiff -u -r1.25 -r1.26 \
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/external/mit/xorg/bin/xdm/config/Makefile
diff -u src/external/mit/xorg/bin/xdm/config/Makefile:1.9 src/external/mit/xorg/bin/xdm/config/Makefile:1.10
--- src/external/mit/xorg/bin/xdm/config/Makefile:1.9 Sun May 23 21:35:35 2010
+++ src/external/mit/xorg/bin/xdm/config/Makefile Mon Nov 29 09:34:40 2010
@@ -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
Index: src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.10 src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.11
--- src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.10 Thu Jun 11 15:32:38 2009
+++ src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile Mon Nov 29 09:34:40 2010
@@ -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
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.14 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.15
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.14 Tue Nov 23 08:22:31 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Mon Nov 29 09:34:41 2010
@@ -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 \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile:1.6 src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile:1.7
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile:1.6 Tue Nov 23 08:22:33 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile Mon Nov 29 09:34:41 2010
@@ -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='"[email protected]"' \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig/Makefile:1.6 src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig/Makefile:1.7
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig/Makefile:1.6 Sat Feb 14 13:32:13 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig/Makefile Mon Nov 29 09:34:41 2010
@@ -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
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.25 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.26
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.25 Tue Nov 23 08:22:35 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Mon Nov 29 09:34:41 2010
@@ -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
