diff --git a/Mk/Uses/gl.mk b/Mk/Uses/gl.mk
index 7d71d9724d92..2c6e36d86bd1 100644
--- a/Mk/Uses/gl.mk
+++ b/Mk/Uses/gl.mk
@@ -1,56 +1,57 @@
 # Use OpenGL and related libraries and ports
 # 
 # Feature:	gl
 # Usage:	USES=gl
-#		USE_GL=egl gbm gl glesv1 glesv2 glew glu glut
+#		USE_GL=egl gbm gl glesv1 glesv2 glew glu glut opengl
 #		
 #		USE_GL specifies which GL components to add as dependencies.
 #		Not specifying USE_GL with USES=gl is an error.
 #		USE_GL=yes implies USE_GL=glu.  This is deprecated
 # 
 # MAINTAINER:	x11@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_GL_MK)
 _INCLUDE_USES_GL_MK=yes
 
 _GL_egl_LIB_DEPENDS=		libEGL.so:graphics/${GL_DEFAULT:S/,/ /g:[1]}
 _GL_gbm_LIB_DEPENDS=		libgbm.so:graphics/${GL_DEFAULT:S/,/ /g:[-1]}
 _GL_gl_LIB_DEPENDS=		libGL.so:graphics/${GL_DEFAULT:S/,/ /g:[1]}
 _GL_gl_USE_XORG=		xorgproto
 _GL_glesv1_LIB_DEPENDS=		libGLESv1_CM.so:graphics/${GL_DEFAULT:S/,/ /g:[1]}
 _GL_glesv2_LIB_DEPENDS=		libGLESv2.so:graphics/${GL_DEFAULT:S/,/ /g:[1]}
 _GL_glew_LIB_DEPENDS=		libGLEW.so:graphics/glew
 _GL_glu_LIB_DEPENDS=		libGLU.so:graphics/libGLU
 _GL_glu_USE_XORG=		xorgproto
 _GL_glut_LIB_DEPENDS=		libglut.so:graphics/freeglut
+_GL_opengl_LIB_DEPENDS=		libOpenGL.so:graphics/libglvnd
 
 .if !empty(gl_ARGS)
 IGNORE=	USES=gl takes no arguments
 .endif
 
 .if !defined(USE_GL)
 IGNORE=		need to specify gl component with USE_GL
 .elif ${USE_GL:tl} == yes
 DEV_WARNING+=	"USE_GL=yes is deprecated, please add USE_GL=glu (default) or specify component"
 USE_GL=		glu
 .endif
 
 .for _component in ${USE_GL}
 .if !defined(_GL_${_component}_LIB_DEPENDS)
 IGNORE=		uses unknown GL component
 .else
 USE_XORG+=	${_GL_${_component}_USE_XORG}
 LIB_DEPENDS+=	${_GL_${_component}_LIB_DEPENDS}
 .endif
 .endfor
 
 # We only need to include xorg.mk if we want USE_XORG modules
 # USES+=xorg does not provide any functionality, it just silences an error
 # message about USES=xorg not being set
 .if defined(USE_XORG) && !empty(USE_XORG)
 USES+=		xorg
 .include "${USESDIR}/xorg.mk"
 .endif
 
 # _INCLUDE_USES_GL_MK
 .endif
diff --git a/graphics/libGLU/Makefile b/graphics/libGLU/Makefile
index 122d5b57813b..3f332cd6d995 100644
--- a/graphics/libGLU/Makefile
+++ b/graphics/libGLU/Makefile
@@ -1,21 +1,21 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
 
 PORTNAME=	libGLU
-PORTVERSION=	9.0.1
-PORTREVISION=	1
+PORTVERSION=	9.0.2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/glu/ \
 		https://mesa.freedesktop.org/archive/glu/
 DISTNAME=	glu-${PORTVERSION}
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	OpenGL utility library
 
-USES=		gl libtool pathfix pkgconfig tar:xz xorg
+USES=		gl libtool pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-static
+CONFIGURE_ARGS=	--disable-static \
+		--enable-libglvnd
 INSTALL_TARGET=	install-strip
-USE_GL=		gl
+USE_GL=		opengl
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/libGLU/distinfo b/graphics/libGLU/distinfo
index 3bd4f27487b9..d0b35fda2468 100644
--- a/graphics/libGLU/distinfo
+++ b/graphics/libGLU/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1568738956
-SHA256 (glu-9.0.1.tar.xz) = fb5a4c2dd6ba6d1c21ab7c05129b0769544e1d68e1e3b0ffecb18e73c93055bc
-SIZE (glu-9.0.1.tar.xz) = 434632
+TIMESTAMP = 1624573301
+SHA256 (glu-9.0.2.tar.xz) = 6e7280ff585c6a1d9dfcdf2fca489251634b3377bfc33c29e4002466a38d02d4
+SIZE (glu-9.0.2.tar.xz) = 436176
diff --git a/graphics/libGLU/pkg-descr b/graphics/libGLU/pkg-descr
index 3a7d2e784f7d..54ae846cd8bf 100644
--- a/graphics/libGLU/pkg-descr
+++ b/graphics/libGLU/pkg-descr
@@ -1,3 +1,3 @@
 This package contains the OpenGL utility library.
 
-WWW: http://www.freedesktop.org/Software/xorg
+WWW: https://gitlab.freedesktop.org/mesa/glu
diff --git a/graphics/libGLU/pkg-plist b/graphics/libGLU/pkg-plist
index 5943486f710b..7a4a80087ffe 100644
--- a/graphics/libGLU/pkg-plist
+++ b/graphics/libGLU/pkg-plist
@@ -1,6 +1,5 @@
 include/GL/glu.h
-include/GL/glu_mangle.h
 lib/libGLU.so
 lib/libGLU.so.1
 lib/libGLU.so.1.3.1
 libdata/pkgconfig/glu.pc