Index: Makefile
===================================================================
--- Makefile	(revision 956)
+++ Makefile	(working copy)
@@ -16,48 +16,28 @@
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-
+USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
 .include <bsd.port.options.mk>
 
 .if defined(WITH_NEW_XORG)
 
-USE_GMAKE=	yes
-
-OPTIONS_DEFINE=	KMS MANPAGES
-OPTIONS_DEFAULT=KMS
-KMS_DESC=	Enable KMS support
-
-.if defined(PACKAGE_BUILDING)
-OPTIONS_DEFAULT+=	MANPAGES
-.endif
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MKMS}
-CONFIGURE_ARGS+=--enable-libkms
-EXTRA_PATCHES+=	${FILESDIR}/extra-xf86drmMode.c
-PLIST_SUB+=	KMS=""
-.else
-PLIST_SUB+=	KMS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMANPAGES}
-BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
-		xsltproc:${PORTSDIR}/textproc/libxslt
-MAN3=		drmAvailable.3 \
-		drmHandleEvent.3 \
-		drmModeGetResources.3
-MAN7=		drm-gem.7 \
-		drm-kms.7 \
-		drm-memory.7 \
-		drm-mm.7 \
-		drm-ttm.7 \
-		drm.7
-.else
+#.if ${PORT_OPTIONS:MMANPAGES}
+#BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
+#		xsltproc:${PORTSDIR}/textproc/libxslt
+#MAN3=		drmAvailable.3 \
+#		drmHandleEvent.3 \
+#		drmModeGetResources.3
+#MAN7=		drm-gem.7 \
+#		drm-kms.7 \
+#		drm-memory.7 \
+#		drm-mm.7 \
+#		drm-ttm.7 \
+#		drm.7
+#.else
 CONFIGURE_ARGS+=--disable-manpages
-.endif
+#.endif
 
 LIBDRM_VERSION=	2.4.45
 LIBDRM_REVISION=0
@@ -65,8 +45,9 @@
 EXTRA_PATCHES+=	${FILESDIR}/extra-configure \
 		${FILESDIR}/extra-tests_modetest_Makefile.in \
 		${FILESDIR}/extra-tests_modetest_modetest.c \
-		${FILESDIR}/extra-tests_modetest_strchrnul.c
-CONFIGURE_ARGS+=--disable-vmwgfx
+		${FILESDIR}/extra-tests_modetest_strchrnul.c \
+		${FILESDIR}/extra-xf86drmMode.c
+CONFIGURE_ARGS+=--disable-vmwgfx --enable-libkms
 .else
 CONFIGURE_ARGS=	--enable-nouveau-experimental-api
 LIBDRM_VERSION=	2.4.17
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 956)
+++ pkg-plist	(working copy)
@@ -38,7 +38,7 @@
 %%NEW%%include/libdrm/savage_drm.h
 %%NEW%%include/libdrm/sis_drm.h
 %%NEW%%include/libdrm/via_drm.h
-%%NEW%%%%KMS%%include/libkms/libkms.h
+%%NEW%%include/libkms/libkms.h
 %%OLD%%include/nouveau/nouveau_bo.h
 %%OLD%%include/nouveau/nouveau_channel.h
 %%OLD%%include/nouveau/nouveau_class.h
@@ -62,15 +62,15 @@
 %%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.la
 %%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so
 %%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so.1
-%%NEW%%%%KMS%%lib/libkms.la
-%%NEW%%%%KMS%%lib/libkms.so
-%%NEW%%%%KMS%%lib/libkms.so.1
+%%NEW%%lib/libkms.la
+%%NEW%%lib/libkms.so
+%%NEW%%lib/libkms.so.1
 libdata/pkgconfig/libdrm.pc
 %%INTEL_DRIVER%%libdata/pkgconfig/libdrm_intel.pc
 libdata/pkgconfig/libdrm_nouveau.pc
 %%NEW%%%%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_radeon.pc
-%%NEW%%%%KMS%%libdata/pkgconfig/libkms.pc
+%%NEW%%libdata/pkgconfig/libkms.pc
 %%OLD%%@dirrm include/nouveau
-%%NEW%%%%KMS%%@dirrm include/libkms
+%%NEW%%@dirrm include/libkms
 %%NEW%%@dirrm include/libdrm
 %%OLD%%@dirrm include/drm