diff --git a/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext b/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext
index 8a31dde2ca9c..a8eef89ceb94 100644
--- a/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext
+++ b/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.Xext,v 1.6 2008/08/09 06:48:17 rtr Exp $
+#	$NetBSD: Makefile.Xext,v 1.7 2009/08/22 02:40:26 mrg Exp $
 
 .PATH:		${X11SRCDIR.xorg-server}/Xext
 
@@ -9,7 +9,19 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/xorg
 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod
 CPPFLAGS+=	-DHAVE_DIX_CONFIG_H
 
-COPTS.xres.c=	-Wno-error
+COPTS.mbuf.c+=			-Wno-error
+COPTS.panoramiX.c+=		-Wno-error
+COPTS.panoramiXprocs.c+=	-Wno-error
+COPTS.saver.c+=			-Wno-error
+COPTS.security.c+=		-Wno-error
+COPTS.shape.c+=			-Wno-error
+COPTS.shm.c+=			-Wno-error
+COPTS.sync.c+=			-Wno-error
+COPTS.xf86bigfont.c+=		-Wno-error
+COPTS.xres.c=			-Wno-error
+COPTS.xvdisp.c+=		-Wno-error
+COPTS.xvmain.c+=		-Wno-error
+COPTS.xvmc.c+=			-Wno-error
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
diff --git a/external/mit/xorg/server/xorg-server/composite/Makefile b/external/mit/xorg/server/xorg-server/composite/Makefile
index b18bd52ef9da..eb5bd1d4bfff 100644
--- a/external/mit/xorg/server/xorg-server/composite/Makefile
+++ b/external/mit/xorg/server/xorg-server/composite/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2009/06/11 05:43:15 mrg Exp $
+#	$NetBSD: Makefile,v 1.4 2009/08/22 02:40:26 mrg Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -24,6 +24,8 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/include \
 
 # XXX
 COPTS.compwindow.c=	-Wno-error
+COPTS.compext.c=	-Wno-error
+COPTS.compinit.c=	-Wno-error
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
diff --git a/external/mit/xorg/server/xorg-server/damageext/Makefile b/external/mit/xorg/server/xorg-server/damageext/Makefile
index b32dfdcafc61..a34ebd680a38 100644
--- a/external/mit/xorg/server/xorg-server/damageext/Makefile
+++ b/external/mit/xorg/server/xorg-server/damageext/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2008/08/02 21:19:21 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2009/08/22 02:40:26 mrg Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -17,5 +17,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/include \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
 		-I${X11SRCDIR.xorg-server}/../include
 
+COPTS.damageext.c+=	-Wno-error
+
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
diff --git a/external/mit/xorg/server/xorg-server/dbe/Makefile b/external/mit/xorg/server/xorg-server/dbe/Makefile
index 03feac4da319..d4319319d88c 100644
--- a/external/mit/xorg/server/xorg-server/dbe/Makefile
+++ b/external/mit/xorg/server/xorg-server/dbe/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2008/08/09 09:08:25 rtr Exp $
+#	$NetBSD: Makefile,v 1.3 2009/08/22 02:40:27 mrg Exp $
 
 LIBISPRIVATE=	yes
 
@@ -7,4 +7,6 @@ LIBISPRIVATE=	yes
 LIB=	dbe
 SRCS=	${SRCS.dbe}
 
+COPTS.dbe.c=		-Wno-error
+
 .include "Makefile.dbe"
diff --git a/external/mit/xorg/server/xorg-server/dix/Makefile b/external/mit/xorg/server/xorg-server/dix/Makefile
index 83f8ea43a667..1b1f2b1367f0 100644
--- a/external/mit/xorg/server/xorg-server/dix/Makefile
+++ b/external/mit/xorg/server/xorg-server/dix/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2009/06/11 05:43:15 mrg Exp $
+#	$NetBSD: Makefile,v 1.8 2009/08/22 02:40:27 mrg Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -30,6 +30,14 @@ CPPFLAGS.main.c=	-DVENDOR_STRING="\"The Xorg Group\"" \
 			-DVENDOR_NAME="\"The Xorg Foundation\""
 
 COPTS.dixutils.c=	-Wno-error
