diff --git a/graphics/glew-wayland/Makefile b/graphics/glew-wayland/Makefile
index 91d9b00b9bfd..31ff37e6ab5e 100644
--- a/graphics/glew-wayland/Makefile
+++ b/graphics/glew-wayland/Makefile
@@ -1,40 +1,39 @@
-PORTREVISION=	2
+PORTREVISION=	3
 PKGNAMESUFFIX=	-wayland
 
 # https://github.com/nigels-com/glew/issues/172
 MAINTAINER=	jbeich@FreeBSD.org
 
 MASTERDIR=	${.CURDIR}/../glew
 PLIST=		${.CURDIR}/pkg-plist
 PKGMESSAGE=	${.CURDIR}/pkg-message
 
-USE_GL=		gl egl
+USE_GL=		egl opengl
 USE_XORG=	# empty
 MAKE_ARGS=	NAME=${PORTNAME:tu}${PKGNAMESUFFIX}
 INSTALL_TARGET=	install.lib
 
 OPTIONS_DEFINE=	# empty
 
 post-patch:	slave-post-patch
 slave-post-patch:
-	@${REINPLACE_CMD} 's/Makefile.$$(SYSTEM)/&-egl/' ${WRKSRC}/Makefile
-	@${SED} 's/linux/${OPSYS:tl}/' ${WRKSRC}/config/Makefile.linux-egl \
-		>${WRKSRC}/config/Makefile.${OPSYS:tl}-egl
-	@${REINPLACE_CMD} -e '/^Requires:/d' \
-		-e '/^Name:/s/${PORTNAME}/${PKGBASE}/' \
+	@${REINPLACE_CMD} 's/Makefile.$$(SYSTEM)/&-egl-glvnd/' ${WRKSRC}/Makefile
+	@${SED} 's/linux/${OPSYS:tl}/' ${WRKSRC}/config/Makefile.linux-egl-glvnd \
+		>${WRKSRC}/config/Makefile.${OPSYS:tl}-egl-glvnd
+	@${REINPLACE_CMD} -e '/^Name:/s/${PORTNAME}/${PKGBASE}/' \
 		${WRKSRC}/${PORTNAME}.pc.in
 # GCC 4.2 doesn't support redefining same typedef
 	@${REINPLACE_CMD} '/typedef.*EGLint;/d' ${WRKSRC}/include/GL/eglew.h
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/glewinfo \
 		${STAGEDIR}${PREFIX}/bin/glewinfo${PKGNAMESUFFIX}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/visualinfo \
 		${STAGEDIR}${PREFIX}/bin/visualinfo${PKGNAMESUFFIX}
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/GL
 	${INSTALL_DATA} ${WRKSRC}/include/GL/eglew.h \
 		${STAGEDIR}${PREFIX}/include/GL
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/${PKGBASE}.pc
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/glew/Makefile b/graphics/glew/Makefile
index a89a917fe3cf..f25aa5bc2dec 100644
--- a/graphics/glew/Makefile
+++ b/graphics/glew/Makefile
@@ -1,37 +1,42 @@
 # Created by: Igor Pokrovsky <tiamat@comset.net>
 
 PORTNAME=	glew
 PORTVERSION=	2.2.0
 PORTREVISION?=	3
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
+# Keep glew-wayland patches here to avoid version desync in distinfo
+PATCH_SITES=	https://github.com/nigels-com/${PORTNAME}/commit/
+PATCHFILES+=	8e2e31e69bb6.patch:-p1 # https://github.com/nigels-com/glew/pull/329
+PATCHFILES+=	062067f2bad8.patch:-p1 # https://github.com/nigels-com/glew/pull/330
+
 MAINTAINER?=	zeising@FreeBSD.org
 COMMENT=	OpenGL Extension Wrangler Library
 
 LICENSE=	MIT BSD3CLAUSE
 LICENSE_COMB=	dual
 
 USES=		gmake gl tar:tgz xorg
 USE_XORG?=	x11
 USE_GL?=	gl glu
 USE_LDCONFIG=	yes
 
 MAKE_ENV=	GLEW_DEST=${PREFIX} GLEW_PREFIX=${PREFIX}
 INSTALL_TARGET?=install.all
 
 OPTIONS_DEFINE?=DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|CFLAGS =|CFLAGS +=|' \
 		-e 's|^LIBDIR|GLEW_LIBDIR|' \
 		-e 's|$$(LIBDIR)|$$(GLEW_LIBDIR)|' \
 		${WRKSRC}/Makefile
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in css html jpg png
 	${INSTALL_DATA} ${WRKSRC}/doc/*.${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/graphics/glew/distinfo b/graphics/glew/distinfo
index 97a741f54f32..0f61f19a10a9 100644
--- a/graphics/glew/distinfo
+++ b/graphics/glew/distinfo
@@ -1,3 +1,7 @@
 TIMESTAMP = 1584273239
 SHA256 (glew-2.2.0.tgz) = d4fc82893cfb00109578d0a1a2337fb8ca335b3ceccf97b97e5cc7f08e4353e1
 SIZE (glew-2.2.0.tgz) = 835861
+SHA256 (8e2e31e69bb6.patch) = 27bfa5fd5047603d179ef0fe46601eb10fb3fb522b9736a5f10fc33ea9b5ec04
+SIZE (8e2e31e69bb6.patch) = 668
+SHA256 (062067f2bad8.patch) = 7dc10ff7464e1bcef7bf82c3f3e09f16317ec6b0f3936c1a3079dc1efcd68190
+SIZE (062067f2bad8.patch) = 607