Bring xorg-server-snap port to 6.8.99.5 after repocopy from xorg-server. This

is a port of the server pieces of the periodic snapshot of X.Org, with the
development DRI drivers enabled.  The purpose of this port is to bring
bleeding-edge graphics support to FreeBSD.

11 files changed, 150 insertions, 294 deletions

diff --git a/x11-servers/xorg-server-snap/Makefile b/x11-servers/xorg-server-snap/Makefile
index 18fde38c251..2ad030b74bc 100644
--- a/x11-servers/xorg-server-snap/Makefile
+++ b/x11-servers/xorg-server-snap/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	xorg-server
-PORTVERSION=	6.8.2
+PORTVERSION=	6.8.99.5
 CATEGORIES=	x11-servers
-MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
-DISTFILES=	X11R${PORTVERSION}-src1.tar.gz \
-		X11R${PORTVERSION}-src3.tar.gz
+MASTER_SITES=	http://xorg.freedesktop.org/snapshots/
+DISTNAME=	xorg-x11-${PORTVERSION}
 
 MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org X server and related programs
+COMMENT=	X.Org X server development snapshot and related programs
 
+USE_BZIP2=	yes
 .if !defined(WITH_MODULAR)
 USE_XLIB=	yes
 .else
@@ -28,7 +27,7 @@ BUILD_DEPENDS=	${X11BASE}/include/X11/extensions/XKMformat.h:${PORTSDIR}/x11/lib
 RUN_DEPENDS=	${LIB_PC_DEPENDS}
 .endif
 
-CONFLICTS=	XFree86-Server-*
+CONFLICTS=	XFree86-Server-* xorg-server-6.[79].* xorg-server-6.8.[012]*
 
 SCRIPTS_ENV=	WITH_DEBUG="${WITH_DEBUG}"
 MAN1=		Xorg.1 \
@@ -67,6 +66,7 @@ MAN5=		getconfig.5 \
 XBUILD_DIRS=	lib/font programs/Xserver
 XINCLUDE_DIRS=	lib/xtrans
 XMAN_DIRS=	programs/Xserver
+LATEST_LINK=	${PORTNAME}-snap
 
 NOT_FOR_ARCHS=	ia64
 .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
@@ -81,7 +81,7 @@ PLIST_SUB+=	ALPHA_NA="@comment "
 .else
 PLIST_SUB+=	ALPHA_NA=""
 .endif
-		
+
 .if ${ARCH} == ia64
 PLIST_SUB+=	IA64_NA="@comment "
 .else
@@ -149,6 +149,12 @@ MAN4+=		apm.4x \
 PLIST_SUB+=	AMD64_I386="@comment "
 .endif
 
+pre-everything::
+	@${ECHO_MSG} "This X Server installs with development DRI DDX drivers.  These drivers are"
+	@${ECHO_MSG} "considered insecure by their authors and may allow privilege escalation by"
+	@${ECHO_MSG} "local X clients with DRI privileges."
+	@${ECHO_MSG} ""
+
 .if !defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO
 pre-everything::
 	@${ECHO_MSG} "By default, the X Server installs as a set-user-id root binary. When run by"
