Index: graphics/mesa-demos/Makefile
===================================================================
--- graphics/mesa-demos/Makefile	(revision 426717)
+++ graphics/mesa-demos/Makefile	(working copy)
@@ -9,16 +9,17 @@
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	OpenGL demos distributed with Mesa
 
+LIB_DEPENDS=	libdrm.so:graphics/libdrm
+
 GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig tar:bzip2
-USE_GL=		glew glu glut
+USE_GL=		egl gbm gl glesv2 glew glu glut
 USE_XORG=	dri2proto glproto x11 xdamage xext xfixes xi xxf86vm
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-CONFIGURE_ARGS+=--disable-egl --disable-gbm --disable-gles2 \
-		--disable-osmesa --disable-vg --disable-wayland \
-		--with-system-data-files --disable-freetype2
+CONFIGURE_ARGS+=--disable-osmesa --disable-vg --disable-wayland \
+		--with-system-data-files
 
 .include <bsd.port.mk>
Index: graphics/mesa-demos/files/patch-src-glsl-Makefile.am
===================================================================
--- graphics/mesa-demos/files/patch-src-glsl-Makefile.am	(revision 426717)
+++ graphics/mesa-demos/files/patch-src-glsl-Makefile.am	(working copy)
@@ -1,6 +1,8 @@
---- src/glsl/Makefile.am.orig	2012-12-15 08:17:06.000000000 +0100
-+++ src/glsl/Makefile.am	2013-03-08 14:03:15.236159234 +0100
-@@ -34,7 +34,7 @@
+# Prevent conflict with x11/bitmap
+#
+--- src/glsl/Makefile.am.orig	2014-03-22 12:59:24 UTC
++++ src/glsl/Makefile.am
+@@ -38,7 +38,7 @@ if HAVE_GLUT
  bin_PROGRAMS = \
  	array \
          bezier \
@@ -9,7 +11,7 @@
  	brick \
  	bump \
  	blinking-teapot \
-@@ -76,7 +76,7 @@
+@@ -83,7 +83,7 @@ samplers_array_SOURCES = samplers.c
  samplers_array_CFLAGS = $(AM_CFLAGS) -DSAMPLERS_ARRAY
  
  array_LDADD = ../util/libutil.la
Index: graphics/mesa-demos/files/patch-src-glsl-Makefile.in
===================================================================
--- graphics/mesa-demos/files/patch-src-glsl-Makefile.in	(revision 426717)
+++ graphics/mesa-demos/files/patch-src-glsl-Makefile.in	(working copy)
@@ -1,6 +1,8 @@
---- src/glsl/Makefile.in.orig	2014-07-05 05:13:28.000000000 -0400
-+++ src/glsl/Makefile.in	2015-04-17 16:41:57.556848000 -0400
-@@ -103,7 +103,7 @@
+# Prevent conflict with x11/bitmap
+#
+--- src/glsl/Makefile.in.orig	2015-12-09 21:24:01 UTC
++++ src/glsl/Makefile.in
+@@ -113,7 +113,7 @@ POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
  @HAVE_GLUT_TRUE@bin_PROGRAMS = array$(EXEEXT) bezier$(EXEEXT) \
@@ -9,7 +11,7 @@
  @HAVE_GLUT_TRUE@	blinking-teapot$(EXEEXT) convolutions$(EXEEXT) \
  @HAVE_GLUT_TRUE@	deriv$(EXEEXT) fragcoord$(EXEEXT) \
  @HAVE_GLUT_TRUE@	fsraytrace$(EXEEXT) \
-@@ -149,9 +149,9 @@
+@@ -158,9 +158,9 @@ am__v_lt_1 = 
  bezier_SOURCES = bezier.c
  bezier_OBJECTS = bezier.$(OBJEXT)
  bezier_DEPENDENCIES = ../util/libutil.la
@@ -22,7 +24,7 @@
  blinking_teapot_SOURCES = blinking-teapot.c
  blinking_teapot_OBJECTS = blinking-teapot.$(OBJEXT)
  blinking_teapot_DEPENDENCIES = ../util/libutil.la
-@@ -535,7 +535,7 @@
+@@ -546,7 +546,7 @@ gsraytrace_SOURCES = gsraytrace.cpp
  samplers_array_SOURCES = samplers.c
  samplers_array_CFLAGS = $(AM_CFLAGS) -DSAMPLERS_ARRAY
  array_LDADD = ../util/libutil.la
@@ -31,7 +33,7 @@
  bezier_LDADD = ../util/libutil.la
  brick_LDADD = ../util/libutil.la
  bump_LDADD = ../util/libutil.la
