Index: head/graphics/glfw/Makefile
===================================================================
--- head/graphics/glfw/Makefile	(revision 482623)
+++ head/graphics/glfw/Makefile	(revision 482624)
@@ -1,54 +1,59 @@
 # Created by: Rusmir Dusko <nemysis@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	glfw
 PORTVERSION=	3.2.1
 PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
 MAINTAINER=	neel@neelc.org
 COMMENT=	Portable framework for OpenGL development
 
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 USES=		cmake localbase zip
 USE_GL=		glu
 USE_LDCONFIG=	yes
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=	DOCS EXAMPLES WAYLAND
+OPTIONS_DEFINE=	DOCS EXAMPLES
+OPTIONS_DEFAULT=X11
+PLATFORM_DESC=	Window creation platform
+OPTIONS_SINGLE=	PLATFORM
+OPTIONS_SINGLE_PLATFORM=	WAYLAND X11
 OPTIONS_EXCLUDE_FreeBSD_10=	WAYLAND # needs dev/evdev/input.h
 
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>=0:graphics/wayland-protocols
 WAYLAND_CMAKE_BOOL=	GLFW_USE_WAYLAND
 WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/wayland \
 			libxkbcommon.so:x11/libxkbcommon
 WAYLAND_USES=		kde:5 pkgconfig
 WAYLAND_USE=		KDE=ecm
-WAYLAND_USE_OFF=	XORG=x11,xcursor,xinerama,xrandr,xxf86vm
+
+X11_USE=		XORG=x11,xcursor,xinerama,xrandr,xxf86vm
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/docs/html/search
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/html/search/* \
 		${STAGEDIR}${DOCSDIR}/docs/html/search
 	cd ${WRKSRC}/docs/html && ${INSTALL_DATA} *.html *.png *.css *.js \
 		 ${STAGEDIR}${DOCSDIR}/docs/html
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/tests
 	cd ${WRKSRC}/examples && ${INSTALL_PROGRAM} \
 		boing gears heightmap particles simple splitview wave \
 		${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/tests && ${INSTALL_PROGRAM} \
 		clipboard cursor empty events gamma glfwinfo iconify \
 		joysticks monitors msaa reopen sharing tearing \
 		threads title windows \
 		${STAGEDIR}${EXAMPLESDIR}/tests
 
 .include <bsd.port.mk>