-don't use the Xrandr version from randrproto for RRQueryVersion but

 hardwire it to 1.1, otherwise we announce more than we can support
-add a "glx" option to build the "glx" extension -- this is work in
 progress (might need sone CFLAGS, see pkgsrc-wip)
-bump PKGREVISION

5 files changed, 52 insertions, 6 deletions

diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile
index 4467f1252bc..da30ab50d70 100644
--- a/x11/modular-xorg-server/Makefile
+++ b/x11/modular-xorg-server/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2007/01/24 13:34:40 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/26 17:51:16 drochner Exp $
 
 DISTNAME=	xorg-server-1.2.0
+PKGREVISION=	1
 PKGNAME=	modular-${DISTNAME}
 CATEGORIES=	x11
 MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/xserver/
@@ -19,11 +20,30 @@ USE_TOOLS+=		pkg-config
 USE_TOOLS+=		gmake
 USE_TOOLS+=		perl
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
-CONFIGURE_ARGS+=	--enable-glx
 CONFIGURE_ARGS+=	--enable-dri
 
+PKG_SUPPORTED_OPTIONS=	glx
+PKG_OPTIONS_VAR=	PKG_OPTIONS.xorg-server
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mglx)
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
+DISTFILES+=		MesaLib-6.5.2.tar.bz2
+SITES.MesaLib-6.5.2.tar.bz2= ${MASTER_SITE_SOURCEFORGE:=mesa3d/}
+CONFIGURE_ARGS+=	--enable-glx
+CONFIGURE_ARGS+=	--with-mesa-source=${WRKDIR}/Mesa-6.5.2
+BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.8nb1
+BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.0.3nb1
+PLIST_SUBST+=		GLX=""
+.else
+CONFIGURE_ARGS+=	--disable-glx
+PLIST_SUBST+=		GLX="@comment "
+.endif
+
 BUILD_DEFS+=		VARBASE
 
+# -wip
+#DEPENDS+=		xkeyboard-config-[0-9]*:../../x11/xkeyboard-config
 DEPENDS+=		xkbdata-[0-9]*:../../x11/xkbdata
 
 BUILDLINK_API_DEPENDS.fixesproto+=	fixesproto>=4.0
@@ -32,7 +52,10 @@ BUILDLINK_API_DEPENDS.kbproto+=		kbproto>=1.0.3
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/libfontenc/buildlink3.mk"
+.if empty(PKG_OPTIONS:Mglx)
+# for GLX we already have the Mesa source
 .include "../../graphics/MesaLib/buildlink3.mk"
+.endif
 .include "../../x11/bigreqsproto/buildlink3.mk"
 .include "../../x11/compositeproto/buildlink3.mk"
 .include "../../x11/damageproto/buildlink3.mk"
diff --git a/x11/modular-xorg-server/PLIST b/x11/modular-xorg-server/PLIST
index 837d45cd697..3c6bd684487 100644
--- a/x11/modular-xorg-server/PLIST
+++ b/x11/modular-xorg-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2007/01/24 13:34:40 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/02/26 17:51:16 drochner Exp $
 bin/X
 bin/Xnest
 bin/Xorg
@@ -191,9 +191,11 @@ lib/X11/Cards
 lib/X11/Options
 lib/X11/app-defaults/XOrgCfg
 lib/pkgconfig/xorg-server.pc
+${GLX}lib/xorg/modules/extensions/libGLcore.la
 lib/xorg/modules/extensions/libdbe.la
 lib/xorg/modules/extensions/libdri.la
 lib/xorg/modules/extensions/libextmod.la
+${GLX}lib/xorg/modules/extensions/libglx.la
 lib/xorg/modules/extensions/librecord.la
 lib/xorg/modules/extensions/libxtrap.la
 lib/xorg/modules/fonts/libfreetype.la
diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index d1f9afe9881..6bb54453db6 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -1,10 +1,14 @@
-$NetBSD: distinfo,v 1.6 2007/02/05 23:08:36 joerg Exp $
+$NetBSD: distinfo,v 1.7 2007/02/26 17:51:16 drochner Exp $
 
+SHA1 (MesaLib-6.5.2.tar.bz2) = ba860bb6ee57c02202342dfd5927464a068ea18f
+RMD160 (MesaLib-6.5.2.tar.bz2) = 9a92d69110c066ae6734bcaafb78f222ac2df6d3
+Size (MesaLib-6.5.2.tar.bz2) = 3295166 bytes
 SHA1 (xorg-server-1.2.0.tar.bz2) = 85fa0e8fa7d6bea6f1a73c66a57488ea68dffa17
 RMD160 (xorg-server-1.2.0.tar.bz2) = 0bbc5ccb5cbbe7627b4f09f17848b188e8be2a50
 Size (xorg-server-1.2.0.tar.bz2) = 6014596 bytes
 SHA1 (patch-ab) = 115905eba320f294c68783bb704359d824460469
-SHA1 (patch-ad) = 67a94598ac23c23688caba23b851aec317a9e7a3
+SHA1 (patch-ad) = 752235269f10daade0bf60665cccde39d1583064
+SHA1 (patch-ae) = 84a9100ebd88c77022b4739dfa0a961fea78df2b
 SHA1 (patch-da) = 73faacda1088304025c5e05f3d58edaf9ae1145f
 SHA1 (patch-db) = 28913a094c8499536a71c8d4d7ca57a5efb25b39
 SHA1 (patch-dc) = 75df6f37b1cbc9574adb5ee66cb84d0f5ebac853
diff --git a/x11/modular-xorg-server/patches/patch-ad b/x11/modular-xorg-server/patches/patch-ad
index 6c01f817cfb..e7187b6da07 100644
--- a/x11/modular-xorg-server/patches/patch-ad
+++ b/x11/modular-xorg-server/patches/patch-ad
@@ -1,4 +1,6 @@
-$NetBSD: patch-ad,v 1.1.1.1 2006/11/14 16:59:30 joerg Exp $
+$NetBSD: patch-ad,v 1.2 2007/02/26 17:51:16 drochner Exp $
+
+So mouse pointer does not get stuck on left side of screen.
 
 --- hw/xfree86/common/xf86Xinput.c.orig	2006-07-05 18:31:40.000000000 +0000
 +++ hw/xfree86/common/xf86Xinput.c
diff --git a/x11/modular-xorg-server/patches/patch-ae b/x11/modular-xorg-server/patches/patch-ae
new file mode 100644
index 00000000000..94df99e7b1d
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.3 2007/02/26 17:51:16 drochner Exp $
+
+--- randr/randr.c.orig	2007-02-26 18:21:23.000000000 +0100
++++ randr/randr.c
+@@ -472,8 +472,8 @@ ProcRRQueryVersion (ClientPtr client)
+     rep.type = X_Reply;
+     rep.length = 0;
+     rep.sequenceNumber = client->sequence;
+-    rep.majorVersion = RANDR_MAJOR;
+-    rep.minorVersion = RANDR_MINOR;
++    rep.majorVersion = 1;
++    rep.minorVersion = 1;
+     if (client->swapped) {
+     	swaps(&rep.sequenceNumber, n);
+     	swapl(&rep.length, n);