build updates for xorg-server 1.6.

2009-06-12 01:59:04 +00:00 · 2009-06-12 01:59:04 +00:00 · d225a0d5f8
parent 6bfaba4900
commit d225a0d5f8
37 changed files with 120 additions and 182 deletions
--- a/external/mit/xorg/server/drivers/Makefile
+++ b/external/mit/xorg/server/drivers/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.27 2009/04/10 17:00:45 bouyer Exp $
+#	$NetBSD: Makefile,v 1.28 2009/06/12 01:59:04 mrg Exp $

 SUBDIR= \
 	xf86-input-keyboard \
@ -91,11 +91,19 @@ SUBDIR+= \
 	xf86-video-cirrus \
 	xf86-video-cirrus_alpine \
 	xf86-video-cirrus_laguna \
-	xf86-video-cyrix \
+
+# replace with xf86-video-geode
+#	xf86-video-cyrix \
+
+SUBDIR+= \
 	xf86-video-glint \
 	xf86-video-i128 \
 	xf86-video-i740 \
-	xf86-video-imstt \
+
+# needs porting for xorg-server 1.6
+#	xf86-video-imstt \
+
+SUBDIR+= \
 	xf86-video-intel \
 	xf86-video-mach64 \
 	xf86-video-mga \
@ -115,10 +123,11 @@ SUBDIR+= \
 	xf86-video-trident \
 	xf86-video-tseng \
 	xf86-video-vga \
-	xf86-video-via
+
+# replace with xf86-video-openchrome
+#	xf86-video-via
 .endif

-#xf86-video-wsfb
 #xf86-video-rendition

 .include <bsd.subdir.mk>
--- a/external/mit/xorg/server/drivers/Makefile.xf86-driver
+++ b/external/mit/xorg/server/drivers/Makefile.xf86-driver
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.xf86-driver,v 1.14 2009/06/05 23:34:36 ahoka Exp $
+#	$NetBSD: Makefile.xf86-driver,v 1.15 2009/06/12 01:59:04 mrg Exp $

 LIBISMODULE=	yes
 SHLIB_MAJOR=	${PACKAGE_MAJOR}
@ -36,6 +36,9 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 \
 		${X11FLAGS.EXTENSION} \
 		${X11FLAGS.DIX} ${X11INCS.DIX} \
 		${X11FLAGS.SERVER} \
+		-DHAVE_XORG_SERVER_1_1_0 \
+		-DSERVER_1_5 \
+		-DXSERVER_LIBPCIACCESS \
 		-DXFree86LOADER

 CPPFLAGS+=	-DPACKAGE_VERSION_MAJOR=${PACKAGE_MAJOR}
--- a/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile
+++ b/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2008/08/03 09:24:14 rtr Exp $
+#	$NetBSD: Makefile,v 1.4 2009/06/12 01:59:04 mrg Exp $

 DRIVER=		xf86-video-tdfx
 DRIVER_NAME=	tdfx_drv
@ -11,4 +11,6 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11/dri
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11/drm

+COPTS.tdfx_driver.c=      -Wno-error	# XXX deprecated
+
 .include "../Makefile.xf86-driver"
--- a/external/mit/xorg/server/drivers/xf86-video-wsfb/Makefile
+++ b/external/mit/xorg/server/drivers/xf86-video-wsfb/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2008/11/04 22:21:17 macallan Exp $
+#	$NetBSD: Makefile,v 1.4 2009/06/12 01:59:04 mrg Exp $

 DRIVER=		xf86-video-wsfb
 DRIVER_NAME=	wsfb_drv
@ -6,4 +6,6 @@ DRIVER_NAME=	wsfb_drv
 SRCS=		wsfb_driver.c wsfb_cursor.c
 MAN=		wsfb.4

+CPPFLAGS+=	-DHAVE_CONFIG_H -I${X11SRCDIR.${DRIVER}}/../include
+
 .include "../Makefile.xf86-driver"
--- a/external/mit/xorg/server/xorg-server/Makefile.Xserver
+++ b/external/mit/xorg/server/xorg-server/Makefile.Xserver
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.Xserver,v 1.9 2009/06/11 05:43:15 mrg Exp $
+#	$NetBSD: Makefile.Xserver,v 1.10 2009/06/12 01:59:04 mrg Exp $

 .for _SL in \
 	mi \
@ -8,7 +8,6 @@
 	Xext \
 	Xext/Xextbuiltin \
 	dbe \
-	XTrap \
 	record \
 	render \
 	randr \
