Index: graphics/libGLU/Makefile
===================================================================
--- graphics/libGLU/Makefile
+++ graphics/libGLU/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libGLU
 PORTVERSION=	9.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/glu/ \
 		https://mesa.freedesktop.org/archive/glu/
@@ -11,11 +11,23 @@
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	OpenGL utility library
 
-USES=		gl libtool pathfix pkgconfig tar:xz xorg
+USES=		libtool pathfix pkgconfig tar:xz xorg
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static
 INSTALL_TARGET=	install-strip
-USE_GL=		gl
 USE_LDCONFIG=	yes
 
+OPTIONS_DEFINE=		X11
+OPTIONS_DEFAULT=	X11
+
+X11_USES=	gl
+X11_USE=	GL=gl
+
+.include <bsd.port.options.mk>
+
+.if ! ${PORT_OPTIONS:MX11}
+CONFIGURE_ARGS+=--enable-osmesa
+LIB_DEPENDS+=	libOSMesa.so:graphics/libosmesa
+.endif
+
 .include <bsd.port.mk>