diff --git a/x11-servers/xorg-server-snap/distinfo b/x11-servers/xorg-server-snap/distinfo
index 00c3b2d7e40..e604a278cb3 100644
--- a/x11-servers/xorg-server-snap/distinfo
+++ b/x11-servers/xorg-server-snap/distinfo
@@ -1,4 +1,2 @@
-MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab
-SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802
-MD5 (xorg/X11R6.8.2-src3.tar.gz) = 057d20af30569434e2c6693c1ca66e57
-SIZE (xorg/X11R6.8.2-src3.tar.gz) = 10379299
+MD5 (xorg/xorg-x11-6.8.99.5.tar.bz2) = 6dc46c7c0d41c47d24729e85125832d2
+SIZE (xorg/xorg-x11-6.8.99.5.tar.bz2) = 44728392
diff --git a/x11-servers/xorg-server-snap/files/patch-elfloader.c b/x11-servers/xorg-server-snap/files/patch-elfloader.c
deleted file mode 100644
index d1942e55e8a..00000000000
--- a/x11-servers/xorg-server-snap/files/patch-elfloader.c
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: programs/Xserver/hw/xfree86/loader/elfloader.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -u -r1.3 -r1.4
---- programs/Xserver/hw/xfree86/loader/elfloader.c	30 Oct 2004 20:33:43 -0000	1.3
-+++ programs/Xserver/hw/xfree86/loader/elfloader.c	9 Nov 2004 15:58:41 -0000	1.4
-@@ -1,4 +1,4 @@
--/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v 1.3 2004/10/30 20:33:43 alanc Exp $ */
-+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v 1.4 2004/11/09 15:58:41 ajax Exp $ */
- /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v 1.61tsi Exp $ */
- 
- /*
-@@ -1609,6 +1609,20 @@
- 	    break;
- 	}
- 
-+ 	case R_ALPHA_SREL32:
-+ 	    {
-+ 		dest32 = (unsigned int *)(secp + rel->r_offset);
-+ 		symval += rel->r_addend;
-+ 		symval -= (unsigned long) dest32;
-+ 		if ((long)symval >= 0x80000000
-+ 		    || (long)symval < -(long)0x80000000)
-+ 		    FatalError("R_ALPHA_SREL32 overflow for %s: %lx\n",
-+ 			       ElfGetSymbolName(elffile, ELF_R_SYM(rel->r_info)),
-+ 			       symval);
-+ 		*dest32 = symval;
-+ 		break;
-+ 	    }
-+ 
- #endif /* alpha */
- #if defined(__mc68000__)
-     case R_68K_32:
diff --git a/x11-servers/xorg-server-snap/files/patch-os-Imakefile b/x11-servers/xorg-server-snap/files/patch-os-Imakefile
index 5251895774a..bbedacae7a9 100644
--- a/x11-servers/xorg-server-snap/files/patch-os-Imakefile
+++ b/x11-servers/xorg-server-snap/files/patch-os-Imakefile
@@ -1,11 +1,12 @@
---- programs/Xserver/os/Imakefile.orig	Sat May  8 18:00:52 2004
-+++ programs/Xserver/os/Imakefile	Sat May  8 18:01:08 2004
-@@ -132,7 +132,7 @@
- 		  $(RANDOM_DEFINES)
+--- programs/Xserver/os/Imakefile.orig	Wed Mar 23 11:58:45 2005
++++ programs/Xserver/os/Imakefile	Sun Apr 17 08:32:03 2005
+@@ -131,7 +131,8 @@
+ 		  $(RANDOM_DEFINES) $(BUGMSG) $(XTRANS_FAILDEFINES)
         INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
  		  -I$(SERVERSRC)/Xext -I$(FONTINCSRC) -I$(SERVERSRC)/render \
--		  -I$(TOP)/lib/Xau -I../lbx Krb5Includes
-+		  -I$(TOP)/lib/Xau -I../lbx Krb5Includes -I$(INCROOT)/X11
+-		  -I$(TOP)/lib/Xau -I../lbx -I../Xprint Krb5Includes
++		  -I$(TOP)/lib/Xau -I../lbx -I../Xprint Krb5Includes \
++		  -I$(INCROOT)/X11
   DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) \
- 		  $(TRANS_INCLUDES) $(CONNECTION_FLAGS) DependDefines
-        LINTLIBS = ../dix/llib-ldix.ln
+ 		  $(TRANS_INCLUDES) $(CONNECTION_FLAGS) $(GETPEER_DEFINES) \
+ 		  DependDefines
diff --git a/x11-servers/xorg-server-snap/files/patch-pc98kbd b/x11-servers/xorg-server-snap/files/patch-pc98kbd
index 5b41887944d..7eb1a2d1534 100644
--- a/x11-servers/xorg-server-snap/files/patch-pc98kbd
+++ b/x11-servers/xorg-server-snap/files/patch-pc98kbd
@@ -1,17 +1,16 @@
---- programs/Xserver/hw/xfree86/input/keyboard/kbd.c.orig	Tue Feb  8 17:48:07 2005
-+++ programs/Xserver/hw/xfree86/input/keyboard/kbd.c	Tue Feb  8 17:48:52 2005
-@@ -595,10 +595,13 @@
+--- programs/Xserver/hw/xfree86/input/keyboard/kbd.c.orig	Tue Jan 11 06:59:02 2005
++++ programs/Xserver/hw/xfree86/input/keyboard/kbd.c	Sun Apr 17 08:34:33 2005
+@@ -604,10 +604,12 @@
     * they need to get the same key code as the base key on the same
     * physical keyboard key.
     */