@ -24,18 +23,15 @@
 	os \
 	dix \
 	config \
+	glx \
 	hw/xnest \
 	hw/xfree86/common \
 	hw/xfree86/ddc \
 	hw/xfree86/dixmods \
-	hw/xfree86/dixmods/afb \
-	hw/xfree86/dixmods/cfb \
-	hw/xfree86/dixmods/cfb32 \
 	hw/xfree86/dixmods/dbe \
 	hw/xfree86/dixmods/extmod \
 	hw/xfree86/dixmods/fb \
 	hw/xfree86/dixmods/freetype \
-	hw/xfree86/dixmods/mfb \
 	hw/xfree86/dixmods/record \
 	hw/xfree86/dixmods/shadow \
 	hw/xfree86/dixmods/type1 \
@ -59,8 +55,6 @@
 	hw/xfree86/vgahw \
 	hw/xfree86/x86emu \
 	hw/xfree86/xaa \
-	hw/xfree86/xf1bpp \
-	hw/xfree86/xf4bpp \
 	hw/xfree86/xf8_16bpp \
 	hw/xfree86/xf8_32bpp \
 	hw/xfree86/xf86config \
--- a/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin
+++ b/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin
@ -1,6 +1,7 @@
-#	$NetBSD: Makefile.Xextbuiltin,v 1.5 2009/06/11 05:43:15 mrg Exp $
+#	$NetBSD: Makefile.Xextbuiltin,v 1.6 2009/06/12 01:59:04 mrg Exp $

-SRCS.Xextbuiltin=	shape.c sleepuntil.c xtest.c	
+SRCS.Xextbuiltin=	bigreq.c geext.c shape.c sleepuntil.c \
+			sync.c xcmisc.c xtest.c
 SRCS.Xextbuiltin+=	shm.c
 SRCS.Xextbuiltin+=	panoramiX.c panoramiXprocs.c panoramiXSwap.c
 SRCS.Xextbuiltin+=	xace.c
--- a/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextmodule
+++ b/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextmodule
@ -1,7 +1,6 @@
-#	$NetBSD: Makefile.Xextmodule,v 1.6 2009/06/11 05:43:15 mrg Exp $
+#	$NetBSD: Makefile.Xextmodule,v 1.7 2009/06/12 01:59:04 mrg Exp $

-SRCS.Xextmodule=	bigreq.c sync.c xcmisc.c
-SRCS.Xextmodule+=	xvmain.c xvdisp.c xvmc.c
+SRCS.Xextmodule=	xvmain.c xvdisp.c xvmc.c
 SRCS.Xextmodule+=	xres.c
 SRCS.Xextmodule+=	saver.c
 SRCS.Xextmodule+=	mbuf.c
--- a/external/mit/xorg/server/xorg-server/glx/Makefile.glx
+++ b/external/mit/xorg/server/xorg-server/glx/Makefile.glx
@ -1,17 +1,17 @@
-#	$NetBSD: Makefile.glx,v 1.1 2009/06/11 05:43:16 mrg Exp $
+#	$NetBSD: Makefile.glx,v 1.2 2009/06/12 01:59:04 mrg Exp $

 .PATH:	${X11SRCDIR.xorg-server}/glx
 .PATH:	${X11SRCDIR.MesaLib}/src/mesa/glapi
 .PATH:	${X11SRCDIR.MesaLib}/src/glx/x11

 SRCS.glx= \
-        indirect_dispatch.c                     \
-        indirect_dispatch_swap.c                \
-        indirect_reqsize.c                      \
-        indirect_size_get.c                     \
-        indirect_table.c                        \
-        glapi.c                                 \
-        glthread.c                              \
+        indirect_dispatch.c \
+        indirect_dispatch_swap.c \
+        indirect_reqsize.c \
+        indirect_size_get.c \
+        indirect_table.c \
+        glapi.c \
+        glthread.c \
        glxdri.c \
        extension_string.c \
        indirect_util.c \
@ -46,6 +46,7 @@ CPPFLAGS+= \
 	-I${X11SRCDIR.xorg-server}/Xext \
 	-I${X11SRCDIR.MesaLib}/include \
 	-I${X11SRCDIR.MesaLib}/src/glx/x11 \
+	-I${X11SRCDIR.MesaLib}/src/mesa \
 	-I${X11SRCDIR.MesaLib}/src/mesa/main \
 	-I${X11SRCDIR.MesaLib}/src/mesa/glapi \
 	-I${DESTDIR}${X11INCDIR}/X11 \
