Assorted fixes for fallout from X.org header rototill.

Bump revision.

17 files changed, 1211 insertions, 3 deletions

diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile
index bf2f8e57f3d..bfed3a23c1c 100644
--- a/x11/modular-xorg-server/Makefile
+++ b/x11/modular-xorg-server/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.56 2010/01/17 12:02:57 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2010/04/09 09:08:13 tnn Exp $
 #
 
 DISTNAME=	xorg-server-1.6.5
 PKGNAME=	modular-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=xserver/}
 EXTRACT_SUFX=	.tar.bz2
@@ -123,6 +123,7 @@ CONFIGURE_ENV+=		ac_cv_path_RAWCPP="cc -E -Uunix -"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libXxf86misc/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libdrm/buildlink3.mk"
 .include "../../x11/libxkbfile/buildlink3.mk"
 .include "../../x11/libxkbui/buildlink3.mk"
diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index 3905d295658..aa88f827a70 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.40 2009/10/29 19:12:03 jakllsch Exp $
+$NetBSD: distinfo,v 1.41 2010/04/09 09:08:13 tnn Exp $
 
 SHA1 (xorg-server-1.6.5.tar.bz2) = c57c80dd15d3ca492e58ae993b9015d085ec6ea6
 RMD160 (xorg-server-1.6.5.tar.bz2) = 702970358a5643dbc9205f42e39c5b8ed2ff845a
@@ -9,6 +9,21 @@ SHA1 (patch-aj) = 84ff5c6215d0b62734cf26e78394a70afe2b7007
 SHA1 (patch-ak) = df6d3b2172254e1f9d44eb40144cad5ed29a7d1d
 SHA1 (patch-al) = cb1fb44037f23fb2838ed36aaf2591946264fe53
 SHA1 (patch-am) = be278e6044dfa37b108d2544c82b84f36b6ca9d7
+SHA1 (patch-ba) = b758aab64fcba81ba33b7c425db6430757b2fd4b
+SHA1 (patch-bb) = 1e8ca63c07b22424d0bf379dd98e032f41eabc0e
+SHA1 (patch-bc) = f1ab56e8876ddc6bc0fe941a45ab2c7726c5cbf4
+SHA1 (patch-bd) = 01abcfe981c5d7d8aa20ca80e6a55cecc5e0daad
+SHA1 (patch-be) = 29d24b313707689c390eb4d3b0f0afe7799944df
+SHA1 (patch-bf) = fe74060e662e39accc285026b7eb0a7fd87e698e
+SHA1 (patch-bg) = 6e44664941585390c32b5f6cc1fdc93447228b09
+SHA1 (patch-bh) = 51074592a06a84a049a4e2bc994471491e2e202c
+SHA1 (patch-bi) = 52012af9c4bd2dab0e9d96cb1692a5e342737748
+SHA1 (patch-bj) = 3bea92151311028e9eeeacd441b1855a0d5f6867
+SHA1 (patch-bk) = 293aba14c63bfd4c8cf282c4a1cca40f76f6634a
+SHA1 (patch-bl) = 42fb973bd4a22bbe6c441159f1edcaf7c04f0d27
+SHA1 (patch-bm) = 9c7192eb98816165d8fb16af465e0056045280b2
+SHA1 (patch-bn) = 27dffea8ce05ac79fd438818fba463f57776f2af
+SHA1 (patch-bo) = ee05a01c6b1d4d0b759d8372f16c5f752273f73e
 SHA1 (patch-sa) = bdd9209e873f676ee4d0436a94e468b824e80f87
 SHA1 (patch-sb) = 0a064016b16e088d08cd9e290a57cb4efb4f5d26
 SHA1 (patch-sc) = dd93e15253b78395050d65df0f972e57ccf546e0