-@@ -684,9 +684,9 @@
+@@ -694,9 +694,9 @@ bezier$(EXEEXT): $(bezier_OBJECTS) $(bez
  	@rm -f bezier$(EXEEXT)
  	$(AM_V_CCLD)$(LINK) $(bezier_OBJECTS) $(bezier_LDADD) $(LIBS)
  
Index: graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.am
===================================================================
--- graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.am	(nonexistent)
+++ graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.am	(working copy)
@@ -0,0 +1,13 @@
+# Install the EGL demos
+#
+--- src/egl/opengl/Makefile.am.orig	2015-12-09 21:04:02 UTC
++++ src/egl/opengl/Makefile.am
+@@ -50,7 +50,7 @@ endif
+ endif
+ 
+ if HAVE_EGL
+-noinst_PROGRAMS = \
++bin_PROGRAMS = \
+ 	eglinfo \
+ 	peglgears \
+ 	$(EGL_DRM_DEMOS) \

Property changes on: graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.am
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: graphics/mesa-demos/files/patch-src_egl_opengl_eglkms.c
===================================================================
--- graphics/mesa-demos/files/patch-src_egl_opengl_eglkms.c	(nonexistent)
+++ graphics/mesa-demos/files/patch-src_egl_opengl_eglkms.c	(working copy)
@@ -0,0 +1,16 @@
+# Fix an uninitialized variable in a particular execution path
+#
+# While it would be better design to set initialize the error
+# value at the start, it is set in every other error path so the
+# least intrusive correction is to set it in the one missed path.
+#
+--- src/egl/opengl/eglkms.c.orig	2016-11-19 13:02:00 UTC
++++ src/egl/opengl/eglkms.c
+@@ -212,6 +212,7 @@ int main(int argc, char *argv[])
+ 
+    if (!eglChooseConfig(dpy, attribs, &config, 1, &n) || n != 1) {
+       fprintf(stderr, "failed to choose argb config\n");
++      ret = -1;
+       goto egl_terminate;
+    }
+    

Property changes on: graphics/mesa-demos/files/patch-src_egl_opengl_eglkms.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: graphics/mesa-demos/files/patch-src_egl_opengles2_es2gears.c
===================================================================
--- graphics/mesa-demos/files/patch-src_egl_opengles2_es2gears.c	(nonexistent)
+++ graphics/mesa-demos/files/patch-src_egl_opengles2_es2gears.c	(working copy)
@@ -0,0 +1,17 @@
+# Provide a fallback for missing sincos()
+#
+--- src/egl/opengles2/es2gears.c.orig	2012-06-25 15:34:58 UTC
++++ src/egl/opengles2/es2gears.c
+@@ -168,6 +168,12 @@ create_gear(GLfloat inner_radius, GLfloa
+    gear->vertices = calloc(VERTICES_PER_TOOTH * teeth, sizeof(*gear->vertices));
+    v = gear->vertices;
+ 
++#ifndef sincos
++#define sincos(__x, _s, _c) do { \
++   float _x = (__x); *(_s) = sin(_x); *(_c) = cos(_x); \
++} while(0)
++#endif
++
+    for (i = 0; i < teeth; i++) {
+       /* Calculate needed sin/cos for varius angles */
+       sincos(i * 2.0 * M_PI / teeth, &s[0], &c[0]);

Property changes on: graphics/mesa-demos/files/patch-src_egl_opengles2_es2gears.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: graphics/mesa-demos/pkg-plist
===================================================================
--- graphics/mesa-demos/pkg-plist	(revision 426717)
+++ graphics/mesa-demos/pkg-plist	(working copy)
@@ -44,7 +44,14 @@
 bin/drawoverhead
 bin/drawpix
 bin/drawrange
+bin/eglgears_x11
+bin/eglinfo
+bin/eglkms
+bin/egltri_x11
 bin/engine
+bin/es2_info
+bin/es2gears_x11
+bin/es2tri
 bin/fbo_firecube
 bin/fbobind
 bin/fbotexture
@@ -126,6 +133,7 @@
 bin/paltex
 bin/pbdemo
 bin/pbinfo
+bin/peglgears
 bin/pgon-mode
 bin/pixeltest
 bin/point
@@ -303,6 +311,8 @@
 bin/vsraytrace
 bin/wincopy
 bin/winpos
+bin/xeglgears
+bin/xeglthreads
 bin/xfont
 bin/xrotfontdemo
 %%DATADIR%%/arch.rgb