From ad3d2520a12becbcae4a3f8c39621151302218b4 Mon Sep 17 00:00:00 2001
From: landry <landry@openbsd.org>
Date: Sun, 26 Nov 2017 18:59:32 +0000
Subject: [PATCH] Fix WANTLIB (mostly adding Xtst) and bump REVISION

---
 x11/xfce4/garcon/Makefile              | 6 +++---
 x11/xfce4/libxfce4ui/Makefile          | 6 +++---
 x11/xfce4/orage/Makefile               | 6 +++---
 x11/xfce4/parole/Makefile              | 6 +++---
 x11/xfce4/terminal/Makefile            | 6 +++---
 x11/xfce4/xfce4-battery/Makefile       | 6 +++---
 x11/xfce4/xfce4-datetime/Makefile      | 6 +++---
 x11/xfce4/xfce4-dict/Makefile          | 6 +++---
 x11/xfce4/xfce4-diskperf/Makefile      | 6 +++---
 x11/xfce4/xfce4-fsguard/Makefile       | 6 +++---
 x11/xfce4/xfce4-genmon/Makefile        | 5 +++--
 x11/xfce4/xfce4-mount/Makefile         | 6 +++---
 x11/xfce4/xfce4-mpc/Makefile           | 6 +++---
 x11/xfce4/xfce4-netload/Makefile       | 6 +++---
 x11/xfce4/xfce4-panel/Makefile         | 6 +++---
 x11/xfce4/xfce4-power-manager/Makefile | 6 +++---
 x11/xfce4/xfce4-smartbookmark/Makefile | 6 +++---
 x11/xfce4/xfce4-systemload/Makefile    | 6 +++---
 x11/xfce4/xfce4-wavelan/Makefile       | 6 +++---
 x11/xfce4/xfce4-xkb/Makefile           | 6 +++---
 x11/xfce4/xfdashboard/Makefile         | 6 +++---
 21 files changed, 63 insertions(+), 62 deletions(-)

diff --git a/x11/xfce4/garcon/Makefile b/x11/xfce4/garcon/Makefile
index e43d030ddbc..af9a21bdd0f 100644
--- a/x11/xfce4/garcon/Makefile
+++ b/x11/xfce4/garcon/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.21 2017/10/23 17:11:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.22 2017/11/26 18:59:32 landry Exp $
 
 COMMENT =	Xfce4 freedesktop.org compliant menu implementation
 
 XFCE_PROJECT =	garcon
 XFCE_VERSION =	0.6.1
-REVISION=		0
+REVISION=	1
 
 PORTROACH=	limitw:1,even
 
@@ -23,7 +23,7 @@ LIB_DEPENDS =	x11/xfce4/libxfce4util \
 WANTLIB =	xfce4util gio-2.0 gmodule-2.0 glib-2.0 gobject-2.0 gthread-2.0 \
 		pcre pthread z ffi iconv intl
 WANTLIB += ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage Xext
-WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 cairo expat
+WANTLIB += Xfixes Xi Xinerama Xrandr Xrender Xtst atk-1.0 cairo expat
 WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 graphite2
 WANTLIB += gtk-x11-2.0 harfbuzz m pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pixman-1 png startup-notification-1 xcb
diff --git a/x11/xfce4/libxfce4ui/Makefile b/x11/xfce4/libxfce4ui/Makefile
index 4f605275123..7f66b6532cc 100644
--- a/x11/xfce4/libxfce4ui/Makefile
+++ b/x11/xfce4/libxfce4ui/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.26 2017/10/23 17:11:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.27 2017/11/26 18:59:32 landry Exp $
 
 COMMENT=	Xfce4 widget library
 
 XFCE_VERSION=	4.12.1
 XFCE_PROJECT=	libxfce4ui
-REVISION=	4
+REVISION=	5
 
 PORTROACH=	limitw:1,even
 
@@ -19,7 +19,7 @@ HOMEPAGE=	http://www.xfce.org/projects/libraries
 PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage Xext Xfixes Xi
-WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi c cairo
+WANTLIB += Xinerama Xrandr Xrender Xtst atk-1.0 atk-bridge-2.0 atspi c cairo
 WANTLIB += cairo-gobject dbus-1 dbus-glib-1 epoxy expat ffi fontconfig
 WANTLIB += freetype gdk-3 gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
 WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