--- a/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2009/06/11 05:43:16 mrg Exp $
+#	$NetBSD: Makefile,v 1.8 2009/06/12 01:59:04 mrg Exp $

 .include <bsd.own.mk>

@ -70,6 +70,7 @@ LDADD+=	${LDADD.dix} \
 	${LDADD.xkbstubs} \
 	${LDADD.composite} \
 	${LDADD.os} \
+	${LDADD.glx} \
 	-lXfont \
 	-lfreetype \
 	-lXau \
@ -85,8 +86,7 @@ DPADD+=	${DPADD.dix} ${DPADD.fb} ${DPADD.mi} ${DPADD.xfixes} \
 	${DPADD.Xext} ${DPADD.config} ${DPADD.dbe} \
 	${DPADD.record} ${DPADD.render} ${DPADD.randr} ${DPADD.damageext} \
 	${DPADD.miext/damage} ${DPADD.miext/shadow} ${DPADD.Xi} \
-	${DPADD.xkb} ${DPADD.composite} ${DPADD.os} \
-	${LIBCWRAPPER} \
+	${DPADD.xkb} ${DPADD.composite} ${DPADD.os} ${DPADD.glx} \
 	${LIBXFONT} ${LIBFREETYPE} ${LIBXAU} ${LIBFONTENC} \
 	${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} \
 	${LIBCRYPTO}
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.26 2009/06/11 05:43:16 mrg Exp $
+#	$NetBSD: Makefile,v 1.27 2009/06/12 01:59:04 mrg Exp $

 SUBDIR=		common init ddc dixmods doc dri dri2 dummy i2c int10 loader \
 		xf86modes exa \
-		xorgos ramdac pcidata shadowfb vbe vgahw \
+		xorgos ramdac shadowfb vbe vgahw \
 		x86emu xaa xf86config xf8_16bpp

 SUBDIR+=	.WAIT utils
@ -62,9 +62,13 @@ LDADD+=	${LDADD.miext/cw}
 LDADD+=	${LDADD.Xi}
 LDADD+=	${LDADD.xkb}
 LDADD+=	${LDADD.os}
+LDADD+=	${LDADD.glx}
+LDADD+=	${LDADD.hw/xfree86/dri}
 LDADD+=	${LDADD.hw/xfree86/dixmods/fb}
 LDADD+=	${LDADD.hw/xfree86/dixmods/xorgxkb}
 LDADD+=	-lpixman-1 -lXfont -lfreetype -lXau -lfontenc -lXdmcp
+LDADD+=	-lpciaccess -ldrm
+LDADD+=	-lcrypto
 LDADD+=	-Wl,--no-whole-archive

 .if ${MACHINE_ARCH} == "i386"
@ -87,7 +91,6 @@ DPADD+=	${DPADD.dix} \
 	${DPADD.Xext} \
 	${DPADD.config} \
 	${DPADD.dbe} \
-	${DPADD.XTrap} \
 	${DPADD.record} \
 	${DPADD.render} \
 	${DPADD.randr} \
@ -99,6 +102,8 @@ DPADD+=	${DPADD.dix} \
 	${DPADD.xkb} \
 	${DPADD.composite} \
 	${DPADD.os} \
+	${DPADD.glx} \
+	${DPADD.hw/xfree86/dri} \
 	${DPADD.hw/xfree86/dixmods/fb} \
 	${DPADD.hw/xfree86/fb} \
 	${DPADD.hw/xfree86/init} \
@ -111,7 +116,8 @@ DPADD+=	${DPADD.dix} \
 	${DPADD.hw/xfree86/i2c} \
 	${LIBCWRAPPER} \
 	${LIBXFONT} ${LIBFREETYPE} ${LIBXAU} ${LIBFONTENC} \
-	${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM}
+	${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS} \
+	${LIBCRYPTO}

 SYMLINKS=	${X11BINDIR}/Xorg ${X11BINDIR}/X

--- a/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2009/06/11 05:43:16 mrg Exp $
+#	$NetBSD: Makefile,v 1.10 2009/06/12 01:59:04 mrg Exp $

 .include <bsd.sys.mk> # for HOST_SH

@ -16,9 +16,11 @@ SRCS=	xf86Configure.c xf86ShowOpts.c xf86Bus.c xf86Config.c \
 	xf86Cursor.c xf86DGA.c xf86DPMS.c \
 	xf86Events.c xf86Globals.c xf86AutoConfig.c \
 	xf86Option.c \
+	xf86VidMode.c xf86fbman.c xf86cmap.c \
 	xf86Helper.c xf86PM.c xf86RAC.c xf86Xinput.c xisb.c \
 	xf86Mode.c xorgHelper.c \
