Module Name: src
Committed By: mrg
Date: Mon Feb 21 04:42:17 UTC 2011
Modified Files:
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: 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 ofppc anywhere other ppc platforms do.
part of the way to getting xorg working on ofppc.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig/Makefile
cvs rdiff -u -r1.27 -r1.28 \
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/server/xorg-server/hw/xfree86/common/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.16 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.17
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.16 Sat Jan 22 15:21:37 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Mon Feb 21 04:42:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2011/01/22 15:21:37 cegger Exp $
+# $NetBSD: Makefile,v 1.17 2011/02/21 04:42:16 mrg Exp $
.include <bsd.sys.mk> # for HOST_SH
@@ -90,7 +90,7 @@
CPPFLAGS+= -DPCCONS_SUPPORT -DPCVT_SUPPORT
.endif
-.if ${MACHINE} == "cats"
+.if ${MACHINE} == "cats" || ${MACHINE} == "ofppc"
CPPFLAGS+= -DPCVT_SUPPORT
.endif
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.7 src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile:1.8
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile:1.7 Mon Nov 29 09:34:41 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile Mon Feb 21 04:42:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/11/29 09:34:41 skrll Exp $
+# $NetBSD: Makefile,v 1.8 2011/02/21 04:42:17 mrg Exp $
.include <bsd.sys.mk> # for HOST_SH
@@ -51,7 +51,7 @@
CPPFLAGS+= -DPCCONS_SUPPORT -DPCVT_SUPPORT
.endif
-.if ${MACHINE} == "cats"
+.if ${MACHINE} == "cats" || ${MACHINE} == "ofppc"
CPPFLAGS+= -DPCVT_SUPPORT
.endif
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile:1.14 src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile:1.15
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile:1.14 Sun Aug 1 06:24:31 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile Mon Feb 21 04:42:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2010/08/01 06:24:31 kiyohara Exp $
+# $NetBSD: Makefile,v 1.15 2011/02/21 04:42:17 mrg Exp $
SUBDIR= cvt gtf
#SUBDIR= cvt gtf xorgconfig
@@ -10,7 +10,8 @@
.if ${MACHINE} == "cats" || ${MACHINE} == "macppc" || \
${MACHINE} == "netwinder" || ${MACHINE_ARCH} == "sparc" || \
${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "alpha" || \
- ${MACHINE} == "prep" || ${MACHINE} == "bebox"
+ ${MACHINE} == "prep" || ${MACHINE} == "bebox" || \
+ ${MACHINE} == "ofppc"
#SUBDIR+=pcitweak scanpci
.endif
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.7 src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig/Makefile:1.8
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig/Makefile:1.7 Mon Nov 29 09:34:41 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig/Makefile Mon Feb 21 04:42:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/11/29 09:34:41 skrll Exp $
+# $NetBSD: Makefile,v 1.8 2011/02/21 04:42:17 mrg Exp $
.include <bsd.own.mk>
@@ -22,7 +22,7 @@
-DFILEMANSUFFIX=\"5\" \
-DXVERSIONSTRING=\"1.4.2\"
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE} == "cats"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE} == "cats" || ${MACHINE} == "ofppc"
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.27 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.28
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.27 Wed Feb 9 13:37:48 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Mon Feb 21 04:42:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2011/02/09 13:37:48 tsutsui Exp $
+# $NetBSD: Makefile,v 1.28 2011/02/21 04:42:17 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -37,6 +37,9 @@
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
.endfor
+.if ${MACHINE} == "ofppc"
+CPPFLAGS.${_FN}+= -DPCVT_SUPPORT
+.endif
.endif
.if ${MACHINE_ARCH} == "alpha"
