diff --git a/x11-toolkits/nanogui/Makefile b/x11-toolkits/nanogui/Makefile
index 74be91453c40..b184a6e91ca8 100644
--- a/x11-toolkits/nanogui/Makefile
+++ b/x11-toolkits/nanogui/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	nanogui
 DISTVERSION=	g20190922
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Minimalistic GUI library for OpenGL
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libglfw.so:graphics/glfw
 
 USES=		cmake compiler:c++14-lang eigen:3,build,run gl xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	wjakob
 GH_TAGNAME=	e9ec8a1a9861cf578d9c6e85a6420080aa715c03
 GH_TUPLE=	wjakob:nanovg:50826f7bf0d910962e6aba2c3310ede889726917:wjakob_nanovg/ext/nanovg
 USE_GL=		gl
 USE_XORG=	x11 xcursor xi xinerama xrandr xxf86vm
 USE_LDCONFIG=	yes
 CMAKE_OFF=	NANOGUI_BUILD_EXAMPLE GLFW_BUILD_EXAMPLES
 
-OPTIONS_DEFINE=	PYTHON
+OPTIONS_DEFINE=		PYTHON
 OPTIONS_DEFAULT=	PYTHON
-OPTIONS_SUB=	yes
+OPTIONS_SUB=		yes
 
 PYTHON_CMAKE_BOOL=	NANOGUI_BUILD_PYTHON
 PYTHON_USES=		python
 PYTHON_BUILD_DEPENDS=	${LOCALBASE}/include/pybind11/pybind11.h:devel/pybind11
 PYTHON_RUN_DEPENDS=	pybind11>0:devel/pybind11
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/ext/nanovg/src/*.h ${STAGEDIR}${PREFIX}/include/nanogui/  # bundled dependency headers aren't installed
 
 post-install-PYTHON-on:
 	@${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 	${MV} ${STAGEDIR}${PREFIX}/lib/nanogui*.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/nanogui/files/patch-ext_nanovg_src_nanovg__gl.h b/x11-toolkits/nanogui/files/patch-ext_nanovg_src_nanovg__gl.h
new file mode 100644
index 000000000000..de10818d8266
--- /dev/null
+++ b/x11-toolkits/nanogui/files/patch-ext_nanovg_src_nanovg__gl.h
@@ -0,0 +1,11 @@
+--- ext/nanovg/src/nanovg_gl.h.orig	2021-10-16 18:18:49 UTC
++++ ext/nanovg/src/nanovg_gl.h
+@@ -113,7 +113,7 @@ enum NVGimageFlagsGL {
+ #include <stdio.h>
+ #include <string.h>
+ #include <math.h>
+-#include "nanovg.h"
++#include <nanovg.h>
+ 
+ enum GLNVGuniformLoc {
+ 	GLNVG_LOC_VIEWSIZE,