-	${SRCS.xv} ${SRCS.bus} ${SRCS.randr}
+	${SRCS.xv} ${SRCS.bus} ${SRCS.randr} \
+	xf86DefModeSet.c

 .if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
 SRCS.bus+=	xf86sbusBus.c
@ -42,7 +44,8 @@ xf86DefModeSet.c:
 	cat \
 	${X11SRCDIR.xorg-server}/hw/xfree86/common/vesamodes \
 	${X11SRCDIR.xorg-server}/hw/xfree86/common/extramodes | \
-	${TOOL_AWK} -f ${.CURDIR}/modeline2c.awk > ${.TARGET}
+	${TOOL_AWK} -f ${X11SRCDIR.xorg-server}/hw/xfree86/common/modeline2c.awk > ${.TARGET}
+	@echo >> ${.TARGET}

 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
@ -119,6 +122,7 @@ COPTS.xf86AutoConfig.c=		-Wno-error
 COPTS.xf86Config.c=		-Wno-error
 COPTS.xf86Cursor.c=		-Wno-error
 COPTS.xf86RandR.c=		-Wno-error
+COPTS.xf86Helper.c=		-Wno-error

 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/common/modeline2c.awk
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/common/modeline2c.awk
@ -1,97 +0,0 @@
-#!/usr/bin/awk -f
-#
-# Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
-# All rights reserved.
-#
-# Based on Perl script by Dirk Hohndel.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
-# COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# Usage: modeline2c.awk < modefile > xf86DefModes.c
-#
-
-BEGIN {
-	flagsdict[""] = "0"
-
-	flagsdict["+hsync +vsync"] = "V_PHSYNC | V_PVSYNC"
-	flagsdict["+hsync -vsync"] = "V_PHSYNC | V_NVSYNC"
-	flagsdict["-hsync +vsync"] = "V_NHSYNC | V_PVSYNC"
-	flagsdict["-hsync -vsync"] = "V_NHSYNC | V_NVSYNC"
-	flagsdict["+hsync +vsync interlace"] = "V_PHSYNC | V_PVSYNC | V_INTERLACE"
-	flagsdict["+hsync -vsync interlace"] = "V_PHSYNC | V_NVSYNC | V_INTERLACE"
-	flagsdict["-hsync +vsync interlace"] = "V_NHSYNC | V_PVSYNC | V_INTERLACE"
-	flagsdict["-hsync -vsync interlace"] = "V_NHSYNC | V_NVSYNC | V_INTERLACE"
-
-	print "/* $" "XFree86$ */"
-	print
-	print "/* THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT -- LOOK at"
-	print " * modeline2c.awk */"
-	print ""
-	print "/*"
-	print " * Author: Joerg Sonnenberger <joerg@NetBSD.org>"
-	print " * Based on Perl script from Dirk Hohndel <hohndel@XFree86.Org>"
-	print " */"
-	print ""
-	print "#ifdef HAVE_XORG_CONFIG_H"
-	print "#include <xorg-config.h>"
-	print "#endif"
-	print ""
-	print "#ifdef __UNIXOS2__"
-	print "#define I_NEED_OS2_H"
-	print "#endif"
-	print "#include \"xf86.h\""
-	print "#include \"xf86Config.h\""
-	print "#include \"xf86Priv.h\""
-	print "#include \"xf86_OSlib.h\""
-	print ""
-	print "#include \"globals.h\""
-	print ""
-	print "#define MODEPREFIX(name) NULL, NULL, name, MODE_OK, M_T_DEFAULT"
-	print "#define MODESUFFIX       0,0, 0,0,0,0,0,0,0, 0,0,0,0,0,0,FALSE,FALSE,0,NULL,0,0.0,0.0"
-	print ""
-	print "DisplayModeRec xf86DefaultModes [] = {"
-
-	modeline = "\t{MODEPREFIX(\"%dx%d\"),%d, %d,%d,%d,%d,0, %d,%d,%d,%d,0, %s, MODESUFFIX},\n"
-	modeline_data = "^[a-zA-Z]+[ \t]+[^ \t]+[ \t0-9.]+"
-}
-
-/^[mM][oO][dD][eE][lL][iI][nN][eE]/ {
-	flags = $0
-	gsub(modeline_data, "", flags)
-	flags = tolower(flags)
-	printf(modeline, $4, $8, $3 * 1000, $4, $5, $6, $7,
-	       $8, $9, $10, $11, flagsdict[flags])
-	# Half-width double scanned modes
-	printf(modeline, $4/2, $8/2, $3 * 500, $4/2, $5/2, $6/2, $7/2,
-	       $8/2, $9/2, $10/2, $11/2, flagsdict[flags] " | V_DBLSCAN")
-}
-
-/^#/ {
-	print "/*" substr($0, 2) " */"
-}
-
-END {
-	printf("\t{MODEPREFIX(NULL),0,0,0,0,0,0,0,0,0,0,0,0,MODESUFFIX}\n};\n")
-}
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2008/08/29 07:46:19 rtr Exp $
+#	$NetBSD: Makefile,v 1.3 2009/06/12 01:59:05 mrg Exp $

 LIBISPRIVATE=yes

