Index: graphics/dri/Makefile
===================================================================
--- graphics/dri/Makefile	(revision 325256)
+++ graphics/dri/Makefile	(working copy)
@@ -28,10 +28,10 @@
 
 .if defined(WITH_NEW_XORG)
 OPTIONS_DEFINE_powerpc=	RADEON SWRAST
-OPTIONS_DEFINE_sparc64=	RADEON SWRAST
+OPTIONS_DEFINE_sparc64=	SWRAST
 .else
 OPTIONS_DEFINE_powerpc=	MACH64 RADEON SWRAST TDFX
-OPTIONS_DEFINE_sparc64=	MACH64 RADEON SWRAST
+OPTIONS_DEFINE_sparc64=	MACH64 SWRAST
 .endif
 
 OPTIONS_DEFAULT=${OPTIONS_DEFINE}
Index: graphics/libdrm/Makefile
===================================================================
--- graphics/libdrm/Makefile	(revision 325256)
+++ graphics/libdrm/Makefile	(working copy)
@@ -17,13 +17,15 @@
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-
 .if defined(WITH_NEW_XORG)
 
 USE_GMAKE=	yes
 
-OPTIONS_DEFINE=	KMS MANPAGES
-OPTIONS_DEFAULT=KMS
+OPTIONS_DEFINE=	MANPAGES
+OPTIONS_DEFINE_i386=	KMS
+OPTIONS_DEFAULT_i386=	KMS
+OPTIONS_DEFINE_amd64=	KMS
+OPTIONS_DEFAULT_amd64=	KMS
 KMS_DESC=	Enable KMS support
 
 .if defined(PACKAGE_BUILDING)
@@ -35,9 +37,10 @@
 .if ${PORT_OPTIONS:MKMS}
 CONFIGURE_ARGS+=--enable-libkms
 EXTRA_PATCHES+=	${FILESDIR}/extra-xf86drmMode.c
-PLIST_SUB+=	KMS=""
+PLIST_SUB+=	KMS="" NOUVEAU=""
 .else
-PLIST_SUB+=	KMS="@comment "
+CONFIGURE_ARGS+=--disable-libkms --disable-nouveau
+PLIST_SUB+=	KMS="@comment " NOUVEAU="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMANPAGES}
@@ -68,7 +71,7 @@
 CONFIGURE_ARGS=	--enable-nouveau-experimental-api
 LIBDRM_VERSION=	2.4.17
 LIBDRM_REVISION=1
-PLIST_SUB+=	OLD="" NEW="@comment "
+PLIST_SUB+=	OLD="" NEW="@comment " NOUVEAU=""
 .endif
 
 .include <bsd.port.pre.mk>
Index: graphics/libdrm/pkg-plist
===================================================================
--- graphics/libdrm/pkg-plist	(revision 325256)
+++ graphics/libdrm/pkg-plist	(working copy)
@@ -22,8 +22,9 @@
 %%NEW%%%%INTEL_DRIVER%%include/libdrm/intel_debug.h
 %%NEW%%include/libdrm/mach64_drm.h
 %%NEW%%include/libdrm/mga_drm.h
-%%NEW%%include/libdrm/nouveau.h
+%%NEW%%%%NOUVEAU%%include/libdrm/nouveau.h
 %%NEW%%include/libdrm/nouveau_drm.h
+%%NEW%%include/libdrm/qxl_drm.h
 %%NEW%%include/libdrm/r128_drm.h
 %%NEW%%%%RADEON_DRIVERS%%include/libdrm/r600_pci_ids.h
 %%NEW%%%%RADEON_DRIVERS%%include/libdrm/radeon_bo.h
@@ -54,10 +55,10 @@
 %%INTEL_DRIVER%%lib/libdrm_intel.la
 %%INTEL_DRIVER%%lib/libdrm_intel.so
 %%INTEL_DRIVER%%lib/libdrm_intel.so.1
-lib/libdrm_nouveau.la
-lib/libdrm_nouveau.so
-%%OLD%%lib/libdrm_nouveau.so.1
-%%NEW%%lib/libdrm_nouveau.so.2
+%%NOUVEAU%%lib/libdrm_nouveau.la
+%%NOUVEAU%%lib/libdrm_nouveau.so
+%%OLD%%%%NOUVEAU%%lib/libdrm_nouveau.so.1
+%%NEW%%%%NOUVEAU%%lib/libdrm_nouveau.so.2
 %%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.la
 %%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so
 %%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so.1
@@ -66,7 +67,7 @@
 %%NEW%%%%KMS%%lib/libkms.so.1
 libdata/pkgconfig/libdrm.pc
 %%INTEL_DRIVER%%libdata/pkgconfig/libdrm_intel.pc
-libdata/pkgconfig/libdrm_nouveau.pc
+%%NOUVEAU%%libdata/pkgconfig/libdrm_nouveau.pc
 %%NEW%%%%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_radeon.pc
 %%NEW%%%%KMS%%libdata/pkgconfig/libkms.pc
 %%OLD%%@dirrm include/nouveau