Index: graphics/dri/Makefile
===================================================================
--- graphics/dri/Makefile	(revision 755)
+++ graphics/dri/Makefile	(working copy)
@@ -10,14 +10,17 @@
 COMMENT=	OpenGL hardware acceleration drivers for the DRI
 
 LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm \
-		expat.6:${PORTSDIR}/textproc/expat2
+		expat:${PORTSDIR}/textproc/expat2
 
 USE_PKGCONFIG=	build
 USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto
 
-ALL_DRI_DRIVERS=I810 I915 I965 MACH64 MGA R128 R200 R300 R600 RADEON \
-		SAVAGE SIS SWRAST TDFX UNICHROME
+ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST
 
+.if ! defined(WITH_NEW_XORG)
+ALL_DRI_DRIVERS+=I810 MACH64 MGA R128 R300 R600 SAVAGE SIS TDFX UNICHROME
+.endif
+
 .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
 
 .if ${ARCH} == "ia64"
@@ -27,9 +30,17 @@
 .if ${ARCH} == "amd64" || ${ARCH} == "i386"
 OPTIONS_DEFINE=	${ALL_DRI_DRIVERS}
 .elif ${ARCH} == "powerpc"
+. if defined(WITH_NEW_XORG)
+OPTIONS_DEFINE=	RADEON SWRAST
+. else
 OPTIONS_DEFINE=	MACH64 RADEON SWRAST TDFX
+. endif
 .elif ${ARCH} == "sparc64"
+. if defined(WITH_NEW_XORG)
+OPTIONS_DEIFNE=	RADEON SWRAST
+. else
 OPTIONS_DEFINE=	MACH64 RADEON SWRAST
+. endif
 .endif
 OPTIONS_DEFAULT=${OPTIONS_DEFINE}
 
Index: graphics/dri/pkg-plist
===================================================================
--- graphics/dri/pkg-plist	(revision 755)
+++ graphics/dri/pkg-plist	(working copy)
@@ -1,19 +1,19 @@
 include/GL/internal/dri_interface.h
-%%I810_DRIVER%%lib/dri/i810_dri.so
+%%OLD%%%%I810_DRIVER%%lib/dri/i810_dri.so
 %%I915_DRIVER%%lib/dri/i915_dri.so
 %%I965_DRIVER%%lib/dri/i965_dri.so
-%%MACH64_DRIVER%%lib/dri/mach64_dri.so
-%%MGA_DRIVER%%lib/dri/mga_dri.so
-%%R128_DRIVER%%lib/dri/r128_dri.so
+%%OLD%%%%MACH64_DRIVER%%lib/dri/mach64_dri.so
+%%OLD%%%%MGA_DRIVER%%lib/dri/mga_dri.so
+%%OLD%%%%R128_DRIVER%%lib/dri/r128_dri.so
 %%R200_DRIVER%%lib/dri/r200_dri.so
-%%R300_DRIVER%%lib/dri/r300_dri.so
-%%R600_DRIVER%%lib/dri/r600_dri.so
+%%OLD%%%%R300_DRIVER%%lib/dri/r300_dri.so
+%%OLD%%%%R600_DRIVER%%lib/dri/r600_dri.so
 %%RADEON_DRIVER%%lib/dri/radeon_dri.so
-%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
-%%SIS_DRIVER%%lib/dri/sis_dri.so
+%%OLD%%%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
+%%OLD%%%%SIS_DRIVER%%lib/dri/sis_dri.so
 %%SWRAST_DRIVER%%lib/dri/swrast_dri.so
-%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
-%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
+%%OLD%%%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
+%%OLD%%%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
 libdata/pkgconfig/dri.pc
 @dirrm lib/dri
 @dirrmtry include/GL/internal