--  if (scanCode == KEY_SysReqest)
--    scanCode = KEY_Print;
+-  if (ModifierDown(AltMask) && (scanCode == KEY_SysReqest))
+-      scanCode = KEY_Print;
 -  else if (scanCode == KEY_Break)
 -    scanCode = KEY_Pause;
-+  /* PC98 keyboards however don't need this */
 +  if (!xf86IsPc98()) {
-+    if (scanCode == KEY_SysReqest)
-+      scanCode = KEY_Print;
++    if (ModifierDown(AltMask) && (scanCode == KEY_SysReqest))
++        scanCode = KEY_Print;
 +    else if (scanCode == KEY_Break)
 +      scanCode = KEY_Pause;
 +  }
diff --git a/x11-servers/xorg-server-snap/files/patch-radeon_driver.c b/x11-servers/xorg-server-snap/files/patch-radeon_driver.c
deleted file mode 100644
index eddd3071447..00000000000
--- a/x11-servers/xorg-server-snap/files/patch-radeon_driver.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c.orig	Thu Feb 17 13:15:22 2005
-+++ programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c	Thu Feb 17 13:21:09 2005
-@@ -7159,7 +7159,6 @@
- 	RADEONDoAdjustFrame(pScrn, x, y, FALSE);
-     }
- 
--    RADEONSetFBLocation (pScrn);
- #ifdef XF86DRI
- 	if (info->CPStarted) DRIUnlock(pScrn->pScreen);
- #endif
diff --git a/x11-servers/xorg-server-snap/files/patch-savage-pci-id b/x11-servers/xorg-server-snap/files/patch-savage-pci-id
deleted file mode 100644
index f7396543d87..00000000000
--- a/x11-servers/xorg-server-snap/files/patch-savage-pci-id
+++ /dev/null
@@ -1,87 +0,0 @@
---- programs/Xserver/hw/xfree86/common/xf86PciInfo.h.savage-pci-id-fixes	2003-01-08 04:28:57.000000000 -0500
-+++ programs/Xserver/hw/xfree86/common/xf86PciInfo.h	2003-01-08 05:28:02.000000000 -0500
-@@ -457,21 +457,34 @@
- #define PCI_CHIP_TRIO64V2_DXGX		0x8901
- #define PCI_CHIP_PLATO_PX		0x8902
- #define PCI_CHIP_Trio3D			0x8904
--#define PCI_CHIP_Trio3D_2X		0x8A13
- #define PCI_CHIP_VIRGE_DXGX		0x8A01
- #define PCI_CHIP_VIRGE_GX2		0x8A10
-+#define PCI_CHIP_Trio3D_2X		0x8A13
- #define PCI_CHIP_SAVAGE3D		0x8A20
- #define PCI_CHIP_SAVAGE3D_MV		0x8A21
- #define PCI_CHIP_SAVAGE4		0x8A22
--#define PCI_CHIP_VIRGE_MX		0x8C01
--#define PCI_CHIP_VIRGE_MXPLUS		0x8C01
--#define PCI_CHIP_VIRGE_MXP		0x8C03
- #define PCI_CHIP_PROSAVAGE_PM		0x8A25
- #define PCI_CHIP_PROSAVAGE_KM		0x8A26
-+#define PCI_CHIP_VIRGE_MX		0x8C01
-+#define PCI_CHIP_VIRGE_MXPLUS		0x8C02
-+#define PCI_CHIP_VIRGE_MXP		0x8C03
- #define PCI_CHIP_SAVAGE_MX_MV		0x8C10
- #define PCI_CHIP_SAVAGE_MX		0x8C11
- #define PCI_CHIP_SAVAGE_IX_MV		0x8C12
- #define PCI_CHIP_SAVAGE_IX		0x8C13
-+#define PCI_CHIP_SUPSAV_MX128		0x8C22
-+#define PCI_CHIP_SUPSAV_MX64		0x8C24
-+#define PCI_CHIP_SUPSAV_MX64C		0x8C26
-+#define PCI_CHIP_SUPSAV_IX128SDR	0x8C2A
-+#define PCI_CHIP_SUPSAV_IX128DDR	0x8C2B
-+#define PCI_CHIP_SUPSAV_IX64SDR		0x8C2C
-+#define PCI_CHIP_SUPSAV_IX64DDR		0x8C2D
-+#define PCI_CHIP_SUPSAV_IXCSDR		0x8C2E
-+#define PCI_CHIP_SUPSAV_IXCDDR		0x8C2F
-+#define PCI_CHIP_S3TWISTER_P		0x8D01
-+#define PCI_CHIP_S3TWISTER_K		0x8D02
-+#define PCI_CHIP_PROSAVAGE_DDR		0x8D03
-+#define PCI_CHIP_PROSAVAGE_DDRK		0x8D04
- #define PCI_CHIP_SAVAGE2000		0x9102
- 
- /* ARK Logic */
---- programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h.savage-pci-id-fixes	2003-01-08 05:31:06.000000000 -0500
-+++ programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h	2003-01-08 05:31:25.000000000 -0500
-@@ -3,30 +3,6 @@
- #ifndef _SAVAGE_REGS_H
- #define _SAVAGE_REGS_H
- 
--/* These are here until xf86PciInfo.h is updated. */
--
--#ifndef PCI_CHIP_S3TWISTER_P
--#define PCI_CHIP_S3TWISTER_P	0x8d01
--#endif
--#ifndef PCI_CHIP_S3TWISTER_K
--#define PCI_CHIP_S3TWISTER_K	0x8d02
--#endif
--#ifndef PCI_CHIP_SUPSAV_MX128
--#define PCI_CHIP_SUPSAV_MX128		0x8c22
--#define PCI_CHIP_SUPSAV_MX64		0x8c24
--#define PCI_CHIP_SUPSAV_MX64C		0x8c26
--#define PCI_CHIP_SUPSAV_IX128SDR	0x8c2a
--#define PCI_CHIP_SUPSAV_IX128DDR	0x8c2b
--#define PCI_CHIP_SUPSAV_IX64SDR		0x8c2c
--#define PCI_CHIP_SUPSAV_IX64DDR		0x8c2d
--#define PCI_CHIP_SUPSAV_IXCSDR		0x8c2e
--#define PCI_CHIP_SUPSAV_IXCDDR		0x8c2f
--#endif
--#ifndef PCI_CHIP_PROSAVAGE_DDR
--#define PCI_CHIP_PROSAVAGE_DDR	0x8d03
--#define PCI_CHIP_PROSAVAGE_DDRK	0x8d04
--#endif
--
- #define S3_SAVAGE3D_SERIES(chip)  ((chip>=S3_SAVAGE3D) && (chip<=S3_SAVAGE_MX))
- 
- #define S3_SAVAGE4_SERIES(chip)   ((chip==S3_SAVAGE4) || (chip==S3_PROSAVAGE))
---- programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c.savage-pci-id-fixes	2003-01-08 06:28:59.000000000 -0500
-+++ programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c	2003-01-08 06:33:02.000000000 -0500
-@@ -123,8 +123,8 @@
-     { PCI_CHIP_SAVAGE_IX,	"Savage/IX" },
-     { PCI_CHIP_PROSAVAGE_PM,	"ProSavage PM133" },
-     { PCI_CHIP_PROSAVAGE_KM,	"ProSavage KM133" },
--    { PCI_CHIP_S3TWISTER_P,	"ProSavage PN133" },
--    { PCI_CHIP_S3TWISTER_K,	"ProSavage KN133" },
-+    { PCI_CHIP_S3TWISTER_P,	"Twister PN133" },
-+    { PCI_CHIP_S3TWISTER_K,	"Twister KN133" },
-     { PCI_CHIP_SUPSAV_MX128,	"SuperSavage/MX 128" },
-     { PCI_CHIP_SUPSAV_MX64,	"SuperSavage/MX 64" },
-     { PCI_CHIP_SUPSAV_MX64C,	"SuperSavage/MX 64C" },
diff --git a/x11-servers/xorg-server-snap/files/patch-xf86Pci.h b/x11-servers/xorg-server-snap/files/patch-xf86Pci.h
deleted file mode 100644
index a7ec47c1e0e..00000000000
--- a/x11-servers/xorg-server-snap/files/patch-xf86Pci.h
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h
-===================================================================
-RCS file: /work/eich/freedesktop/cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h,v
-retrieving revision 1.1.1.2
-diff -u -r1.1.1.2 xf86Pci.h
---- programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h	25 Nov 2003 19:28:50 -0000	1.1.1.2
-+++ programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h	2 Mar 2005 16:08:29 -0000
-@@ -329,7 +329,7 @@
- #define PCI_MAP_IS_MEM(b)	(!PCI_MAP_IS_IO(b))
- 
- #define PCI_MAP_IS64BITMEM(b)	\
--	(((b) & PCI_MAP_MEMORY_TYPE_MASK) == PCI_MAP_MEMORY_TYPE_64BIT)
-+	  (((b) & PCI_MAP_MEMORY_TYPE) == PCI_MAP_MEMORY_TYPE_64BIT)
- 
- #define PCIGETMEMORY(b)		((b) & PCI_MAP_MEMORY_ADDRESS_MASK)
- #define PCIGETMEMORY64HIGH(b)	(*((CARD32*)&b + 1))
diff --git a/x11-servers/xorg-server-snap/files/patch-xorgconfig.c b/x11-servers/xorg-server-snap/files/patch-xorgconfig.c
deleted file mode 100644
index 650360ec75f..00000000000
--- a/x11-servers/xorg-server-snap/files/patch-xorgconfig.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- programs/Xserver/hw/xfree86/xf86config/xorgconfig.c.orig	Mon Nov  8 22:18:58 2004
-+++ programs/Xserver/hw/xfree86/xf86config/xorgconfig.c	Mon Nov  8 22:19:22 2004
-@@ -854,8 +854,7 @@
- "which is the rate at which scanlines are displayed.\n"
- "\n"
- "The valid range for horizontal sync and vertical sync should be documented\n"
--"in the manual of your monitor. If in doubt, check the monitor database\n"
--TREEROOTDOC "/Monitors to see if your monitor is there.\n"
-+"in the manual of your monitor.\n"
- "\n";
- 
- static char *hsyncintro_text =
diff --git a/x11-servers/xorg-server-snap/pkg-plist b/x11-servers/xorg-server-snap/pkg-plist
index 1a28ebdfef0..542125649dc 100644
--- a/x11-servers/xorg-server-snap/pkg-plist
+++ b/x11-servers/xorg-server-snap/pkg-plist
@@ -78,116 +78,127 @@ lib/X11/getconfig/cfg.sample
 lib/X11/getconfig/xorg.cfg
 lib/X11/xorg.conf.eg
 lib/X11/xserver/SecurityPolicy
