diff --git a/x11-drivers/xorgxrdp/Makefile b/x11-drivers/xorgxrdp/Makefile
index 07e2d506d8be..22e8929cce3c 100644
--- a/x11-drivers/xorgxrdp/Makefile
+++ b/x11-drivers/xorgxrdp/Makefile
@@ -5,7 +5,8 @@ PORTREVISION=	0
 CATEGORIES=	x11-drivers
 MASTER_SITES=	https://github.com/neutrinolabs/${PORTNAME}/releases/download/v${DISTVERSION}/ \
 		https://github.com/neutrinolabs/xrdp/releases/download/v${XRDPVER}/:xrdp
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} xrdp-${XRDPVER}${EXTRACT_SUFX}:xrdp
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		xrdp-${XRDPVER}${EXTRACT_SUFX}:xrdp
 DIST_SUBDIR=	xrdp
 
 PATCH_SITES=	https://github.com/neutrinolabs/${GH_PROJECT}/commit/
@@ -17,31 +18,34 @@ WWW=		https://www.xrdp.org/
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	xauth:x11/xauth
 BUILD_DEPENDS=	nasm:devel/nasm
+RUN_DEPENDS=	xauth:x11/xauth
 
 USES=		autoreconf libtool:build localbase pkgconfig xorg
-USE_XORG=	xorgproto xorg-server
 USE_LDCONFIG=	yes
+USE_XORG=	xorg-server xorgproto
 
-XRDPVER=	0.10.3
+XRDPVER=		0.10.3
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	XRDP_CFLAGS=-I${WRKDIR}/xrdp-${XRDPVER}/common
 INSTALL_TARGET=	install-strip
 
-CONFIGURE_ENV=	XRDP_CFLAGS=-I${WRKDIR}/xrdp-${XRDPVER}/common
 CONFLICTS=	xorgxrdp-devel
 
-OPTIONS_DEFINE=	DEBUG DRI3
+OPTIONS_DEFINE=		DEBUG DRI3
 OPTIONS_DEFAULT=	DRI3
 
-DRI3_DESC=	DRI3/Glamor OpenGL Support
-DRI3_CONFIGURE_ENABLE=	glamor
-DRI3_LIB_DEPENDS=	libepoxy.so:graphics/libepoxy
+DRI3_DESC=		DRI3/Glamor OpenGL Support
 DRI3_BUILD_DEPENDS=	${LOCALBASE}/include/libdrm/drm.h:graphics/libdrm
+DRI3_LIB_DEPENDS=	libepoxy.so:graphics/libepoxy
+DRI3_CONFIGURE_ENABLE=	glamor
 DRI3_CFLAGS=		-I${LOCALBASE}/include/libdrm
 DRI3_SUB_FILES=		pkg-message
 
+# Bug 285815
+NO_SHLIB_REQUIRES_GLOB=	libglamoregl.so
+
 post-patch-DEBUG-on:
 	${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e 's|#define LOG_LEVEL [0-9]*|#define LOG_LEVEL 20|'