@ -13,6 +13,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus \
+		-I${X11SRCDIR.xorg-server}/Xext \
 		-I${X11SRCDIR.xorg-server}/include \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/i2c
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2009/06/11 05:43:16 mrg Exp $
+#	$NetBSD: Makefile,v 1.7 2009/06/12 01:59:05 mrg Exp $

 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
@ -22,11 +22,9 @@ CPPFLAGS+= \
 	-DXFree86LOADER

 SUBDIR = \
-	GLcore \
 	dbe \
 	extmod \
 	fb \
-	glx \
 	record \
 	shadow \
 	wfb \
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/06/11 05:43:16 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2009/06/12 01:59:05 mrg Exp $

 XMODULEDIR=     ${X11USRLIBDIR}/modules/extensions

@ -10,7 +10,6 @@ LIB=	extmod
 .PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod
 SRCS=	xf86dga2.c \
 	xvmod.c \
-	xf86misc.c \
 	xf86vmode.c \
 	modinit.c

@ -21,6 +20,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/dbe \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/hw/xfree86/loader \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/miext/shadow \
+		-I${X11SRCDIR.xorg-server}/Xext \
 		-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
 		-I${DESTDIR}${X11INCDIR}/xorg \
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/glx/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/glx/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2008/09/25 14:15:06 rtr Exp $
+#	$NetBSD: Makefile,v 1.2 2009/06/12 01:59:05 mrg Exp $

 XMODULEDIR=	${X11USRLIBDIR}/modules/extensions

@ -10,4 +10,6 @@ LIB=	glx
 .PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/dixmods
 SRCS=	${SRCS.glx} glxmodule.c

-.include "../../../../GL/glx/Makefile.glx"
+CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/${LIB}
+
+.include "../../../../glx/Makefile.glx"
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/wfb/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/wfb/Makefile
@ -1,10 +1,11 @@
-#	$NetBSD: Makefile,v 1.1 2008/08/06 07:16:40 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2009/06/12 01:59:05 mrg Exp $

 LIB=	wfb

 SRCS=	fbmodule.c fbcmap_mi.c

 CPPFLAGS+=	-DFB_ACCESS_WRAPPER \
+		-I${X11SRCDIR.xorg-server}/Xext \
 		-I${X11SRCDIR.xorg-server}/fb

 .include "../Makefile.dixmod"
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/xorgxkb/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/xorgxkb/Makefile
@ -1,7 +1,9 @@
-#	$NetBSD: Makefile,v 1.1 2008/08/06 07:16:40 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2009/06/12 01:59:05 mrg Exp $

 LIB=	xorgxkb

 SRCS=	xkbVT.c xkbPrivate.c xkbKillSrv.c

+CPPFLAGS=	-I${X11SRCDIR.xorg-server}/Xext
+
 .include "../Makefile.dixmod"
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/06/11 05:43:17 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2009/06/12 01:59:05 mrg Exp $

 XMODULEDIR=	${X11USRLIBDIR}/modules/extensions

@ -22,6 +22,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
 		-I${X11SRCDIR.xorg-server}/i2c \
 		-I${X11SRCDIR.xorg-server}/parser \
 		-I${X11SRCDIR.xorg-server}/ramdac \
+		-I${X11SRCDIR.xorg-server}/Xext \
 		-I${X11SRCDIR.MesaLib}/include \
 		-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${DESTDIR}${X11INCDIR}/X11/dri \
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/06/11 17:59:25 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2009/06/12 01:59:05 mrg Exp $

 XMODULEDIR=	${X11USRLIBDIR}/modules/extensions

@ -15,6 +15,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus \
+		-I${X11SRCDIR.xorg-server}/xfixes \
 		-I${X11SRCDIR.xorg-server}/glx \
 		-I${X11SRCDIR.xorg-server}/GL/include \
 		-I${X11SRCDIR.xorg-server}/modes \
