diff --git a/x11/virtualgl/Makefile b/x11/virtualgl/Makefile
index b9da33f39bcf..3e2f0c99cafb 100644
--- a/x11/virtualgl/Makefile
+++ b/x11/virtualgl/Makefile
@@ -1,60 +1,55 @@
 PORTNAME=	virtualgl
-DISTVERSION=	3.0
-PORTREVISION=	1
+DISTVERSION=	3.1
 CATEGORIES=	x11 graphics
+MASTER_SITES=	SF/${PORTNAME}/${DISTVERSION}
+DISTNAME=	VirtualGL-${DISTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Redirects commands from an OpenGL app to another X server
 WWW=		https://www.virtualgl.org
 
 ONLY_FOR_ARCHS=	aarch64 amd64 armv7 i386 powerpc powerpc64 powerpc64le
 
 LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk \
 		libturbojpeg.so:graphics/libjpeg-turbo \
 		libxcb-keysyms.so:x11/xcb-util-keysyms
 
-USES=		cmake compiler:c++11-lang gl xorg
+USES=		cmake compiler:c++11-lang gl localbase xorg
 USE_GL=		egl gl glu
 USE_XORG=	x11 xcb xext xtst
 USE_LDCONFIG=	${PREFIX}/VirtualGL/lib
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	VirtualGL
-
 CMAKE_ARGS=	-DTJPEG_INCLUDE_DIR=${LOCALBASE}/include \
 		-DTJPEG_LIBRARY=${LOCALBASE}/lib/libturbojpeg.so \
 		-DVGL_FAKEXCB=on -DVGL_SYSTEMFLTK=on \
 		-DCMAKE_INSTALL_DOCDIR=${DOCSDIR}
-CFLAGS+=	-I${LOCALBASE}/include
-CXXFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 CMAKE_INSTALL_PREFIX=	${LOCALBASE}/VirtualGL
 
 DOCSDIR=	${LOCALBASE}/VirtualGL/doc
 
 OPTIONS_DEFINE=	OPENCL OPENSSL XVIDEO DOCS
 OPTIONS_DEFAULT=	OPENCL
 OPTIONS_SUB=	yes
 
 OPENCL_CMAKE_BOOL=	VGL_FAKEOPENCL
 OPENCL_BUILD_DEPENDS=	opencl>=0:devel/opencl
 OPENCL_LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd
 OPENCL_DESC=		Build OpenCL interposer library
 
 OPENSSL_CMAKE_BOOL=	VGL_USESSL
 OPENSSL_USES=		ssl
 
 XVIDEO_CMAKE_BOOL=	VGL_USEXV
 XVIDEO_USE=	XORG=xv
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "armv7" || ${ARCH} == "i386" || ${ARCH} == "powerpc"
-PLIST_SUB+=	I386=""
-PLIST_SUB+=	AMD64="@comment "
+PLIST_SUB+=	I386="" \
+		AMD64="@comment "
 .else
-PLIST_SUB+=	I386="@comment "
-PLIST_SUB+=	AMD64=""
+PLIST_SUB+=	I386="@comment " \
+		AMD64=""
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11/virtualgl/distinfo b/x11/virtualgl/distinfo
index b47124a5e2db..1f320f394767 100644
--- a/x11/virtualgl/distinfo
+++ b/x11/virtualgl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1638599825
-SHA256 (VirtualGL-virtualgl-3.0_GH0.tar.gz) = d6e00a8d0596cafa67955d6211e0dab6c8aa8239bd718f7eca6eb0b032711f9b
-SIZE (VirtualGL-virtualgl-3.0_GH0.tar.gz) = 1244021
+TIMESTAMP = 1680779381
+SHA256 (VirtualGL-3.1.tar.gz) = 57bd20a9b1127de344313b6178b19610838a6af6309c059702788e41b6a875d0
+SIZE (VirtualGL-3.1.tar.gz) = 1248818
diff --git a/x11/virtualgl/pkg-plist b/x11/virtualgl/pkg-plist
index 1654d385d108..36ca0d9573a3 100644
--- a/x11/virtualgl/pkg-plist
+++ b/x11/virtualgl/pkg-plist
@@ -1,36 +1,39 @@
 %%AMD64%%VirtualGL/bin/.vglrun.vars64
 %%I386%%VirtualGL/bin/.vglrun.vars32
 VirtualGL/bin/eglinfo
+VirtualGL/bin/eglxinfo
+%%AMD64%%VirtualGL/bin/eglxspheres64
+%%I386%%VirtualGL/bin/eglxspheres
 VirtualGL/bin/glreadtest
 VirtualGL/bin/glxinfo
 %%AMD64%%VirtualGL/bin/glxspheres64
 %%I386%%VirtualGL/bin/glxspheres
 VirtualGL/bin/nettest
 VirtualGL/bin/tcbench
 VirtualGL/bin/vglclient
 VirtualGL/bin/vglconfig
 VirtualGL/bin/vglconnect
 VirtualGL/bin/vglgenkey
 VirtualGL/bin/vgllogin
 VirtualGL/bin/vglrun
 VirtualGL/bin/vglserver_config
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.md
 %%PORTDOCS%%%%DOCSDIR%%/LGPL.txt
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE-FLTK.txt
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
 %%PORTDOCS%%%%DOCSDIR%%/configdialog.gif
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/somerights20.png
 %%PORTDOCS%%%%DOCSDIR%%/sshtunnel.png
 %%PORTDOCS%%%%DOCSDIR%%/subsampling.gif
 %%PORTDOCS%%%%DOCSDIR%%/vgltransport.png
 %%PORTDOCS%%%%DOCSDIR%%/vgltransportservernetwork.png
 %%PORTDOCS%%%%DOCSDIR%%/virtualgl.css
 %%PORTDOCS%%%%DOCSDIR%%/x11transport.png
 VirtualGL/include/rr.h
 VirtualGL/include/rrtransport.h
 VirtualGL/lib/libdlfaker.so
 VirtualGL/lib/libgefaker.so
 VirtualGL/lib/libvglfaker-nodl.so
 %%OPENCL%%VirtualGL/lib/libvglfaker-opencl.so
 VirtualGL/lib/libvglfaker.so