Index: graphics/mesa-demos/Makefile
===================================================================
--- graphics/mesa-demos/Makefile
+++ graphics/mesa-demos/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mesa-demos
 PORTVERSION=	8.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/demos/ #${PORTVERSION}/
 
@@ -14,12 +14,26 @@
 
 LIB_DEPENDS=	libdrm.so:graphics/libdrm
 
-USES=		gmake gl localbase pkgconfig tar:bzip2 xorg
+USES=		gmake gl localbase pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 USE_GL=		egl gbm gl glesv2 glew glu glut
-USE_XORG=	xorgproto x11 xdamage xext xfixes xi xxf86vm
 
-CONFIGURE_ARGS+=--disable-gles1 --disable-osmesa --disable-vg --disable-wayland \
+OPTIONS_DEFINE=		X11 WAYLAND
+OPTIONS_DEFAULT=	X11 WAYLAND
+OPTIONS_SUB=		yes
+
+X11_CONFIGURE_ENABLE=		x11
+X11_USES=			xorg
+X11_USE=			xorg=x11,xext
+
+WAYLAND_CONFIGURE_ENABLE=	wayland
+
+WAYLAND_USES=			xorg
+WAYLAND_USE=			xorg=x11
+WAYLAND_BUILD_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/wayland-client.pc:graphics/wayland
+WAYLAND_RUN_DEPENDS=		wayland>=0:graphics/wayland
+
+CONFIGURE_ARGS+=--disable-gles1 --disable-osmesa --disable-vg  \
 		--with-system-data-files
 
 .include <bsd.port.mk>
Index: graphics/mesa-demos/pkg-plist
===================================================================
--- graphics/mesa-demos/pkg-plist
+++ graphics/mesa-demos/pkg-plist
@@ -44,14 +44,17 @@
 bin/drawoverhead
 bin/drawpix
 bin/drawrange
-bin/eglgears_x11
+%%X11%%bin/eglgears_x11
+%%WAYLAND%%bin/eglgears_wayland
 bin/eglinfo
 bin/eglkms
-bin/egltri_x11
+%%X11%%bin/egltri_x11
+%%WAYLAND%%bin/egltri_wayland
 bin/engine
-bin/es2_info
-bin/es2gears_x11
-bin/es2tri
+%%X11%%bin/es2_info
+%%X11%%bin/es2gears_x11
+%%WAYLAND%%bin/es2gears_wayland
+%%X11%%bin/es2tri
 bin/fbo_firecube
 bin/fbobind
 bin/fbotexture
@@ -78,20 +81,20 @@
 bin/gloss
 bin/glsl-compile-time
 bin/glslstateschange
-bin/glsync
+%%X11%%bin/glsync
 bin/gltestperf
-bin/glthreads
-bin/glxcontexts
-bin/glxdemo
-bin/glxgears
-bin/glxgears_fbconfig
-bin/glxgears_pixmap
-bin/glxheads
-bin/glxinfo
-bin/glxpbdemo
-bin/glxpixmap
-bin/glxsnoop
-bin/glxswapcontrol
+%%X11%%bin/glthreads
+%%X11%%bin/glxcontexts
+%%X11%%bin/glxdemo
+%%X11%%bin/glxgears
+%%X11%%bin/glxgears_fbconfig
+%%X11%%bin/glxgears_pixmap
+%%X11%%bin/glxheads
+%%X11%%bin/glxinfo
+%%X11%%bin/glxpbdemo
+%%X11%%bin/glxpixmap
+%%X11%%bin/glxsnoop
+%%X11%%bin/glxswapcontrol
 bin/gs-tri
 bin/gsraytrace
 bin/identity
@@ -121,19 +124,19 @@
 bin/lodbias
 bin/long-fixed-func
 bin/mandelbrot
-bin/manywin
+%%X11%%bin/manywin
 bin/morph3d
 bin/multiarb
-bin/multictx
+%%X11%%bin/multictx
 bin/multinoise
 bin/multitex
 bin/noise
 bin/noise2
-bin/offset
-bin/overlay
+%%X11%%bin/offset
+%%X11%%bin/overlay
 bin/paltex
-bin/pbdemo
-bin/pbinfo
+%%X11%%bin/pbdemo
+%%X11%%bin/pbinfo
 bin/peglgears
 bin/pgon-mode
 bin/pixeltest
@@ -183,9 +186,9 @@
 bin/samplers_array
 bin/shadow_sampler
 bin/shadowtex
-bin/shape
-bin/sharedtex
-bin/sharedtex_mt
+%%X11%%bin/shape
+%%X11%%bin/sharedtex
+%%X11%%bin/sharedtex_mt
 bin/shtest
 bin/simplex-noise
 bin/singlebuffer
@@ -204,7 +207,7 @@
 bin/texdemo1
 bin/texenv
 bin/teximage
-bin/texture_from_pixmap
+%%X11%%bin/texture_from_pixmap
 bin/textures
 bin/toyball
 bin/tri
@@ -310,12 +313,12 @@
 bin/vp-tri-tex
 bin/vp-unfilled
 bin/vsraytrace
-bin/wincopy
+%%X11%%bin/wincopy
 bin/winpos
-bin/xeglgears
-bin/xeglthreads
-bin/xfont
-bin/xrotfontdemo
+%%X11%%bin/xeglgears
+%%X11%%bin/xeglthreads
+%%X11%%bin/xfont
+%%X11%%bin/xrotfontdemo
 %%DATADIR%%/arch.rgb
 %%DATADIR%%/bw.rgb
 %%DATADIR%%/geartrain.dat