diff --git a/x11/xfce4/orage/Makefile b/x11/xfce4/orage/Makefile
index 7a76a0124fd..f0e1c392d70 100644
--- a/x11/xfce4/orage/Makefile
+++ b/x11/xfce4/orage/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.53 2017/11/08 05:38:08 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.54 2017/11/26 18:59:32 landry Exp $
 
 COMMENT=	Xfce4 advanced calendar
 
 XFCE_GOODIE=	orage
 XFCE_VERSION=	4.12.1
-REVISION=	3
+REVISION=	4
 
 HOMEPAGE=	http://www.kolumbus.fi/~w408237/orage/
 # GPLv2
@@ -27,6 +27,6 @@ WANTLIB=	X11 Xcomposite Xcursor Xdamage Xext xcb-render \
 		pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread \
 		xfce4util z xcb ical icalss icalvcal popt ffi \
 		xcb-shm xfce4panel-1.0 notify dbus-1 dbus-glib-1 graphite2 \
-		harfbuzz icui18n icuuc iconv intl
+		harfbuzz icui18n icuuc iconv intl ${COMPILER_LIBCXX} db icudata
 
 .include <bsd.port.mk>
diff --git a/x11/xfce4/parole/Makefile b/x11/xfce4/parole/Makefile
index b2173976e62..0b181b7a82f 100644
--- a/x11/xfce4/parole/Makefile
+++ b/x11/xfce4/parole/Makefile
@@ -1,17 +1,17 @@
-# $OpenBSD: Makefile,v 1.43 2017/10/23 17:11:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.44 2017/11/26 18:59:32 landry Exp $
 
 COMMENT =	Xfce4 media player
 
 XFCE_VERSION =	0.9.2
 XFCE_GOODIE =	parole
 CATEGORIES +=	audio
-REVISION =	1
+REVISION =	2
 
 # GPLv2
 PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage Xext Xfixes Xi
-WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi c cairo
+WANTLIB += Xinerama Xrandr Xrender Xtst atk-1.0 atk-bridge-2.0 atspi c cairo
 WANTLIB += cairo-gobject dbus-1 dbus-glib-1 epoxy expat ffi fontconfig
 WANTLIB += freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB += gobject-2.0 graphite2 gstaudio-1.0 gstbase-1.0 gstpbutils-1.0
diff --git a/x11/xfce4/terminal/Makefile b/x11/xfce4/terminal/Makefile
index 83b5882a593..5728cd4db3d 100644
--- a/x11/xfce4/terminal/Makefile
+++ b/x11/xfce4/terminal/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.56 2017/10/23 17:11:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.57 2017/11/26 18:59:32 landry Exp $
 
 COMMENT=	Xfce4 vte-based terminal
 
 XFCE_VERSION=	0.8.6
 XFCE_GOODIE=	xfce4-terminal
-REVISION=	0
+REVISION=	1
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
@@ -17,7 +17,7 @@ LIB_DEPENDS=	x11/xfce4/libxfce4ui \
 
 WANTLIB=	X11 X11-xcb atk-1.0 c gdk_pixbuf-2.0 gio-2.0 \
 		ICE SM Xcomposite Xcursor Xdamage Xext Xfixes \
-		Xi Xinerama Xrandr Xrender cairo expat fontconfig freetype \
+		Xi Xinerama Xrandr Xrender Xtst cairo expat fontconfig freetype \
 		gmodule-2.0 gthread-2.0 m pangocairo-1.0 \
 		pangoft2-1.0 pcre pixman-1 png pthread \
 		xcb xcb-render xcb-shm z xcb-util pcre2-8 iconv intl \
diff --git a/x11/xfce4/xfce4-battery/Makefile b/x11/xfce4/xfce4-battery/Makefile
index e7a277bc6f2..433579c6072 100644
--- a/x11/xfce4/xfce4-battery/Makefile
+++ b/x11/xfce4/xfce4-battery/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.47 2017/10/23 17:11:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.48 2017/11/26 18:59:32 landry Exp $
 
 ONLY_FOR_ARCHS=	${APM_ARCHS}
 
@@ -6,14 +6,14 @@ COMMENT=	Xfce4 battery monitor panel plugin
 
 XFCE_VERSION=	1.1.0
 XFCE_PLUGIN=	battery
