Index: branches/2020Q4/x11-wm/xfce4-wm/Makefile
===================================================================
--- branches/2020Q4/x11-wm/xfce4-wm/Makefile	(revision 555210)
+++ branches/2020Q4/x11-wm/xfce4-wm/Makefile	(revision 555211)
@@ -1,53 +1,54 @@
 # Created by: James Earl <jdearl@telus.net>
 # $FreeBSD$
 
 PORTNAME=	xfce4-wm
-PORTVERSION=	4.14.5
+PORTVERSION=	4.14.6
+PORTREVISION=	1
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	XFCE
 DISTNAME=	xfwm4-${DISTVERSIONFULL}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Xfce's window manager
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libepoxy.so:graphics/libepoxy
 
 USES=		compiler:c11 gettext-tools gmake gnome pkgconfig tar:bzip2 \
 		xfce xorg
 USE_GNOME=	cairo gtk30 intltool libwnck3
 USE_XFCE=	libmenu xfconf
 USE_XORG=	ice sm x11 xcomposite xdamage xext xfixes xi xinerama \
 		xorgproto xpresent xrandr xrender xres
 
 CONFIGURE_ARGS=	--enable-xsync \
 		--enable-render \
 		--enable-randr \
 		--enable-compositor \
 		--enable-xpresent \
 		--disable-kde-systray
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 DATADIR=	${PREFIX}/share/xfwm4
 
 PORTSCOUT=	limitw:1,even
 
 OPTIONS_DEFINE=		NLS STARTUP
 OPTIONS_DEFAULT=	STARTUP
 OPTIONS_SUB=		yes
 
 STARTUP_DESC=		Startup notification
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext-runtime
 
 STARTUP_CONFIGURE_ENABLE=	startup-notification
 STARTUP_LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|Default|Greybird|' \
 		${WRKSRC}/settings-dialogs/xfwm4-settings.c
 
 .include <bsd.port.mk>
Index: branches/2020Q4/x11-wm/xfce4-wm/distinfo
===================================================================
--- branches/2020Q4/x11-wm/xfce4-wm/distinfo	(revision 555210)
+++ branches/2020Q4/x11-wm/xfce4-wm/distinfo	(revision 555211)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1596989339
-SHA256 (xfce4/xfwm4-4.14.5.tar.bz2) = d7a7c63fa42ec6d7cb3caab130d6f496be5bd7689b775d20e8786b7f3e282930
-SIZE (xfce4/xfwm4-4.14.5.tar.bz2) = 1165140
+TIMESTAMP = 1604253744
+SHA256 (xfce4/xfwm4-4.14.6.tar.bz2) = ac6fa8b09d34090fb9ad81d8b7fb0455a10eccf500396b644afa2b9c2444142f
+SIZE (xfce4/xfwm4-4.14.6.tar.bz2) = 1167818
Index: branches/2020Q4/x11-wm/xfce4-wm/files/patch-XKillClient-XError
===================================================================
--- branches/2020Q4/x11-wm/xfce4-wm/files/patch-XKillClient-XError	(nonexistent)
+++ branches/2020Q4/x11-wm/xfce4-wm/files/patch-XKillClient-XError	(revision 555211)
@@ -0,0 +1,24 @@
+diff --git a/src/client.c b/src/client.c
+index c90c7ada710b482a847e80a1e835adf54fe97f34..13acc44f75455b1c9de70255a73cf4457dfb7531 100644
+--- src/client.c
++++ src/client.c
+@@ -2705,10 +2705,18 @@ clientClose (Client *c)
+ void
+ clientKill (Client *c)
+ {
++    ScreenInfo *screen_info;
++    DisplayInfo *display_info;
++
+     g_return_if_fail (c != NULL);
+     TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
+ 
+-    XKillClient (clientGetXDisplay (c), c->window);
++    screen_info = c->screen_info;
++    display_info = screen_info->display_info;
++
++    myDisplayErrorTrapPush (display_info);
++    XKillClient (display_info->dpy, c->window);
++    myDisplayErrorTrapPopIgnored (display_info);
+ }
+ 
+ void

Property changes on: branches/2020Q4/x11-wm/xfce4-wm/files/patch-XKillClient-XError
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q4
===================================================================
--- branches/2020Q4	(revision 555210)
+++ branches/2020Q4	(revision 555211)

Property changes on: branches/2020Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r553863,555201