@ -22,6 +23,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
 		-I${X11SRCDIR.xorg-server}/i2c \
 		-I${X11SRCDIR.xorg-server}/parser \
 		-I${X11SRCDIR.xorg-server}/ramdac \
+		-I${X11SRCDIR.xorg-server}/Xext \
 		-I${X11SRCDIR.MesaLib}/include \
 		-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${DESTDIR}${X11INCDIR}/X11/dri \
@ -32,8 +34,6 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
 CPPFLAGS+=	-DXF86DRI \
 		${X11FLAGS.DIX}

-CPPFLAGS.dri.c=	-Wno-error
-
 LIBDPLIBS=	drm ${.CURDIR}/../../../../../lib/libdrm

 .include <bsd.x11.mk>
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dummy/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dummy/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2009/06/11 05:43:17 mrg Exp $
+#	$NetBSD: Makefile,v 1.4 2009/06/12 01:59:05 mrg Exp $

 MKX11LOADABLE=no

@ -22,6 +22,7 @@ SRCS+=	sigiostubs.c
 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/dummylib \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
+		-I${X11SRCDIR.xorg-server}/Xext \
 		-I${X11SRCDIR.xorg-server}/include \
 		-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/i2c/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/i2c/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2008/08/24 13:47:05 rtr Exp $
+#	$NetBSD: Makefile,v 1.4 2009/06/12 01:59:05 mrg Exp $

 XMODULEDIR=	${X11USRLIBDIR}/modules

@ -18,6 +18,7 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR} \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
+		-I${X11SRCDIR.xorg-server}/Xext \
 		-I${X11SRCDIR.xorg-server}/include

 CPPFLAGS+=	${X11FLAGS.DIX}
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2009/02/14 13:32:13 abs Exp $
+#	$NetBSD: Makefile,v 1.5 2009/06/12 01:59:06 mrg Exp $

 .include <bsd.sys.mk> # for HOST_SH

@ -36,6 +36,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/int10 \
 		-I${X11SRCDIR.xorg-server}/render \
 		-I${X11SRCDIR.xorg-server}/randr \
+		-I${X11SRCDIR.xorg-server}/../include \
 		-I.

 CPPFLAGS+=	${X11FLAGS.EXTENSION} ${X11FLAGS.OS_DEFINES} \
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/06/11 05:43:17 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2009/06/12 01:59:06 mrg Exp $

 XMODULEDIR=	${X11USRLIBDIR}/modules

@ -20,8 +20,10 @@ CPPFLAGS+=	-D_PC

 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
+		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/x86emu \
+		-I${X11SRCDIR.xorg-server}/Xext \
 		-I${X11SRCDIR.xorg-server}/include \
 		-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${DESTDIR}${X11INCDIR}/X11/extensions \
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2009/06/11 05:43:17 mrg Exp $
+#	$NetBSD: Makefile,v 1.5 2009/06/12 01:59:06 mrg Exp $

 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
@ -6,7 +6,7 @@
 LIB=	loader
 .PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/${LIB}

-SRCS=	loader.c loadext.c loadmod.c loadfont.c dlloader.c os.c dixsym.c  \
+SRCS=	loader.c loadext.c loadmod.c dlloader.c os.c dixsym.c  \
 	extsym.c misym.c xf86sym.c 

 .if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/pcidata/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/pcidata/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2009/06/10 02:20:13 mrg Exp $
+#	$NetBSD: Makefile,v 1.5 2009/06/12 01:59:06 mrg Exp $

 # XXX this one is installed in modular-xorg-server

@ -11,7 +11,6 @@ LIB=	pcidata

 .PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/scanpci
 SRCS=	xf86PciData.c
-DPSRCS+=xf86PciIds.h

 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/08/15 15:55:06 rtr Exp $
+# $NetBSD: Makefile,v 1.4 2009/06/12 01:59:06 mrg Exp $

 #XMODULEDIR=	${X11USRLIBDIR}/modules

@ -13,6 +13,7 @@ SRCS=	xf86RamDac.c xf86RamDacCmap.c \
 	xf86BitOrder.c

 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
+		-I${X11SRCDIR.xorg-server}/Xext \
 		-I${X11SRCDIR.xorg-server}/include \
 		-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/08/24 13:47:05 rtr Exp $
+# $NetBSD: Makefile,v 1.4 2009/06/12 01:59:06 mrg Exp $

 XMODULEDIR=	${X11USRLIBDIR}/modules

