Consolidate the Mesa ports, update to 17.0.4, and add Wayland option

* libGL, libEGL, libglesv2, libglapi, and gbm have been moved into mesa-libs,
  graphics/dri has been renamed to mesa-dri, and USE_GL has been adjusted
* mesa-libs has a new WAYLAND option that enables platform support in libEGL
* mesa-dri now depends on graphics/s2tc for compressed texture support [1]
* re-remove obsolete dependency on makedepends [2]
* correct sed fix backported from 17.1 [3]

PR:		218799 (exp-run), 212762 [1], 218552 [2], 218562 [3]
Submitted by:	dbn [1], jbeich [2,3]
Reported by:	afiskon@devzen.ru [1]
Reviewed by:	kwm, johalun0@gmail.com
Approved by:	portmgr, swills (mentor)
Differential Revision:  https://reviews.freebsd.org/D10448

4 files changed, 0 insertions, 155 deletions

diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
deleted file mode 100644
index d2bef87d2cb4..000000000000
--- a/graphics/dri/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	dri
-PORTVERSION=	${MESAVERSION}
-PORTEPOCH=	2
-CATEGORIES=	graphics
-
-COMMENT=	OpenGL hardware acceleration drivers for the DRI
-
-LIB_DEPENDS=	libdrm.so:graphics/libdrm \
-		libexpat.so:textproc/expat2
-
-USE_XORG=	dri2proto dri3proto glproto presentproto x11 xdamage xext \
-		xfixes xshmfence xv xvmc xxf86vm 
-
-OPTIONS_DEFINE=	TEXTURE VAAPI VDPAU
-OPTIONS_DEFAULT=TEXTURE
-OPTIONS_SUB=	yes
-
-TEXTURE_DESC=	Enable texture-float support (patent encumbered)
-TEXTURE_CONFIGURE_ENABLE=	texture-float
-
-VAAPI_CONFIGURE_ENABLE=	va
-VAAPI_LIB_DEPENDS=	libva.so:multimedia/libva
-VAAPI_USE=		XORG=xcb
-
-VDPAU_CONFIGURE_ENABLE=	vdpau
-VDPAU_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
-
-PKGHELP=	${.CURDIR}/pkg-help
-
-.include <bsd.port.options.mk>
-
-.include "${.CURDIR}/../../graphics/libGL/Makefile.common"
-
-#src/mesa/libmesagallium.la
-#MESA_BUILD_WRKSRC=	src/util src/gallium
-#MESA_INSTALL_WRKSRC=	src/gallium
-
-.include "${.CURDIR}/../../graphics/libGL/Makefile.targets"
-
-post-install:
-	@${RM} -r ${STAGEDIR}/etc/OpenCL
-
-.include <bsd.port.mk>
diff --git a/graphics/dri/pkg-descr b/graphics/dri/pkg-descr
deleted file mode 100644
index 776a52aaf110..000000000000
--- a/graphics/dri/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-This package contains the current stable release of the client drivers for the
-DRI.  With an X Server configured for the DRI they allow direct rendering of
-hardware-accelerated OpenGL.
-
-WWW: http://dri.sourceforge.net/
diff --git a/graphics/dri/pkg-help b/graphics/dri/pkg-help
deleted file mode 100644
index 03d56b5752d8..000000000000
--- a/graphics/dri/pkg-help
+++ /dev/null
@@ -1,15 +0,0 @@
-VAAPI and VDPAU options enable building Gallium based VA-API and VDPAU
-drivers to decode video on the GPU via libva and libvdpau, respectively.
-Gallium based VAAPI and VDPAU drivers are only available for Radeon GPUs.
-
-Both GPU decode options require newer drm drivers than are currently present
-in a released FreeBSD kernel. These are options for DRM-next and DragonFly.
-
-The TEXTURE option enables texture-float support, which SGI claims requires
-US Patent #6,650,327 [1], filed Jun 16, 1998 thus expiring on Jun 16, 2018.
-Use may require a license depending on jurisdiction, consult a lawyer.
-
-See docs/patents.txt in the Mesa tarball or the following URLs:
-
-[1] https://www.google.com/patents/US6650327
-[2] http://www.opengl.org/registry/specs/ARB/texture_float.txt
diff --git a/graphics/dri/pkg-plist b/graphics/dri/pkg-plist
deleted file mode 100644
index 7e78bd505ee7..000000000000
--- a/graphics/dri/pkg-plist
+++ /dev/null
@@ -1,89 +0,0 @@
-etc/drirc
-@comment include/EGL/egl.h
-@comment include/EGL/eglext.h
-@comment include/EGL/eglextchromium.h
-@comment include/EGL/eglmesaext.h
-@comment include/EGL/eglplatform.h
-@comment include/GL/gl.h
-@comment include/GL/gl_mangle.h
-@comment include/GL/glcorearb.h
-@comment include/GL/glext.h
-@comment include/GL/glx.h
-@comment include/GL/glx_mangle.h
-@comment include/GL/glxext.h
-include/GL/internal/dri_interface.h
-@comment include/GL/osmesa.h
-@comment include/GLES2/gl2.h
-@comment include/GLES2/gl2ext.h
-@comment include/GLES2/gl2platform.h
-@comment include/GLES3/gl3.h
-@comment include/GLES3/gl31.h
-@comment include/GLES3/gl32.h
-@comment include/GLES3/gl3ext.h
-@comment include/GLES3/gl3platform.h
-@comment include/KHR/khrplatform.h
-@comment include/gbm.h
-%%I915_DRIVER%%lib/dri/i915_dri.so
-%%I965_DRIVER%%lib/dri/i965_dri.so
-%%SWRAST_GDRIVER%%lib/dri/kms_swrast_dri.so
-%%R200_DRIVER%%lib/dri/r200_dri.so
-%%R300_GDRIVER%%lib/dri/r300_dri.so
-%%R600_GDRIVER%%lib/dri/r600_dri.so
-%%VAAPI%%%%R600_GDRIVER%%lib/dri/r600_drv_video.so
-%%RADEON_DRIVER%%lib/dri/radeon_dri.so
-%%RADEONSI_GDRIVER%%lib/dri/radeonsi_dri.so
-%%VAAPI%%%%RADEONSI_GDRIVER%%lib/dri/radeonsi_drv_video.so
-%%SWRAST_DRIVER%%lib/dri/swrast_dri.so
-%%SVGA_GDRIVER%%lib/dri/vmwgfx_dri.so
-@comment lib/gallium-pipe/pipe_r300.so
-@comment lib/gallium-pipe/pipe_r600.so
-@comment lib/gallium-pipe/pipe_radeonsi.so
-@comment lib/gallium-pipe/pipe_swrast.so
-@comment lib/gallium-pipe/pipe_vmwgfx.so
-@comment lib/libEGL.so
-@comment lib/libEGL.so.1
-@comment lib/libEGL.so.1.0.0
-@comment lib/libGL.so
-@comment lib/libGL.so.1
-@comment lib/libGL.so.1.2.0
-@comment lib/libGLESv2.so
-@comment lib/libGLESv2.so.2
-@comment lib/libGLESv2.so.2.0.0
-@comment lib/libMesaOpenCL.so
-@comment lib/libMesaOpenCL.so.1
-@comment lib/libMesaOpenCL.so.1.0.0
-@comment lib/libOSMesa.so
-@comment lib/libOSMesa.so.8
-@comment lib/libOSMesa.so.8.0.0
-%%R600_GDRIVER%%lib/libXvMCr600.so
-%%R600_GDRIVER%%lib/libXvMCr600.so.1
-%%R600_GDRIVER%%lib/libXvMCr600.so.1.0
-%%R600_GDRIVER%%lib/libXvMCr600.so.1.0.0
-@comment lib/libgbm.so
-@comment lib/libgbm.so.1
-@comment lib/libgbm.so.1.0.0
-@comment lib/libglapi.so
-@comment lib/libglapi.so.0
-@comment lib/libglapi.so.0.0.0
-%%VDPAU%%%%R300_GDRIVER%%lib/vdpau/libvdpau_r300.so
-%%VDPAU%%%%R300_GDRIVER%%lib/vdpau/libvdpau_r300.so.1
-%%VDPAU%%%%R300_GDRIVER%%lib/vdpau/libvdpau_r300.so.1.0
-%%VDPAU%%%%R300_GDRIVER%%lib/vdpau/libvdpau_r300.so.1.0.0
-%%VDPAU%%%%R600_GDRIVER%%lib/vdpau/libvdpau_r600.so
-%%VDPAU%%%%R600_GDRIVER%%lib/vdpau/libvdpau_r600.so.1
-%%VDPAU%%%%R600_GDRIVER%%lib/vdpau/libvdpau_r600.so.1.0
-%%VDPAU%%%%R600_GDRIVER%%lib/vdpau/libvdpau_r600.so.1.0.0
-%%VDPAU%%%%RADEONSI_GDRIVER%%lib/vdpau/libvdpau_radeonsi.so
-%%VDPAU%%%%RADEONSI_GDRIVER%%lib/vdpau/libvdpau_radeonsi.so.1
-%%VDPAU%%%%RADEONSI_GDRIVER%%lib/vdpau/libvdpau_radeonsi.so.1.0
-%%VDPAU%%%%RADEONSI_GDRIVER%%lib/vdpau/libvdpau_radeonsi.so.1.0.0
-@comment lib/libwayland-egl.so
-@comment lib/libwayland-egl.so.1
-@comment lib/libwayland-egl.so.1.0.0
-libdata/pkgconfig/dri.pc
-@comment libdata/pkgconfig/egl.pc
-@comment libdata/pkgconfig/gbm.pc
-@comment libdata/pkgconfig/gl.pc
-@comment libdata/pkgconfig/glesv2.pc
-@comment libdata/pkgconfig/osmesa.pc
-@comment libdata/pkgconfig/wayland-egl.pc