23 files changed, 0 insertions, 806 deletions

diff --git a/graphics/libGL/Makefile b/graphics/libGL/Makefile
deleted file mode 100644
index fbb085966d6e..000000000000
--- a/graphics/libGL/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	libGL
-PORTVERSION=	${MESAVERSION}
-PORTREVISION=	0
-CATEGORIES=	graphics
-
-COMMENT=	OpenGL library that renders using GLX or DRI
-
-LIB_DEPENDS+=	libdrm.so:graphics/libdrm \
-		libglapi.so:graphics/libglapi \
-		libexpat.so:textproc/expat2
-
-USE_XORG=	dri2proto dri3proto glproto presentproto x11 xcb xdamage xext \
-		xfixes xshmfence xxf86vm
-
-.include <bsd.port.options.mk>
-.include "${.CURDIR}/Makefile.common"
-
-MESA_BUILD_WRKSRC=	src/mapi src/glx
-MESA_INSTALL_WRKSRC=	src/glx
-
-.include "${.CURDIR}/Makefile.targets"
-
-post-install:
-	@cd ${WRKSRC}/src && ${SETENV} DESTDIR=${STAGEDIR} \
-		${MAKE_CMD} install-pkgconfigDATA install-glHEADERS install-glxHEADERS
-
-.include <bsd.port.mk>
diff --git a/graphics/libGL/Makefile.common b/graphics/libGL/Makefile.common
deleted file mode 100644
index 13a6d361f8db..000000000000
--- a/graphics/libGL/Makefile.common
+++ /dev/null
@@ -1,173 +0,0 @@
-# Makefile.common - shared code between MesaLib ports.
-#
-# !!! Here be dragons !!! (they seem to be everywhere these days)
-#
-# Remember to upgrade the following ports everytime you bump MESAVERSION:
-#
-#    - graphics/dri
-#    - graphics/gbm
-#    - graphics/libEGL
-#    - graphics/libGL
-#    - graphics/libglapi
-#    - graphics/libglesv2
-#    - graphics/libosmesa
-#    - lang/clover
-#
-# $FreeBSD$
-
-MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
-MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
-
-MESABASEVERSION=	17.0.3
-# if there is a subversion, don't include the '-' between 7.11-rc2.
-MESASUBVERSION=
-
-MASTER_SITES=	https://mesa.freedesktop.org/archive/ \
-		https://mesa.freedesktop.org/archive/${MESABASEVERSION}/ \
-		ftp://ftp.freedesktop.org/pub/mesa/ \
-		ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/
-
-DISTFILES=	mesa-${MESADISTVERSION}${EXTRACT_SUFX}
-
-MAINTAINER=	x11@FreeBSD.org
-
-BUILD_DEPENDS+=	makedepend:devel/makedepend
-
-USES+=		compiler:c++11-lib bison gettext-tools gmake libtool \
-		localbase pathfix pkgconfig python:2,build shebangfix tar:xz
-USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-
-PKGINSTALL=	${.CURDIR}/pkg-install
-PKGDEINSTALL=	${.CURDIR}/pkg-deinstall
-
-# only have one port to check with portscout.
-.if ${PORTNAME} != libGL
-PORTSCOUT=	ignore:1
-.endif
-
-python_OLD_CMD=	"/usr/bin/env[[:space:]]python"
-python_CMD=	${LOCALBASE}/bin/python2
-SHEBANG_FILES=	src/gallium/*/*/*.py src/gallium/tools/trace/*.py \
-		src/gallium/drivers/svga/svgadump/svga_dump.py \
-		src/mapi/glapi/gen/*.py
-SHEBANG_FILES+=	src/mapi/mapi_abi.py
-
-MASTERDIR=	${.CURDIR}/../../graphics/libGL
-PATCHDIR=	${MASTERDIR}/files
-WRKSRC=		${WRKDIR}/mesa-${MESADISTVERSION}
-DESCR=		${.CURDIR}/pkg-descr
-PLIST=		${.CURDIR}/pkg-plist
-INSTALL_TARGET=	install-strip
-
-COMPONENT=	${PORTNAME:tl:C/^lib//:C/mesa-//}
-
-.if (${ARCH} != sparc64 && ${ARCH} != ia64)	# no working LLVM
-MESA_LLVM_VER?=	40
-LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/llvm${MESA_LLVM_VER}/lib
-.endif
-
-# There are issues that need to be fixed to use TLS model "initial-exec"
-# So stick with "global-dynamic"'s model for now. kan@ is working on a
-# patch for rtld. We might want to backport global-dynamic or
-# pthread_setspecific which it uses now by default. But since this
-# configure switch is going away ...
-# https://lists.freebsd.org/pipermail/freebsd-arch/2016-February/017699.html
-CONFIGURE_ARGS+=	--disable-glx-tls
-
-# libEGL, dri and clover need gallium enabled.
-# the third option in --with-egl-platforms is wayland.
-.if (${MESA_LLVM_VER} != "")
-CONFIGURE_ARGS+=	--enable-egl --with-egl-platforms=x11,drm
-.else
-CONFIGURE_ARGS+=	--disable-egl
-.endif
-
-# we don't care about GLes v1
-CONFIGURE_ARGS+=	--disable-gles1 --enable-gles2
-
-# Clover (OpenCL).
-.if ${OPSYS} == DragonFly || \
-	(${OPSYS} == FreeBSD && \
-		(${ARCH} == amd64 || ${ARCH} == i386))
-
-BUILD_DEPENDS+=	libclc>=0.2.0.20160915:devel/libclc
-
-# We need the clang port too even if it is not used to compile because
-# Clover needs some of the clang includes to build.
-.if ${COMPONENT:Mdri} != "" || ${COMPONENT:Mclover} != "" || ${COMPONENT:Mosmesa} != ""
-_USES_pre_configure+=	290:clover-pre-configure
-
-# .if !exists() evaluates too early before cairo has a chance to be installed
-clover-pre-configure:
-	@if [ -e ${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER} ] && \
-		! [ -e ${LOCALBASE}/bin/clang${MESA_LLVM_VER} ]; then \
-		${ECHO_MSG} "Your llvm${MESA_LLVM_VER} is not build with clang support, which is required."; \
-		${FALSE}; \
-	fi
-.endif
-
-CONFIGURE_ARGS+=	--enable-opencl --enable-opencl-icd
-.else
-CONFIGURE_ARGS+=	--disable-opencl
-.endif
-
-CONFIGURE_ARGS+=	--enable-osmesa --enable-xvmc
-
-# gallium
-.if (${MESA_LLVM_VER} != "")
-BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>=3.9.0_4:devel/llvm${MESA_LLVM_VER}
-.if ${COMPONENT:Mdri} != "" || ${COMPONENT:Mclover} != "" || ${COMPONENT:Megl} != ""
-RUN_DEPENDS+=   llvm${MESA_LLVM_VER}>=3.9.0_4:devel/llvm${MESA_LLVM_VER}
-.endif
-
-CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER}
-
-CONFIGURE_ARGS+=	--enable-gallium-llvm --enable-llvm-shared-libs
-.else
-CONFIGURE_ARGS+=	--disable-gallium-llvm
-.endif
-
-ALL_DRI_DRIVERS=	I915 I965 RADEON R200 SWRAST
-ALL_GALLIUM_DRIVERS=	R300 R600 RADEONSI SVGA SWRAST
-
-.if ${ARCH} == amd64 || ${ARCH} == i386
-DRI_DRIVERS=		I915 I965 RADEON R200
-GALLIUM_DRIVERS=	R300 R600 RADEONSI SVGA
-.endif
-
-.if ${ARCH} == powerpc || ${ARCH} == powerpc64
-DRI_DRIVERS=		RADEON R200
-GALLIUM_DRIVERS=	R300 R600 RADEONSI
-.endif
-
-# software rendering for all arches
-DRI_DRIVERS+=		SWRAST
-GALLIUM_DRIVERS+=	SWRAST
-
-.for _d in ${ALL_DRI_DRIVERS}
-. if ${DRI_DRIVERS:M${_d}}
-PLIST_SUB+=	${_d}_DRIVER=""
-. else
-PLIST_SUB+=	${_d}_DRIVER="@comment "
-. endif
-.endfor
-
-CONFIGURE_ARGS+=--with-dri-drivers="${DRI_DRIVERS:tl}"
-
-.for _gd in ${ALL_GALLIUM_DRIVERS}
-. if ${GALLIUM_DRIVERS:M${_gd}}
-PLIST_SUB+=	${_gd}_GDRIVER=""
-. else
-PLIST_SUB+=	${_gd}_GDRIVER="@comment "
-. endif
-.endfor
-
-.if (${MESA_LLVM_VER} != "")
-CONFIGURE_ARGS+=--with-gallium-drivers="${GALLIUM_DRIVERS:tl}"
-.endif
-
-.if ${OPSYS} == DragonFly
-LIB_DEPENDS+= libelf.so:devel/libelf
-.endif
-
diff --git a/graphics/libGL/Makefile.targets b/graphics/libGL/Makefile.targets
deleted file mode 100644
index 71629e2b156b..000000000000
--- a/graphics/libGL/Makefile.targets
+++ /dev/null
@@ -1,55 +0,0 @@
-# $FreeBSD$
-#
-# this file holds common targets
-
-post-patch:
-.if ${OPSYS} == FreeBSD
-	@${REINPLACE_CMD} -e 's|x86_64|amd64|' \
-		${WRKSRC}/configure
-# Clang 3.4 in 10.x on i386 fails with the following error when using "GCC atomics"
-#
-# glsl/cache.c:613:4: error: cannot compile this atomic library call yet
-#   p_atomic_add(cache->size, size); note: expanded from macro 'p_atomic_add'
-# define p_atomic_add(v, i) (void) __atomic_add_fetch((v), (i), __ATOMIC_ACQ_REL)
-#
-.if ${OSVERSION} < 1100000 && ${ARCH} == "i386"
-	@${REINPLACE_CMD} -e 's|-DUSE_GCC_ATOMIC_BUILTINS||' ${WRKSRC}/configure
-.endif
-.else # ${OPSYS} == DragonFly
-#	Sed on dragonfly doesn't support \< or \>
-	@${REINPLACE_CMD} -e 's|\\>//|[[:>:]]//|' \
-		${WRKSRC}/configure
-.endif # ${OPSYS}
-	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \
-		${WRKSRC}/src/mesa/drivers/dri/common/xmlconfig.c
-	@${REINPLACE_CMD} -e 's|#!/use/bin/python|#!${PYTHON_CMD}|g' \
-		${WRKSRC}/src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py
-	@${REINPLACE_CMD} -e 's|!/use/bin/python2|!${PYTHON_CMD}|g' \
-		${WRKSRC}/src/mesa/main/get_hash_generator.py \
-		${WRKSRC}/src/mapi/glapi/gen/gl_enums.py \
-		${WRKSRC}/src/mapi/glapi/gen/gl_table.py
-
-pre-build: mesa-pre-build
-
-#custom targets so we can build parts of Mesa
-mesa-pre-build:
-# do propper gmake target.
-	@cd ${WRKSRC}/src/mesa/drivers/dri/common/ && ${MAKE_CMD}
-	@cd ${WRKSRC}/src/loader && ${MAKE_CMD}
-# libloader.la
-
-.if defined(MESA_BUILD_WRKSRC)
-do-build:
-. for dir in ${MESA_BUILD_WRKSRC}
-	(cd ${WRKSRC}/${dir}; ${DO_MAKE_BUILD} ${ALL_TARGET};)
-. endfor
-.endif
-
-.if defined(MESA_INSTALL_WRKSRC)
-do-install:
-. for dir in ${MESA_INSTALL_WRKSRC}
-	(cd ${WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
-		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
-. endfor
-.endif
-
diff --git a/graphics/libGL/distinfo b/graphics/libGL/distinfo
deleted file mode 100644
index e8cc973ab76a..000000000000
--- a/graphics/libGL/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1491068637
-SHA256 (mesa-17.0.3.tar.xz) = ca646f5075a002d60ef9123c8a4331cede155c01712ef945a65c59a5e69fe7ed
-SIZE (mesa-17.0.3.tar.xz) = 9485792
diff --git a/graphics/libGL/files/configure.ac b/graphics/libGL/files/configure.ac
deleted file mode 100644
index f5bd08bdf3f9..000000000000
--- a/graphics/libGL/files/configure.ac
+++ /dev/null
@@ -1,78 +0,0 @@
---- configure.ac.orig	2017-04-01 15:33:36 UTC
-+++ configure.ac
-@@ -943,18 +943,19 @@ llvm_add_target() {
- # $1 is the llvm-config command with arguments.
- strip_unwanted_llvm_flags() {
-     # Use \> (marks the end of the word)
--    echo " `$1`" | sed \
--        -e 's/\s\+-m\S*//g' \
--        -e 's/\s\+-DNDEBUG\>//g' \
--        -e 's/\s\+-D_GNU_SOURCE\>//g' \
--        -e 's/\s\+-pedantic\>//g' \
--        -e 's/\s\+-W\S*//g' \
--        -e 's/\s\+-O\S*//g' \
--        -e 's/\s\+-g\S*//g' \
-+    echo " `$1`" | sed -E \
-+        -e 's/[[[:space:]]]+-m[[^[:space:]]]*//g' \
-+        -e 's/[[[:space:]]]+-DNDEBUG\>//g' \
-+        -e 's/[[[:space:]]]+-D_GNU_SOURCE\>//g' \
-+        -e 's/[[[:space:]]]+-pedantic\>//g' \
-+        -e 's/[[[:space:]]]+-W[[^[:space:]]]*//g' \
-+        -e 's/[[[:space:]]]+-O[[^[:space:]]]*//g' \
-+        -e 's/[[[:space:]]]+-g[[^[:space:]]]*//g' \
-         -e 's/-fno-rtti\>/-Fno-rtti/g' \
--        -e 's/\s\+-f\S*//g' \
-+        -e 's/[[[:space:]]]+-f[[^[:space:]]]*//g' \
-         -e 's/-Fno-rtti\>/-fno-rtti/g' \
--        -e 's/^ //'
-+        -e 's/-fno-exceptions\>//g' \
-+        -e 's/^[[[:space:]]]//'
- }
- 
- llvm_set_environment_variables() {
-@@ -1121,7 +1122,7 @@ fi
- AC_SUBST(LIBSENSORS_LIBS)
- 
- case "$host_os" in
--linux*)
-+linux* | freebsd*)
-     dri3_default=yes
-     ;;
- *)
-@@ -1631,7 +1632,7 @@ dnl platform checks. Set DEFINES and LIB
- if test "x$enable_dri" = xyes; then
-     # Platform specific settings and drivers to build
-     case "$host_os" in
--    linux*)
-+    linux* | freebsd*)
-         if test "x$enable_dri3" = xyes; then
-             DEFINES="$DEFINES -DHAVE_DRI3"
-         fi
-@@ -2002,9 +2003,18 @@ if test "x$enable_opencl" = xyes; then
-         AC_MSG_ERROR([cannot enable OpenCL without Gallium])
-     fi
- 
-+    if test "x$acv_mesa_CLANG" = xno; then
-+
-+    GCC_VERSION=`$CC -dumpversion`
-+    if test $? -eq 0; then
-+        GCC_VERSION_MAJOR=`echo $GCC_VERSION | cut -d. -f1`
-+        GCC_VERSION_MINOR=`echo $GCC_VERSION | cut -d. -f2`
-+    fi
-+
-     if test $GCC_VERSION_MAJOR -lt 4 -o $GCC_VERSION_MAJOR -eq 4 -a $GCC_VERSION_MINOR -lt 7; then
-         AC_MSG_ERROR([gcc >= 4.7 is required to build clover])
-     fi
-+    fi # end of clang test
- 
-     if test "x$have_libclc" = xno; then
-         AC_MSG_ERROR([pkg-config cannot find libclc.pc which is required to build clover.
-@@ -2061,8 +2071,6 @@ if test "x$enable_opencl" = xyes; then
-         CLANG_LIBDIR=${LLVM_LIBDIR}
-     fi
-     CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
--    AS_IF([test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"],
--        [AC_MSG_ERROR([Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries.])])
- fi
- AM_CONDITIONAL(HAVE_CLOVER, test "x$enable_opencl" = xyes)
- AM_CONDITIONAL(HAVE_CLOVER_ICD, test "x$enable_opencl_icd" = xyes)
diff --git a/graphics/libGL/files/patch-configure b/graphics/libGL/files/patch-configure
deleted file mode 100644
index 5216c37796bd..000000000000
--- a/graphics/libGL/files/patch-configure
+++ /dev/null
@@ -1,80 +0,0 @@
---- configure.orig	2017-04-01 15:33:50 UTC
-+++ configure
-@@ -22351,18 +22351,19 @@ llvm_add_target() {
- # $1 is the llvm-config command with arguments.
- strip_unwanted_llvm_flags() {
-     # Use \> (marks the end of the word)
--    echo " `$1`" | sed \
--        -e 's/\s\+-m\S*//g' \
--        -e 's/\s\+-DNDEBUG\>//g' \
--        -e 's/\s\+-D_GNU_SOURCE\>//g' \
--        -e 's/\s\+-pedantic\>//g' \
--        -e 's/\s\+-W\S*//g' \
--        -e 's/\s\+-O\S*//g' \
--        -e 's/\s\+-g\S*//g' \
-+    echo " `$1`" | sed -E \
-+        -e 's/[[[:space:]]]+-m[[^[:space:]]]*//g' \
-+        -e 's/[[[:space:]]]+-DNDEBUG\>//g' \
-+        -e 's/[[[:space:]]]+-D_GNU_SOURCE\>//g' \
-+        -e 's/[[[:space:]]]+-pedantic\>//g' \
-+        -e 's/[[[:space:]]]+-W[[^[:space:]]]*//g' \
-+        -e 's/[[[:space:]]]+-O[[^[:space:]]]*//g' \
-+        -e 's/[[[:space:]]]+-g[[^[:space:]]]*//g' \
-         -e 's/-fno-rtti\>/-Fno-rtti/g' \
--        -e 's/\s\+-f\S*//g' \
-+        -e 's/[[[:space:]]]+-f[[^[:space:]]]*//g' \
-         -e 's/-Fno-rtti\>/-fno-rtti/g' \
--        -e 's/^ //'
-+        -e 's/-fno-exceptions\>//g' \
-+        -e 's/^[[[:space:]]]//'
- }
- 
- llvm_set_environment_variables() {
-@@ -22560,7 +22561,7 @@ fi
- 
- 
- case "$host_os" in
--linux*)
-+linux* | freebsd*)
-     dri3_default=yes
-     ;;
- *)
-@@ -24099,7 +24100,7 @@ fi
- if test "x$enable_dri" = xyes; then
-     # Platform specific settings and drivers to build
-     case "$host_os" in
--    linux*)
-+    linux* | freebsd*)
-         if test "x$enable_dri3" = xyes; then
-             DEFINES="$DEFINES -DHAVE_DRI3"
-         fi
-@@ -25851,9 +25852,19 @@ if test "x$enable_opencl" = xyes; then
-         as_fn_error $? "cannot enable OpenCL without Gallium" "$LINENO" 5
-     fi
- 
-+    if test "x$acv_mesa_CLANG" = xno; then
-+
-+    GCC_VERSION=`$CC -dumpversion`
-+    if test $? -eq 0; then
-+        GCC_VERSION_MAJOR=`echo $GCC_VERSION | cut -d. -f1`
-+        GCC_VERSION_MINOR=`echo $GCC_VERSION | cut -d. -f2`
-+    fi
-+
-     if test $GCC_VERSION_MAJOR -lt 4 -o $GCC_VERSION_MAJOR -eq 4 -a $GCC_VERSION_MINOR -lt 7; then
-         as_fn_error $? "gcc >= 4.7 is required to build clover" "$LINENO" 5
-     fi
-+# end of clang test.
-+    fi
- 
-     if test "x$have_libclc" = xno; then
-         as_fn_error $? "pkg-config cannot find libclc.pc which is required to build clover.
-@@ -25916,9 +25927,6 @@ rm -f core conftest.err conftest.$ac_obj
-         CLANG_LIBDIR=${LLVM_LIBDIR}
-     fi
-     CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
--    if test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"; then :
--  as_fn_error $? "Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries." "$LINENO" 5
--fi
- fi
-  if test "x$enable_opencl" = xyes; then
-   HAVE_CLOVER_TRUE=
diff --git a/graphics/libGL/files/patch-include_GL_internal_dri__interface.h b/graphics/libGL/files/patch-include_GL_internal_dri__interface.h
deleted file mode 100644
index 292d66dd6d2b..000000000000
--- a/graphics/libGL/files/patch-include_GL_internal_dri__interface.h
+++ /dev/null
@@ -1,19 +0,0 @@
-GCC on 9.x doesn't allow types to be overwritten, these types are defined
-in drm.h also, which causes build issues in xorg-server.
-
---- include/GL/internal/dri_interface.h.orig	2016-11-10 22:05:17 UTC
-+++ include/GL/internal/dri_interface.h
-@@ -40,13 +40,7 @@
- #ifndef DRI_INTERFACE_H
- #define DRI_INTERFACE_H
- 
--#ifdef HAVE_LIBDRM
- #include <drm.h>
--#else
--typedef unsigned int drm_context_t;
--typedef unsigned int drm_drawable_t;
--typedef struct drm_clip_rect drm_clip_rect_t;
--#endif
- 
- /**
-  * \name DRI interface structures
diff --git a/graphics/libGL/files/patch-src_egl_drivers_dri2_platform__x11.c b/graphics/libGL/files/patch-src_egl_drivers_dri2_platform__x11.c
deleted file mode 100644
index 40c8de0d4a1c..000000000000
--- a/graphics/libGL/files/patch-src_egl_drivers_dri2_platform__x11.c
+++ /dev/null
@@ -1,16 +0,0 @@
-# work-around for https://bugs.freedesktop.org/show_bug.cgi?id=100627
-#
---- src/egl/drivers/dri2/platform_x11.c.orig	2017-04-01 15:33:36 UTC
-+++ src/egl/drivers/dri2/platform_x11.c
-@@ -1507,7 +1507,11 @@
- 
-    if (!getenv("LIBGL_ALWAYS_SOFTWARE")) {
- #ifdef HAVE_DRI3
-+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && !defined (__DRM_NEXT__)
-+      if (getenv("LIBGL_DRI3_ENABLE") && !getenv("LIBGL_DRI3_DISABLE"))
-+#else
-       if (!getenv("LIBGL_DRI3_DISABLE"))
-+#endif
-          initialized = dri2_initialize_x11_dri3(drv, disp);
- #endif
- 
diff --git a/graphics/libGL/files/patch-src_gallium_auxiliary_pipe-loader_pipe__loader__drm.c b/graphics/libGL/files/patch-src_gallium_auxiliary_pipe-loader_pipe__loader__drm.c
deleted file mode 100644
index c1e855d7105b..000000000000
--- a/graphics/libGL/files/patch-src_gallium_auxiliary_pipe-loader_pipe__loader__drm.c
+++ /dev/null
@@ -1,118 +0,0 @@
-Revert the following commit.
-
-FreeBSD and DragonFly don't have the required render nodes.
-
--------
-
-From 69a1b9959e59653da262185c4e2cf57d24939b19 Mon Sep 17 00:00:00 2001
-From: Emil Velikov <emil.l.velikov@gmail.com>
-Date: Mon, 29 Jun 2015 12:36:45 +0100
-Subject: pipe-loader: drop support for non-render node devices
-
-Render nodes have been around for quite some time. Removing support via
-the master/primary node allows us to clean up the conditional
-compilation and simplify the build greatly.
-
-For example currently we the pipe-loader, which explicitly links against
-xcb and friends (for X auth) if found at compile-time. That
-would cause problems as one will be forced to use X/xcb, even if it's a
-headless system that is used for opencl.
-
-v2: Clarify the linking topic in the commit message.
-
-Cc: Tom Stellard <thomas.stellard@amd.com>
-Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
-Reviewed-by: Francisco Jerez <currojerez@riseup.net>
-
-
---- src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c.orig	2017-04-01 15:33:37 UTC
-+++ src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
-@@ -225,6 +225,14 @@ pipe_loader_drm_probe_fd(struct pipe_loa
- }
- 
- static int
-+open_drm_minor(int minor)
-+{
-+   char path[PATH_MAX];
-+   snprintf(path, sizeof(path), DRM_DEV_NAME, DRM_DIR_NAME, minor);
-+   return open(path, O_RDWR, 0);
-+}
-+
-+static int
- open_drm_render_node_minor(int minor)
- {
-    char path[PATH_MAX];
-@@ -236,8 +244,15 @@ open_drm_render_node_minor(int minor)
- int
- pipe_loader_drm_probe(struct pipe_loader_device **devs, int ndev)
- {
--   int i, j, fd;
-+   int i, k, fd, num_render_node_devs;
-+   int j = 0;
-+
-+   struct {
-+      unsigned vendor_id;
-+      unsigned chip_id;
-+   } render_node_devs[DRM_RENDER_NODE_MAX_NODES];
- 
-+   /* Look for render nodes first */
-    for (i = DRM_RENDER_NODE_MIN_MINOR, j = 0;
-         i <= DRM_RENDER_NODE_MAX_MINOR; i++) {
-       struct pipe_loader_device *dev;
-@@ -251,6 +266,9 @@ pipe_loader_drm_probe(struct pipe_loader
-          continue;
-       }
- 
-+      render_node_devs[j].vendor_id = dev->u.pci.vendor_id;
-+      render_node_devs[j].chip_id = dev->u.pci.chip_id;
-+
-       if (j < ndev) {
-          devs[j] = dev;
-       } else {
-@@ -260,6 +278,46 @@ pipe_loader_drm_probe(struct pipe_loader
-       j++;
-    }
- 
-+   num_render_node_devs = j;
-+
-+   /* Next look for drm devices. */
-+   for (i = 0; i < DRM_MAX_MINOR; i++) {
-+      struct pipe_loader_device *dev;
-+      boolean duplicate = FALSE;
-+      fd = open_drm_minor(i);
-+      if (fd < 0)
-+         continue;
-+
-+      if (!pipe_loader_drm_probe_fd(&dev, fd)) {
-+         close(fd);
-+         continue;
-+      }
-+
-+      /* Check to make sure we aren't already accessing this device via
-+       * render nodes.
-+       */
-+      for (k = 0; k < num_render_node_devs; k++) {
-+         if (dev->u.pci.vendor_id == render_node_devs[k].vendor_id &&
-+             dev->u.pci.chip_id == render_node_devs[k].chip_id) {
-+            close(fd);
-+            dev->ops->release(&dev);
-+            duplicate = TRUE;
-+            break;
-+         }
-+      }
-+
-+      if (duplicate)
-+         continue;
-+
-+      if (j < ndev) {
-+         devs[j] = dev;
-+      } else {
-+         dev->ops->release(&dev);
-+      }
-+
-+      j++;
-+   }
-+
-    return j;
- }
- 
diff --git a/graphics/libGL/files/patch-src_gallium_auxiliary_util_u__network.c b/graphics/libGL/files/patch-src_gallium_auxiliary_util_u__network.c
deleted file mode 100644
index 618348e8f474..000000000000
--- a/graphics/libGL/files/patch-src_gallium_auxiliary_util_u__network.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gallium/auxiliary/util/u_network.c.orig	2016-11-10 22:05:17 UTC
-+++ src/gallium/auxiliary/util/u_network.c
-@@ -6,7 +6,7 @@
- #if defined(PIPE_SUBSYSTEM_WINDOWS_USER)
- #  include <winsock2.h>
- #  include <windows.h>
--#elif defined(PIPE_OS_LINUX) || defined(PIPE_OS_HAIKU) || \
-+#elif defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_HAIKU) || \
-    defined(PIPE_OS_APPLE) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_SOLARIS)
- #  include <sys/socket.h>
- #  include <netinet/in.h>
diff --git a/graphics/libGL/files/patch-src_gallium_include_pipe_p__config.h b/graphics/libGL/files/patch-src_gallium_include_pipe_p__config.h
deleted file mode 100644
index 57053969e8c3..000000000000
--- a/graphics/libGL/files/patch-src_gallium_include_pipe_p__config.h
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/gallium/include/pipe/p_config.h.orig	2016-11-10 22:05:17 UTC
-+++ src/gallium/include/pipe/p_config.h
-@@ -76,6 +76,13 @@
- #define PIPE_CC_ICL
- #endif
- 
-+#if defined(__sparc__) || defined(__sparc64__)
-+#define PIPE_ARCH_SPARC
-+#if defined(__sparc64__)
-+#define PIPE_ARCH_SPARC_64
-+#endif
-+#endif
-+
- 
- /*
-  * Processor architecture
-@@ -130,7 +137,7 @@
- 
- #if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64) || defined(PIPE_ARCH_ARM) || defined(PIPE_ARCH_AARCH64)
- #define PIPE_ARCH_LITTLE_ENDIAN
--#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) || defined(PIPE_ARCH_S390)
-+#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) || defined(PIPE_ARCH_S390) || defined(PIPE_ARCH_SPARC) || defined(PIPE_ARCH_SPARC_64)
- #define PIPE_ARCH_BIG_ENDIAN
- #endif
- 
-@@ -159,6 +166,12 @@
- #define PIPE_OS_ANDROID
- #endif
- 
-+#if defined(__DragonFly__)
-+#define PIPE_OS_DRAGONFLY
-+#define PIPE_OS_BSD
-+#define PIPE_OS_UNIX
-+#endif
-+
- #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- #define PIPE_OS_FREEBSD
- #define PIPE_OS_BSD
diff --git a/graphics/libGL/files/patch-src_gallium_state__trackers_clover_llvm_invocation.cpp b/graphics/libGL/files/patch-src_gallium_state__trackers_clover_llvm_invocation.cpp
deleted file mode 100644
index 02b4071cae21..000000000000
--- a/graphics/libGL/files/patch-src_gallium_state__trackers_clover_llvm_invocation.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-# fix errors like the following
-#
-# llvm/invocation.cpp:(.text+0x1275): undefined reference to `std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >::c_str()
- const'
-# /usr/bin/ld: ../../../../src/gallium/state_trackers/clover/.libs/libclover.a(libclllvm_la-invocation.o): relocation R_X86_64_PC32 against `_ZNKSt3__112bas
-ic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE5c_strEv' can not be used when making a shared object; recompile with -fPIC
-# /usr/bin/ld: final link failed: Bad value
-#
---- src/gallium/state_trackers/clover/llvm/invocation.cpp.orig	2017-04-01 15:33:37 UTC
-+++ src/gallium/state_trackers/clover/llvm/invocation.cpp
-@@ -93,6 +93,8 @@ namespace {
-       return ctx;
-    }
- 
-+   const char* cstr(const std::string& str) { return str.c_str(); }
-+
-    std::unique_ptr<clang::CompilerInstance>
-    create_compiler_instance(const target &target,
-                             const std::vector<std::string> &opts,
-@@ -105,8 +107,8 @@ namespace {
-       // Parse the compiler options.  A file name should be present at the end
-       // and must have the .cl extension in order for the CompilerInvocation
-       // class to recognize it as an OpenCL source file.
--      const std::vector<const char *> copts =
--         map(std::mem_fn(&std::string::c_str), opts);
-+      std::vector<const char *> copts;
-+      std::transform(opts.begin(), opts.end(), copts.begin(), cstr);
- 
-       if (!clang::CompilerInvocation::CreateFromArgs(
-              c->getInvocation(), copts.data(), copts.data() + copts.size(), diag))
diff --git a/graphics/libGL/files/patch-src_gallium_state__trackers_clover_llvm_metadata.hpp b/graphics/libGL/files/patch-src_gallium_state__trackers_clover_llvm_metadata.hpp
deleted file mode 100644
index 3254f70fcd62..000000000000
--- a/graphics/libGL/files/patch-src_gallium_state__trackers_clover_llvm_metadata.hpp
+++ /dev/null
@@ -1,13 +0,0 @@
-# Fix error: no matching constructor for initialization of 'std::vector<const ::llvm::MDNode *>' 
-#
---- src/gallium/state_trackers/clover/llvm/metadata.hpp.orig	2016-11-10 22:05:17 UTC
-+++ src/gallium/state_trackers/clover/llvm/metadata.hpp
-@@ -42,7 +42,7 @@ namespace clover {
-          get_kernel_nodes(const ::llvm::Module &mod) {
-             if (const ::llvm::NamedMDNode *n =
-                    mod.getNamedMetadata("opencl.kernels"))
--               return { n->op_begin(), n->op_end() };
-+               return { n->getOperand(0), n->getOperand(n->getNumOperands()) };
-             else
-                return {};
-          }
diff --git a/graphics/libGL/files/patch-src_gallium_state__trackers_clover_util_range.hpp b/graphics/libGL/files/patch-src_gallium_state__trackers_clover_util_range.hpp
deleted file mode 100644
index f54ab0601e9e..000000000000
--- a/graphics/libGL/files/patch-src_gallium_state__trackers_clover_util_range.hpp
+++ /dev/null
@@ -1,31 +0,0 @@
-From b95533b981af9a6687b41418e7cc2a5652fc2bdb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?= <dumbbell@FreeBSD.org>
-Date: Fri, 7 Mar 2014 15:16:08 +0100
-Subject: [PATCH 3/3] Work around for clang 3.4 which fails to build Clover
-
-See:
-  https://bugs.freedesktop.org/show_bug.cgi?id=74098#c3
---- src/gallium/state_trackers/clover/util/range.hpp.orig	2016-11-10 22:05:17 UTC
-+++ src/gallium/state_trackers/clover/util/range.hpp
-@@ -362,6 +362,12 @@ namespace clover {
-       return { i, i + n };
-    }
- 
-+   namespace detail {
-+      template<typename T>
-+      using fixup_function_type =
-+         typename std::conditional<std::is_function<T>::value, T &, T>::type;
-+   }
-+
-    ///
-    /// Create a range by transforming the contents of a number of
-    /// source ranges \a rs element-wise using a provided functor \a f.
-@@ -369,7 +375,7 @@ namespace clover {
-    /// \sa adaptor_range.
-    ///
-    template<typename F, typename... Rs>
--   adaptor_range<F, Rs...>
-+   adaptor_range<detail::fixup_function_type<F>, Rs...>
-    map(F &&f, Rs &&... rs) {
-       return { std::forward<F>(f), std::forward<Rs>(rs)... };
-    }
diff --git a/graphics/libGL/files/patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c b/graphics/libGL/files/patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c
deleted file mode 100644
index bc41ac9d4955..000000000000
--- a/graphics/libGL/files/patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/gallium/winsys/svga/drm/vmw_screen_ioctl.c.orig	2016-11-10 22:05:17 UTC
-+++ src/gallium/winsys/svga/drm/vmw_screen_ioctl.c
-@@ -70,6 +70,11 @@ vmw_region_size(struct vmw_region *regio
-    return region->size;
- }
- 
-+#if defined(__DragonFly__) || defined(__FreeBSD__) || \
-+    defined(__NetBSD__) || defined(__OpenBSD__)
-+#define ERESTART EINTR
-+#endif
-+
- uint32
- vmw_ioctl_context_create(struct vmw_winsys_screen *vws)
- {
diff --git a/graphics/libGL/files/patch-src_glx_glxext.c b/graphics/libGL/files/patch-src_glx_glxext.c
deleted file mode 100644
index 5ce6507416f0..000000000000
--- a/graphics/libGL/files/patch-src_glx_glxext.c
+++ /dev/null
@@ -1,16 +0,0 @@
-# work-around for https://bugs.freedesktop.org/show_bug.cgi?id=100627
-#
---- src/glx/glxext.c.orig	2017-04-01 15:33:37 UTC
-+++ src/glx/glxext.c
-@@ -906,7 +906,11 @@ __glXInitialize(Display * dpy)
- #if defined(GLX_USE_DRM)
-    if (glx_direct && glx_accel) {
- #if defined(HAVE_DRI3)
-+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && !defined (__DRM_NEXT__)
-+      if (getenv("LIBGL_DRI3_ENABLE") && !getenv("LIBGL_DRI3_DISABLE"))
-+#else
-       if (!getenv("LIBGL_DRI3_DISABLE"))
-+#endif
-          dpyPriv->dri3Display = dri3_create_display(dpy);
- #endif /* HAVE_DRI3 */
-       dpyPriv->dri2Display = dri2CreateDisplay(dpy);
diff --git a/graphics/libGL/files/patch-src_intel_tools_aubinator.c b/graphics/libGL/files/patch-src_intel_tools_aubinator.c
deleted file mode 100644
index 206487393420..000000000000
--- a/graphics/libGL/files/patch-src_intel_tools_aubinator.c
+++ /dev/null
@@ -1,14 +0,0 @@
-# We don't have MAP_NORESERVE so use MAP_NOSYNC | MAP_NOCORE and
-# hope for the best (this alloc is too big but it's only a test)
-#
---- src/intel/tools/aubinator.c.orig	2017-04-01 15:33:37 UTC
-+++ src/intel/tools/aubinator.c
-@@ -1299,7 +1299,7 @@ int main(int argc, char *argv[])
-    /* mmap a terabyte for our gtt space. */
-    gtt_size = 1ull << 40;
-    gtt = mmap(NULL, gtt_size, PROT_READ | PROT_WRITE,
--              MAP_PRIVATE | MAP_ANONYMOUS |  MAP_NORESERVE, -1, 0);
-+              MAP_PRIVATE | MAP_ANONYMOUS | MAP_NOSYNC | MAP_NOCORE, -1, 0);
-    if (gtt == MAP_FAILED) {
-       fprintf(stderr, "failed to alloc gtt space: %s\n", strerror(errno));
-       exit(EXIT_FAILURE);
diff --git a/graphics/libGL/files/patch-src_mapi_glapi_gen_gl__gentable.py b/graphics/libGL/files/patch-src_mapi_glapi_gen_gl__gentable.py
deleted file mode 100644
index efbd90d3fc89..000000000000
--- a/graphics/libGL/files/patch-src_mapi_glapi_gen_gl__gentable.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mapi/glapi/gen/gl_gentable.py.orig	2017-01-06 02:14:06 UTC
-+++ src/mapi/glapi/gen/gl_gentable.py
-@@ -44,7 +44,7 @@ header = """/* GLXEXT is the define used
- #endif
- 
- #if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \\
--	|| (!defined(GLXEXT) && defined(DEBUG) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__))
-+	|| (!defined(GLXEXT) && defined(DEBUG) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__))
- #define USE_BACKTRACE
- #endif
- 
diff --git a/graphics/libGL/files/patch-src_mesa_main_compiler.h b/graphics/libGL/files/patch-src_mesa_main_compiler.h
deleted file mode 100644
index ecbf16bcd2b1..000000000000
--- a/graphics/libGL/files/patch-src_mesa_main_compiler.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/mesa/main/compiler.h.orig	2016-11-10 22:05:17 UTC
-+++ src/mesa/main/compiler.h
-@@ -56,6 +56,9 @@ extern "C" {
- #if defined(__linux__)
- #include <byteswap.h>
- #define CPU_TO_LE32( x )	bswap_32( x )
-+#elif defined(__FreeBSD__)
-+#include <sys/endian.h>
-+#define CPU_TO_LE32( x )	bswap32( x )
- #elif defined(__APPLE__)
- #include <CoreFoundation/CFByteOrder.h>
- #define CPU_TO_LE32( x )	CFSwapInt32HostToLittle( x )
diff --git a/graphics/libGL/files/patch-src_util_ralloc.c b/graphics/libGL/files/patch-src_util_ralloc.c
deleted file mode 100644
index 2c3841d38903..000000000000
--- a/graphics/libGL/files/patch-src_util_ralloc.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/util/ralloc.c.orig	2017-04-01 15:33:37 UTC
-+++ src/util/ralloc.c
-@@ -338,6 +338,7 @@ ralloc_parent(const void *ptr)
- 
- static void *autofree_context = NULL;
- 
-+__attribute__((destructor))
- static void
- autofree(void)
- {
-@@ -349,7 +350,6 @@ ralloc_autofree_context(void)
- {
-    if (unlikely(autofree_context == NULL)) {
-       autofree_context = ralloc_context(NULL);
--      atexit(autofree);
-    }
-    return autofree_context;
- }
diff --git a/graphics/libGL/files/patch-src_util_u__endian.h b/graphics/libGL/files/patch-src_util_u__endian.h
deleted file mode 100644
index 67e7bcd093ad..000000000000
--- a/graphics/libGL/files/patch-src_util_u__endian.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/util/u_endian.h.orig	2016-11-10 22:05:17 UTC
-+++ src/util/u_endian.h
-@@ -54,7 +54,7 @@
- # define PIPE_ARCH_BIG_ENDIAN
- #endif
- 
--#elif defined(__OpenBSD__) || defined(__NetBSD__)
-+#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
- #include <sys/types.h>
- #include <machine/endian.h>
- 
diff --git a/graphics/libGL/pkg-descr b/graphics/libGL/pkg-descr
deleted file mode 100644
index eeba29334de5..000000000000
--- a/graphics/libGL/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This package contains the OpenGL library, which can perform rendering over GLX
-or using the Direct Rendering Infrastructure.
-
-WWW: http://www.freedesktop.org/Software/xorg
diff --git a/graphics/libGL/pkg-plist b/graphics/libGL/pkg-plist
deleted file mode 100644
index 88ec363b70f1..000000000000
--- a/graphics/libGL/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-include/GL/gl.h
-include/GL/gl_mangle.h
-include/GL/glcorearb.h
-include/GL/glext.h
-include/GL/glx.h
-include/GL/glx_mangle.h
-include/GL/glxext.h
-lib/libGL.so
-lib/libGL.so.1
-lib/libGL.so.1.2.0
-libdata/pkgconfig/gl.pc