-%%AMD64_I386%%lib/modules/drivers/apm_drv.o
-%%AMD64_I386%%lib/modules/drivers/ark_drv.o
-lib/modules/drivers/ati_drv.o
-lib/modules/drivers/atimisc_drv.o
-%%AMD64_I386%%lib/modules/drivers/chips_drv.o
-%%SPARC64_NA%%%%PPC_NA%%lib/modules/drivers/cirrus_alpine.o
-%%SPARC64_NA%%%%PPC_NA%%lib/modules/drivers/cirrus_drv.o
-%%SPARC64_NA%%%%PPC_NA%%lib/modules/drivers/cirrus_laguna.o
-%%AMD64_I386%%lib/modules/drivers/cyrix_drv.o
-%%AMD64_I386%%lib/modules/drivers/dummy_drv.o
-lib/modules/drivers/glint_drv.o
-%%AMD64_I386%%lib/modules/drivers/i128_drv.o
-%%I386%%lib/modules/drivers/i740_drv.o
-%%AMD64_I386%%lib/modules/drivers/i810_drv.o
-lib/modules/drivers/mga_drv.o
-%%AMD64_I386%%lib/modules/drivers/neomagic_drv.o
-%%I386%%lib/modules/drivers/nsc_drv.o
-%%SPARC64_NA%%lib/modules/drivers/nv_drv.o
-lib/modules/drivers/r128_drv.o
-lib/modules/drivers/radeon_drv.o
-%%SPARC64_NA%%%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/rendition_drv.o
-%%SPARC64_NA%%lib/modules/drivers/riva128.o
-%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3_drv.o
-%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3virge_drv.o
-%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/savage_drv.o
-%%SPARC64_NA%%%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/siliconmotion_drv.o
-%%AMD64_I386%%lib/modules/drivers/sis_drv.o
-%%SPARC64%%lib/modules/drivers/sunbw2_drv.o
-%%SPARC64%%lib/modules/drivers/suncg14_drv.o
-%%SPARC64%%lib/modules/drivers/suncg3_drv.o
-%%SPARC64%%lib/modules/drivers/suncg6_drv.o
-%%SPARC64%%lib/modules/drivers/sunffb_drv.o
-%%SPARC64%%lib/modules/drivers/sunleo_drv.o
-%%SPARC64%%lib/modules/drivers/suntcx_drv.o
-lib/modules/drivers/tdfx_drv.o
-%%SPARC64_NA%%%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/tga_drv.o
-%%AMD64_I386%%lib/modules/drivers/trident_drv.o
-%%AMD64_I386%%lib/modules/drivers/tseng_drv.o
-%%ALPHA_NA%%%%PPC_NA%%lib/modules/drivers/vesa_drv.o
-lib/modules/drivers/vga_drv.o
-%%I386%%lib/modules/drivers/via_drv.o
-%%I386%%lib/modules/drivers/vmware_drv.o
-lib/modules/extensions/libGLcore.a
-lib/modules/extensions/libdbe.a
-lib/modules/extensions/libdri.a
-lib/modules/extensions/libextmod.a
-lib/modules/extensions/libglx.a
-lib/modules/extensions/librecord.a
-lib/modules/extensions/libxtrap.a
-lib/modules/fonts/libbitmap.a
+%%AMD64_I386%%lib/modules/drivers/apm_drv.so
+%%AMD64_I386%%lib/modules/drivers/ark_drv.so
+lib/modules/drivers/ati_drv.so
+lib/modules/drivers/atimisc_drv.so
+%%AMD64_I386%%lib/modules/drivers/chips_drv.so
+%%SPARC64_NA%%%%PPC_NA%%lib/modules/drivers/cirrus_alpine.so
+%%SPARC64_NA%%%%PPC_NA%%lib/modules/drivers/cirrus_drv.so
+%%SPARC64_NA%%%%PPC_NA%%lib/modules/drivers/cirrus_laguna.so
+%%AMD64_I386%%lib/modules/drivers/cyrix_drv.so
+%%AMD64_I386%%lib/modules/drivers/dummy_drv.so
+lib/modules/drivers/glint_drv.so
+%%AMD64_I386%%lib/modules/drivers/i128_drv.so
+%%I386%%lib/modules/drivers/i740_drv.so
+%%AMD64_I386%%lib/modules/drivers/i810_drv.so
+lib/modules/drivers/mga_drv.so
+%%AMD64_I386%%lib/modules/drivers/neomagic_drv.so
+%%I386%%lib/modules/drivers/nsc_drv.so
+%%SPARC64_NA%%lib/modules/drivers/nv_drv.so
+lib/modules/drivers/r128_drv.so
+lib/modules/drivers/radeon_drv.so
+%%SPARC64_NA%%%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/rendition_drv.so
+%%SPARC64_NA%%lib/modules/drivers/riva128.so
+%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3_drv.so
+%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3virge_drv.so
+%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/savage_drv.so
+%%SPARC64_NA%%%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/siliconmotion_drv.so
+%%AMD64_I386%%lib/modules/drivers/sis_drv.so
+%%SPARC64%%lib/modules/drivers/sunbw2_drv.so
+%%SPARC64%%lib/modules/drivers/suncg14_drv.so
+%%SPARC64%%lib/modules/drivers/suncg3_drv.so
+%%SPARC64%%lib/modules/drivers/suncg6_drv.so
+%%SPARC64%%lib/modules/drivers/sunffb_drv.so
+%%SPARC64%%lib/modules/drivers/sunleo_drv.so
+%%SPARC64%%lib/modules/drivers/suntcx_drv.so
+lib/modules/drivers/tdfx_drv.so
+%%SPARC64_NA%%%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/tga_drv.so
+%%AMD64_I386%%lib/modules/drivers/trident_drv.so
+%%AMD64_I386%%lib/modules/drivers/tseng_drv.so
+%%ALPHA_NA%%%%PPC_NA%%lib/modules/drivers/vesa_drv.so
+lib/modules/drivers/vga_drv.so
+%%I386%%lib/modules/drivers/via_drv.so
+%%AMD64_I386%%lib/modules/drivers/vmware_drv.so
+lib/modules/extensions/libGLcore.so
+lib/modules/extensions/libdbe.so
+lib/modules/extensions/libdri.so
+lib/modules/extensions/libextmod.so
+lib/modules/extensions/libglx.so
+lib/modules/extensions/librecord.so
+lib/modules/extensions/libxtrap.so
+lib/modules/fonts/libbitmap.so
 lib/modules/fonts/libfreetype.so
