summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorGuido Falsi <madpilot@FreeBSD.org>2019-09-19 23:46:33 +0000
committerGuido Falsi <madpilot@FreeBSD.org>2019-09-19 23:46:33 +0000
commite69e6941cc0f1dab5aefa920fb26c0f26941f258 (patch)
treee3316902afbb4318b0439dc574f0496749ecfdc3 /x11
parentUpgrade editors/openoffice-devel to upstream git hash d871312c80. (diff)
Welcome XFCE 4.14 to the FreeBSD ports tree
- This XFCE release uses almost exclusively gtk3, so the USES=xfce now defaults to gtk3 - Make x11-themes/gtk-xfce-engine an optional dependency(disabled by default), it only supports gtk2, so would leave miost of this XFCE version unthemed. - Add Greybird as an optional and enabled dependency as a modern theme supporting both GTK versions and all other XFCE parts - The xfce4-vala port is deprecated and removed. The VALA bindings are available in the library ports using the GIR and VAPI options (on by default) - Fixed various missing library and portlint warnings (portmgr fixit blanket) - Default Display Manager changed to lightdm (Thanks to woodsb02 for help) - Add x11/xfce4-screensaver as an optional dependency to the xfce4-goodies (enabled by default) - Remove dependency on x11-fm/thunar-vfs and deprecate the port. It is EOL upstream and the functionality is included in thunar itself Update: - Added back sysutils/xfce4-places-plugin, updated to 1.8.1 - archivers/thunar-archive-plugin to 0.4.0 - audio/thunar-media-tags-plugin to 0.3.0 - audio/xfce4-mpc-plugin to 0.5.2 - audio/xfce4-pulseaudio-plugin to 0.4.2 - deskutils/xfce4-tumbler to 0.2.7 - devel/thunar-vcs-plugin to 0.2.0 [1] - devel/xfce4-dev-tools to 4.14.0 - misc/xfce4-appfinder to 4.14.0 - misc/xfce4-weather-plugin to 0.10.0 - multimedia/xfce4-parole to 1.0.4 - sysutils/gigolo to 0.5.0 - sysutils/xfce4-battery-plugin to 1.1.3 - sysutils/xfce4-fsguard-plugin to 1.1.1 - sysutils/xfce4-netload-plugin to 1.3.2 - sysutils/xfce4-power-manage to 1.6.5 - sysutils/xfce4-settings 4.14.1 - sysutils/xfce4-systemload-plugin to 1.2.3 - sysutils/xfce4-wavelan-plugin to 0.6.1 - www/xfce4-smartbookmark-plugin to 0.5.1 - x11-clocks/xfce4-datetime-plugin to 0.8.0 - Added new xfce4-stopwatch-plugin, version 0.3.1 - x11-clocks/xfce4-timer-out-plugin to 1.0.3 - x11-fm/thunar to 1.8.9 - x11-wm/xfce4-desktop to 4.14.1 - x11-wm/xfce4-panel to 4.14.0 - x11-wm/xfce4-session to 4.14.0 - x11-wm/xfce4-wm to 4.14.0 - x11/libexo to 0.12.8 - x11/libxfce4menu to 4.14.1 - x11/libxfce4util to 4.14.0 - x11/xfce4-conf to 4.14.1 - x11/xfce4-dashboard to 0.7.5 - x11/xfce4-screensaver to 0.1.8 - x11/xfce4-screenshooter-plugin to 1.9.6 - x11/xfce4-verve-plugin to 2.0.0 Thanks to: Olivier Duchateau <duchateau.olivier@gmail.com> PR: 240236 Exp-run by: antoine Tested by: sbruno Approved by: sergey.dyatko@gmail.com (maintainer timeout via email), portmgr (fixit blanket, port breaks with new Thunar if not updated) [1] Differential Revision: https://reviews.freebsd.org/D21278
Notes
Notes: svn path=/head/; revision=512378
Diffstat (limited to 'x11')
-rw-r--r--x11/libexo/Makefile12
-rw-r--r--x11/libexo/distinfo6
-rw-r--r--x11/libexo/pkg-plist56
-rw-r--r--x11/libxfce4menu/Makefile36
-rw-r--r--x11/libxfce4menu/distinfo5
-rw-r--r--x11/libxfce4menu/pkg-plist107
-rw-r--r--x11/libxfce4util/Makefile19
-rw-r--r--x11/libxfce4util/distinfo5
-rw-r--r--x11/libxfce4util/pkg-plist8
-rw-r--r--x11/xfce4-clipman-plugin/Makefile8
-rw-r--r--x11/xfce4-conf/Makefile25
-rw-r--r--x11/xfce4-conf/distinfo6
-rw-r--r--x11/xfce4-conf/pkg-plist11
-rw-r--r--x11/xfce4-dashboard/Makefile15
-rw-r--r--x11/xfce4-dashboard/distinfo6
-rw-r--r--x11/xfce4-dashboard/files/patch-libxfdashboard_application-database.c20
-rw-r--r--x11/xfce4-dashboard/files/patch-libxfdashboard_applications-menu-model.c11
-rw-r--r--x11/xfce4-dashboard/pkg-plist27
-rw-r--r--x11/xfce4-embed-plugin/Makefile7
-rw-r--r--x11/xfce4-goodies/Makefile32
-rw-r--r--x11/xfce4-goodies/pkg-descr2
-rw-r--r--x11/xfce4-quicklauncher-plugin/Makefile6
-rw-r--r--x11/xfce4-screensaver/Makefile13
-rw-r--r--x11/xfce4-screensaver/distinfo6
-rw-r--r--x11/xfce4-screensaver/files/patch-src_xfce4-screensaver-configure21
-rw-r--r--x11/xfce4-screenshooter-plugin/Makefile5
-rw-r--r--x11/xfce4-screenshooter-plugin/distinfo6
-rw-r--r--x11/xfce4-screenshooter-plugin/pkg-plist4
-rw-r--r--x11/xfce4-taskmanager/Makefile8
-rw-r--r--x11/xfce4-terminal/Makefile8
-rw-r--r--x11/xfce4-verve-plugin/Makefile11
-rw-r--r--x11/xfce4-verve-plugin/distinfo6
-rw-r--r--x11/xfce4-verve-plugin/pkg-plist1
-rw-r--r--x11/xfce4-wmdock-plugin/Makefile7
34 files changed, 325 insertions, 201 deletions
diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index 04ea27ec8fbf..133a6da75cbd 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= libexo
-PORTVERSION= 0.12.7
+PORTVERSION= 0.12.8
CATEGORIES= x11 xfce
MASTER_SITES= XFCE
DISTNAME= exo-${DISTVERSIONFULL}
@@ -22,8 +22,8 @@ BUILD_DEPENDS= p5-URI>=1.70:net/p5-URI
RUN_DEPENDS= p5-URI>=1.70:net/p5-URI
USES= desktop-file-utils gettext-tools gmake gnome libtool pathfix \
- perl5 pkgconfig tar:bzip2 xfce:gtk3
-USE_GNOME= cairo glib20 gtk20 gtk30 intltool
+ perl5 pkgconfig tar:bzip2 xfce xorg
+USE_GNOME= cairo glib20 gtk30 intltool
USE_LDCONFIG= yes
USE_XFCE= libmenu
USE_XORG= ice sm x11
@@ -34,9 +34,13 @@ INSTALLS_ICONS= yes
INSTALL_TARGET= install-strip
CONFIGURE_ARGS= --without-html-dir --disable-silent-rules
-OPTIONS_DEFINE= NLS
+OPTIONS_DEFINE= GTK2 NLS
+OPTIONS_DEFAULT= GTK2
OPTIONS_SUB= yes
+GTK2_USE= gnome=gtk20
+GTK2_CONFIGURE_ENABLE= gtk2
+
NLS_CONFIGURE_ENABLE= nls
NLS_USES= gettext-runtime
diff --git a/x11/libexo/distinfo b/x11/libexo/distinfo
index 8f3b34908507..cdee19fbc375 100644
--- a/x11/libexo/distinfo
+++ b/x11/libexo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564304777
-SHA256 (xfce4/exo-0.12.7.tar.bz2) = 78d10943b52eb50ce76224ae27c025fb174d39895b31723db90a869d6eeaf1da
-SIZE (xfce4/exo-0.12.7.tar.bz2) = 1342229
+TIMESTAMP = 1565559687
+SHA256 (xfce4/exo-0.12.8.tar.bz2) = 3400a2e64aa41ede25bedaca4909bde7ea4f8698d9598d1b80f02a40ac89fcde
+SIZE (xfce4/exo-0.12.8.tar.bz2) = 1342201
diff --git a/x11/libexo/pkg-plist b/x11/libexo/pkg-plist
index 43137edf84cb..a314eae1eda4 100644
--- a/x11/libexo/pkg-plist
+++ b/x11/libexo/pkg-plist
@@ -3,30 +3,30 @@ bin/exo-desktop-item-edit
bin/exo-open
bin/exo-preferred-applications
etc/xdg/xfce4/helpers.rc
-include/exo-1/exo/exo-binding.h
-include/exo-1/exo/exo-cell-renderer-ellipsized-text.h
-include/exo-1/exo/exo-cell-renderer-icon.h
-include/exo-1/exo/exo-config.h
-include/exo-1/exo/exo-enum-types.h
-include/exo-1/exo/exo-execute.h
-include/exo-1/exo/exo-gdk-pixbuf-extensions.h
-include/exo-1/exo/exo-gobject-extensions.h
-include/exo-1/exo/exo-gtk-extensions.h
-include/exo-1/exo/exo-icon-bar.h
-include/exo-1/exo/exo-icon-chooser-dialog.h
-include/exo-1/exo/exo-icon-view.h
-include/exo-1/exo/exo-job.h
-include/exo-1/exo/exo-simple-job.h
-include/exo-1/exo/exo-string.h
-include/exo-1/exo/exo-toolbars-editor-dialog.h
-include/exo-1/exo/exo-toolbars-editor.h
-include/exo-1/exo/exo-toolbars-model.h
-include/exo-1/exo/exo-toolbars-view.h
-include/exo-1/exo/exo-tree-view.h
-include/exo-1/exo/exo-utils.h
-include/exo-1/exo/exo-wrap-table.h
-include/exo-1/exo/exo-xsession-client.h
-include/exo-1/exo/exo.h
+%%GTK2%%include/exo-1/exo/exo-binding.h
+%%GTK2%%include/exo-1/exo/exo-cell-renderer-ellipsized-text.h
+%%GTK2%%include/exo-1/exo/exo-cell-renderer-icon.h
+%%GTK2%%include/exo-1/exo/exo-config.h
+%%GTK2%%include/exo-1/exo/exo-enum-types.h
+%%GTK2%%include/exo-1/exo/exo-execute.h
+%%GTK2%%include/exo-1/exo/exo-gdk-pixbuf-extensions.h
+%%GTK2%%include/exo-1/exo/exo-gobject-extensions.h
+%%GTK2%%include/exo-1/exo/exo-gtk-extensions.h
+%%GTK2%%include/exo-1/exo/exo-icon-bar.h
+%%GTK2%%include/exo-1/exo/exo-icon-chooser-dialog.h
+%%GTK2%%include/exo-1/exo/exo-icon-view.h
+%%GTK2%%include/exo-1/exo/exo-job.h
+%%GTK2%%include/exo-1/exo/exo-simple-job.h
+%%GTK2%%include/exo-1/exo/exo-string.h
+%%GTK2%%include/exo-1/exo/exo-toolbars-editor-dialog.h
+%%GTK2%%include/exo-1/exo/exo-toolbars-editor.h
+%%GTK2%%include/exo-1/exo/exo-toolbars-model.h
+%%GTK2%%include/exo-1/exo/exo-toolbars-view.h
+%%GTK2%%include/exo-1/exo/exo-tree-view.h
+%%GTK2%%include/exo-1/exo/exo-utils.h
+%%GTK2%%include/exo-1/exo/exo-wrap-table.h
+%%GTK2%%include/exo-1/exo/exo-xsession-client.h
+%%GTK2%%include/exo-1/exo/exo.h
include/exo-2/exo/exo-binding.h
include/exo-2/exo/exo-cell-renderer-icon.h
include/exo-2/exo/exo-config.h
@@ -47,15 +47,15 @@ include/exo-2/exo/exo-toolbars-model.h
include/exo-2/exo/exo-tree-view.h
include/exo-2/exo/exo-utils.h
include/exo-2/exo/exo.h
-lib/libexo-1.so
-lib/libexo-1.so.0
-lib/libexo-1.so.0.1.0
+%%GTK2%%lib/libexo-1.so
+%%GTK2%%lib/libexo-1.so.0
+%%GTK2%%lib/libexo-1.so.0.1.0
lib/libexo-2.so
lib/libexo-2.so.0
lib/libexo-2.so.0.1.0
lib/xfce4/exo-2/exo-helper-2
lib/xfce4/exo/exo-compose-mail
-libdata/pkgconfig/exo-1.pc
+%%GTK2%%libdata/pkgconfig/exo-1.pc
libdata/pkgconfig/exo-2.pc
man/man1/exo-csource.1.gz
man/man1/exo-open.1.gz
diff --git a/x11/libxfce4menu/Makefile b/x11/libxfce4menu/Makefile
index 9ae5bbac8d41..cede6d6c0395 100644
--- a/x11/libxfce4menu/Makefile
+++ b/x11/libxfce4menu/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= libxfce4menu
-PORTVERSION= 4.12.1
-PORTREVISION= 2
+PORTVERSION= 4.14.1
CATEGORIES= x11 xfce
MASTER_SITES= XFCE
DISTNAME= libxfce4ui-${DISTVERSIONFULL}
@@ -15,13 +14,11 @@ COMMENT= Widgets library for the Xfce desktop environment
LICENSE= GPLv2
LIB_DEPENDS= 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 pathfix pkgconfig \
- tar:bzip2 xfce
-USE_GNOME= cairo glib20 gtk20 intlhack intltool
+ tar:bzip2 xfce xorg
+USE_GNOME= cairo glib20 gtk30 intltool
USE_LDCONFIG= yes
USE_XFCE= xfconf
USE_XORG= ice sm x11
@@ -31,17 +28,24 @@ INSTALLS_ICONS= yes
CONFIGURE_ARGS= --with-vendor-info=${OPSYS} --without-html-dir
INSTALL_TARGET= install-strip
-PORTSCOUT= limit:^4\.12\.
+PORTSCOUT= limitw:1,even
-OPTIONS_DEFINE= GLADE GTK3 NLS STARTUP
-OPTIONS_DEFAULT= GTK3 STARTUP
+OPTIONS_DEFINE= GIR GLADE GTK2 NLS STARTUP VAPI
+OPTIONS_DEFAULT= GIR GTK2 STARTUP VAPI
OPTIONS_SUB= yes
-GLADE_CONFIGURE_ENABLE= gladeui
-GLADE_LIB_DEPENDS= libgladeui-1.so:devel/glade3
+GIR_DESC= Use Gobject Introspection
-GTK3_CONFIGURE_ENABLE= gtk3
-GTK3_USE= gnome=gtk30
+GIR_USE= gnome=introspection:build
+GIR_CONFIGURE_ON= --enable-introspection=yes
+GIR_CONFIGURE_OFF= --enable-introspection=no
+
+GLADE_CONFIGURE_ENABLE= gladeui2
+GLADE_LIB_DEPENDS= libgladeui-2.so:devel/glade
+GLADE_USE= gnome=libxml2
+
+GTK2_CONFIGURE_ENABLE= gtk2
+GTK2_USE= gnome=gtk20
NLS_CONFIGURE_ENABLE= nls
NLS_USES= gettext-runtime
@@ -50,4 +54,8 @@ STARTUP_CONFIGURE_ENABLE= startup-notification
STARTUP_DESC= Startup notification
STARTUP_LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification
+VAPI_BUILD_DEPENDS= vapigen:lang/vala
+VAPI_CONFIGURE_ENABLE= vala
+VAPI_IMPLIES= GIR
+
.include <bsd.port.mk>
diff --git a/x11/libxfce4menu/distinfo b/x11/libxfce4menu/distinfo
index b32e7917dc53..9ecdc286a28d 100644
--- a/x11/libxfce4menu/distinfo
+++ b/x11/libxfce4menu/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xfce4/libxfce4ui-4.12.1.tar.bz2) = 3d619811bfbe7478bb984c16543d980cadd08586365a7bc25e59e3ca6384ff43
-SIZE (xfce4/libxfce4ui-4.12.1.tar.bz2) = 665624
+TIMESTAMP = 1565558955
+SHA256 (xfce4/libxfce4ui-4.14.1.tar.bz2) = c449075eaeae4d1138d22eeed3d2ad7032b87fb8878eada9b770325bed87f2da
+SIZE (xfce4/libxfce4ui-4.14.1.tar.bz2) = 756175
diff --git a/x11/libxfce4menu/pkg-plist b/x11/libxfce4menu/pkg-plist
index ddefb8f66d7d..a0b8c72a24f0 100644
--- a/x11/libxfce4menu/pkg-plist
+++ b/x11/libxfce4menu/pkg-plist
@@ -1,63 +1,66 @@
bin/xfce4-about
etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
-include/xfce4/libxfce4kbd-private-2/libxfce4kbd-private/xfce-shortcut-dialog.h
-include/xfce4/libxfce4kbd-private-2/libxfce4kbd-private/xfce-shortcuts-grabber.h
-include/xfce4/libxfce4kbd-private-2/libxfce4kbd-private/xfce-shortcuts-provider.h
-include/xfce4/libxfce4kbd-private-2/libxfce4kbd-private/xfce-shortcuts-xfwm4.h
-include/xfce4/libxfce4kbd-private-2/libxfce4kbd-private/xfce-shortcuts.h
-%%GTK3%%include/xfce4/libxfce4kbd-private-3/libxfce4kbd-private/xfce-shortcut-dialog.h
-%%GTK3%%include/xfce4/libxfce4kbd-private-3/libxfce4kbd-private/xfce-shortcuts-grabber.h
-%%GTK3%%include/xfce4/libxfce4kbd-private-3/libxfce4kbd-private/xfce-shortcuts-provider.h
-%%GTK3%%include/xfce4/libxfce4kbd-private-3/libxfce4kbd-private/xfce-shortcuts-xfwm4.h
-%%GTK3%%include/xfce4/libxfce4kbd-private-3/libxfce4kbd-private/xfce-shortcuts.h
-include/xfce4/libxfce4ui-1/libxfce4ui/libxfce4ui-config.h
-include/xfce4/libxfce4ui-1/libxfce4ui/libxfce4ui-enum-types.h
-include/xfce4/libxfce4ui-1/libxfce4ui/libxfce4ui.h
-include/xfce4/libxfce4ui-1/libxfce4ui/xfce-dialogs.h
-include/xfce4/libxfce4ui-1/libxfce4ui/xfce-gdk-extensions.h
-include/xfce4/libxfce4ui-1/libxfce4ui/xfce-gtk-extensions.h
-include/xfce4/libxfce4ui-1/libxfce4ui/xfce-sm-client.h
-include/xfce4/libxfce4ui-1/libxfce4ui/xfce-spawn.h
-include/xfce4/libxfce4ui-1/libxfce4ui/xfce-titled-dialog.h
-%%GTK3%%include/xfce4/libxfce4ui-2/libxfce4ui/libxfce4ui-config.h
-%%GTK3%%include/xfce4/libxfce4ui-2/libxfce4ui/libxfce4ui-enum-types.h
-%%GTK3%%include/xfce4/libxfce4ui-2/libxfce4ui/libxfce4ui.h
-%%GTK3%%include/xfce4/libxfce4ui-2/libxfce4ui/xfce-dialogs.h
-%%GTK3%%include/xfce4/libxfce4ui-2/libxfce4ui/xfce-gdk-extensions.h
-%%GTK3%%include/xfce4/libxfce4ui-2/libxfce4ui/xfce-gtk-extensions.h
-%%GTK3%%include/xfce4/libxfce4ui-2/libxfce4ui/xfce-sm-client.h
-%%GTK3%%include/xfce4/libxfce4ui-2/libxfce4ui/xfce-spawn.h
-%%GTK3%%include/xfce4/libxfce4ui-2/libxfce4ui/xfce-titled-dialog.h
-%%GLADE%%lib/glade3/modules/libxfce4uiglade.so
-lib/libxfce4kbd-private-2.so
-lib/libxfce4kbd-private-2.so.0
-lib/libxfce4kbd-private-2.so.0.0.0
-%%GTK3%%lib/libxfce4kbd-private-3.so
-%%GTK3%%lib/libxfce4kbd-private-3.so.0
-%%GTK3%%lib/libxfce4kbd-private-3.so.0.0.0
-lib/libxfce4ui-1.so
-lib/libxfce4ui-1.so.0
-lib/libxfce4ui-1.so.0.0.0
-%%GTK3%%lib/libxfce4ui-2.so
-%%GTK3%%lib/libxfce4ui-2.so.0
-%%GTK3%%lib/libxfce4ui-2.so.0.0.0
-libdata/pkgconfig/libxfce4kbd-private-2.pc
-%%GTK3%%libdata/pkgconfig/libxfce4kbd-private-3.pc
-libdata/pkgconfig/libxfce4ui-1.pc
-%%GTK3%%libdata/pkgconfig/libxfce4ui-2.pc
+%%GTK2%%include/xfce4/libxfce4kbd-private-2/libxfce4kbd-private/xfce-shortcut-dialog.h
+%%GTK2%%include/xfce4/libxfce4kbd-private-2/libxfce4kbd-private/xfce-shortcuts-grabber.h
+%%GTK2%%include/xfce4/libxfce4kbd-private-2/libxfce4kbd-private/xfce-shortcuts-provider.h
+%%GTK2%%include/xfce4/libxfce4kbd-private-2/libxfce4kbd-private/xfce-shortcuts-xfwm4.h
+%%GTK2%%include/xfce4/libxfce4kbd-private-2/libxfce4kbd-private/xfce-shortcuts.h
+include/xfce4/libxfce4kbd-private-3/libxfce4kbd-private/xfce-shortcut-dialog.h
+include/xfce4/libxfce4kbd-private-3/libxfce4kbd-private/xfce-shortcuts-grabber.h
+include/xfce4/libxfce4kbd-private-3/libxfce4kbd-private/xfce-shortcuts-provider.h
+include/xfce4/libxfce4kbd-private-3/libxfce4kbd-private/xfce-shortcuts-xfwm4.h
+include/xfce4/libxfce4kbd-private-3/libxfce4kbd-private/xfce-shortcuts.h
+%%GTK2%%include/xfce4/libxfce4ui-1/libxfce4ui/libxfce4ui-config.h
+%%GTK2%%include/xfce4/libxfce4ui-1/libxfce4ui/libxfce4ui-enum-types.h
+%%GTK2%%include/xfce4/libxfce4ui-1/libxfce4ui/libxfce4ui.h
+%%GTK2%%include/xfce4/libxfce4ui-1/libxfce4ui/xfce-dialogs.h
+%%GTK2%%include/xfce4/libxfce4ui-1/libxfce4ui/xfce-gdk-extensions.h
+%%GTK2%%include/xfce4/libxfce4ui-1/libxfce4ui/xfce-gtk-extensions.h
+%%GTK2%%include/xfce4/libxfce4ui-1/libxfce4ui/xfce-sm-client.h
+%%GTK2%%include/xfce4/libxfce4ui-1/libxfce4ui/xfce-spawn.h
+%%GTK2%%include/xfce4/libxfce4ui-1/libxfce4ui/xfce-titled-dialog.h
+include/xfce4/libxfce4ui-2/libxfce4ui/libxfce4ui-config.h
+include/xfce4/libxfce4ui-2/libxfce4ui/libxfce4ui-enum-types.h
+include/xfce4/libxfce4ui-2/libxfce4ui/libxfce4ui.h
+include/xfce4/libxfce4ui-2/libxfce4ui/xfce-dialogs.h
+include/xfce4/libxfce4ui-2/libxfce4ui/xfce-gdk-extensions.h
+include/xfce4/libxfce4ui-2/libxfce4ui/xfce-gtk-extensions.h
+include/xfce4/libxfce4ui-2/libxfce4ui/xfce-sm-client.h
+include/xfce4/libxfce4ui-2/libxfce4ui/xfce-spawn.h
+include/xfce4/libxfce4ui-2/libxfce4ui/xfce-titled-dialog.h
+%%GIR%%lib/girepository-1.0/libxfce4ui-2.0.typelib
+%%GLADE%%lib/glade/modules/libxfce4uiglade2.so
+%%GTK2%%lib/libxfce4kbd-private-2.so
+%%GTK2%%lib/libxfce4kbd-private-2.so.0
+%%GTK2%%lib/libxfce4kbd-private-2.so.0.0.0
+lib/libxfce4kbd-private-3.so
+lib/libxfce4kbd-private-3.so.0
+lib/libxfce4kbd-private-3.so.0.0.0
+%%GTK2%%lib/libxfce4ui-1.so
+%%GTK2%%lib/libxfce4ui-1.so.0
+%%GTK2%%lib/libxfce4ui-1.so.0.0.0
+lib/libxfce4ui-2.so
+lib/libxfce4ui-2.so.0
+lib/libxfce4ui-2.so.0.0.0
+%%GTK2%%libdata/pkgconfig/libxfce4kbd-private-2.pc
+libdata/pkgconfig/libxfce4kbd-private-3.pc
+%%GTK2%%libdata/pkgconfig/libxfce4ui-1.pc
+libdata/pkgconfig/libxfce4ui-2.pc
share/applications/xfce4-about.desktop
-%%GLADE%%share/glade3/catalogs/libxfce4ui.xml
-%%GLADE%%share/glade3/catalogs/libxfce4ui.xml.in
-%%GLADE%%share/glade3/pixmaps/hicolor/16x16/actions/widget-libxfce4ui-xfce-titled-dialog.png
-%%GLADE%%share/glade3/pixmaps/hicolor/22x22/actions/widget-libxfce4ui-xfce-titled-dialog.png
+%%GIR%%share/gir-1.0/libxfce4ui-2.0.gir
+%%GLADE%%share/glade/catalogs/libxfce4ui-2.xml
+%%GLADE%%share/glade/pixmaps/hicolor/16x16/actions/widget-libxfce4ui-xfce-titled-dialog.png
+%%GLADE%%share/glade/pixmaps/hicolor/22x22/actions/widget-libxfce4ui-xfce-titled-dialog.png
share/icons/hicolor/48x48/apps/xfce4-logo.png
%%NLS%%share/locale/am/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/ar/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/ast/LC_MESSAGES/libxfce4ui.mo
+%%NLS%%share/locale/be/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/bg/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/bn/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/ca/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/cs/LC_MESSAGES/libxfce4ui.mo
+%%NLS%%share/locale/cy/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/da/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/de/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/el/LC_MESSAGES/libxfce4ui.mo
@@ -71,7 +74,10 @@ share/icons/hicolor/48x48/apps/xfce4-logo.png
%%NLS%%share/locale/he/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/hr/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/hu/LC_MESSAGES/libxfce4ui.mo
+%%NLS%%share/locale/hy/LC_MESSAGES/libxfce4ui.mo
+%%NLS%%share/locale/hy_AM/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/id/LC_MESSAGES/libxfce4ui.mo
+%%NLS%%share/locale/ie/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/is/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/it/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/ja/LC_MESSAGES/libxfce4ui.mo
@@ -93,6 +99,7 @@ share/icons/hicolor/48x48/apps/xfce4-logo.png
%%NLS%%share/locale/si/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/sk/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/sl/LC_MESSAGES/libxfce4ui.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/sr/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/sv/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/te/LC_MESSAGES/libxfce4ui.mo
@@ -106,3 +113,5 @@ share/icons/hicolor/48x48/apps/xfce4-logo.png
%%NLS%%share/locale/zh_CN/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/zh_HK/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/libxfce4ui.mo
+%%VAPI%%share/vala/vapi/libxfce4ui-2.deps
+%%VAPI%%share/vala/vapi/libxfce4ui-2.vapi
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index 5246e449d317..7cd41a1c102a 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= libxfce4util
-PORTVERSION= 4.12.1
+PORTVERSION= 4.14.0
CATEGORIES= x11 xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
@@ -14,17 +14,30 @@ LICENSE= GPLv2
USES= gettext-tools gmake gnome libtool pathfix perl5 pkgconfig \
tar:bzip2 xfce
-USE_GNOME= glib20 intlhack intltool
+USE_GNOME= glib20 intltool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
CONFIGURE_ARGS= --without-html-dir
-OPTIONS_DEFINE= NLS
+PORTSCOUT= limitw:1,even
+
+OPTIONS_DEFINE= GIR NLS VAPI
+OPTIONS_DEFAULT= GIR VAPI
OPTIONS_SUB= yes
+GIR_DESC= Use Gobject Introspection
+
+GIR_USE= gnome=introspection:build
+GIR_CONFIGURE_ON= --enable-introspection=yes
+GIR_CONFIGURE_OFF= --enable-introspection=no
+
NLS_CONFIGURE_ENABLE= nls
NLS_USES= gettext-runtime
+VAPI_BUILD_DEPENDS= vapigen:lang/vala
+VAPI_CONFIGURE_ENABLE= vala
+VAPI_IMPLIES= GIR
+
.include <bsd.port.mk>
diff --git a/x11/libxfce4util/distinfo b/x11/libxfce4util/distinfo
index 02d509a93255..e67e4a42a6db 100644
--- a/x11/libxfce4util/distinfo
+++ b/x11/libxfce4util/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xfce4/libxfce4util-4.12.1.tar.bz2) = 876bdefa2e13cbf68b626b2158892fb93e824e1ef59cf951123a96cefbc8881d
-SIZE (xfce4/libxfce4util-4.12.1.tar.bz2) = 455329
+TIMESTAMP = 1565543253
+SHA256 (xfce4/libxfce4util-4.14.0.tar.bz2) = 32ad79b7992ec3fd863e8ff2f03eebda8740363ef9d7d910a35963ac1c1a6324
+SIZE (xfce4/libxfce4util-4.14.0.tar.bz2) = 516358
diff --git a/x11/libxfce4util/pkg-plist b/x11/libxfce4util/pkg-plist
index 7278aaec52d1..70b63e386cb4 100644
--- a/x11/libxfce4util/pkg-plist
+++ b/x11/libxfce4util/pkg-plist
@@ -11,18 +11,22 @@ include/xfce4/libxfce4util/xfce-posix-signal-handler.h
include/xfce4/libxfce4util/xfce-rc.h
include/xfce4/libxfce4util/xfce-resource.h
include/xfce4/libxfce4util/xfce-utf8.h
+%%GIR%%lib/girepository-1.0/libxfce4util-1.0.typelib
lib/libxfce4util.so
lib/libxfce4util.so.7
lib/libxfce4util.so.7.0.0
libdata/pkgconfig/libxfce4util-1.0.pc
sbin/xfce4-kiosk-query
+%%GIR%%share/gir-1.0/libxfce4util-1.0.gir
%%NLS%%share/locale/am/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/ar/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/ast/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/be/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/bg/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/bn/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/ca/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/cs/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/cy/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/da/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/de/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/el/LC_MESSAGES/libxfce4util.mo
@@ -37,7 +41,10 @@ sbin/xfce4-kiosk-query
%%NLS%%share/locale/he/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/hr/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/hu/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/hy/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/hy_AM/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/id/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/ie/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/is/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/it/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/ja/LC_MESSAGES/libxfce4util.mo
@@ -71,3 +78,4 @@ sbin/xfce4-kiosk-query
%%NLS%%share/locale/zh_CN/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/zh_HK/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/libxfce4util.mo
+%%VAPI%%share/vala/vapi/libxfce4util-1.0.vapi
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index e57ca0472df5..5dd9a96ef760 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xfce4-clipman-plugin
PORTVERSION= 1.4.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
@@ -13,10 +13,8 @@ COMMENT= Clipboard manager for the Xfce panel
LICENSE= GPLv2
-LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
- libdbus-1.so:devel/dbus
-
-USES= gettext gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3
+USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 \
+ xfce xorg
USE_GNOME= cairo glib20 gtk30 intltool
USE_XFCE= panel
USE_XORG= ice sm x11 xorgproto xtst
diff --git a/x11/xfce4-conf/Makefile b/x11/xfce4-conf/Makefile
index 003e17bff94e..c604a18fe556 100644
--- a/x11/xfce4-conf/Makefile
+++ b/x11/xfce4-conf/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-conf
-PORTVERSION= 4.12.1
+PORTVERSION= 4.14.1
CATEGORIES= x11 xfce
MASTER_SITES= XFCE
DISTNAME= xfconf-${DISTVERSIONFULL}
@@ -14,12 +14,10 @@ COMMENT= D-Bus-based configuration storage system
LICENSE= GPLv2
BUILD_DEPENDS= p5-XML-Parser>=2.44:textproc/p5-XML-Parser
-LIB_DEPENDS= libdbus-1.so:devel/dbus \
- libdbus-glib-1.so:devel/dbus-glib
USES= gettext-tools gmake gnome libtool pathfix perl5 pkgconfig \
- tar:bzip2 xfce
-USE_GNOME= glib20 gtk20 intlhack intltool
+ tar:bzip2 xfce xorg
+USE_GNOME= glib20 intltool
USE_LDCONFIG= yes
USE_PERL5= build
USE_XFCE= libutil
@@ -29,9 +27,19 @@ GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
CONFIGURE_ARGS= --without-html-dir
-OPTIONS_DEFINE= PERL NLS
+PORTSCOUT= limitw:1,even
+
+OPTIONS_DEFINE= GIR NLS PERL VAPI
+OPTIONS_DEFAULT= GIR VAPI
OPTIONS_SUB= yes
+GIR_DESC= Use Gobject Introspection
+PERL_DESC= Perl scripting language bindings (deprecated)
+
+GIR_USE= gnome=introspection:build
+GIR_CONFIGURE_ON= --enable-introspection=yes
+GIR_CONFIGURE_OFF= --enable-introspection=no
+
NLS_CONFIGURE_ENABLE= nls
NLS_USES= gettext-runtime
@@ -39,6 +47,11 @@ PERL_BUILD_DEPENDS= p5-ExtUtils-Depends>=0.405:devel/p5-ExtUtils-Depends \
p5-ExtUtils-PkgConfig>=1.15:devel/p5-ExtUtils-PkgConfig \
p5-Glib2>=1.321:devel/p5-Glib2
PERL_CONFIGURE_ENABLE= perl-bindings
+PERL_LIB_DEPENDS= libdbus-1.so:devel/dbus
PERL_USE= perl5=run
+VAPI_BUILD_DEPENDS= vapigen:lang/vala
+VAPI_CONFIGURE_ENABLE= vala
+VAPA_IMPLIES= GIR
+
.include <bsd.port.mk>
diff --git a/x11/xfce4-conf/distinfo b/x11/xfce4-conf/distinfo
index 0861cb6ab6c9..fa09008ab243 100644
--- a/x11/xfce4-conf/distinfo
+++ b/x11/xfce4-conf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1477326649
-SHA256 (xfce4/xfconf-4.12.1.tar.bz2) = 35f48564e5694faa54fdc180cd3268e16fc2352946a89a3c2fc12cbe400ada36
-SIZE (xfce4/xfconf-4.12.1.tar.bz2) = 564131
+TIMESTAMP = 1565565372
+SHA256 (xfce4/xfconf-4.14.1.tar.bz2) = b893e0a329aee00902fec2f0509f56916c9dcc7844e1b1f9e3c7399458290d59
+SIZE (xfce4/xfconf-4.14.1.tar.bz2) = 644804
diff --git a/x11/xfce4-conf/pkg-plist b/x11/xfce4-conf/pkg-plist
index fb3b899e853a..0c6ef091d265 100644
--- a/x11/xfce4-conf/pkg-plist
+++ b/x11/xfce4-conf/pkg-plist
@@ -4,14 +4,17 @@ include/xfce4/xfconf-0/xfconf/xfconf-channel.h
include/xfce4/xfconf-0/xfconf/xfconf-errors.h
include/xfce4/xfconf-0/xfconf/xfconf-types.h
include/xfce4/xfconf-0/xfconf/xfconf.h
+%%GIR%%lib/girepository-1.0/Xfconf-0.typelib
lib/libxfconf-0.so
-lib/libxfconf-0.so.2
-lib/libxfconf-0.so.2.0.0
+lib/libxfconf-0.so.3
+lib/libxfconf-0.so.3.0.0
lib/xfce4/xfconf/xfconfd
libdata/pkgconfig/libxfconf-0.pc
share/dbus-1/services/org.xfce.Xfconf.service
+%%GIR%%share/gir-1.0/Xfconf-0.gir
%%NLS%%share/locale/ar/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/ast/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/be/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/bg/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/bn/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/ca/LC_MESSAGES/xfconf.mo
@@ -20,6 +23,7 @@ share/dbus-1/services/org.xfce.Xfconf.service
%%NLS%%share/locale/de/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/el/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/en_AU/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/en_CA/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/en_GB/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/es/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/eu/LC_MESSAGES/xfconf.mo
@@ -29,6 +33,7 @@ share/dbus-1/services/org.xfce.Xfconf.service
%%NLS%%share/locale/he/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/hr/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/hu/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/hy_AM/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/id/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/is/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/it/LC_MESSAGES/xfconf.mo
@@ -69,3 +74,5 @@ share/dbus-1/services/org.xfce.Xfconf.service
%%PERL%%%%SITE_ARCH%%/Xfce4/Xfconf/Install/xfconfperl-autogen.h
%%PERL%%%%SITE_ARCH%%/Xfce4/Xfconf/Install/xfconfperl.typemap
%%PERL%%%%SITE_ARCH%%/Xfce4/Xfconf.pm
+%%VAPI%%share/vala/vapi/libxfconf-0.deps
+%%VAPI%%share/vala/vapi/libxfconf-0.vapi
diff --git a/x11/xfce4-dashboard/Makefile b/x11/xfce4-dashboard/Makefile
index d79730e58a3f..a4218b016f4b 100644
--- a/x11/xfce4-dashboard/Makefile
+++ b/x11/xfce4-dashboard/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= dashboard
-PORTVERSION= 0.6.1
-PORTREVISION= 1
+PORTVERSION= 0.7.5
CATEGORIES= x11 xfce
MASTER_SITES= XFCE/apps
PKGNAMEPREFIX= xfce4-
@@ -15,16 +14,14 @@ COMMENT= GNOME shell like dashboard for the Xfce desktop
LICENSE= GPLv2
-LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
- libdbus-1.so:devel/dbus \
- libjson-glib-1.0.so:devel/json-glib \
+LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib \
libcogl.so:graphics/cogl \
libclutter-1.0.so:graphics/clutter
USES= gettext-tools gmake gnome localbase libtool pathfix perl5 pkgconfig \
- tar:bzip2 xfce:gtk3
-USE_GNOME= cairo glib20 gtk30 intlhack intltool libwnck3
-USE_XFCE= garcon
+ tar:bzip2 xfce xorg
+USE_GNOME= cairo glib20 gtk30 intltool libwnck3
+USE_XFCE= garcon xfconf
USE_XORG= x11 xcomposite xdamage xext xfixes xi xinerama xrandr
USE_GL= egl gl
USE_LDCONFIG= yes
@@ -44,6 +41,6 @@ post-patch:
# With some graphics cards, quick launch icons are totally black with
# default value
${FIND} ${WRKSRC}/data/themes -type f -name 'effects.xml' \
- | ${XARGS} ${REINPLACE_CMD} -i "" 's|>1.0<|>0.45<|'
+ | ${XARGS} ${REINPLACE_CMD} -i "" 's|factor">1.0|factor">0.25|'
.include <bsd.port.mk>
diff --git a/x11/xfce4-dashboard/distinfo b/x11/xfce4-dashboard/distinfo
index eb2f012b5952..4c505f597112 100644
--- a/x11/xfce4-dashboard/distinfo
+++ b/x11/xfce4-dashboard/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482480176
-SHA256 (xfce4/xfdashboard-0.6.1.tar.bz2) = ad5dcfe168e4d37e8e85910912f51cfb0ea229ff9863f6582f87b9431a90c2af
-SIZE (xfce4/xfdashboard-0.6.1.tar.bz2) = 2402318
+TIMESTAMP = 1565615330
+SHA256 (xfce4/xfdashboard-0.7.5.tar.bz2) = 4c673be445c08f7247a03f924281480b71a9a9155f833f946d78e8133fe4a4de
+SIZE (xfce4/xfdashboard-0.7.5.tar.bz2) = 3366413
diff --git a/x11/xfce4-dashboard/files/patch-libxfdashboard_application-database.c b/x11/xfce4-dashboard/files/patch-libxfdashboard_application-database.c
new file mode 100644
index 000000000000..5be2424bbb46
--- /dev/null
+++ b/x11/xfce4-dashboard/files/patch-libxfdashboard_application-database.c
@@ -0,0 +1,20 @@
+--- libxfdashboard/application-database.c.orig 2018-04-25 20:40:40 UTC
++++ libxfdashboard/application-database.c
+@@ -118,14 +118,11 @@ static void _xfdashboard_application_database_add_hash
+ static void _xfdashboard_application_database_on_application_menu_reload_required(XfdashboardApplicationDatabase *self,
+ gpointer inUserData)
+ {
+- GarconMenu *menu;
+- GError *error;
++ GarconMenu *menu=GARCON_MENU(inUserData);
++ GError *error=NULL;
+
+ g_return_if_fail(XFDASHBOARD_IS_APPLICATION_DATABASE(self));
+- g_return_if_fail(GARCON_IS_MENU(inUserData));
+-
+- menu=GARCON_MENU(inUserData);
+- error=NULL;
++ g_return_if_fail(GARCON_IS_MENU(menu));
+
+ /* Reload application menu. This also emits all necessary signals. */
+ XFDASHBOARD_DEBUG(self, APPLICATIONS,
diff --git a/x11/xfce4-dashboard/files/patch-libxfdashboard_applications-menu-model.c b/x11/xfce4-dashboard/files/patch-libxfdashboard_applications-menu-model.c
new file mode 100644
index 000000000000..6f7ec5cf346c
--- /dev/null
+++ b/x11/xfce4-dashboard/files/patch-libxfdashboard_applications-menu-model.c
@@ -0,0 +1,11 @@
+--- libxfdashboard/applications-menu-model.c.orig 2018-04-25 20:40:40 UTC
++++ libxfdashboard/applications-menu-model.c
+@@ -440,7 +440,7 @@ static void _xfdashboard_applications_menu_model_fill_
+
+ item=_xfdashboard_applications_menu_model_item_new();
+ item->sequenceID=inFillData->sequenceID;
+- if(inMenu) item->menuElement=g_object_ref(inMenu);
++ if(inMenu) item->menuElement=GARCON_MENU_ELEMENT(inMenu);
+ if(inParentMenu) item->parentMenu=g_object_ref(inParentMenu);
+ if(section) item->section=g_object_ref(section);
+ if(title) item->title=g_strdup(title);
diff --git a/x11/xfce4-dashboard/pkg-plist b/x11/xfce4-dashboard/pkg-plist
index ac62e0243cb3..23170d33e74b 100644
--- a/x11/xfce4-dashboard/pkg-plist
+++ b/x11/xfce4-dashboard/pkg-plist
@@ -19,6 +19,8 @@ include/xfdashboard/libxfdashboard/click-action.h
include/xfdashboard/libxfdashboard/collapse-box.h
include/xfdashboard/libxfdashboard/compat.h
include/xfdashboard/libxfdashboard/css-selector.h
+include/xfdashboard/libxfdashboard/debug.h
+include/xfdashboard/libxfdashboard/desktop-app-info-action.h
include/xfdashboard/libxfdashboard/desktop-app-info.h
include/xfdashboard/libxfdashboard/drag-action.h
include/xfdashboard/libxfdashboard/drop-action.h
@@ -28,13 +30,19 @@ include/xfdashboard/libxfdashboard/fill-box-layout.h
include/xfdashboard/libxfdashboard/focus-manager.h
include/xfdashboard/libxfdashboard/focusable.h
include/xfdashboard/libxfdashboard/image-content.h
+include/xfdashboard/libxfdashboard/label.h
include/xfdashboard/libxfdashboard/libxfdashboard.h
+include/xfdashboard/libxfdashboard/live-window-simple.h
include/xfdashboard/libxfdashboard/live-window.h
include/xfdashboard/libxfdashboard/live-workspace.h
include/xfdashboard/libxfdashboard/model.h
include/xfdashboard/libxfdashboard/outline-effect.h
include/xfdashboard/libxfdashboard/plugin.h
include/xfdashboard/libxfdashboard/plugins-manager.h
+include/xfdashboard/libxfdashboard/popup-menu-item-button.h
+include/xfdashboard/libxfdashboard/popup-menu-item-separator.h
+include/xfdashboard/libxfdashboard/popup-menu-item.h
+include/xfdashboard/libxfdashboard/popup-menu.h
include/xfdashboard/libxfdashboard/quicklaunch.h
include/xfdashboard/libxfdashboard/scaled-table-layout.h
include/xfdashboard/libxfdashboard/scrollbar.h
@@ -59,19 +67,27 @@ include/xfdashboard/libxfdashboard/view-manager.h
include/xfdashboard/libxfdashboard/view-selector.h
include/xfdashboard/libxfdashboard/view.h
include/xfdashboard/libxfdashboard/viewpad.h
+include/xfdashboard/libxfdashboard/window-content-x11.h
include/xfdashboard/libxfdashboard/window-content.h
+include/xfdashboard/libxfdashboard/window-tracker-backend-x11.h
+include/xfdashboard/libxfdashboard/window-tracker-backend.h
+include/xfdashboard/libxfdashboard/window-tracker-monitor-x11.h
include/xfdashboard/libxfdashboard/window-tracker-monitor.h
+include/xfdashboard/libxfdashboard/window-tracker-window-x11.h
include/xfdashboard/libxfdashboard/window-tracker-window.h
+include/xfdashboard/libxfdashboard/window-tracker-workspace-x11.h
include/xfdashboard/libxfdashboard/window-tracker-workspace.h
+include/xfdashboard/libxfdashboard/window-tracker-x11.h
include/xfdashboard/libxfdashboard/window-tracker.h
include/xfdashboard/libxfdashboard/windows-view.h
include/xfdashboard/libxfdashboard/workspace-selector.h
lib/libxfdashboard.so
lib/libxfdashboard.so.0
-lib/libxfdashboard.so.0.600.1
+lib/libxfdashboard.so.0.700.5
lib/xfdashboard/plugins/clock-view.so
lib/xfdashboard/plugins/gnome-shell-search-provider.so
lib/xfdashboard/plugins/hot-corner.so
+lib/xfdashboard/plugins/middle-click-window-close.so
libdata/pkgconfig/libxfdashboard.pc
share/appdata/xfdashboard.appdata.xml
share/applications/xfdashboard-settings.desktop
@@ -85,12 +101,20 @@ share/icons/hicolor/32x32/apps/xfdashboard.png
share/icons/hicolor/48x48/apps/xfdashboard.png
share/icons/hicolor/64x64/apps/xfdashboard.png
share/icons/hicolor/96x96/apps/xfdashboard.png
+%%NLS%%share/locale/ca/LC_MESSAGES/xfdashboard.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfdashboard.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfdashboard.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfdashboard.mo
%%NLS%%share/locale/es/LC_MESSAGES/xfdashboard.mo
%%NLS%%share/locale/fr/LC_MESSAGES/xfdashboard.mo
%%NLS%%share/locale/he/LC_MESSAGES/xfdashboard.mo
%%NLS%%share/locale/it_IT/LC_MESSAGES/xfdashboard.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfdashboard.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/xfdashboard.mo
%%NLS%%share/locale/lt/LC_MESSAGES/xfdashboard.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfdashboard.mo
%%NLS%%share/locale/sr/LC_MESSAGES/xfdashboard.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfdashboard.mo
share/themes/xfdashboard-auber/xfdashboard-1.0/effects.xml
share/themes/xfdashboard-auber/xfdashboard-1.0/screenshot-xfdashboard-auber.png
share/themes/xfdashboard-auber/xfdashboard-1.0/xfdashboard-auber.css
@@ -99,6 +123,7 @@ share/themes/xfdashboard-auber/xfdashboard-1.0/xfdashboard.css
share/themes/xfdashboard-auber/xfdashboard-1.0/xfdashboard.theme
share/themes/xfdashboard-auber/xfdashboard-1.0/xfdashboard.xml
share/themes/xfdashboard-blue/xfdashboard-1.0/effects.xml
+share/themes/xfdashboard-blue/xfdashboard-1.0/screenshot-xfdashboard-blue.png
share/themes/xfdashboard-blue/xfdashboard-1.0/xfdashboard-blue.css
share/themes/xfdashboard-blue/xfdashboard-1.0/xfdashboard-secondary.xml
share/themes/xfdashboard-blue/xfdashboard-1.0/xfdashboard.css
diff --git a/x11/xfce4-embed-plugin/Makefile b/x11/xfce4-embed-plugin/Makefile
index 83d56e3fab61..acdb7bb1cf1c 100644
--- a/x11/xfce4-embed-plugin/Makefile
+++ b/x11/xfce4-embed-plugin/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xfce4-embed-plugin
PORTVERSION= 1.6.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
@@ -16,8 +16,9 @@ LICENSE= GPLv2
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
-USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce
-USE_GNOME= cairo gdkpixbuf2 glib20 gtk20 intlhack intltool
+USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 \
+ xfce:gtk2 xorg
+USE_GNOME= cairo gdkpixbuf2 glib20 gtk20 intltool
USE_XFCE= panel
USE_XORG= ice sm x11
diff --git a/x11/xfce4-goodies/Makefile b/x11/xfce4-goodies/Makefile
index a3b315387173..796eb14a7af6 100644
--- a/x11/xfce4-goodies/Makefile
+++ b/x11/xfce4-goodies/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-goodies
-PORTVERSION= 4.12
-PORTREVISION= 2
+PORTVERSION= 4.14
CATEGORIES= x11
MAINTAINER= xfce@FreeBSD.org
@@ -11,23 +10,22 @@ COMMENT= Meta-port for software and artwork from the Xfce4 Goodies Project
USES= metaport
-OPTIONS_DEFAULT= DASHBOARD DICTIONARY GIGOLO PAROLE \
- POWERMANAGER RISTRETTO SCREENSHOOTER TASKMANAGER \
+OPTIONS_DEFAULT= DASHBOARD DICTIONARY GIGOLO PAROLE POWERMANAGER \
+ RISTRETTO SCREENSAVER SCREENSHOOTER TASKMANAGER \
TERMINAL XFBURN \
- BATTERY CALCULATOR CLIPMAN CPUGRAPH \
- DATETIME DISKPERF EMBED FSGUARD GENMON \
- MAILWATCH MENULIBRE MOUNT NETLOAD NOTES \
- SMARTBOOKMARK SYSTEMLOAD TIMER TIMEOUT VERVE WAVELAN \
- WEATHER WHISKERMENU XKB \
- ARCHIVE MEDIATAGS VCS \
- BSDCPUFREQ EQUAKE MIXER THEMES VOLUMED
+ BATTERY CALCULATOR CLIPMAN CPUGRAPH DATETIME \
+ DISKPERF EMBED FSGUARD GENMON MAILWATCH \
+ MENULIBRE MOUNT NETLOAD NOTES SMARTBOOKMARK \
+ SYSTEMLOAD TIMER TIMEOUT VERVE WAVELAN \
+ WEATHER WHISKERMENU XKB ARCHIVE MEDIATAGS \
+ VCS BSDCPUFREQ EQUAKE THEMES VOLUMED
OPTIONS_GROUP= APPLICATIONS PANELPLUGINS THUNARPLUGINS UNOFFICIAL
OPTIONS_GROUP_APPLICATIONS= DASHBOARD DICTIONARY GIGOLO MIDORI PAROLE \
POWERMANAGER RISTRETTO SCREENSHOOTER \
TASKMANAGER TERMINAL VOLUMEDPULSE XFBURN \
- XFMPC
+ XFMPC SCREENSAVER
DASHBOARD_DESC= GNOME shell like dashboard for the Xfce desktop
DICTIONARY_DESC= Xfce4 plugin to query different dictionaries
GIGOLO_DESC= Frontend to easily manage filesystem connections
@@ -35,6 +33,7 @@ MIDORI_DESC= Lightweight web browser using WebKit engine
PAROLE_DESC= Lightweight media player based on GStreamer
POWERMANAGER_DESC= Power manager for the Xfce Desktop
RISTRETTO_DESC= Image viewer with Xfce integration
+SCREENSAVER_DESC= Screen Saver for the Xfce Desktop
SCREENSHOOTER_DESC= Application and panel plugin to take screenshots
TASKMANAGER_DESC= Task manager for the Xfce desktop
TERMINAL_DESC= Terminal emulator for the X windowing system
@@ -49,6 +48,7 @@ MIDORI_RUN_DEPENDS= midori>=0:www/midori
PAROLE_RUN_DEPENDS= parole>=0:multimedia/xfce4-parole
POWERMANAGER_RUN_DEPENDS= xfce4-power-manager>=0:sysutils/xfce4-power-manager
RISTRETTO_RUN_DEPENDS= ristretto>=0:graphics/ristretto
+SCREENSAVER_RUN_DEPENDS= xfce4-screensaver>=0:x11/xfce4-screensaver
SCREENSHOOTER_RUN_DEPENDS= xfce4-screenshooter-plugin>=0:x11/xfce4-screenshooter-plugin
TASKMANAGER_RUN_DEPENDS= xfce4-taskmanager>=0:x11/xfce4-taskmanager
TERMINAL_RUN_DEPENDS= xfce4-terminal>=0:x11/xfce4-terminal
@@ -120,7 +120,7 @@ XKB_RUN_DEPENDS= xfce4-xkb-plugin>=0:deskutils/xfce4-xkb-plugin
OPTIONS_GROUP_THUNARPLUGINS= ARCHIVE MEDIATAGS VCS
ARCHIVE_DESC= Create/extract archives from file context menus
-MEDIATAGS_DESC= View/edit id3/ogg tags in file properties dialog
+MEDIATAGS_DESC= View/edit id3/ogg tags in file properties dialog
VCS_DESC= SVN+GIT Version Control System integration
ARCHIVE_RUN_DEPENDS= thunar-archive-plugin>=0:archivers/thunar-archive-plugin
@@ -128,15 +128,13 @@ MEDIATAGS_RUN_DEPENDS= thunar-media-tags-plugin>=0:audio/thunar-media-tags-plug
VCS_RUN_DEPENDS= thunar-vcs-plugin>=0:devel/thunar-vcs-plugin
OPTIONS_GROUP_UNOFFICIAL= BSDCPUFREQ EQUAKE MENULIBRE MIXER PRINT THEMES \
- VALA VFS VOLUMED
+ VOLUMED
BSDCPUFREQ_DESC= Display the CPU clock frequency in Xfce panel
EQUAKE_DESC= Earthquake monitor plugin for the Xfce panel
MENULIBRE_DESC= Advanced compliant menu editor
MIXER_DESC= Volume control for the Xfce desktop
PRINT_DESC= Print system support for the Xfce Desktop
THEMES_DESC= Additional themes for xfwm4
-VALA_DESC= Vala binding for the Xfce core libraries
-VFS_DESC= The virtual filesystem for Thunar
VOLUMED_DESC= Volume management daemon for the Xfce desktop
BSDCPUFREQ_RUN_DEPENDS= xfce4-bsdcpufreq-plugin>=0:sysutils/xfce4-bsdcpufreq-plugin
@@ -145,8 +143,6 @@ MENULIBRE_RUN_DEPENDS= py${PYTHON3_DEFAULT:S/.//}-menulibre>=0:x11/menulibre
MIXER_RUN_DEPENDS= xfce4-mixer>=0:audio/xfce4-mixer
PRINT_RUN_DEPENDS= xfce4-print>=0:print/xfce4-print
THEMES_RUN_DEPENDS= xfce4-wm-themes>=0:misc/xfce4-wm-themes
-VALA_RUN_DEPENDS= xfce4-vala>=0:devel/xfce4-vala
-VFS_RUN_DEPENDS= thunar-vfs>=0:x11-fm/thunar-vfs
VOLUMED_RUN_DEPENDS= xfce4-volumed>=0:deskutils/xfce4-volumed
.include <bsd.port.mk>
diff --git a/x11/xfce4-goodies/pkg-descr b/x11/xfce4-goodies/pkg-descr
index 65ec3f45ca1d..e41adbfaff81 100644
--- a/x11/xfce4-goodies/pkg-descr
+++ b/x11/xfce4-goodies/pkg-descr
@@ -12,4 +12,4 @@ ports which are part of the Xfce Goodies Project, and a few additional ports
which are not officially part of Goodies, but highly recommended for an Xfce
desktop environment.
-WWW: http://goodies.xfce.org/
+WWW: https://goodies.xfce.org/
diff --git a/x11/xfce4-quicklauncher-plugin/Makefile b/x11/xfce4-quicklauncher-plugin/Makefile
index 0e801c88ea16..5ca8e110fe33 100644
--- a/x11/xfce4-quicklauncher-plugin/Makefile
+++ b/x11/xfce4-quicklauncher-plugin/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xfce4-quicklauncher-plugin
PORTVERSION= 1.9.4
-PORTREVISION= 18
+PORTREVISION= 19
CATEGORIES= x11 xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
@@ -16,8 +16,8 @@ LICENSE= GPLv2
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
-USES= gettext gmake gnome libtool pkgconfig tar:bzip2 xfce
-USE_GNOME= cairo gdkpixbuf2 gtk20 intlhack intltool
+USES= gettext gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk2
+USE_GNOME= cairo gdkpixbuf2 gtk20 intltool
USE_XFCE= libgui panel
SSP_UNSAFE= yes
diff --git a/x11/xfce4-screensaver/Makefile b/x11/xfce4-screensaver/Makefile
index 20727b87c3e5..055d7c55dc1a 100644
--- a/x11/xfce4-screensaver/Makefile
+++ b/x11/xfce4-screensaver/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= xfce4-screensaver
-PORTVERSION= 0.1.7
+PORTVERSION= 0.1.8
CATEGORIES= x11 xfce
MASTER_SITES= XFCE/apps
DIST_SUBDIR= xfce4
@@ -16,16 +16,13 @@ LICENSE_FILE_LGPL20= ${WRKSRC}/COPYING.LIB
LIB_DEPENDS= libdbus-1.so:devel/dbus \
libdbus-glib-1.so:devel/dbus-glib \
- libnotify.so:devel/libnotify \
- libstartup-notification-1.so:x11/startup-notification \
- libxklavier.so:x11/libxklavier \
- libconsolekit.so:sysutils/consolekit2
+ libxklavier.so:x11/libxklavier
USES= gettext-tools gl gmake gnome pkgconfig python:3.5+ shebangfix \
- tar:bzip2 xfce:gtk3
+ tar:bzip2 xfce xorg
USE_GL= gl
-USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool
-USE_XFCE= garcon libexo libutil
+USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool libwnck3
+USE_XFCE= garcon libexo xfconf
USE_XORG= ice sm x11 xext xrandr xscrnsaver xxf86vm
SHEBANG_FILES= src/xfce4-screensaver-configure
diff --git a/x11/xfce4-screensaver/distinfo b/x11/xfce4-screensaver/distinfo
index 3377c4cc575f..0772729eeca7 100644
--- a/x11/xfce4-screensaver/distinfo
+++ b/x11/xfce4-screensaver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564334497
-SHA256 (xfce4/xfce4-screensaver-0.1.7.tar.bz2) = bab8ec0b866168cc5f48e0ab128c7b295770d67177b305f6c8d13ca57da3bc17
-SIZE (xfce4/xfce4-screensaver-0.1.7.tar.bz2) = 607447
+TIMESTAMP = 1565600817
+SHA256 (xfce4/xfce4-screensaver-0.1.8.tar.bz2) = 4056045ea5fd3eccfe328b86ae245ee4949b9e3044e42ca29c492c0f4ac860d7
+SIZE (xfce4/xfce4-screensaver-0.1.8.tar.bz2) = 593968
diff --git a/x11/xfce4-screensaver/files/patch-src_xfce4-screensaver-configure b/x11/xfce4-screensaver/files/patch-src_xfce4-screensaver-configure
new file mode 100644
index 000000000000..a3a29be3f8a6
--- /dev/null
+++ b/x11/xfce4-screensaver/files/patch-src_xfce4-screensaver-configure
@@ -0,0 +1,21 @@
+--- src/xfce4-screensaver-configure.orig 2019-08-03 17:11:05 UTC
++++ src/xfce4-screensaver-configure
+@@ -711,16 +711,15 @@ if __name__ == "__main__":
+ args = parser.parse_args()
+
+ graphical = not args.check
++ primary = _("Unable to configure screensaver")
+
+ saver = args.screensaver
+ if saver is None:
+- show_fatal(primary, _("Screensaver required.") % saver)
++ show_fatal(primary, _("Screensaver required."))
+ sys.exit(1)
+
+ if saver.startswith("screensavers-"):
+ saver = saver[13:]
+-
+- primary = _("Unable to configure screensaver")
+
+ fname = get_filename(saver)
+ if fname is None:
diff --git a/x11/xfce4-screenshooter-plugin/Makefile b/x11/xfce4-screenshooter-plugin/Makefile
index e1e185047454..d83bc5d5bf3e 100644
--- a/x11/xfce4-screenshooter-plugin/Makefile
+++ b/x11/xfce4-screenshooter-plugin/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-screenshooter-plugin
-PORTVERSION= 1.9.5
+PORTVERSION= 1.9.6
CATEGORIES= x11 xfce
MASTER_SITES= XFCE/apps
DISTNAME= xfce4-screenshooter-${DISTVERSIONFULL}
@@ -16,7 +16,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libsoup-2.4.so:devel/libsoup
-USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3
+USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 \
+ xfce xorg
USE_CSTD= c99
USE_GNOME= cairo glib20 gtk30 intltool libxml2
USE_XFCE= panel
diff --git a/x11/xfce4-screenshooter-plugin/distinfo b/x11/xfce4-screenshooter-plugin/distinfo
index a1f4767e3c08..b727640c1757 100644
--- a/x11/xfce4-screenshooter-plugin/distinfo
+++ b/x11/xfce4-screenshooter-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1554018584
-SHA256 (xfce4/xfce4-screenshooter-1.9.5.tar.bz2) = bf35b5432cb920987c6d7ff193600e5dd4d73422b6aa02b4ec5288744053b38c
-SIZE (xfce4/xfce4-screenshooter-1.9.5.tar.bz2) = 502423
+TIMESTAMP = 1566812875
+SHA256 (xfce4/xfce4-screenshooter-1.9.6.tar.bz2) = 88c174ce687d1f7ba5470d6ab5784d33dc215f8f220211e892e268189dbea658
+SIZE (xfce4/xfce4-screenshooter-1.9.6.tar.bz2) = 529233
diff --git a/x11/xfce4-screenshooter-plugin/pkg-plist b/x11/xfce4-screenshooter-plugin/pkg-plist
index c20051f3b698..d98998068d41 100644
--- a/x11/xfce4-screenshooter-plugin/pkg-plist
+++ b/x11/xfce4-screenshooter-plugin/pkg-plist
@@ -1,7 +1,6 @@
bin/xfce4-screenshooter
lib/xfce4/panel/plugins/libscreenshooterplugin.so
man/man1/xfce4-screenshooter.1.gz
-share/appdata/xfce4-screenshooter.appdata.xml
share/applications/xfce4-screenshooter.desktop
share/icons/hicolor/48x48/apps/applets-screenshooter.png
share/icons/hicolor/scalable/apps/applets-screenshooter.svg
@@ -25,7 +24,9 @@ share/icons/hicolor/scalable/apps/applets-screenshooter.svg
%%NLS%%share/locale/he/LC_MESSAGES/xfce4-screenshooter.mo
%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-screenshooter.mo
%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-screenshooter.mo
+%%NLS%%share/locale/hy_AM/LC_MESSAGES/xfce4-screenshooter.mo
%%NLS%%share/locale/id/LC_MESSAGES/xfce4-screenshooter.mo
+%%NLS%%share/locale/ie/LC_MESSAGES/xfce4-screenshooter.mo
%%NLS%%share/locale/is/LC_MESSAGES/xfce4-screenshooter.mo
%%NLS%%share/locale/it/LC_MESSAGES/xfce4-screenshooter.mo
%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-screenshooter.mo
@@ -60,4 +61,5 @@ share/icons/hicolor/scalable/apps/applets-screenshooter.svg
%%NLS%%share/locale/vi/LC_MESSAGES/xfce4-screenshooter.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-screenshooter.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-screenshooter.mo
+share/metainfo/xfce4-screenshooter.appdata.xml
share/xfce4/panel/plugins/screenshooter.desktop
diff --git a/x11/xfce4-taskmanager/Makefile b/x11/xfce4-taskmanager/Makefile
index 53f899ed5b3b..e0d17d2d0e8e 100644
--- a/x11/xfce4-taskmanager/Makefile
+++ b/x11/xfce4-taskmanager/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xfce4-taskmanager
PORTVERSION= 1.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 xfce
MASTER_SITES= XFCE/apps
DIST_SUBDIR= xfce4
@@ -14,10 +14,8 @@ COMMENT= Task manager for the Xfce desktop
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2
-
-USES= gettext-tools gmake gnome localbase pkgconfig tar:bzip2
+USES= gettext-tools gmake gnome localbase pkgconfig tar:bzip2 \
+ xorg
USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool libwnck3
USE_XORG= ice sm x11 xmu xt
diff --git a/x11/xfce4-terminal/Makefile b/x11/xfce4-terminal/Makefile
index 7d9d2955b1a6..44f4e283f618 100644
--- a/x11/xfce4-terminal/Makefile
+++ b/x11/xfce4-terminal/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-terminal
PORTVERSION= 0.8.8
+PORTREVISION= 1
CATEGORIES= x11 xfce
MASTER_SITES= XFCE/apps
DIST_SUBDIR= xfce4
@@ -13,12 +14,9 @@ COMMENT= Terminal emulator for the X windowing system
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libpcre2-8.so:devel/pcre2 \
- libgnutls.so:security/gnutls
-
-USES= gettext-tools gmake gnome pkgconfig tar:bzip2 xfce:gtk3
+USES= gettext-tools gmake gnome pkgconfig tar:bzip2 xfce xorg
USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool libxml2 vte3
-USE_XFCE= libmenu
+USE_XFCE= libmenu xfconf
USE_XORG= ice sm x11
GNU_CONFIGURE= yes
diff --git a/x11/xfce4-verve-plugin/Makefile b/x11/xfce4-verve-plugin/Makefile
index d75d6993bca6..739e09f4e537 100644
--- a/x11/xfce4-verve-plugin/Makefile
+++ b/x11/xfce4-verve-plugin/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= verve-plugin
-PORTVERSION= 1.1.1
-PORTREVISION= 1
+PORTVERSION= 2.0.0
CATEGORIES= x11 xfce
MASTER_SITES= XFCE/panel-plugins
PKGNAMEPREFIX= xfce4-
@@ -15,14 +14,10 @@ COMMENT= Command line plugin for the Xfce Desktop
LICENSE= GPLv2
-LIB_DEPENDS= libpcre.so:devel/pcre \
- libdbus-glib-1.so:devel/dbus-glib \
- libdbus-1.so:devel/dbus \
- libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2
+LIB_DEPENDS= libpcre.so:devel/pcre
USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce
-USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 intlhack intltool pango
+USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk30 intltool pango
USE_XFCE= panel
GNU_CONFIGURE= yes
diff --git a/x11/xfce4-verve-plugin/distinfo b/x11/xfce4-verve-plugin/distinfo
index e76c4f7af57c..a74d3c96521d 100644
--- a/x11/xfce4-verve-plugin/distinfo
+++ b/x11/xfce4-verve-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523823848
-SHA256 (xfce4/xfce4-verve-plugin-1.1.1.tar.bz2) = 0b8ccbe0778d31e9c9eda4dc97836d8093d05d607de5dfcafff8127b0b2a0afc
-SIZE (xfce4/xfce4-verve-plugin-1.1.1.tar.bz2) = 393914
+TIMESTAMP = 1547922481
+SHA256 (xfce4/xfce4-verve-plugin-2.0.0.tar.bz2) = 9e6510ba6c48fcfc60d1c6ab14613dd7b6ff095cabbf4746f82bf788d8ab4cd2
+SIZE (xfce4/xfce4-verve-plugin-2.0.0.tar.bz2) = 384165
diff --git a/x11/xfce4-verve-plugin/pkg-plist b/x11/xfce4-verve-plugin/pkg-plist
index e75e1dcb9567..1e086e1df9e4 100644
--- a/x11/xfce4-verve-plugin/pkg-plist
+++ b/x11/xfce4-verve-plugin/pkg-plist
@@ -1,4 +1,3 @@
-bin/verve-focus
lib/xfce4/panel/plugins/libverve.so
%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-verve-plugin.mo
%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-verve-plugin.mo
diff --git a/x11/xfce4-wmdock-plugin/Makefile b/x11/xfce4-wmdock-plugin/Makefile
index 2aa56a5c3f22..84e760bcd456 100644
--- a/x11/xfce4-wmdock-plugin/Makefile
+++ b/x11/xfce4-wmdock-plugin/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xfce4-wmdock-plugin
PORTVERSION= 0.6.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11 xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
@@ -14,8 +14,9 @@ COMMENT= WMdock plugin for Xfce
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
-USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce
-USE_GNOME= cairo gtk20 intlhack intltool libwnck
+USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 \
+ xfce:gtk2 xorg
+USE_GNOME= cairo gtk20 intltool libwnck
USE_XFCE= libgui panel
USE_XORG= x11