diff --git a/x11/modular-xorg-server/patches/patch-ba b/x11/modular-xorg-server/patches/patch-ba
new file mode 100644
index 00000000000..06d8126aec5
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-ba
@@ -0,0 +1,18 @@
+$NetBSD: patch-ba,v 1.3 2010/04/09 09:08:13 tnn Exp $
+
+--- include/dix-config.h.in.orig	2009-10-12 02:52:40.000000000 +0000
++++ include/dix-config.h.in
+@@ -3,6 +3,13 @@
+ #ifndef _DIX_CONFIG_H_
+ #define _DIX_CONFIG_H_
+ 
++#ifndef HAVE_XNEST_CONFIG_H
++#define Status int
++typedef struct {} Display;
++typedef struct {} XImage;
++typedef struct {} Visual;
++#endif
++
+ /* Support BigRequests extension */
+ #undef BIGREQS
+ 
diff --git a/x11/modular-xorg-server/patches/patch-bb b/x11/modular-xorg-server/patches/patch-bb
new file mode 100644
index 00000000000..9f11cfd32ae
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-bb
@@ -0,0 +1,12 @@
+$NetBSD: patch-bb,v 1.1 2010/04/09 09:08:13 tnn Exp $
+
+--- Xext/shmint.h.orig	2009-10-12 02:52:40.000000000 +0000
++++ Xext/shmint.h
+@@ -25,6 +25,7 @@
+ 
+ #define _XSHM_SERVER_
+ #include <X11/extensions/shmstr.h>
++#include <X11/extensions/shmproto.h>
+ 
+ #include "screenint.h"
+ #include "pixmap.h"
diff --git a/x11/modular-xorg-server/patches/patch-bc b/x11/modular-xorg-server/patches/patch-bc
new file mode 100644
index 00000000000..37588f9b1f4
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-bc
@@ -0,0 +1,12 @@
+$NetBSD: patch-bc,v 1.1 2010/04/09 09:08:13 tnn Exp $
+
+--- mi/miscrinit.c.orig	2009-10-12 02:52:40.000000000 +0000
++++ mi/miscrinit.c
+@@ -29,6 +29,7 @@ from The Open Group.
+ #ifdef HAVE_DIX_CONFIG_H
+ #include <dix-config.h>
+ #endif
++#include <gcstruct.h>
+ 
+ #include <X11/X.h>
+ #include "servermd.h"
diff --git a/x11/modular-xorg-server/patches/patch-bd b/x11/modular-xorg-server/patches/patch-bd
new file mode 100644
index 00000000000..0373ab35d4e
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-bd
@@ -0,0 +1,54 @@
+$NetBSD: patch-bd,v 1.1 2010/04/09 09:08:13 tnn Exp $
+
+--- hw/xfree86/dixmods/extmod/modinit.h.orig	2009-10-12 02:52:40.000000000 +0000
++++ hw/xfree86/dixmods/extmod/modinit.h
+@@ -8,7 +8,7 @@
+ #endif
+ 
+ #define _SHAPE_SERVER_  /* don't want Xlib structures */
+-#include <X11/extensions/shapestr.h>
++#include <X11/extensions/shapeproto.h>
+ 
+ #ifdef MULTIBUFFER
+ extern void MultibufferExtensionInit(INITARGS);
+@@ -19,8 +19,7 @@ extern void MultibufferExtensionInit(INI
+ #ifdef XTEST
+ extern void XTestExtensionInit(INITARGS);
+ #define _XTEST_SERVER_
+-#include <X11/extensions/XTest.h>
+-#include <X11/extensions/xteststr.h>
++#include <X11/extensions/xtestproto.h>
+ #endif
+ 
+ #if 1
+@@ -35,19 +34,19 @@ extern void ScreenSaverExtensionInit (IN
+ #ifdef XF86VIDMODE
+ extern void	XFree86VidModeExtensionInit(INITARGS);
+ #define _XF86VIDMODE_SERVER_
+-#include <X11/extensions/xf86vmstr.h>
++#include <X11/extensions/xf86vmproto.h>
+ #endif
+ 
+ #ifdef XFreeXDGA
+ extern void XFree86DGAExtensionInit(INITARGS);
+ extern void XFree86DGARegister(INITARGS);
+ #define _XF86DGA_SERVER_
+-#include <X11/extensions/xf86dgastr.h>
++#include <X11/extensions/xf86dgaproto.h>
+ #endif
+ 
+ #ifdef DPMSExtension
+ extern void DPMSExtensionInit(INITARGS);
+-#include <X11/extensions/dpmsstr.h>
++#include <X11/extensions/dpmsproto.h>
+ #endif
+ 
+ #ifdef XV
+@@ -66,6 +65,7 @@ extern void ResExtensionInit(INITARGS);
+ #ifdef SHM
+ extern void ShmExtensionInit(INITARGS);
+ #include <X11/extensions/shmstr.h>
++#include <X11/extensions/shmproto.h>
+ extern void ShmRegisterFuncs(
+     ScreenPtr pScreen,
+     ShmFuncsPtr funcs);
diff --git a/x11/modular-xorg-server/patches/patch-be b/x11/modular-xorg-server/patches/patch-be
new file mode 100644
index 00000000000..29a5269709a
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-be
@@ -0,0 +1,13 @@
+$NetBSD: patch-be,v 1.1 2010/04/09 09:08:13 tnn Exp $
+
+--- ./Xext/bigreq.c.orig	2009-10-12 02:52:40.000000000 +0000
++++ ./Xext/bigreq.c
+@@ -37,7 +37,7 @@ from The Open Group.
+ #include "os.h"
+ #include "dixstruct.h"
+ #include "extnsionst.h"
+-#include <X11/extensions/bigreqstr.h>
++#include <X11/extensions/bigreqsproto.h>
+ #include "opaque.h"
+ #include "modinit.h"
+ 
diff --git a/x11/modular-xorg-server/patches/patch-bf b/x11/modular-xorg-server/patches/patch-bf
new file mode 100644
index 00000000000..4eb4d3acc6e
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-bf
@@ -0,0 +1,13 @@
+$NetBSD: patch-bf,v 1.1 2010/04/09 09:08:13 tnn Exp $
+
+--- Xext/shape.c.orig	2009-10-12 02:52:40.000000000 +0000
++++ Xext/shape.c
+@@ -44,7 +44,7 @@ in this Software without prior written a
+ #include "resource.h"
+ #include "opaque.h"
+ #define _SHAPE_SERVER_	/* don't want Xlib structures */
+-#include <X11/extensions/shapestr.h>
++#include <X11/extensions/shapeproto.h>
+ #include "regionstr.h"
+ #include "gcstruct.h"
+ #include "modinit.h"
diff --git a/x11/modular-xorg-server/patches/patch-bg b/x11/modular-xorg-server/patches/patch-bg
new file mode 100644
index 00000000000..1ca4c0691f9
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-bg
@@ -0,0 +1,15 @@
+$NetBSD: patch-bg,v 1.1 2010/04/09 09:08:13 tnn Exp $
+
+--- Xext/sync.c.orig	2009-10-12 02:52:40.000000000 +0000
++++ Xext/sync.c
+@@ -68,8 +68,8 @@ PERFORMANCE OF THIS SOFTWARE.
+ #include "resource.h"
+ #include "opaque.h"
+ #define _SYNC_SERVER
+-#include <X11/extensions/sync.h>
+-#include <X11/extensions/syncstr.h>
++#include "sync_old.h"
++#include "syncstr_old.h"
+ 
+ #include <stdio.h>
+ #if !defined(WIN32)
diff --git a/x11/modular-xorg-server/patches/patch-bh b/x11/modular-xorg-server/patches/patch-bh
new file mode 100644
index 00000000000..d222f786b7b
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-bh
@@ -0,0 +1,14 @@
+$NetBSD: patch-bh,v 1.1 2010/04/09 09:08:14 tnn Exp $
+
+--- Xext/xtest.c.orig	2009-10-12 02:52:40.000000000 +0000
++++ Xext/xtest.c
+@@ -44,8 +44,7 @@
+ #include "sleepuntil.h"
+ #include "mi.h"
+ #define _XTEST_SERVER_
+-#include <X11/extensions/XTest.h>
+-#include <X11/extensions/xteststr.h>
++#include <X11/extensions/xtestproto.h>
+ #include <X11/extensions/XI.h>
+ #include <X11/extensions/XIproto.h>
+ 
diff --git a/x11/modular-xorg-server/patches/patch-bi b/x11/modular-xorg-server/patches/patch-bi
new file mode 100644
index 00000000000..c091bc30061
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-bi
@@ -0,0 +1,499 @@
+$NetBSD: patch-bi,v 1.1 2010/04/09 09:08:14 tnn Exp $
+
+--- /dev/null	2010-03-23 17:09:47.000000000 +0000
++++ Xext/syncstr_old.h
+@@ -0,0 +1,494 @@
++/* $Xorg: syncstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
++/*
++
++Copyright 1991, 1993, 1994, 1998  The Open Group
++
++Permission to use, copy, modify, distribute, and sell this software and its
++documentation for any purpose is hereby granted without fee, provided that
++the above copyright notice appear in all copies and that both that
++copyright notice and this permission notice appear in supporting
++documentation.
++
++The above copyright notice and this permission notice shall be included in
++all copies or substantial portions of the Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++
++Except as contained in this notice, the name of The Open Group shall not be
++used in advertising or otherwise to promote the sale, use or other dealings
++in this Software without prior written authorization from The Open Group.
++
++*/
++
++/***********************************************************
++Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,
++and Olivetti Research Limited, Cambridge, England.
++
++                        All Rights Reserved
++
++Permission to use, copy, modify, and distribute this software and its 
++documentation for any purpose and without fee is hereby granted, 
++provided that the above copyright notice appear in all copies and that
++both that copyright notice and this permission notice appear in 
++supporting documentation, and that the names of Digital or Olivetti
++not be used in advertising or publicity pertaining to distribution of the
++software without specific, written prior permission.  
++
++DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
++SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
++FITNESS, IN NO EVENT SHALL THEY BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
++USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
++OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++PERFORMANCE OF THIS SOFTWARE.
++
++******************************************************************/
++/* $XFree86: xc/include/extensions/syncstr.h,v 1.3 2003/07/16 01:38:24 dawes Exp $ */
++
++#ifndef _SYNCSTR_H_
++#define _SYNCSTR_H_
++
++#include "sync_old.h"
++
++#ifndef _SYNC_OS
++
++/* cover up types from sync.h to make sure they're the right size for
++ * protocol packaging.  These will be undef'ed after all the protocol
++ * structures are defined.
++ */
++#define XSyncCounter CARD32
++#define XSyncAlarm   CARD32
++
++/*
++ * Initialize
++ */
++typedef struct _xSyncInitialize {
++    CARD8	reqType;
++    CARD8	syncReqType;
++    CARD16	length B16;
++    CARD8	majorVersion;
++    CARD8	minorVersion;
++    CARD16	pad B16;
++} xSyncInitializeReq;
++#define sz_xSyncInitializeReq		8
++
++typedef struct {
++    BYTE	type;
++    CARD8	unused;
++    CARD16	sequenceNumber B16;
++    CARD32	length B32;
++    CARD8	majorVersion;
++    CARD8	minorVersion;
++    CARD16	pad B16;
++    CARD32	pad0 B32;
++    CARD32	pad1 B32;
++    CARD32	pad2 B32;
++    CARD32	pad3 B32;
++    CARD32	pad4 B32;
++} xSyncInitializeReply;
++#define sz_xSyncInitializeReply	32
++
++/*
++ * ListSystemCounters
++ */
++typedef struct _xSyncListSystemCounters
++{
++    CARD8	reqType;
++    CARD8	syncReqType;
++    CARD16	length B16;
++} xSyncListSystemCountersReq;
++#define sz_xSyncListSystemCountersReq	4
++
++typedef struct {
++    BYTE	type;
++    CARD8	unused;
++    CARD16	sequenceNumber B16;
++    CARD32	length B32;
++    INT32	nCounters B32;
++    CARD32	pad0 B32;
++    CARD32	pad1 B32;
++    CARD32	pad2 B32;
++    CARD32	pad3 B32;
++    CARD32	pad4 B32;
++} xSyncListSystemCountersReply;
++#define sz_xSyncListSystemCountersReply	32
++
++typedef struct {
++    XSyncCounter counter B32;
++    INT32	resolution_hi B32;
++    CARD32	resolution_lo B32;
++    CARD16	name_length B16;
++} xSyncSystemCounter;
++#define sz_xSyncSystemCounter 14
++
++/*
++ * Create Counter
++ */
++typedef struct _xSyncCreateCounterReq {
++    CARD8	reqType;
++    CARD8	syncReqType;
++    CARD16	length B16;
++    XSyncCounter cid B32;
++    INT32       initial_value_hi B32;
++    CARD32	initial_value_lo B32;
++} xSyncCreateCounterReq;
++#define sz_xSyncCreateCounterReq	16
++
++/*
++ * Change Counter
++ */
++typedef struct _xSyncChangeCounterReq {
++    CARD8	reqType;
++    CARD8	syncReqType;
++    CARD16	length B16;
++    XSyncCounter cid B32;
++    INT32       value_hi B32;
++    CARD32	value_lo B32;
++} xSyncChangeCounterReq;
++#define sz_xSyncChangeCounterReq	16
++
++/*
++ * Set Counter
++ */
++typedef struct _xSyncSetCounterReq {
++    CARD8	reqType;
++    CARD8	syncReqType;
++    CARD16	length B16;
++    XSyncCounter cid B32;
++    INT32       value_hi B32;
++    CARD32	value_lo B32;
++} xSyncSetCounterReq;
++#define sz_xSyncSetCounterReq	16
++
++/*
++ * Destroy Counter
++ */
++typedef struct _xSyncDestroyCounterReq {
++    CARD8	reqType;
++    CARD8	syncReqType;
++    CARD16	length B16;
++    XSyncCounter counter B32;
++} xSyncDestroyCounterReq;
++#define sz_xSyncDestroyCounterReq	8
++
++/*
++ * Query Counter
++ */
++typedef struct _xSyncQueryCounterReq {
++    CARD8	reqType;
++    CARD8	syncReqType;
++    CARD16	length B16;
++    XSyncCounter counter B32;
++} xSyncQueryCounterReq;
++#define sz_xSyncQueryCounterReq		8
++
++
++typedef struct {
++    BYTE	type;
++    CARD8	unused;
++    CARD16	sequenceNumber B16;
++    CARD32	length B32;
++    INT32	value_hi B32;
++    CARD32	value_lo B32;
++    CARD32	pad0 B32;
++    CARD32	pad1 B32;
++    CARD32	pad2 B32;
++    CARD32	pad3 B32;
++} xSyncQueryCounterReply;
++#define sz_xSyncQueryCounterReply	32
++
++/*
++ * Await
++ */
++typedef struct _xSyncAwaitReq {
++    CARD8	reqType;
++    CARD8	syncReqType;
++    CARD16	length B16;
++} xSyncAwaitReq;
++#define sz_xSyncAwaitReq		4
++
++typedef struct _xSyncWaitCondition {
++    XSyncCounter counter B32;
++    CARD32	value_type B32;
++    INT32       wait_value_hi B32;
++    CARD32      wait_value_lo B32;
++    CARD32	test_type B32;
++    INT32	event_threshold_hi B32;
++    CARD32	event_threshold_lo B32;
++} xSyncWaitCondition;
++#define sz_xSyncWaitCondition		28
++
++/*
++ * Create Alarm
++ */
++typedef struct _xSyncCreateAlarmReq {
++    CARD8	reqType;
++    CARD8	syncReqType;
++    CARD16	length B16;
++    XSyncAlarm	id B32;
++    CARD32      valueMask B32;
++} xSyncCreateAlarmReq;
++#define sz_xSyncCreateAlarmReq		12
++
++/*
++ * Destroy Alarm
++ */
++typedef struct _xSyncDestroyAlarmReq {
++    CARD8	reqType;
++    CARD8	syncReqType;
++    CARD16	length B16;
++    XSyncAlarm	alarm B32;
++} xSyncDestroyAlarmReq;
++#define sz_xSyncDestroyAlarmReq		8
++
++/*
++ * Query Alarm
++ */
++typedef struct _xSyncQueryAlarmReq {
++    CARD8	reqType;
++    CARD8	syncReqType;
++    CARD16	length B16;
++    XSyncAlarm	alarm B32;
++} xSyncQueryAlarmReq;
++#define sz_xSyncQueryAlarmReq		8
++
++typedef struct {
++    BYTE	type;
++    CARD8	unused;
++    CARD16	sequenceNumber B16;
++    CARD32	length B32;
++    XSyncCounter counter B32;
++    CARD32	value_type B32;
++    INT32	wait_value_hi B32;
++    CARD32	wait_value_lo B32;
++    CARD32	test_type      B32;
++    INT32	delta_hi B32;
++    CARD32	delta_lo B32;
++    BOOL        events;
++    BYTE        state;
++    BYTE	pad0;
++    BYTE	pad1;
++} xSyncQueryAlarmReply;
++#define sz_xSyncQueryAlarmReply		40
++
++/*
++ * Change Alarm
++ */
++typedef struct _xSyncChangeAlarmReq {
++    CARD8	reqType;
++    CARD8	syncReqType;
++    CARD16	length B16;
++    XSyncAlarm	alarm B32;
++    CARD32	valueMask B32;
++} xSyncChangeAlarmReq;
++#define sz_xSyncChangeAlarmReq		12
++
++/*
++ * SetPriority
++ */
++typedef struct _xSyncSetPriority{
++    CARD8   	reqType;
++    CARD8   	syncReqType;
++    CARD16  	length B16;
++    CARD32  	id B32;
++    INT32  	priority B32;
++} xSyncSetPriorityReq;
++#define sz_xSyncSetPriorityReq	    	12
++
++/*
++ * Get Priority
++ */
++typedef struct _xSyncGetPriority{
++    CARD8   	reqType;
++    CARD8   	syncReqType;
++    CARD16  	length B16;
++    CARD32  	id B32; /*XXX XID? */
++} xSyncGetPriorityReq;
++#define sz_xSyncGetPriorityReq	    	 8
++
++typedef struct {
++    BYTE	type;
++    CARD8	unused;
++    CARD16	sequenceNumber B16;
++    CARD32	length B32;
++    INT32  	priority B32;
++    CARD32  	pad0 B32;
++    CARD32  	pad1 B32;
++    CARD32  	pad2 B32;
++    CARD32  	pad3 B32;
++    CARD32  	pad4 B32;
++} xSyncGetPriorityReply;
++#define sz_xSyncGetPriorityReply	32
++
++/*
++ * Events
++ */
++
++typedef struct _xSyncCounterNotifyEvent {
++    BYTE	type;
++    BYTE	kind;
++    CARD16	sequenceNumber B16;
++    XSyncCounter counter B32;
++    INT32	wait_value_hi B32;
++    CARD32	wait_value_lo B32;
++    INT32	counter_value_hi B32;
++    CARD32	counter_value_lo B32;
++    CARD32	time B32;
++    CARD16	count B16;
++    BOOL	destroyed;
++    BYTE        pad0;
++} xSyncCounterNotifyEvent;
++
++typedef struct _xSyncAlarmNotifyEvent {
++    BYTE	type;
++    BYTE	kind;
++    CARD16	sequenceNumber B16;
++    XSyncAlarm	alarm B32;
++    INT32	counter_value_hi B32;
++    CARD32	counter_value_lo B32;
++    INT32	alarm_value_hi B32;
++    CARD32	alarm_value_lo B32;
++    CARD32	time B32;
++    CARD8       state;
++    BYTE        pad0;
++    BYTE        pad1;
++    BYTE        pad2;
++} xSyncAlarmNotifyEvent;
++
++#undef XSyncCounter
++#undef XSyncAlarm
++
++#endif /* _SYNC_OS */
++
++#ifdef _SYNC_SERVER
++
++#define CARD64 XSyncValue /* XXX temporary! need real 64 bit values for Alpha */
++
++typedef struct _SyncCounter {
++    ClientPtr		client;	/* Owning client. 0 for system counters */
++    XSyncCounter	id;		/* resource ID */
++    CARD64		value;		/* counter value */
++    struct _SyncTriggerList *pTriglist;	/* list of triggers */
++    Bool		beingDestroyed; /* in process of going away */
++    struct _SysCounterInfo *pSysCounterInfo; /* NULL if not a system counter */
++} SyncCounter;
++
++/*
++ * The System Counter interface
++ */
++
++typedef enum {
++    XSyncCounterNeverChanges,
++    XSyncCounterNeverIncreases,
++    XSyncCounterNeverDecreases,
++    XSyncCounterUnrestricted
++} SyncCounterType;
++
++typedef struct _SysCounterInfo {
++    char	*name;
++    CARD64	resolution;
++    CARD64	bracket_greater;
++    CARD64	bracket_less;
++    SyncCounterType counterType;  /* how can this counter change */
++    void        (*QueryValue)(
++			      pointer /*pCounter*/,
++			      CARD64 * /*freshvalue*/
++);
++    void	(*BracketValues)(
++				 pointer /*pCounter*/,
++				 CARD64 * /*lessthan*/,
++				 CARD64 * /*greaterthan*/
++);
++} SysCounterInfo;
++
++
++
++typedef struct _SyncTrigger {
++    SyncCounter *pCounter;
++    CARD64	wait_value;	/* wait value */
++    unsigned int value_type;     /* Absolute or Relative */
++    unsigned int test_type;	/* transition or Comparision type */
++    CARD64	test_value;	/* trigger event threshold value */
++    Bool	(*CheckTrigger)(
++				struct _SyncTrigger * /*pTrigger*/,
++				CARD64 /*newval*/
++				);
++    void	(*TriggerFired)(
++				struct _SyncTrigger * /*pTrigger*/
++				);
++    void	(*CounterDestroyed)(
++				struct _SyncTrigger * /*pTrigger*/
++				    );
++} SyncTrigger;
++
++typedef struct _SyncTriggerList {
++    SyncTrigger *pTrigger;
++    struct _SyncTriggerList *next;
++} SyncTriggerList;
++
++typedef struct _SyncAlarmClientList {
++    ClientPtr	client;
++    XID		delete_id;
++    struct _SyncAlarmClientList *next;
++} SyncAlarmClientList;
++
++typedef struct _SyncAlarm {
++    SyncTrigger trigger;
++    ClientPtr	client;
++    XSyncAlarm 	alarm_id;
++    CARD64	delta;
++    int		events;
++    int		state;
++    SyncAlarmClientList *pEventClients;
++} SyncAlarm;
++
++typedef struct {
++    ClientPtr	client;
++    CARD32 	delete_id;
++    int		num_waitconditions;
++} SyncAwaitHeader;
++
++typedef struct {
++    SyncTrigger trigger;
++    CARD64	event_threshold;
++    SyncAwaitHeader *pHeader;
++} SyncAwait;
++
++typedef union {
++    SyncAwaitHeader header;
++    SyncAwait	    await;
++} SyncAwaitUnion;
++
++
++extern pointer SyncCreateSystemCounter(
++    char *	/* name */,
++    CARD64  	/* inital_value */,
++    CARD64  	/* resolution */,
++    SyncCounterType /* change characterization */,
++    void        (* /*QueryValue*/ ) (
++        pointer /* pCounter */,
++        CARD64 * /* pValue_return */), /* XXX prototype */
++    void        (* /*BracketValues*/) (
++        pointer /* pCounter */, 
++        CARD64 * /* pbracket_less */,
++        CARD64 * /* pbracket_greater */)
++);
++
++extern void SyncChangeCounter(
++    SyncCounter *	/* pCounter*/,
++    CARD64  		/* new_value */
++);
++
++extern void SyncDestroySystemCounter(
++    pointer pCounter
++);
++extern void InitServertime(void);
++
++#endif /* _SYNC_SERVER */
++
++#endif /* _SYNCSTR_H_ */
diff --git a/x11/modular-xorg-server/patches/patch-bj b/x11/modular-xorg-server/patches/patch-bj
new file mode 100644
index 00000000000..7c904951b50
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-bj
@@ -0,0 +1,474 @@
+$NetBSD: patch-bj,v 1.1 2010/04/09 09:08:14 tnn Exp $
+
+--- /dev/null	2010-03-23 17:10:01.000000000 +0000
++++ Xext/sync_old.h
+@@ -0,0 +1,469 @@
++/* $Xorg: sync.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
++/*
++
++Copyright 1991, 1993, 1994, 1998  The Open Group
++
++Permission to use, copy, modify, distribute, and sell this software and its
++documentation for any purpose is hereby granted without fee, provided that
++the above copyright notice appear in all copies and that both that
++copyright notice and this permission notice appear in supporting
++documentation.
++
++The above copyright notice and this permission notice shall be included in
++all copies or substantial portions of the Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++
++Except as contained in this notice, the name of The Open Group shall not be
++used in advertising or otherwise to promote the sale, use or other dealings
++in this Software without prior written authorization from The Open Group.
++
++*/
++
++/***********************************************************
++Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,
++and Olivetti Research Limited, Cambridge, England.
++
++                        All Rights Reserved
++
++Permission to use, copy, modify, and distribute this software and its 
++documentation for any purpose and without fee is hereby granted, 
++provided that the above copyright notice appear in all copies and that
++both that copyright notice and this permission notice appear in 
++supporting documentation, and that the names of Digital or Olivetti
++not be used in advertising or publicity pertaining to distribution of the
++software without specific, written prior permission.  
++
++DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
++SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
++FITNESS, IN NO EVENT SHALL THEY BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
++USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
++OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++PERFORMANCE OF THIS SOFTWARE.
++
++******************************************************************/
++/* $XFree86: xc/include/extensions/sync.h,v 1.4 2001/12/20 19:40:59 tsi Exp $ */
++
++#ifndef _SYNC_H_
++#define _SYNC_H_
++
++#include <X11/Xfuncproto.h>
++
++_XFUNCPROTOBEGIN
++
++#define SYNC_NAME "SYNC"
++
++#define SYNC_MAJOR_VERSION	3
++#define SYNC_MINOR_VERSION	0
++
++#define X_SyncInitialize		0
++#define X_SyncListSystemCounters	1
++#define X_SyncCreateCounter		2
++#define X_SyncSetCounter		3
++#define X_SyncChangeCounter		4
++#define X_SyncQueryCounter              5
++#define X_SyncDestroyCounter		6
++#define X_SyncAwait			7
++#define X_SyncCreateAlarm               8
++#define X_SyncChangeAlarm	        9
++#define X_SyncQueryAlarm	       10
++#define X_SyncDestroyAlarm	       11
++#define X_SyncSetPriority   	       12
++#define X_SyncGetPriority   	       13
++
++#define XSyncCounterNotify              0
++#define XSyncAlarmNotify		1
++#define XSyncAlarmNotifyMask 		(1L << XSyncAlarmNotify)
++
++#define XSyncNumberEvents		2L
++
++#define XSyncBadCounter			0L
++#define XSyncBadAlarm			1L
++#define XSyncNumberErrors		(XSyncBadAlarm + 1)
++
++/*
++ * Flags for Alarm Attributes
++ */
++#define XSyncCACounter			(1L<<0)
++#define XSyncCAValueType		(1L<<1)
++#define XSyncCAValue			(1L<<2)
++#define XSyncCATestType			(1L<<3)
++#define XSyncCADelta			(1L<<4)
++#define XSyncCAEvents			(1L<<5)
++
++/*
++ * Constants for the value_type argument of various requests
++ */
++typedef enum {
++    XSyncAbsolute,
++    XSyncRelative
++} XSyncValueType;
++
++/*
++ * Alarm Test types
++ */
++typedef enum {
++    XSyncPositiveTransition,
++    XSyncNegativeTransition,
++    XSyncPositiveComparison,
++    XSyncNegativeComparison
++} XSyncTestType;
++
++/*
++ * Alarm state constants
++ */
++typedef enum {
++    XSyncAlarmActive,
++    XSyncAlarmInactive,
++    XSyncAlarmDestroyed
++} XSyncAlarmState;
++
++
++typedef XID XSyncCounter;
++typedef XID XSyncAlarm;
++typedef struct _XSyncValue {
++    int hi;
++    unsigned int lo;
++} XSyncValue;
++
++/*
++ *   Macros/functions for manipulating 64 bit values
++ */
++
++/* have to put these prototypes before the corresponding macro definitions */
++
++extern void XSyncIntToValue(
++    XSyncValue* /*pv*/,
++    int /*i*/
++);
++
++extern void XSyncIntsToValue(
++    XSyncValue* /*pv*/,
++    unsigned int /*l*/,
++    int /*h*/
++);
++
++extern Bool XSyncValueGreaterThan(
++    XSyncValue /*a*/,
++    XSyncValue /*b*/
++);
++
++extern Bool XSyncValueLessThan(
++    XSyncValue /*a*/,
++    XSyncValue /*b*/
++);
++
++extern Bool XSyncValueGreaterOrEqual(
++    XSyncValue /*a*/,
++    XSyncValue /*b*/
++);
++
++extern Bool XSyncValueLessOrEqual(
++    XSyncValue /*a*/,
++    XSyncValue /*b*/
++);
++
++extern Bool XSyncValueEqual(
++    XSyncValue /*a*/,
++    XSyncValue /*b*/
++);
++
++extern Bool XSyncValueIsNegative(
++    XSyncValue /*v*/
++);
++
++extern Bool XSyncValueIsZero(
++    XSyncValue /*a*/
++);
++
++extern Bool XSyncValueIsPositive(
++    XSyncValue /*v*/
++);
++
++extern unsigned int XSyncValueLow32(
++    XSyncValue /*v*/
++);
++
++extern int XSyncValueHigh32(
++    XSyncValue /*v*/
++);
++
++extern void XSyncValueAdd(
++    XSyncValue* /*presult*/,
++    XSyncValue /*a*/,
++    XSyncValue /*b*/,
++    int* /*poverflow*/
++);
++
++extern void XSyncValueSubtract(
++    XSyncValue* /*presult*/,
++    XSyncValue /*a*/,
++    XSyncValue /*b*/,
++    int* /*poverflow*/
++);
++
++extern void XSyncMaxValue(
++    XSyncValue* /*pv*/
++);
++
++extern void XSyncMinValue(
++    XSyncValue* /*pv*/
++);
++
++_XFUNCPROTOEND
++
++/*  The _XSync macros below are for library internal use only.  They exist 
++ *  so that if we have to make a fix, we can change it in this one place
++ *  and have both the macro and function variants inherit the fix.
++ */
++
++#define _XSyncIntToValue(pv, i)     ((pv)->hi=((i<0)?~0:0),(pv)->lo=(i))
++#define _XSyncIntsToValue(pv, l, h) ((pv)->lo = (l), (pv)->hi = (h))
++#define _XSyncValueGreaterThan(a, b)\
++    ((a).hi>(b).hi || ((a).hi==(b).hi && (a).lo>(b).lo))
++#define _XSyncValueLessThan(a, b)\
++    ((a).hi<(b).hi || ((a).hi==(b).hi && (a).lo<(b).lo))
++#define _XSyncValueGreaterOrEqual(a, b)\
++    ((a).hi>(b).hi || ((a).hi==(b).hi && (a).lo>=(b).lo))
++#define _XSyncValueLessOrEqual(a, b)\
++    ((a).hi<(b).hi || ((a).hi==(b).hi && (a).lo<=(b).lo))
++#define _XSyncValueEqual(a, b)	((a).lo==(b).lo && (a).hi==(b).hi)
++#define _XSyncValueIsNegative(v) (((v).hi & 0x80000000) ? 1 : 0)
++#define _XSyncValueIsZero(a)	((a).lo==0 && (a).hi==0)
++#define _XSyncValueIsPositive(v) (((v).hi & 0x80000000) ? 0 : 1)
++#define _XSyncValueLow32(v)	((v).lo)
++#define _XSyncValueHigh32(v)	((v).hi)
++#define _XSyncValueAdd(presult,a,b,poverflow) {\
++	int t = (a).lo;\
++	Bool signa = XSyncValueIsNegative(a);\
++	Bool signb = XSyncValueIsNegative(b);\
++	((presult)->lo = (a).lo + (b).lo);\
++	((presult)->hi = (a).hi + (b).hi);\
++	if (t>(presult)->lo) (presult)->hi++;\
++	*poverflow = ((signa == signb) && !(signa == XSyncValueIsNegative(*presult)));\
++     }
++#define _XSyncValueSubtract(presult,a,b,poverflow) {\
++	int t = (a).lo;\
++	Bool signa = XSyncValueIsNegative(a);\
++	Bool signb = XSyncValueIsNegative(b);\
++	((presult)->lo = (a).lo - (b).lo);\
++	((presult)->hi = (a).hi - (b).hi);\
++	if (t>(presult)->lo) (presult)->hi--;\
++	*poverflow = ((signa == signb) && !(signa == XSyncValueIsNegative(*presult)));\
++     }
++#define _XSyncMaxValue(pv) ((pv)->hi = 0x7fffffff, (pv)->lo = 0xffffffff)
++#define _XSyncMinValue(pv) ((pv)->hi = 0x80000000, (pv)->lo = 0)
++
++/*
++ *  These are the publically usable macros.  If you want the function version
++ *  of one of these, just #undef the macro to uncover the function.
++ *  (This is the same convention that the ANSI C library uses.)
++ */
++
++#define XSyncIntToValue(pv, i) _XSyncIntToValue(pv, i)
++#define XSyncIntsToValue(pv, l, h) _XSyncIntsToValue(pv, l, h)
++#define XSyncValueGreaterThan(a, b) _XSyncValueGreaterThan(a, b)
++#define XSyncValueLessThan(a, b) _XSyncValueLessThan(a, b)
++#define XSyncValueGreaterOrEqual(a, b) _XSyncValueGreaterOrEqual(a, b)
++#define XSyncValueLessOrEqual(a, b) _XSyncValueLessOrEqual(a, b)
++#define XSyncValueEqual(a, b) _XSyncValueEqual(a, b)
++#define XSyncValueIsNegative(v) _XSyncValueIsNegative(v)
++#define XSyncValueIsZero(a) _XSyncValueIsZero(a)
++#define XSyncValueIsPositive(v) _XSyncValueIsPositive(v)
++#define XSyncValueLow32(v) _XSyncValueLow32(v)
++#define XSyncValueHigh32(v) _XSyncValueHigh32(v)
++#define XSyncValueAdd(presult,a,b,poverflow) _XSyncValueAdd(presult,a,b,poverflow)
++#define XSyncValueSubtract(presult,a,b,poverflow) _XSyncValueSubtract(presult,a,b,poverflow)
++#define XSyncMaxValue(pv) _XSyncMaxValue(pv)
++#define XSyncMinValue(pv) _XSyncMinValue(pv)
++
++#ifndef _SYNC_SERVER
++
++typedef struct _XSyncSystemCounter {
++    char *name;			/* null-terminated name of system counter */
++    XSyncCounter counter;	/* counter id of this system counter */
++    XSyncValue resolution;	/* resolution of this system counter */
++} XSyncSystemCounter;
++
++
++typedef struct {
++    XSyncCounter counter;	/* counter to trigger on */
++    XSyncValueType value_type;	/* absolute/relative */
++    XSyncValue wait_value;	/* value to compare counter to */
++    XSyncTestType test_type;	/* pos/neg comparison/transtion */
++} XSyncTrigger;
++
++typedef struct {
++    XSyncTrigger trigger;	/* trigger for await */
++    XSyncValue event_threshold; /* send event if past threshold */
++} XSyncWaitCondition;
++
++
++typedef struct {
++    XSyncTrigger trigger;
++    XSyncValue  delta;
++    Bool events;
++    XSyncAlarmState state;
++} XSyncAlarmAttributes;
++
++/*
++ *  Events
++ */
++
++typedef struct {
++    int type;			/* event base + XSyncCounterNotify */
++    unsigned long serial;	/* # of last request processed by server */
++    Bool send_event;		/* true if this came from a SendEvent request */
++    Display *display;		/* Display the event was read from */
++    XSyncCounter counter;	/* counter involved in await */
++    XSyncValue wait_value;	/* value being waited for */
++    XSyncValue counter_value;	/* counter value when this event was sent */
++    Time time;			/* milliseconds */
++    int count;			/* how many more events to come */
++    Bool destroyed;		/* True if counter was destroyed */
++} XSyncCounterNotifyEvent;
++
++typedef struct {
++    int type;			/* event base + XSyncCounterNotify */
++    unsigned long serial;	/* # of last request processed by server */
++    Bool send_event;		/* true if this came from a SendEvent request */
++    Display *display;		/* Display the event was read from */
++    XSyncAlarm alarm;		/* alarm that triggered */
++    XSyncValue counter_value;	/* value that triggered the alarm */
++    XSyncValue alarm_value;	/* test  value of trigger in alarm */
++    Time time;			/* milliseconds */
++    XSyncAlarmState state;	/* new state of alarm */
++} XSyncAlarmNotifyEvent;
++
++/*
++ *  Errors 
++ */
++
++typedef struct {
++    int type;			
++    Display *display;		/* Display the event was read from */
++    XSyncAlarm alarm;		/* resource id */
++    unsigned long serial;	/* serial number of failed request */
++    unsigned char error_code;	/* error base + XSyncBadAlarm */
++    unsigned char request_code;	/* Major op-code of failed request */
++    unsigned char minor_code;	/* Minor op-code of failed request */
++} XSyncAlarmError;
++
++typedef struct {
++    int type;			
++    Display *display;		/* Display the event was read from */
++    XSyncCounter counter;	/* resource id */
++    unsigned long serial;	/* serial number of failed request */
++    unsigned char error_code;	/* error base + XSyncBadCounter */
++    unsigned char request_code;	/* Major op-code of failed request */
++    unsigned char minor_code;	/* Minor op-code of failed request */
++} XSyncCounterError;
++
++/* 
++ *  Prototypes
++ */
++
++_XFUNCPROTOBEGIN
++
++extern Status XSyncQueryExtension(
++    Display* /*dpy*/,
++    int* /*event_base_return*/,
++    int* /*error_base_return*/
++);
++
++extern Status XSyncInitialize(
++    Display* /*dpy*/,
++    int* /*major_version_return*/,
++    int* /*minor_version_return*/
++);
++
++extern XSyncSystemCounter *XSyncListSystemCounters(
++    Display* /*dpy*/,
++    int* /*n_counters_return*/
++);
++
++extern void XSyncFreeSystemCounterList(
++    XSyncSystemCounter* /*list*/
++);
++
++extern XSyncCounter XSyncCreateCounter(
++    Display* /*dpy*/,
++    XSyncValue /*initial_value*/
++);
++
++extern Status XSyncSetCounter(
++    Display* /*dpy*/,
++    XSyncCounter /*counter*/,
++    XSyncValue /*value*/
++);
++
++extern Status XSyncChangeCounter(
++    Display* /*dpy*/,
++    XSyncCounter /*counter*/,
++    XSyncValue /*value*/
++);
++
++extern Status XSyncDestroyCounter(
++    Display* /*dpy*/,
++    XSyncCounter /*counter*/
++);
++
++extern Status XSyncQueryCounter(
++    Display* /*dpy*/,
++    XSyncCounter /*counter*/,
++    XSyncValue* /*value_return*/
++);
++
++extern Status XSyncAwait(
++    Display* /*dpy*/,
++    XSyncWaitCondition* /*wait_list*/,
++    int /*n_conditions*/
++);
++
++extern XSyncAlarm XSyncCreateAlarm(
++    Display* /*dpy*/,
++    unsigned long /*values_mask*/,
++    XSyncAlarmAttributes* /*values*/
++);
++
++extern Status XSyncDestroyAlarm(
++    Display* /*dpy*/,
++    XSyncAlarm /*alarm*/
++);
++
++extern Status XSyncQueryAlarm(
++    Display* /*dpy*/,
++    XSyncAlarm /*alarm*/,
++    XSyncAlarmAttributes* /*values_return*/
++);
++
++extern Status XSyncChangeAlarm(
++    Display* /*dpy*/,
++    XSyncAlarm /*alarm*/,
++    unsigned long /*values_mask*/,
++    XSyncAlarmAttributes* /*values*/
++);
++
++extern Status XSyncSetPriority(
++    Display* /*dpy*/,
++    XID /*client_resource_id*/,
++    int /*priority*/
++);
++
++extern Status XSyncGetPriority(
++    Display* /*dpy*/,
++    XID /*client_resource_id*/,
++    int* /*return_priority*/
++);
++
++#endif /* _SYNC_SERVER */
++
++_XFUNCPROTOEND
++
++#endif /* _SYNC_H_ */
diff --git a/x11/modular-xorg-server/patches/patch-bk b/x11/modular-xorg-server/patches/patch-bk
new file mode 100644
index 00000000000..8d35dbae721
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-bk
@@ -0,0 +1,12 @@
+$NetBSD: patch-bk,v 1.1 2010/04/09 09:08:14 tnn Exp $
+
+--- Xext/shm.c.orig	2009-10-12 02:52:40.000000000 +0000
++++ Xext/shm.c
+@@ -56,6 +56,7 @@ in this Software without prior written a
+ #include "xace.h"
+ #define _XSHM_SERVER_
+ #include <X11/extensions/shmstr.h>
++#include <X11/extensions/shmproto.h>
+ #include <X11/Xfuncproto.h>
+ 
+ /* Needed for Solaris cross-zone shared memory extension */
diff --git a/x11/modular-xorg-server/patches/patch-bl b/x11/modular-xorg-server/patches/patch-bl
new file mode 100644
index 00000000000..fb86f325a32
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-bl
@@ -0,0 +1,12 @@
+$NetBSD: patch-bl,v 1.1 2010/04/09 09:08:14 tnn Exp $
+
+--- Xext/xvdisp.c.orig	2009-10-12 02:52:40.000000000 +0000
++++ Xext/xvdisp.c
+@@ -44,6 +44,7 @@ SOFTWARE.
+ #ifdef MITSHM
+ #define _XSHM_SERVER_
+ #include <X11/extensions/shmstr.h>
++#include <X11/extensions/shmproto.h>
+ #endif
+ 
+ #include "xvdisp.h"
diff --git a/x11/modular-xorg-server/patches/patch-bm b/x11/modular-xorg-server/patches/patch-bm
new file mode 100644
index 00000000000..538b971eaca
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-bm
@@ -0,0 +1,13 @@
+$NetBSD: patch-bm,v 1.1 2010/04/09 09:08:14 tnn Exp $
+
+--- Xext/dpms.c.orig	2009-10-12 02:52:40.000000000 +0000
++++ Xext/dpms.c
+@@ -46,7 +46,7 @@ Equipment Corporation.
+ #include "opaque.h"
+ #define DPMS_SERVER
+ #include <X11/extensions/dpms.h>
+-#include <X11/extensions/dpmsstr.h>
++#include <X11/extensions/dpmsproto.h>
+ #include "dpmsproc.h"
+ #include "modinit.h"
+ 
diff --git a/x11/modular-xorg-server/patches/patch-bn b/x11/modular-xorg-server/patches/patch-bn
new file mode 100644
index 00000000000..7103af318de
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-bn
@@ -0,0 +1,14 @@
+$NetBSD: patch-bn,v 1.1 2010/04/09 09:08:14 tnn Exp $
+
+--- dbe/dbestruct.h.orig	2009-10-12 02:52:40.000000000 +0000
++++ dbe/dbestruct.h
+@@ -37,7 +37,8 @@
+ /* INCLUDES */
+ 
+ #define NEED_DBE_PROTOCOL
+-#include <X11/extensions/Xdbeproto.h>
++#include <X11/extensions/Xdbe.h>
++#include <X11/extensions/dbeproto.h>
+ #include "windowstr.h"
+ #include "privates.h"
+ 
diff --git a/x11/modular-xorg-server/patches/patch-bo b/x11/modular-xorg-server/patches/patch-bo
new file mode 100644
index 00000000000..accdf79d084
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-bo
@@ -0,0 +1,17 @@
+$NetBSD: patch-bo,v 1.1 2010/04/09 09:08:14 tnn Exp $
+
+--- mi/miinitext.c.orig	2009-10-12 02:52:40.000000000 +0000
++++ mi/miinitext.c
+@@ -162,10 +162,11 @@ typedef void (*InitExtension)(INITARGS);
+ #ifdef MITSHM
+ #define _XSHM_SERVER_
+ #include <X11/extensions/shmstr.h>
++#include <X11/extensions/shmproto.h>
+ #endif
+ #ifdef XTEST
+ #define _XTEST_SERVER_
+-#include <X11/extensions/XTest.h>
++#include <X11/extensions/xtestconst.h>
+ #endif
+ #ifdef XKB
+ #include <X11/extensions/XKB.h>