@ -11,6 +11,7 @@ SRCS=	sfbmodule.c shadow.c

 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
 		-I${X11SRCDIR.xorg-server}/mi \
+		-I${X11SRCDIR.xorg-server}/Xext \
 		-I${X11SRCDIR.xorg-server}/include \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2009/06/11 05:43:17 mrg Exp $
+#	$NetBSD: Makefile,v 1.4 2009/06/12 01:59:06 mrg Exp $

 PROG=	cvt
 SRCS=	cvt.c xf86cvt.c
@ -9,6 +9,7 @@ MAN=	cvt.1
 CPPFLAGS+=	${X11FLAGS.DIX} -DHAVE_XORG_CONFIG_H \
 		-I${DESTDIR}${X11INCDIR}/xorg \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
+		-I${X11SRCDIR.xorg-server}/Xext \
 		-I${X11SRCDIR.xorg-server}/../include \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/ddc \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/parser
@ -17,7 +18,7 @@ LDADD+=	${LIBDUMMY}
 DPADD+=	${LIBDUMMY}

 .PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/utils/${PROG}
-.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/common
+.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/modes

 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/vbe/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/vbe/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/08/24 13:47:05 rtr Exp $
+# $NetBSD: Makefile,v 1.4 2009/06/12 01:59:06 mrg Exp $

 XMODULEDIR=	${X11USRLIBDIR}/modules

@ -12,6 +12,7 @@ SRCS=	vbe.c vbeModes.c vbe_module.c

 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
+		-I${X11SRCDIR.xorg-server}/Xext \
 		-I${X11SRCDIR.xorg-server}/mi \
 		-I${X11SRCDIR.xorg-server}/include \
 		-I${DESTDIR}${X11INCDIR}/X11 \
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/vgahw/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/vgahw/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2008/08/24 13:47:05 rtr Exp $
+#	$NetBSD: Makefile,v 1.4 2009/06/12 01:59:06 mrg Exp $

 XMODULEDIR=	${X11USRLIBDIR}/modules

@ -13,6 +13,7 @@ SRCS=	vgaHW.c vgaHWmodule.c
 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/vgahw \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
+		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus \
 		-I${X11SRCDIR.xorg-server}/Xext \
 		-I${X11SRCDIR.xorg-server}/cfb \
 		-I${X11SRCDIR.xorg-server}/mfb \
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/06/11 05:43:17 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2009/06/12 01:59:06 mrg Exp $

 XMODULEDIR=	${X11USRLIBDIR}/modules

@ -39,6 +39,7 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${X11SRCDIR.xorg-server}/include \
 		-I${X11SRCDIR.xorg-server}/include/extensions \
 		-I${X11SRCDIR.xorg-server}/mi \
+		-I${X11SRCDIR.xorg-server}/miext/cw \
 		-I${X11SRCDIR.xorg-server}/render

 # XXX to find files lokoing for "../../../../hw/something"
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/08/15 15:55:06 rtr Exp $
+# $NetBSD: Makefile,v 1.3 2009/06/12 01:59:06 mrg Exp $

 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
@ -6,7 +6,7 @@
 LIB=	xf86modes

 .PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/modes
-SRCS=	xf86Crtc.c xf86Cursors.c xf86cvt.c xf86DiDGA.c \
+SRCS=	xf86Crtc.c xf86Cursors.c xf86cvt.c xf86gtf.c xf86DiDGA.c \
 	xf86EdidModes.c xf86Modes.c xf86RandR12.c xf86Rotate.c

 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
@ -21,6 +21,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/vgahw \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/ramdac \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod \
+		-I${X11SRCDIR.xorg-server}/Xext \
 		-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
 		-I${DESTDIR}${X11INCDIR}/xorg
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_16bpp/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_16bpp/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/08/24 13:47:05 rtr Exp $
+# $NetBSD: Makefile,v 1.4 2009/06/12 01:59:07 mrg Exp $

 XMODULEDIR=	${X11USRLIBDIR}/modules

@ -11,10 +11,8 @@ LIB=	xf8_16bpp
 SRCS=	xf8_16module.c

 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
-		-I${X11SRCDIR.xorg-server}/hw/xfree86/xf1bpp \
-		-I${X11SRCDIR.xorg-server}/mfb \
-		-I${X11SRCDIR.xorg-server}/cfb \
 		-I${X11SRCDIR.xorg-server}/mi \
+		-I${X11SRCDIR.xorg-server}/Xext \
 		-I${X11SRCDIR.xorg-server}/include \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2009/06/11 05:43:17 mrg Exp $
