Index: head/x11/xfce4-terminal/Makefile
===================================================================
--- head/x11/xfce4-terminal/Makefile	(revision 450044)
+++ head/x11/xfce4-terminal/Makefile	(revision 450045)
@@ -1,29 +1,28 @@
 # Created by: Matt Lancereau
 # $FreeBSD$
 
 PORTNAME=	xfce4-terminal
-PORTVERSION=	0.8.4
-PORTREVISION=	1
+PORTVERSION=	0.8.6
 CATEGORIES=	x11 xfce
 MASTER_SITES=	XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Terminal emulator for the X windowing system
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 
+USES=		gettext gmake pkgconfig tar:bzip2 xfce:gtk3
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk30 glib20 cairo gdkpixbuf2 intltool vte3 libxml2
 USE_XFCE=	libmenu
 USE_XORG=	x11
-USES=		gettext gmake pkgconfig tar:bzip2 xfce:gk3
 INSTALL_TARGET=	install-strip
 SUB_FILES=	pkg-message
 
 CONFIGURE_ARGS=	--without-gnome-default-appsdir
 
 .include <bsd.port.mk>
Index: head/x11/xfce4-terminal/distinfo
===================================================================
--- head/x11/xfce4-terminal/distinfo	(revision 450044)
+++ head/x11/xfce4-terminal/distinfo	(revision 450045)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486410575
-SHA256 (xfce4/xfce4-terminal-0.8.4.tar.bz2) = c5c1163b30e7a43d56ff92a25193bf9f29ce60e6cf43e5988530df79c84cfdc8
-SIZE (xfce4/xfce4-terminal-0.8.4.tar.bz2) = 934044
+TIMESTAMP = 1500179401
+SHA256 (xfce4/xfce4-terminal-0.8.6.tar.bz2) = bc2a560409a0f0b666d1c557e991748b986ec27572a45ae88b0ee5a480d881d7
+SIZE (xfce4/xfce4-terminal-0.8.6.tar.bz2) = 952859
Index: head/x11/xfce4-terminal/files/patch-terminal_terminal-window.c
===================================================================
--- head/x11/xfce4-terminal/files/patch-terminal_terminal-window.c	(nonexistent)
+++ head/x11/xfce4-terminal/files/patch-terminal_terminal-window.c	(revision 450045)
@@ -0,0 +1,13 @@
+--- terminal/terminal-window.c.orig	2017-07-05 22:57:57 UTC
++++ terminal/terminal-window.c
+@@ -1879,6 +1879,10 @@ title_popover_close (GtkWidget      *pop
+   /* close the dialog */
+   gtk_widget_destroy (window->priv->title_popover);
+   window->priv->title_popover = NULL;
++
++  /* focus the terminal: bug #13754 */
++  if (G_LIKELY (window->priv->active != NULL))
++    terminal_screen_focus (window->priv->active);
+ }
+ 
+ 

Property changes on: head/x11/xfce4-terminal/files/patch-terminal_terminal-window.c
___________________________________________________________________
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: head/x11/xfce4-terminal/files/pkg-message.in
===================================================================
--- head/x11/xfce4-terminal/files/pkg-message.in	(revision 450044)
+++ head/x11/xfce4-terminal/files/pkg-message.in	(revision 450045)
@@ -1,9 +1,17 @@
-To reduce the height of tabs, add the hidden 'MiscSlimTabs' option
-in ~/.config/xfce4/terminal/terminalrc.
+Some options could need manual change to ~/.config/xfce4/terminal/terminalrc:
 
+To reduce the height of tabs, add the hidden 'MiscSlimTabs' option:
+
 MiscSlimTabs=TRUE
 
 By default this option is not defined.
+
+If you have configured a custom color cursor you will also need to add:
+
+ColorCursorUseDefault=FALSE
+
+to have such configuration still working, otherwise reconfigure the color
+in the GUI.
 
 Keep in mind, when you change an option in Preferences window, this file
 is overwritten.