-REVISION =	1
+REVISION =	2
 
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
 MODXFCE_WANTLIB =	xfce4panel-2.0
 
 WANTLIB+= ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage
-WANTLIB+= Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 cairo
+WANTLIB+= Xext Xfixes Xi Xinerama Xrandr Xrender Xtst atk-1.0 cairo
 WANTLIB+= expat ffi fontconfig freetype gdk_pixbuf-2.0
 WANTLIB+= gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0
 WANTLIB+= harfbuzz m pango-1.0 pangocairo-1.0 pangoft2-1.0
diff --git a/x11/xfce4/xfce4-datetime/Makefile b/x11/xfce4/xfce4-datetime/Makefile
index 78c6f27a9e2..1105e9a1727 100644
--- a/x11/xfce4/xfce4-datetime/Makefile
+++ b/x11/xfce4/xfce4-datetime/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.17 2017/10/23 17:11:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.18 2017/11/26 18:59:32 landry Exp $
 
 COMMENT=	Xfce4 datetime and calendar plugin
 
 XFCE_VERSION=	0.7.0
 XFCE_PLUGIN=	datetime
-REVISION =	1
+REVISION =	2
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
@@ -13,7 +13,7 @@ MODULES=	x11/xfce4
 MODXFCE_WANTLIB =	xfce4panel-2.0
 
 WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender atk-1.0 cairo expat fontconfig freetype
+WANTLIB += Xrandr Xrender Xtst atk-1.0 cairo expat fontconfig freetype
 WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB += gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 pixman-1 png xcb
diff --git a/x11/xfce4/xfce4-dict/Makefile b/x11/xfce4/xfce4-dict/Makefile
index 480a6f1d411..68652d5cc56 100644
--- a/x11/xfce4/xfce4-dict/Makefile
+++ b/x11/xfce4/xfce4-dict/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.40 2017/10/23 17:11:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.41 2017/11/26 18:59:32 landry Exp $
 
 COMMENT=	Xfce4 dictionary application
 
 XFCE_VERSION=	0.8.0
 XFCE_GOODIE=	xfce4-dict
-REVISION=	0
+REVISION=	1
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
@@ -17,7 +17,7 @@ MODXFCE_PURGE_LA =	lib/xfce4/panel/plugins
 LIB_DEPENDS=	x11/xfce4/xfce4-panel
 
 WANTLIB += ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage
-WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender iconv intl
+WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xtst iconv intl
 WANTLIB += atk-1.0 c cairo expat ffi fontconfig freetype
 WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
 WANTLIB += gthread-2.0 m pango-1.0 pangocairo-1.0
diff --git a/x11/xfce4/xfce4-diskperf/Makefile b/x11/xfce4/xfce4-diskperf/Makefile
index 8b062eaefb6..5049139cc1e 100644
--- a/x11/xfce4/xfce4-diskperf/Makefile
+++ b/x11/xfce4/xfce4-diskperf/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.39 2017/10/23 17:11:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.40 2017/11/26 18:59:32 landry Exp $
 
 COMMENT=	Xfce4 disk performance panel plugin
 
 XFCE_VERSION=	2.6.1
 XFCE_PLUGIN=	diskperf
-REVISION=	0
+REVISION=	1
 
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
@@ -13,7 +13,7 @@ MODULES=	x11/xfce4
 MODXFCE_WANTLIB =	xfce4panel-2.0
 
 WANTLIB += ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage
-WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender
+WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xtst
 WANTLIB += atk-1.0 cairo expat ffi fontconfig freetype
 WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
 WANTLIB += gthread-2.0 m pango-1.0 pangocairo-1.0 iconv intl
diff --git a/x11/xfce4/xfce4-fsguard/Makefile b/x11/xfce4/xfce4-fsguard/Makefile
index 37577de0fd5..b9a08ae0507 100644
--- a/x11/xfce4/xfce4-fsguard/Makefile
+++ b/x11/xfce4/xfce4-fsguard/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.43 2017/10/23 17:11:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.44 2017/11/26 18:59:32 landry Exp $
 
 COMMENT =	Xfce4 disk usage monitor panel plugin
 
 XFCE_VERSION =	1.1.0
 XFCE_PLUGIN =	fsguard
-REVISION =	1
+REVISION =	2
 
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
@@ -15,7 +15,7 @@ MODXFCE_ICON_CACHE=	Yes
 MODXFCE_WANTLIB =	xfce4panel-2.0
 
 WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender atk-1.0 cairo expat fontconfig freetype