+#	$NetBSD: Makefile,v 1.15 2009/06/12 01:59:07 mrg Exp $

 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
@ -9,7 +9,7 @@ LIB=	xorgos
 .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_VTsw.c bsd_bell.c bsd_init.c bsd_pci.c \
 		kmod_noop.c \
 		posix_tty.c sigio.c vidmem.c

@ -76,10 +76,6 @@ CPPFLAGS.arm_video.c=	-Wno-error
 .PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus
 SRCS.bus+=	Pci.c

-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-SRCS.bus+=	ix86Pci.c
-.endif
-
 .if ${MACHINE} == "macppc" || ${MACHINE} == "cats" || \
    ${MACHINE} == "sgimips" || ${MACHINE} == "shark" || \
    ${MACHINE} == "netwinder" || ${MACHINE_ARCH} == "sparc" || \
@ -93,7 +89,7 @@ CPPFLAGS.netbsdPci.c+= -DPCI_VIA_TTYE0
 .endif

 .PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/os-support/misc
-SRCS.misc=	xf86_Util.c Delay.c
+SRCS.misc=	Delay.c

 # XXX .S not built from automake either
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
@ -111,6 +107,7 @@ SRCS.misc=	xf86_Util.c Delay.c
 #SRCS.misc+=     CBUSmemcpy.c CIODelay.c CSlowBcopy.c
 .endif

+SRCS.misc+=     BUSmemcpy.c SlowBcopy.c

 # XXX namespace collision so avoid it, only has to be done for non-i386.
 #BUILDSYMLINKS=	BUSmemcpy.c CBUSmemcpy.c \
@ -129,6 +126,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
 		-I${DESTDIR}${X11INCDIR}/X11/extensions \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
 		-I${X11SRCDIR.xorg-server}/mi \
+		-I${X11SRCDIR.xorg-server}/Xext \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/shared \
 		-I${X11SRCDIR.xc}/extras/drm/shared
 .if ${X11DRI} != "no"
--- a/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2009/06/11 05:43:18 mrg Exp $
+#	$NetBSD: Makefile,v 1.10 2009/06/12 01:59:07 mrg Exp $

 .include <bsd.own.mk>

@ -64,6 +64,7 @@ LDADD+=	${LDADD.dix} \
 	${LDADD.xkbstubs} \
 	${LDADD.composite} \
 	${LDADD.os} \
+	${LDADD.glx} \
 	-lXfont -lXext -lfontenc \
 	-lpixman-1 -lX11 -lXau \
 	-lXdmcp -lfreetype -lm -lcrypto
@ -86,6 +87,7 @@ DPADD+=	${LDADD.dix} \
 	${DPADD.xkb} \
 	${DPADD.composite} \
 	${DPADD.os} \
+	${DPADD.glx} \
 	${LIBXFONT} ${LIBXEXT} ${LIBFONTENC} \
 	${LIBPIXMAN-1} ${LIBX11} ${LIBXAU} \
 	${LIBXDMCP} ${LIBFREETYPE} ${LIBM} ${LIBCRYPTO}
--- a/external/mit/xorg/server/xorg-server/include/Makefile
+++ b/external/mit/xorg/server/xorg-server/include/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2009/06/11 05:43:18 mrg Exp $
+#	$NetBSD: Makefile,v 1.6 2009/06/12 01:59:07 mrg Exp $

 .include <bsd.own.mk>

@ -8,7 +8,7 @@ XORGINC_SUBDIR=	Xext dbe exa fb include mi \
 		miext/damage miext/shadow randr render xkb record
 XF86_SUBDIR=	common ddc dixmods/extmod dri fbdevhw i2c int10 modes \
 		os-support os-support/bus parser rac ramdac shadowfb \
-		vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp xf8_32bpp
+		vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp xf8_32bpp dri2

 .for _dir in ${XORGINC_SUBDIR}
 .PATH: ${XORGSRC}/${_dir}
@ -50,7 +50,7 @@ INCS=	BT.h IBM.h TI.h XIstubs.h bstore.h \
 	xkbstr.h xkbrules.h xserver-properties.h \
 	dixaccess.h privates.h ptrveloc.h registry.h xkbfile.h \
 	xf86xvmc.h xf86xvpriv.h xisb.h xorg-server.h xorgVersion.h xvdix.h \
-	xvmcext.h hotplug.h xkbsrv.h dix-config.h
+	xvmcext.h hotplug.h xkbsrv.h dix-config.h dri2.h rrtransform.h

 .include <bsd.x11.mk>
 .include <bsd.prog.mk>