9 files changed, 32 insertions, 37 deletions

diff --git a/deskutils/orage/Makefile b/deskutils/orage/Makefile
index 5af034fab308..293bf4a3d2c6 100644
--- a/deskutils/orage/Makefile
+++ b/deskutils/orage/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	orage
 PORTVERSION=	4.12.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
@@ -21,17 +21,19 @@ LIB_DEPENDS=	libpopt.so:devel/popt \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
-GNU_CONFIGURE=	yes
-INSTALLS_ICONS=	yes
 USES=		desktop-file-utils gettext gmake gnome libtool pkgconfig \
-		tar:bzip2 xfce
-USE_GNOME=	cairo gtk20 intlhack intltool
+		tar:bzip2 xfce:gtk2 xorg
+USE_GNOME=	cairo gtk20 intltool
 USE_XFCE=	panel
 USE_XORG=	x11
 
+GNU_CONFIGURE=	yes
+INSTALLS_ICONS=	yes
 CFLAGS+=	-I${LOCALBASE}/include/libical
 CONFIGURE_ARGS=	--enable-dbus
 
+PORTSCOUT=	limitw:1,even
+
 OPTIONS_DEFINE=		NLS NOTIFY
 OPTIONS_DEFAULT=	NOTIFY
 OPTIONS_SUB=		yes
diff --git a/deskutils/xfce4-generic-slider/Makefile b/deskutils/xfce4-generic-slider/Makefile
index 5264542909c1..f7336b2264a0 100644
--- a/deskutils/xfce4-generic-slider/Makefile
+++ b/deskutils/xfce4-generic-slider/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	xfce4-generic-slider
 PORTVERSION=	0.0.20171223
+PORTREVISION=	1
 CATEGORIES=	deskutils
 
 MAINTAINER=	ehaupt@FreeBSD.org
@@ -14,7 +15,7 @@ BUILD_DEPENDS=	xdt-autogen:devel/xfce4-dev-tools
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
-USES=		gettext gmake libtool pkgconfig xfce
+USES=		gettext gmake gnome libtool pkgconfig xfce:gtk2
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 intltool pango
 USE_XFCE=	libmenu panel
 
diff --git a/deskutils/xfce4-notes-plugin/Makefile b/deskutils/xfce4-notes-plugin/Makefile
index 56caac9b9ca3..295c9ce7e53e 100644
--- a/deskutils/xfce4-notes-plugin/Makefile
+++ b/deskutils/xfce4-notes-plugin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-notes-plugin
 PORTVERSION=	1.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
@@ -15,12 +15,11 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libunique-1.0.so:x11-toolkits/unique \
 		libfontconfig.so:x11-fonts/fontconfig \
-		libfreetype.so:print/freetype2 \
-		libdbus-glib-1.so:devel/dbus-glib \
-		libdbus-1.so:devel/dbus
+		libfreetype.so:print/freetype2
 
-USES=		gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce
-USE_GNOME=	cairo glib20 gtk20 intlhack intltool
+USES=		gettext-tools gmake gnome libtool pkgconfig tar:bzip2 \
+		xfce:gtk2 xorg
+USE_GNOME=	cairo glib20 gtk20 intltool
 USE_XFCE=	panel
 USE_XORG=	ice sm x11
 
diff --git a/deskutils/xfce4-notifyd/Makefile b/deskutils/xfce4-notifyd/Makefile
index 2ae2cb19fcbe..a3114b9fb09d 100644
--- a/deskutils/xfce4-notifyd/Makefile
+++ b/deskutils/xfce4-notifyd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce4-notifyd
 PORTVERSION=	0.4.4
+PORTREVISION=	1
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
@@ -16,13 +17,11 @@ COMMENT=	Visually-appealing notification daemon for Xfce
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libnotify.so:devel/libnotify \
-		libdbus-glib-1.so:devel/dbus-glib \
-		libdbus-1.so:devel/dbus
+LIB_DEPENDS=	libnotify.so:devel/libnotify
 
 USES=		gettext-tools gmake gnome libtool pkgconfig tar:bzip2 \
-		xfce:gtk3
-USE_GNOME=	cairo gtk30 glib20 intltool
+		xfce xorg
+USE_GNOME=	cairo glib20 gtk30 intltool
 USE_XFCE=	libutil panel
 USE_XORG=	ice sm x11
 
