diff --git a/games/wmqstat/Makefile b/games/wmqstat/Makefile
index e00f9b4ab464..6cc91b907198 100644
--- a/games/wmqstat/Makefile
+++ b/games/wmqstat/Makefile
@@ -1,35 +1,28 @@
 PORTNAME=	wmqstat
 PORTVERSION=	0.0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games windowmaker
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/wmQStat%20${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dockapp for monitoring of various Internet game servers
 WWW=		http://wmqstat.sourceforge.net/
 
 LICENSE=	GPLv2
 
-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: display
-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: display
-
 RUN_DEPENDS=	qstat:games/qstat
 
 USES=		xorg
 USE_XORG=	xpm x11 xext
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	README
 
 OPTIONS_DEFINE=	DOCS
 
-# Unbreak the build against Clang
-post-patch:
-	@${REINPLACE_CMD} -e 's, inline,,' ${WRKSRC}/wmgeneral/list.h
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/games/wmqstat/files/patch-wmgeneral_list.h b/games/wmqstat/files/patch-wmgeneral_list.h
new file mode 100644
index 000000000000..19d90c2b6bf9
--- /dev/null
+++ b/games/wmqstat/files/patch-wmgeneral_list.h
@@ -0,0 +1,11 @@
+--- wmgeneral/list.h.orig	2003-04-09 19:48:21 UTC
++++ wmgeneral/list.h
+@@ -30,7 +30,7 @@ Boston, MA 02111-1307, USA.  */
+ #define __LIST_H_
+ 
+ #if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+-# define INLINE inline
++# define INLINE
+ #else
+ # define INLINE
+ #endif
diff --git a/games/wmqstat/files/patch-wmgeneral_wmgeneral.c b/games/wmqstat/files/patch-wmgeneral_wmgeneral.c
new file mode 100644
index 000000000000..89b00f4b9c65
--- /dev/null
+++ b/games/wmqstat/files/patch-wmgeneral_wmgeneral.c
@@ -0,0 +1,10 @@
+--- wmgeneral/wmgeneral.c.orig	2022-11-07 08:44:56 UTC
++++ wmgeneral/wmgeneral.c
+@@ -55,6 +55,7 @@
+  /* X11 Variables */
+ /*****************/
+ 
++Display		*display;
+ Window		Root;
+ int			screen;
+ int			x_fd;
diff --git a/games/wmqstat/files/patch-wmgeneral_wmgeneral.h b/games/wmqstat/files/patch-wmgeneral_wmgeneral.h
new file mode 100644
index 000000000000..561104770414
--- /dev/null
+++ b/games/wmqstat/files/patch-wmgeneral_wmgeneral.h
@@ -0,0 +1,11 @@
+--- wmgeneral/wmgeneral.h.orig	2003-04-09 19:48:21 UTC
++++ wmgeneral/wmgeneral.h
+@@ -36,7 +36,7 @@ typedef struct {
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
++extern Display		*display;
+ 
+   /***********************/
+  /* Function Prototypes */