From 9787f71de921f5960126f721a66a1f8c21741077 Mon Sep 17 00:00:00 2001
From: Koichiro Iwao <meta@FreeBSD.org>
Date: Wed, 2 Apr 2025 16:26:00 +0900
Subject: [PATCH] x11-drivers/xorgxrdp-devel: Fix build with pkg 2.1.0

Fix suggested by bapt.

While here, reformat Makefile with portfmt, and pet portclippy.

PR:		285815
Reported by:	Anton Saietskii
Sponsored by:	Cybertrust Japan

(cherry picked from commit cfb71f4ea6c6825b49f28e7f0401a5bc2e0fe0a0)
---
 x11-drivers/xorgxrdp-devel/Makefile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/x11-drivers/xorgxrdp-devel/Makefile b/x11-drivers/xorgxrdp-devel/Makefile
index 4e5f88bac5e0..604a9728db50 100644
--- a/x11-drivers/xorgxrdp-devel/Makefile
+++ b/x11-drivers/xorgxrdp-devel/Makefile
@@ -16,32 +16,35 @@ 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=	xorgproto xorg-server
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	neutrinolabs
 GH_TAGNAME=	9698ba0
 GH_TUPLE=	neutrinolabs:xrdp:4c8c773:xrdp
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	XRDP_CFLAGS=-I${WRKSRC_xrdp}/common
 INSTALL_TARGET=	install-strip
 
-CONFIGURE_ENV=	XRDP_CFLAGS=-I${WRKSRC_xrdp}/common
 CONFLICTS=	xorgxrdp
 
 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_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|'