-lib/modules/fonts/libtype1.a
-lib/modules/freebsd/libdrm.a
-lib/modules/input/acecad_drv.o
-lib/modules/input/calcomp_drv.o
-lib/modules/input/citron_drv.o
-lib/modules/input/digitaledge_drv.o
-lib/modules/input/dmc_drv.o
-lib/modules/input/dynapro_drv.o
-lib/modules/input/elographics_drv.o
-lib/modules/input/fpit_drv.o
-lib/modules/input/hyperpen_drv.o
-lib/modules/input/js_x_drv.o
-lib/modules/input/kbd_drv.o
-lib/modules/input/keyboard_drv.o
-lib/modules/input/magellan_drv.o
-lib/modules/input/microtouch_drv.o
-lib/modules/input/mouse_drv.o
-lib/modules/input/mutouch_drv.o
-lib/modules/input/palmax_drv.o
-lib/modules/input/penmount_drv.o
-lib/modules/input/spaceorb_drv.o
-lib/modules/input/summa_drv.o
-lib/modules/input/tek4957_drv.o
-lib/modules/input/void_drv.o
-lib/modules/input/wacom_drv.o
-%%ALPHA_NA%%lib/modules/libafb.a
-lib/modules/libcfb.a
-lib/modules/libcfb16.a
-lib/modules/libcfb24.a
-lib/modules/libcfb32.a
-lib/modules/libcw.a
-lib/modules/libdamage.a
-lib/modules/libddc.a
-lib/modules/libfb.a
-lib/modules/libi2c.a
-lib/modules/libint10.a
-lib/modules/liblayer.a
-lib/modules/libmfb.a
-lib/modules/libpcidata.a
-lib/modules/librac.a
-lib/modules/libramdac.a
-lib/modules/libscanpci.a
-lib/modules/libshadow.a
-lib/modules/libshadowfb.a
-lib/modules/libvbe.a
-lib/modules/libvgahw.a
-lib/modules/libxaa.a
-lib/modules/libxf1bpp.a
-lib/modules/libxf24_32bpp.a
-lib/modules/libxf4bpp.a
-lib/modules/libxf8_16bpp.a
-lib/modules/libxf8_32bpp.a
-%%SPARC64%%lib/modules/libxf8_32wid.a
+lib/modules/fonts/libtype1.so
+lib/modules/freebsd/libdrm.so
+lib/modules/input/acecad_drv.so
+lib/modules/input/calcomp_drv.so
+lib/modules/input/citron_drv.so
+lib/modules/input/digitaledge_drv.so
+lib/modules/input/dmc_drv.so
+lib/modules/input/dynapro_drv.so
+lib/modules/input/elographics_drv.so
+lib/modules/input/fpit_drv.so
+lib/modules/input/hyperpen_drv.so
+lib/modules/input/js_x_drv.so
+lib/modules/input/kbd_drv.so
+lib/modules/input/keyboard_drv.so
+lib/modules/input/magellan_drv.so
+lib/modules/input/microtouch_drv.so
+lib/modules/input/mouse_drv.so
+lib/modules/input/mutouch_drv.so
+lib/modules/input/palmax_drv.so
+lib/modules/input/penmount_drv.so
+lib/modules/input/spaceorb_drv.so
+lib/modules/input/summa_drv.so
+lib/modules/input/tek4957_drv.so
+lib/modules/input/void_drv.so
+lib/modules/input/wacom_drv.so
+%%ALPHA_NA%%lib/modules/libafb.so
+lib/modules/libcfb.so
+lib/modules/libcfb16.so
+lib/modules/libcfb24.so
+lib/modules/libcfb32.so
+lib/modules/libcw.so
+lib/modules/libdamage.so
+lib/modules/libddc.so
+lib/modules/libfb.so
+lib/modules/libi2c.so
+lib/modules/libint10.so
+lib/modules/liblayer.so
+lib/modules/libmfb.so
+lib/modules/libpcidata.so
+lib/modules/librac.so
+lib/modules/libramdac.so
+lib/modules/libscanpci.so
+lib/modules/libshadow.so
+lib/modules/libshadowfb.so
+lib/modules/libvbe.so
+lib/modules/libvgahw.so
+lib/modules/libxaa.so
+lib/modules/libxf1bpp.so
+lib/modules/libxf4bpp.so
+lib/modules/libxf8_16bpp.so
+lib/modules/libxf8_32bpp.so
+%%SPARC64%%lib/modules/libxf8_32wid.so
+lib/modules/multimedia/bt829_drv.so
+lib/modules/multimedia/fi1236_drv.so
+lib/modules/multimedia/msp3430_drv.so
+lib/modules/multimedia/tda8425_drv.so
+lib/modules/multimedia/tda9850_drv.so
+lib/modules/multimedia/tda9885_drv.so
+lib/modules/multimedia/theatre200_drv.so
+lib/modules/multimedia/theatre_detect_drv.so
+lib/modules/multimedia/theatre_drv.so
+lib/modules/multimedia/uda1380_drv.so
 %%SPARC64_NA%%%%PPC_NA%%lib/modules/v10002d.uc
 %%SPARC64_NA%%%%PPC_NA%%lib/modules/v20002d.uc