+WANTLIB += Xrandr Xrender Xtst atk-1.0 cairo expat fontconfig freetype
 WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB += gobject-2.0 m pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 pixman-1 png xcb
diff --git a/x11/xfce4/xfce4-genmon/Makefile b/x11/xfce4/xfce4-genmon/Makefile
index e26c4521c6d..e9359c12b34 100644
--- a/x11/xfce4/xfce4-genmon/Makefile
+++ b/x11/xfce4/xfce4-genmon/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.26 2017/10/29 18:44:40 landry Exp $
+# $OpenBSD: Makefile,v 1.27 2017/11/26 18:59:32 landry Exp $
 
 COMMENT=	Xfce4 generic scriptable monitor panel plugin
 
 XFCE_VERSION=	4.0.1
 XFCE_PLUGIN=	genmon
+REVISION=	0
 
 # LGPLv2
 PERMIT_PACKAGE_CDROM=	Yes
@@ -12,7 +13,7 @@ MODULES=	x11/xfce4
 MODXFCE_WANTLIB =	xfce4panel-2.0
 
 WANTLIB += ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage
-WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 cairo
+WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xtst atk-1.0 cairo
 WANTLIB += expat ffi fontconfig freetype gdk_pixbuf-2.0
 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
 WANTLIB += gthread-2.0 harfbuzz m pango-1.0 pangocairo-1.0
diff --git a/x11/xfce4/xfce4-mount/Makefile b/x11/xfce4/xfce4-mount/Makefile
index 1f18891b4a1..01fa921c6c3 100644
--- a/x11/xfce4/xfce4-mount/Makefile
+++ b/x11/xfce4/xfce4-mount/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.20 2017/10/23 17:11:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.21 2017/11/26 18:59:32 landry Exp $
 
 COMMENT=	Xfce4 mount device panel plugin
 
 XFCE_VERSION=	1.1.2
 XFCE_PLUGIN=	mount
-REVISION=	0
+REVISION=	1
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
@@ -15,7 +15,7 @@ MODXFCE_ICON_CACHE=	Yes
 MODXFCE_WANTLIB=	xfce4panel-2.0
 
 WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender atk-1.0 cairo expat fontconfig freetype
+WANTLIB += Xrandr Xrender Xtst atk-1.0 cairo expat fontconfig freetype
 WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB += atk-bridge-2.0 atspi cairo-gobject dbus-1 epoxy gdk-3 gtk-3
 WANTLIB += gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0
diff --git a/x11/xfce4/xfce4-mpc/Makefile b/x11/xfce4/xfce4-mpc/Makefile
index 26876f5dffd..78b4749cd79 100644
--- a/x11/xfce4/xfce4-mpc/Makefile
+++ b/x11/xfce4/xfce4-mpc/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.29 2017/10/23 17:11:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.30 2017/11/26 18:59:32 landry Exp $
 
 COMMENT=	Xfce4 mpd client panel plugin
 
 XFCE_VERSION=	0.5.0
 XFCE_PLUGIN=	mpc
-REVISION =	1
+REVISION =	2
 
 # BSD-ISC
 PERMIT_PACKAGE_CDROM=	Yes
@@ -15,7 +15,7 @@ CONFIGURE_ARGS=	--without-libmpd
 MODXFCE_WANTLIB=	xfce4panel-2.0
 
 WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender atk-1.0 cairo expat fontconfig pcre
+WANTLIB += Xrandr Xrender Xtst atk-1.0 cairo expat fontconfig pcre
 WANTLIB += freetype gdk_pixbuf-2.0 gio-2.0 glib-2.0
 WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 m pango-1.0
 WANTLIB += pangocairo-1.0 pangoft2-1.0 pixman-1 png
diff --git a/x11/xfce4/xfce4-netload/Makefile b/x11/xfce4/xfce4-netload/Makefile
index 1f339bae706..a55d775d3c9 100644
--- a/x11/xfce4/xfce4-netload/Makefile
+++ b/x11/xfce4/xfce4-netload/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.41 2017/10/23 17:11:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.42 2017/11/26 18:59:32 landry Exp $
 
 COMMENT=	Xfce4 network load monitor panel plugin
 
 XFCE_VERSION=	1.3.1
 XFCE_PLUGIN=	netload