+COPTS.colormap.c=	-Wno-error
+COPTS.cursor.c=		-Wno-error
+COPTS.deprecated.c=	-Wno-error
+COPTS.dispatch.c=	-Wno-error
+COPTS.dixfonts.c=	-Wno-error
+COPTS.events.c=		-Wno-error
+COPTS.resource.c=	-Wno-error
+COPTS.window.c=		-Wno-error
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
diff --git a/external/mit/xorg/server/xorg-server/glx/Makefile.glx b/external/mit/xorg/server/xorg-server/glx/Makefile.glx
index 241a463aaa3a..f7510dba1d3a 100644
--- a/external/mit/xorg/server/xorg-server/glx/Makefile.glx
+++ b/external/mit/xorg/server/xorg-server/glx/Makefile.glx
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.glx,v 1.2 2009/06/12 01:59:04 mrg Exp $
+#	$NetBSD: Makefile.glx,v 1.3 2009/08/22 02:40:27 mrg Exp $
 
 .PATH:	${X11SRCDIR.xorg-server}/glx
 .PATH:	${X11SRCDIR.MesaLib}/src/mesa/glapi
@@ -39,6 +39,8 @@ SRCS.glx= \
 COPTS.glxcmds.c=		-Wno-error
 COPTS.indirect_dispatch.c=	-Wno-error
 COPTS.indirect_dispatch_swap.c=	-Wno-error
+COPTS.glxscreens.c=		-Wno-error
+COPTS.xfont.c=			-Wno-error
 
 CPPFLAGS+= \
 	-I${X11SRCDIR.xorg-server}/include \
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
index 1cdc54ab0ac2..fcf828a1deaa 100644
--- 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.11 2009/06/23 04:39:52 mrg Exp $
+#	$NetBSD: Makefile,v 1.12 2009/08/22 02:40:27 mrg Exp $
 
 .include <bsd.sys.mk> # for HOST_SH
 
@@ -120,6 +120,7 @@ COPTS.xf86Config.c=		-Wno-error
 COPTS.xf86Cursor.c=		-Wno-error
 COPTS.xf86RandR.c=		-Wno-error
 COPTS.xf86Helper.c=		-Wno-error
+COPTS.xf86cmap.c=		-Wno-error
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile
index 82bbb586cce2..153e7ea7a76c 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2008/08/09 09:08:25 rtr Exp $
+#	$NetBSD: Makefile,v 1.4 2009/08/22 02:40:27 mrg Exp $
 
 XMODULEDIR=     ${X11USRLIBDIR}/modules/extensions
 
@@ -15,4 +15,6 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/xorg \
 		-I${X11SRCDIR.xorg-server}/../include
 CPPFLAGS+=	-DHAVE_XORG_CONFIG_H
 
+COPTS.dbe.c+=		-Wno-error
+
 .include "../../../../dbe/Makefile.dbe"
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile
index f1d383c0830c..e2791ca6bf4f 100644
--- 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.7 2009/06/12 01:59:05 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2009/08/22 02:40:27 mrg Exp $
 
 XMODULEDIR=     ${X11USRLIBDIR}/modules/extensions
 
@@ -31,6 +31,7 @@ CPPFLAGS+=	${X11FLAGS.DIX} \
 
 # XXX
 CPPFLAGS.xf86RandR12.c=	-Wno-error
+CPPFLAGS.xf86dga2.c=	-Wno-error
 
 XEXTMODULEOBJDIR!=  cd ${NETBSDSRCDIR}/external/mit/xorg/server/xorg-server/Xext/Xextmodule && ${PRINTOBJDIR}
 LIBXEXTMODULE=	${XEXTMODULEOBJDIR}/libXextmodule.a
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile
index e5d4cf88ac32..344039933b6d 100644
--- 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.2 2009/06/12 01:59:05 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2009/08/22 02:40:27 mrg Exp $
 
 XMODULEDIR=	${X11USRLIBDIR}/modules/extensions
 
@@ -36,6 +36,8 @@ CPPFLAGS+=	-DXF86DRI \
 
 LIBDPLIBS=	drm ${.CURDIR}/../../../../../lib/libdrm
 