diff --git a/deskutils/xfce4-tumbler/Makefile b/deskutils/xfce4-tumbler/Makefile
index ba311373066d..19e33456e9e5 100644
--- a/deskutils/xfce4-tumbler/Makefile
+++ b/deskutils/xfce4-tumbler/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tumbler
-PORTVERSION=	0.2.6
-PORTREVISION=	3
+PORTVERSION=	0.2.7
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	XFCE
 PKGNAMEPREFIX=	xfce4-
diff --git a/deskutils/xfce4-tumbler/distinfo b/deskutils/xfce4-tumbler/distinfo
index 7f57b71a96bc..a6ac97f620dd 100644
--- a/deskutils/xfce4-tumbler/distinfo
+++ b/deskutils/xfce4-tumbler/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564326844
-SHA256 (xfce4/tumbler-0.2.6.tar.bz2) = 74d21781fb0c1e8c11ac803cc5afb469893a0b220721fdc25660c54891a10fa0
-SIZE (xfce4/tumbler-0.2.6.tar.bz2) = 564327
+TIMESTAMP = 1565562564
+SHA256 (xfce4/tumbler-0.2.7.tar.bz2) = f704c35f16716cbee3c94883cee2a8d865e9cf2535d0e84f57e1c8cce00314e4
+SIZE (xfce4/tumbler-0.2.7.tar.bz2) = 564538
diff --git a/deskutils/xfce4-volumed-pulse/Makefile b/deskutils/xfce4-volumed-pulse/Makefile
index 2f578762e52b..587e6936ebbd 100644
--- a/deskutils/xfce4-volumed-pulse/Makefile
+++ b/deskutils/xfce4-volumed-pulse/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-volumed-pulse
 PORTVERSION=	0.2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
@@ -16,11 +16,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpulse.so:audio/pulseaudio \
 		libnotify.so:devel/libnotify \
-		libkeybinder-3.0.so:x11/keybinder-gtk3 \
-		libdbus-glib-1.so:devel/dbus-glib \
-		libdbus-1.so:devel/dbus
+		libkeybinder-3.0.so:x11/keybinder-gtk3
 
-USES=		gmake gnome libtool pkgconfig tar:bz2 xfce:gtk3
+USES=		gmake gnome libtool pkgconfig tar:bz2 xfce
 USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30
 USE_XFCE=	xfconf
 
diff --git a/deskutils/xfce4-volumed/Makefile b/deskutils/xfce4-volumed/Makefile
index c8be189cfed8..05a66d745fe8 100644
--- a/deskutils/xfce4-volumed/Makefile
+++ b/deskutils/xfce4-volumed/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-volumed
 PORTVERSION=	0.1.13
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
@@ -13,14 +13,12 @@ COMMENT=	Volume management daemon for the Xfce desktop
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
-		libdbus-1.so:devel/dbus \
-		libnotify.so:devel/libnotify \
+LIB_DEPENDS=	libnotify.so:devel/libnotify \
 		libkeybinder.so:x11/keybinder \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
-USES=		gmake gnome pkgconfig tar:bzip2 xfce
+USES=		gmake gnome pkgconfig tar:bzip2 xfce:gtk2
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 libxml2 pango
 USE_GSTREAMER=	yes
 USE_XFCE=	xfconf
diff --git a/deskutils/xfce4-xkb-plugin/Makefile b/deskutils/xfce4-xkb-plugin/Makefile
index 0be243e040cd..10add965ee83 100644
--- a/deskutils/xfce4-xkb-plugin/Makefile
+++ b/deskutils/xfce4-xkb-plugin/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xfce4-xkb-plugin
 PORTVERSION=	0.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	XFCE/panel-plugins
 
@@ -11,11 +11,10 @@ COMMENT=	Keyboard layout switching plugin for the Xfce panel
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libxklavier.so:x11/libxklavier \
-		libdbus-glib-1.so:devel/dbus-glib \
-		libdbus-1.so:devel/dbus
+LIB_DEPENDS=	libxklavier.so:x11/libxklavier
 
-USES=		gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3
+USES=		gettext-tools gmake gnome libtool pkgconfig tar:bzip2 \
+		xfce xorg
 USE_GNOME=	cairo gtk30 intltool librsvg2 libwnck3
 USE_XFCE=	panel
 USE_XORG=	x11