-REVISION=	0
+REVISION=	1
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
@@ -15,7 +15,7 @@ MODXFCE_ICON_CACHE=	Yes
 MODXFCE_WANTLIB=	xfce4panel-2.0
 
 WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender atk-1.0 cairo expat fontconfig freetype
+WANTLIB += Xrandr Xrender Xtst atk-1.0 cairo expat fontconfig freetype
 WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB += gobject-2.0 m pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 pixman-1 png pthread xcb
diff --git a/x11/xfce4/xfce4-panel/Makefile b/x11/xfce4/xfce4-panel/Makefile
index c18ac28a1c6..9c6738f32a8 100644
--- a/x11/xfce4/xfce4-panel/Makefile
+++ b/x11/xfce4/xfce4-panel/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.65 2017/10/23 17:11:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.66 2017/11/26 18:59:32 landry Exp $
 
 COMMENT=	Xfce4 desktop panel
 
 XFCE_PROJECT=	xfce4-panel
 XFCE_VERSION=	4.12.1
-REVISION =	1
+REVISION =	2
 
 PORTROACH=	limitw:1,even
 
@@ -15,7 +15,7 @@ SHARED_LIBS=	xfce4panel-1.0	1.0 \
 PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += ICE SM X11 X11-xcb XRes Xcomposite Xcursor Xdamage Xext
-WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0
+WANTLIB += Xfixes Xi Xinerama Xrandr Xrender Xtst atk-1.0 atk-bridge-2.0
 WANTLIB += atspi c cairo cairo-gobject dbus-1 dbus-glib-1 epoxy exo-1
 WANTLIB += expat ffi fontconfig freetype garcon-1 garcon-gtk2-1 gdk-3
 WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
diff --git a/x11/xfce4/xfce4-power-manager/Makefile b/x11/xfce4/xfce4-power-manager/Makefile
index 74299e12c68..7227a0a1667 100644
--- a/x11/xfce4/xfce4-power-manager/Makefile
+++ b/x11/xfce4/xfce4-power-manager/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.24 2017/10/23 17:11:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.25 2017/11/26 18:59:33 landry Exp $
 
 COMMENT =	Xfce4 power manager
 
 XFCE_VERSION =	1.6.0
 XFCE_GOODIE =	xfce4-power-manager
-REVISION =	1
+REVISION =	2
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
@@ -29,7 +29,7 @@ CONFIGURE_ENV +=ac_cv_lib_Xext_DPMSQueryExtension=yes
 FAKE_FLAGS =	autostartdir=${PREFIX}/share/examples/xfce4-power-manager
 
 WANTLIB += ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage Xext
-WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1
+WANTLIB += Xfixes Xi Xinerama Xrandr Xrender Xtst atk-1.0 c cairo dbus-1
 WANTLIB += dbus-glib-1 expat ffi fontconfig freetype
 WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
 WANTLIB += graphite2 gthread-2.0 harfbuzz m notify
diff --git a/x11/xfce4/xfce4-smartbookmark/Makefile b/x11/xfce4/xfce4-smartbookmark/Makefile
index 8e6d051d9c0..ef3a923f23c 100644
--- a/x11/xfce4/xfce4-smartbookmark/Makefile
+++ b/x11/xfce4/xfce4-smartbookmark/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.22 2017/10/23 17:11:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.23 2017/11/26 18:59:33 landry Exp $
 
 COMMENT=	Xfce4 web search panel plugin
 
 XFCE_VERSION=	0.5.0
 XFCE_PLUGIN=	smartbookmark
-REVISION =	1
+REVISION =	2
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
@@ -13,7 +13,7 @@ MODULES=	x11/xfce4
 MODXFCE_WANTLIB =	xfce4panel-2.0
 
 WANTLIB += ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage
-WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender
+WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xtst
 WANTLIB += atk-1.0 cairo expat ffi fontconfig freetype
 WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
 WANTLIB += gthread-2.0 m pango-1.0 pangocairo-1.0