+COPTS.dri2ext.c+=	-Wno-error
+
 .include <bsd.x11.mk>
 LIBDIR=	${XMODULEDIR}
 .include <bsd.lib.mk>
diff --git a/external/mit/xorg/server/xorg-server/hw/xnest/Makefile b/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
index f6bc072da472..9e0535f16207 100644
--- 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.10 2009/06/12 01:59:07 mrg Exp $
+#	$NetBSD: Makefile,v 1.11 2009/08/22 02:40:27 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -41,6 +41,8 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xnest \
 
 CPPFLAGS.Events.c=	-Wno-error
 CPPFLAGS.Screen.c=	-Wno-error
+CPPFLAGS.Color.c=	-Wno-error
+CPPFLAGS.Window.c=	-Wno-error
 CPPFLAGS.miinitext.c=	-UDPMSExtension
 
 .include "../../Makefile.Xserver"
diff --git a/external/mit/xorg/server/xorg-server/mi/Makefile b/external/mit/xorg/server/xorg-server/mi/Makefile
index 3df60825c7e8..6ef259bb9c66 100644
--- a/external/mit/xorg/server/xorg-server/mi/Makefile
+++ b/external/mit/xorg/server/xorg-server/mi/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2009/02/14 13:32:13 abs Exp $
+#	$NetBSD: Makefile,v 1.7 2009/08/22 02:40:27 mrg Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -41,5 +41,8 @@ CPPFLAGS.miscrinit.c+=   -UXF86MISC -UXINPUT -UXF86VIDMODE -UXFreeXDGA
 .endif
 .endif
 
+COPTS.micmap.c+=	-Wno-error
+COPTS.miexpose.c+=	-Wno-error
+
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
diff --git a/external/mit/xorg/server/xorg-server/randr/Makefile b/external/mit/xorg/server/xorg-server/randr/Makefile
index 4acc1422dfe5..310b54643313 100644
--- a/external/mit/xorg/server/xorg-server/randr/Makefile
+++ b/external/mit/xorg/server/xorg-server/randr/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2009/06/11 05:43:19 mrg Exp $
+#	$NetBSD: Makefile,v 1.4 2009/08/22 02:40:28 mrg Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -17,5 +17,12 @@ CPPFLAGS+=      -I${DESTDIR}${X11INCDIR}/pixman-1 \
 		-I${X11SRCDIR.xorg-server}/../include
 CPPFLAGS+=      ${X11FLAGS.DIX}
 
+COPTS.randr.c+=		-Wno-error
+COPTS.rrcrtc.c+=	-Wno-error
+COPTS.rrdispatch.c+=	-Wno-error
+COPTS.rrmode.c+=	-Wno-error
+COPTS.rroutput.c+=	-Wno-error
+COPTS.rrproperty.c+=	-Wno-error
+
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
diff --git a/external/mit/xorg/server/xorg-server/render/Makefile b/external/mit/xorg/server/xorg-server/render/Makefile
index a9c777beba6f..e8e3f82e5228 100644
--- a/external/mit/xorg/server/xorg-server/render/Makefile
+++ b/external/mit/xorg/server/xorg-server/render/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2009/06/11 05:43:19 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2009/08/22 02:40:28 mrg Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -17,6 +17,8 @@ CPPFLAGS+=      ${X11FLAGS.DIX}
 
 COPTS.miglyph.c=-Wno-error	# XXX gcc 3.3
 COPTS.mirect.c=	-Wno-error	# XXX gcc 3.3
+COPTS.picture.c=	-Wno-error
+COPTS.render.c=		-Wno-error
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
diff --git a/external/mit/xorg/server/xorg-server/xfixes/Makefile b/external/mit/xorg/server/xorg-server/xfixes/Makefile
index 401d854b26d0..9ae9c917838c 100644
--- a/external/mit/xorg/server/xorg-server/xfixes/Makefile
+++ b/external/mit/xorg/server/xorg-server/xfixes/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2008/08/28 07:34:20 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2009/08/22 02:40:28 mrg Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -20,6 +20,8 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/include \
 
 # XXX
 COPTS.cursor.c+=	-Wno-error
+COPTS.region.c+=	-Wno-error
+COPTS.select.c+=	-Wno-error
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>