Index: head/x11/xnee/Makefile
===================================================================
--- head/x11/xnee/Makefile	(revision 554927)
+++ head/x11/xnee/Makefile	(revision 554928)
@@ -1,61 +1,69 @@
 # Created by: Alexey Dokuchaev <danfe@regency.nsu.ru>
 # $FreeBSD$
 
 PORTNAME=	xnee
 PORTVERSION=	3.19
 PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	GNU
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	zab@zltech.eu
 COMMENT=	X11 events recorder and player
 
 LICENSE=	GPLv3
 
-# Fix build with -fno-common (llvm 11)
-CFLAGS+=	-fcommon
-
-DEPRECATED=	Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
-EXPIRATION_DATE=2021-04-01
-
 GNU_CONFIGURE=	yes
 USES=		gmake pathfix xorg
-USE_XORG=	xtst
+USE_XORG=	x11 xtst
 
 CONFIGURE_ARGS=	--enable-cli --disable-doc --disable-xinput2
 
 INFO=		${PORTNAME}
 
 OPTIONS_DEFINE=	GNEE
 OPTIONS_SUB=	yes
 
 GNEE_DESC=	GUI frontend
 GNEE_CONFIGURE_ENABLE=	gui
 GNEE_USES=	gnome pkgconfig
 GNEE_USE=	GNOME=gtk20
 
 GNEE_DESKTOP_ENTRIES=	"Gnee" "" "${PORTNAME}.png" \
 			"gnee" "Development;" true
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|$${libdir}/gnome-panel|$${prefix}/libexec|g ; \
 		 s|$${libdir}/bonobo/|$${prefix}/libdata/bonobo/|g ; \
 		 s|"CCC"|""|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		's|@PIXMAP_DIR@|pixmap|g ; \
 		 s|@DOC_DIR@||g' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's|make man|$$(MAKE) man|g' ${WRKSRC}/cnee/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's|: install-docDATA|:|g' ${WRKSRC}/cnee/src/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's|$$(libgnomeui_CFLAGS)||g ; \
 		 s|$$(libgnomeui_LIBS)||g' ${WRKSRC}/gnee/src/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's|src test|src|g' ${WRKSRC}/libxnee/Makefile.in
+	@${REINPLACE_CMD} -E 's,} (${_ENUM_NAMES:ts|}),},' \
+		${WRKSRC}/libxnee/include/libxnee/xnee.h \
+		${WRKSRC}/libxnee/include/libxnee/xnee_grab.h \
+		${WRKSRC}/libxnee/include/libxnee/xnee_internal.h \
+		${WRKSRC}/libxnee/include/libxnee/xnee_window.h
+	@${REINPLACE_CMD} -e \
+		's|^xnee_option_t|extern &|' ${WRKSRC}/cnee/src/cnee_demo.c
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/xnee.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
+
+# We must trim the names from enums below to build with -fno-common
+_ENUM_NAMES=	_bool_string_values _cont_proc_commands _return_values \
+		_xnee_grab_modes _xnee_protocol_data_numbers \
+		_xnee_replay_backend _xnee_resolution_states \
+		xnee_data_types xnee_grab_modifiers_control xnee_mode \
+		xnee_option_type xnee_override_display xnee_window_types
 
 .include <bsd.port.mk>