--- x11-wm/xfce4-wm/Makefile	(revision 555006)
+++ x11-wm/xfce4-wm/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	xfce4-wm
 PORTVERSION=	4.14.6
+PORTREVISION=	1
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	XFCE
 DISTNAME=	xfwm4-${DISTVERSIONFULL}
--- x11-wm/xfce4-wm/files/patch-src_client.c	(nonexistent)
+++ x11-wm/xfce4-wm/files/patch-src_client.c	(working copy)
@@ -0,0 +1,22 @@ 
+--- src/client.c
++++ src/client.c
+@@ -2712,10 +2712,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