-@dirrm lib/X11/getconfig
+@dirrm lib/modules/multimedia
+@dirrm lib/modules/internal
+@dirrm lib/modules/input
+@dirrm lib/modules/freebsd
 @dirrm lib/modules/fonts
 @dirrm lib/modules/extensions
-@dirrm lib/modules/freebsd
 @dirrm lib/modules/drivers
-@dirrm lib/modules/input
+@dirrm lib/X11/getconfig
 @unexec rmdir %D/lib/X11/doc 2>/dev/null || true
diff --git a/x11-servers/xorg-server-snap/scripts/configure b/x11-servers/xorg-server-snap/scripts/configure
index 84cf7bd2a73..e210b56ac0b 100644
--- a/x11-servers/xorg-server-snap/scripts/configure
+++ b/x11-servers/xorg-server-snap/scripts/configure
@@ -21,6 +21,7 @@ echo "#define ModInstall YES"			>> $LOCALDEF
 echo "#define XF86Server NO"			>> $LOCALDEF
 echo "#define BuildServersOnly YES"		>> $LOCALDEF
 echo "#define BuildGLXLibrary YES"		>> $LOCALDEF
+echo "#define BuildDevelDRIDrivers YES"		>> $LOCALDEF
 echo "#define UseInstalledPrograms YES"		>> $LOCALDEF
 echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
 echo "#define BuildXFree86ConfigTools YES"	>> $LOCALDEF