diff --git a/graphics/glx-utils/Makefile b/graphics/glx-utils/Makefile
index 00455c2c7f12..4a14dc3b243e 100644
--- a/graphics/glx-utils/Makefile
+++ b/graphics/glx-utils/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	glx-utils
 DISTVERSIONPREFIX=	${GL_ACCOUNT}-${GL_PROJECT}-
-DISTVERSION=	8.5.0-31
+DISTVERSION=	9.0.0
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -18,14 +18,19 @@ USE_XORG=	x11
 GL_SITE=	https://gitlab.freedesktop.org
 GL_ACCOUNT=	mesa
 GL_PROJECT=	demos
-GL_COMMIT=	f5e202be2d10f58084ad6d115be5196fdd917da3
+GL_COMMIT=	661681767bfb4e8f136aac1fd7934e6b0fa46d29
 WRKSRC_SUBDIR=	src/xdemos
+CFLAGS+=	-ffunction-sections -fdata-sections
+LDFLAGS+=	-Wl,--gc-sections
 PLIST_FILES=	bin/glxgears \
 		bin/glxinfo \
 		${NULL}
 
 do-build:
-	(cd ${WRKSRC} && ${CC} ${CFLAGS} -o glxinfo glxinfo.c glinfo_common.c ${LDFLAGS} -lGL -lX11)
+	(cd ${WRKSRC} && ${CC} ${CFLAGS} -o glxinfo glxinfo.c \
+		-I../util ../util/glinfo_common.c \
+		-I../glad/include ../glad/src/glad.c \
+		${LDFLAGS} -lGL -lX11)
 	(cd ${WRKSRC} && ${CC} ${CFLAGS} -o glxgears glxgears.c ${LDFLAGS} -lGL -lX11 -lm)
 
 do-install:
diff --git a/graphics/glx-utils/distinfo b/graphics/glx-utils/distinfo
index aaf17ec96ea3..c04f43a33122 100644
--- a/graphics/glx-utils/distinfo
+++ b/graphics/glx-utils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1671135859
-SHA256 (mesa-demos-f5e202be2d10f58084ad6d115be5196fdd917da3_GL0.tar.gz) = e67d101e54e8b82f4b2497354863d65091f046dee39f7aeb5dbaaa240fadcd7e
-SIZE (mesa-demos-f5e202be2d10f58084ad6d115be5196fdd917da3_GL0.tar.gz) = 20927932
+TIMESTAMP = 1679487223
+SHA256 (mesa-demos-661681767bfb4e8f136aac1fd7934e6b0fa46d29_GL0.tar.gz) = 003f1195116648b10f20bd576b3e2fe7d1652a618aa86630d1b6a6f014e80d6b
+SIZE (mesa-demos-661681767bfb4e8f136aac1fd7934e6b0fa46d29_GL0.tar.gz) = 20930796