 @@ -1,19 +1,19 @@
-#	$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
 .endif
 CPPSCRIPTS=	Xresources Xreset Xservers.ws Xsession Xstartup xdm-config
 CPPSCRIPTFLAGS_Xresources=	-DXPM -DBITMAPDIR=${X11INCDIR}/X11/pixmaps \
 				-DXDM_PIXMAP=NetBSD.xpm \
 				-DXDM_BWPIXMAP=NetBSD-bw.xpm
 CPPSCRIPTFLAGS_Xreset=		-DBINDIR=${X11BINDIR} -DXDMCONFIGDIR=${XDMDIR}
 CPPSCRIPTFLAGS_Xservers.ws=	-DBINDIR=${X11BINDIR} -DDEFAULTVT=${DEFAULTVT}
 CPPSCRIPTFLAGS_Xsession=	-DBINDIR=${X11BINDIR} \

 @@ -1,20 +1,20 @@
-#	$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
 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
 CPPFLAGS+=	-DXKB
 CPPFLAGS.kbd.c=	-D__XKBDEFRULES__=${__XKBDEFRULES__}
 X11EXTRAMANDEFS+=	-e 's,__xkb_path__,${X11LIBDIR}/xkb,g'
 COPTS.kbd.c=      -Wno-error	# XXX deprecated
 .include "../Makefile.xf86-driver"

 @@ -1,14 +1,14 @@
-#	$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
 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
 LIB=	common
 .PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/common
 SRCS.xv=	xf86xv.c xf86xvmc.c
 SRCS.bus=	xf86pciBus.c xf86fbBus.c xf86noBus.c
 SRCS.randr=	xf86RandR.c
 @@ -79,26 +79,30 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw
 CPPFLAGS+=	${X11FLAGS.EXTENSION} ${X11FLAGS.OS_DEFINES} \
 		${X11FLAGS.DIX} \
 		-DXFree86LOADER -DWSCONS_SUPPORT -D__XKBDEFRULES__='"xorg"' \
 		-D__XSERVERNAME__='"Xorg"' -D__XCONFIGFILE__='"xorg.conf"' \
 		-D__VENDORDWEBSUPPORT__='"http://wiki.X.Org"' \
 		-DXVENDORNAME='"The X.Org Foundation"' \
 		-DHAVE_XORG_CONFIG_H
 .if ${MACHINE_ARCH} == "i386"
 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 \
 		i740 tdfx savage cirrus vmware tseng trident chips \
 		apm i128
 DRIVERS+=	ati i810 ark cyrix siliconmotion via fbdev vesa \
 		dummy
 IDRIVERS=	mouse keyboard acecad calcomp citron digitaledge \
 		dmc dynapro elographics tek4957 microtouch \
 		mutouch penmount spaceorb summa wacom void \
 		magellan hyperpen jamstudio fpit palmax

 @@ -1,14 +1,14 @@
-#	$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
 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
 LIB=	init
 .PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/common
 SRCS=	xf86Init.c
 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
 @@ -41,21 +41,25 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw
 CPPFLAGS+=	${X11FLAGS.EXTENSION} ${X11FLAGS.OS_DEFINES} \
 		${X11FLAGS.DIX} \
 		-DXFree86LOADER -DWSCONS_SUPPORT -D__XKBDEFRULES__='"xorg"' \
 		-D__XSERVERNAME__='"Xorg"' -D__XCONFIGFILE__='"xorg.conf"' \
 		-D__VENDORDWEBSUPPORT__='"http://wiki.X.Org"' \
 		-DXVENDORNAME='"The X.Org Foundation"' \
 		-DHAVE_XORG_CONFIG_H
 .if ${MACHINE_ARCH} == "i386"
 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"' \
 			-DDEFAULT_MODULE_PATH=\"${X11USRLIBDIR}/modules\" \
 			-DDEFAULT_LIBRARY_PATH=\"${X11USRLIBDIR}\"
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>

 @@ -1,33 +1,33 @@
-#	$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>
 PROG=	xorgconfig
 .PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/utils/xorgconfig
 SRCS=	xorgconfig.c cards.c
 LDADD=	-lxkbfile -lXext -lX11
 DPADD=	${LIBXKBFILE} ${LIBXEXT} ${LIBX11}
 CPPFLAGS+=	-DCARD_DATABASE_FILE='"${X11USRLIBDIR}/X11/Cards"' \
 		-DXKB_RULES_DIR=\"${X11USRLIBDIR}/X11/xkb/rules\" \
 		-DXVERSION=${XORG_VERSION_CURRENT} \
 		-DWSCONS_SUPPORT -D__XKBDEFRULES__='"xorg"' \
 		-D__XCONFIGFILE__='"xorg.conf"' \
 		-D__XSERVERNAME__='"Xorg"' \
 		-D__XKBDEFRULES__='"xorg"' \
 		-DXVENDORNAME='"The X.Org Foundation"' \
 		-DFILEMANSUFFIX=\"5\" \
 		-DXVERSIONSTRING=\"1.4.2\"
-.if ${MACHINE_ARCH} == "i386"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE} == "cats"
 CPPFLAGS+=	-DPCVT_SUPPORT
 .endif
 FILES+=		Cards
 FILESDIR_Cards=	${X11USRLIBDIR}/X11
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>

 @@ -1,14 +1,14 @@
-#	$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"
 LIB=	xorgos
 .PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/os-support
 .PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bsd
 .PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/os-support/shared
 SRCS.bsd=	\
 		bsd_VTsw.c bsd_bell.c bsd_init.c bsd_pci.c \
 		kmod_noop.c \
 		posix_tty.c sigio.c vidmem.c
 @@ -60,26 +60,29 @@ SRCS.bsd+=	ppc_video.c pm_noop.c agp_noo
 .for _FN in ${SRCS.bsd}
 CPPFLAGS.${_FN}=	-DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
 .endfor
 .endif
 .if ${MACHINE} == "cats" || \
     ${MACHINE} == "hpcarm" || \
     ${MACHINE} == "shark" || \
     ${MACHINE} == "netwinder" || \
     ${MACHINE} == "zaurus"
 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
 .if ${MACHINE} == "dreamcast" || \
     ${MACHINE} == "hpcsh"
 SRCS.bsd+=	ppc_video.c pm_noop.c agp_noop.c
 .for _FN in ${SRCS.bsd}
 CPPFLAGS.${_FN}=	-DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
 .endfor
 .endif
 # some platforms will probably need ioperm_noop.c