diff --git a/x11/xfce4/xfce4-systemload/Makefile b/x11/xfce4/xfce4-systemload/Makefile
index be1cef3d5f2..f8fcdc3e52a 100644
--- a/x11/xfce4/xfce4-systemload/Makefile
+++ b/x11/xfce4/xfce4-systemload/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.37 2017/10/23 17:11:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.38 2017/11/26 18:59:33 landry Exp $
 
 COMMENT=	Xfce4 cpu/memory/swap/uptime monitor panel plugin
 
 XFCE_VERSION=	1.2.1
 XFCE_PLUGIN=	systemload
-REVISION=	0
+REVISION=	1
 
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
@@ -14,7 +14,7 @@ CONFIGURE_ARGS=	--disable-upower
 MODXFCE_WANTLIB =	xfce4panel-2.0
 
 WANTLIB += ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage
-WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender
+WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xtst
 WANTLIB += atk-1.0 cairo expat ffi fontconfig freetype
 WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
 WANTLIB += gthread-2.0 kvm m pango-1.0 pangocairo-1.0
diff --git a/x11/xfce4/xfce4-wavelan/Makefile b/x11/xfce4/xfce4-wavelan/Makefile
index 2c6243d16ea..277ab132708 100644
--- a/x11/xfce4/xfce4-wavelan/Makefile
+++ b/x11/xfce4/xfce4-wavelan/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.38 2017/10/23 17:11:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.39 2017/11/26 18:59:33 landry Exp $
 
 COMMENT=	Xfce4 wireless interface monitor panel plugin
 
 XFCE_VERSION=	0.6.0
 XFCE_PLUGIN=	wavelan
-REVISION =	1
+REVISION =	2
 
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
@@ -13,7 +13,7 @@ MODULES=	x11/xfce4
 MODXFCE_WANTLIB=	xfce4panel-2.0
 
 WANTLIB += ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage
-WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender
+WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xtst
 WANTLIB += atk-1.0 cairo expat ffi fontconfig freetype
 WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
 WANTLIB += gthread-2.0 m pango-1.0 pangocairo-1.0 iconv intl
diff --git a/x11/xfce4/xfce4-xkb/Makefile b/x11/xfce4/xfce4-xkb/Makefile
index 62a7d7e5bb3..1883b5eab92 100644
--- a/x11/xfce4/xfce4-xkb/Makefile
+++ b/x11/xfce4/xfce4-xkb/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.39 2017/10/23 17:11:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.40 2017/11/26 18:59:33 landry Exp $
 
 COMMENT=	Xfce4 xkb layout switcher panel plugin
 
 XFCE_VERSION=	0.8.1
 XFCE_PLUGIN=	xkb
-REVISION=	0
+REVISION=	1
 
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
@@ -16,7 +16,7 @@ LIB_DEPENDS =	x11/gnome/librsvg \
 MODXFCE_WANTLIB=	xfce4panel-2.0
 
 WANTLIB += ICE SM X11 X11-xcb XRes Xcomposite Xcursor Xdamage
-WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0
+WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xtst atk-1.0 atk-bridge-2.0
 WANTLIB += atspi cairo cairo-gobject croco-0.6 dbus-1 epoxy expat
 WANTLIB += ffi fontconfig freetype garcon-1 gdk-3 gdk_pixbuf-2.0
 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
diff --git a/x11/xfce4/xfdashboard/Makefile b/x11/xfce4/xfdashboard/Makefile
index a346be27357..be800fbdf79 100644
--- a/x11/xfce4/xfdashboard/Makefile
+++ b/x11/xfce4/xfdashboard/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2017/10/23 17:11:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2017/11/26 18:59:33 landry Exp $
 
 COMMENT=	Xfce4 gnome-shell like dashboard
 
 XFCE_GOODIE =	xfdashboard
 XFCE_VERSION =	0.6.1
-REVISION=	0
+REVISION=	1
 PORTROACH +=	limitw:1,even
 SHARED_LIBS +=	xfdashboard	0.0 # 600.0
 
@@ -24,7 +24,7 @@ LIB_DEPENDS =	graphics/clutter/core \
 		devel/libwnck3
 
 WANTLIB += X11 X11-xcb XRes Xcomposite Xcursor Xdamage Xext Xfixes
-WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo cairo-gobject
+WANTLIB += Xi Xinerama Xrandr Xrender Xtst atk-1.0 c cairo cairo-gobject
 WANTLIB += clutter-1.0 cogl cogl-pango cogl-path dbus-1 dbus-glib-1 expat
 WANTLIB += ffi fontconfig freetype garcon-1 gdk-3
 WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0