aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES6
-rw-r--r--MOVED2
-rw-r--r--Mk/Uses/xfce.mk31
-rw-r--r--archivers/squeeze/Makefile12
-rw-r--r--archivers/thunar-archive-plugin/Makefile12
-rw-r--r--archivers/thunar-archive-plugin/distinfo5
-rw-r--r--archivers/thunar-archive-plugin/pkg-plist14
-rw-r--r--audio/thunar-media-tags-plugin/Makefile9
-rw-r--r--audio/thunar-media-tags-plugin/distinfo5
-rw-r--r--audio/thunar-media-tags-plugin/pkg-plist12
-rw-r--r--audio/xfce4-mixer/Makefile5
-rw-r--r--audio/xfce4-mixer/files/patch-panel-plugin_Makefile.in22
-rw-r--r--audio/xfce4-mixer/files/patch-xfce4-mixer_Makefile.in22
-rw-r--r--audio/xfce4-mpc-plugin/Makefile4
-rw-r--r--audio/xfce4-mpc-plugin/distinfo6
-rw-r--r--audio/xfce4-mpc-plugin/pkg-plist3
-rw-r--r--audio/xfce4-pulseaudio-plugin/Makefile6
-rw-r--r--audio/xfce4-pulseaudio-plugin/distinfo6
-rw-r--r--audio/xfce4-pulseaudio-plugin/pkg-plist5
-rw-r--r--audio/xfmpc/Makefile7
-rw-r--r--deskutils/orage/Makefile12
-rw-r--r--deskutils/xfce4-generic-slider/Makefile3
-rw-r--r--deskutils/xfce4-notes-plugin/Makefile11
-rw-r--r--deskutils/xfce4-notifyd/Makefile9
-rw-r--r--deskutils/xfce4-tumbler/Makefile3
-rw-r--r--deskutils/xfce4-tumbler/distinfo6
-rw-r--r--deskutils/xfce4-volumed-pulse/Makefile8
-rw-r--r--deskutils/xfce4-volumed/Makefile8
-rw-r--r--deskutils/xfce4-xkb-plugin/Makefile9
-rw-r--r--devel/Makefile1
-rw-r--r--devel/thunar-vcs-plugin/Makefile14
-rw-r--r--devel/thunar-vcs-plugin/distinfo6
-rw-r--r--devel/thunar-vcs-plugin/pkg-plist3
-rw-r--r--devel/xfce4-dev-tools/Makefile11
-rw-r--r--devel/xfce4-dev-tools/distinfo5
-rw-r--r--devel/xfce4-dev-tools/pkg-plist3
-rw-r--r--devel/xfce4-vala/Makefile24
-rw-r--r--devel/xfce4-vala/distinfo2
-rw-r--r--devel/xfce4-vala/files/patch-configure20
-rw-r--r--devel/xfce4-vala/pkg-descr3
-rw-r--r--devel/xfce4-vala/pkg-plist11
-rw-r--r--editors/mousepad/Makefile7
-rw-r--r--graphics/ristretto/Makefile9
-rw-r--r--mail/xfce4-mailwatch-plugin/Makefile7
-rw-r--r--math/xfce4-calculator-plugin/Makefile6
-rw-r--r--misc/xfce4-appfinder/Makefile28
-rw-r--r--misc/xfce4-appfinder/distinfo5
-rw-r--r--misc/xfce4-appfinder/pkg-plist4
-rw-r--r--misc/xfce4-weather-plugin/Makefile8
-rw-r--r--misc/xfce4-weather-plugin/distinfo6
-rw-r--r--misc/xfce4-wm-themes/Makefile6
-rw-r--r--multimedia/xfce4-parole/Makefile4
-rw-r--r--multimedia/xfce4-parole/distinfo6
-rw-r--r--print/xfce4-print/Makefile10
-rw-r--r--science/xfce4-equake-plugin/Makefile4
-rw-r--r--sysutils/Makefile1
-rw-r--r--sysutils/garcon/Makefile3
-rw-r--r--sysutils/gigolo/Makefile6
-rw-r--r--sysutils/gigolo/distinfo6
-rw-r--r--sysutils/gigolo/pkg-plist2
-rw-r--r--sysutils/xfburn/Makefile6
-rw-r--r--sysutils/xfce4-battery-plugin/Makefile4
-rw-r--r--sysutils/xfce4-battery-plugin/distinfo6
-rw-r--r--sysutils/xfce4-battery-plugin/files/patch-panel-plugin_libacpi.c38
-rw-r--r--sysutils/xfce4-battery-plugin/pkg-plist1
-rw-r--r--sysutils/xfce4-bsdcpufreq-plugin/Makefile7
-rw-r--r--sysutils/xfce4-cpugraph-plugin/Makefile6
-rw-r--r--sysutils/xfce4-diskperf-plugin/Makefile8
-rw-r--r--sysutils/xfce4-fsguard-plugin/Makefile5
-rw-r--r--sysutils/xfce4-fsguard-plugin/distinfo6
-rw-r--r--sysutils/xfce4-fsguard-plugin/files/patch-panel-plugin_fsguard.c148
-rw-r--r--sysutils/xfce4-fsguard-plugin/pkg-plist2
-rw-r--r--sysutils/xfce4-genmon-plugin/Makefile3
-rw-r--r--sysutils/xfce4-mount-plugin/Makefile6
-rw-r--r--sysutils/xfce4-netload-plugin/Makefile4
-rw-r--r--sysutils/xfce4-netload-plugin/distinfo6
-rw-r--r--sysutils/xfce4-netload-plugin/pkg-plist1
-rw-r--r--sysutils/xfce4-places-plugin/Makefile31
-rw-r--r--sysutils/xfce4-places-plugin/distinfo3
-rw-r--r--sysutils/xfce4-places-plugin/pkg-descr9
-rw-r--r--sysutils/xfce4-places-plugin/pkg-plist57
-rw-r--r--sysutils/xfce4-power-manager/Makefile10
-rw-r--r--sysutils/xfce4-power-manager/distinfo6
-rw-r--r--sysutils/xfce4-settings/Makefile27
-rw-r--r--sysutils/xfce4-settings/distinfo6
-rw-r--r--sysutils/xfce4-settings/pkg-message30
-rw-r--r--sysutils/xfce4-settings/pkg-plist20
-rw-r--r--sysutils/xfce4-systemload-plugin/Makefile5
-rw-r--r--sysutils/xfce4-systemload-plugin/distinfo6
-rw-r--r--sysutils/xfce4-systemload-plugin/files/patch-fix-crash-on-properties-dialog31
-rw-r--r--sysutils/xfce4-wavelan-plugin/Makefile5
-rw-r--r--sysutils/xfce4-wavelan-plugin/distinfo6
-rw-r--r--sysutils/xfce4-wavelan-plugin/files/patch-panel-plugin_wavelan.c91
-rw-r--r--sysutils/xfce4-wavelan-plugin/files/patch-panel-plugin_wi__bsd.c251
-rw-r--r--textproc/xfce4-dict-plugin/Makefile4
-rw-r--r--www/midori/Makefile2
-rw-r--r--www/xfce4-smartbookmark-plugin/Makefile4
-rw-r--r--www/xfce4-smartbookmark-plugin/distinfo6
-rw-r--r--www/xfce4-smartbookmark-plugin/pkg-plist3
-rw-r--r--x11-clocks/Makefile1
-rw-r--r--x11-clocks/xfce4-datetime-plugin/Makefile4
-rw-r--r--x11-clocks/xfce4-datetime-plugin/distinfo6
-rw-r--r--x11-clocks/xfce4-datetime-plugin/pkg-plist4
-rw-r--r--x11-clocks/xfce4-stopwatch-plugin/Makefile29
-rw-r--r--x11-clocks/xfce4-stopwatch-plugin/distinfo3
-rw-r--r--x11-clocks/xfce4-stopwatch-plugin/pkg-descr3
-rw-r--r--x11-clocks/xfce4-stopwatch-plugin/pkg-plist53
-rw-r--r--x11-clocks/xfce4-timer-out-plugin/Makefile8
-rw-r--r--x11-clocks/xfce4-timer-out-plugin/distinfo5
-rw-r--r--x11-clocks/xfce4-timer-out-plugin/pkg-plist3
-rw-r--r--x11-clocks/xfce4-timer-plugin/Makefile4
-rw-r--r--x11-fm/thunar-vfs/Makefile13
-rw-r--r--x11-fm/thunar/Makefile32
-rw-r--r--x11-fm/thunar/distinfo6
-rw-r--r--x11-fm/thunar/pkg-plist83
-rw-r--r--x11-toolkits/libxfce4gui/Makefile7
-rw-r--r--x11-wm/xfce4-desktop/Makefile15
-rw-r--r--x11-wm/xfce4-desktop/distinfo6
-rw-r--r--x11-wm/xfce4-desktop/pkg-plist5
-rw-r--r--x11-wm/xfce4-panel-profiles/Makefile3
-rw-r--r--x11-wm/xfce4-panel/Makefile36
-rw-r--r--x11-wm/xfce4-panel/distinfo6
-rw-r--r--x11-wm/xfce4-panel/files/patch-plugins_applicationsmenu_applicationsmenu.c58
-rw-r--r--x11-wm/xfce4-panel/files/patch-plugins_pager_pager.c25
-rw-r--r--x11-wm/xfce4-panel/pkg-plist72
-rw-r--r--x11-wm/xfce4-session/Makefile25
-rw-r--r--x11-wm/xfce4-session/distinfo5
-rw-r--r--x11-wm/xfce4-session/files/patch-scripts_xflock423
-rw-r--r--x11-wm/xfce4-session/files/patch-xfce4-session_xfsm-global.h16
-rw-r--r--x11-wm/xfce4-session/pkg-plist33
-rw-r--r--x11-wm/xfce4-wm/Makefile28
-rw-r--r--x11-wm/xfce4-wm/distinfo6
-rw-r--r--x11-wm/xfce4-wm/pkg-plist5
-rw-r--r--x11-wm/xfce4/Makefile34
-rw-r--r--x11-wm/xfce4/pkg-descr2
-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
169 files changed, 1247 insertions, 1310 deletions
diff --git a/CHANGES b/CHANGES
index d5d1694ced56..808837dbc4b4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,12 @@ in the release notes and/or placed into UPDATING.
All ports committers are allowed to commit to this file.
+20190919:
+AUTHOR: madpilot@FreeBSD.org
+
+ USES=xfce now defaults to gtk3, so for ported applications requiring
+ GTK2 XFCE support USES=xfce:gtk2 should be used.
+
20181225:
AUTHOR: kde@FreeBSD.org
diff --git a/MOVED b/MOVED
index 7e7beab968ab..3b9b13985f19 100644
--- a/MOVED
+++ b/MOVED
@@ -2903,7 +2903,6 @@ sysutils/rsyslog4-devel-relp||2011-11-02|Is now stable; see sysutils/rsyslog4
sysutils/rsyslog4-devel-rfc3195||2011-11-02|Is now stable; see sysutils/rsyslog4
sysutils/rsyslog4-devel-snmp||2011-11-02|Is now stable; see sysutils/rsyslog4
www/php-yaf|www/pecl-yaf|2011-11-02|The project has been moved to PECL
-sysutils/xfce4-places-plugin||2011-11-06|Removed, integrated in Xfce 4.8 panel
lang/p5-F77|lang/p5-ExtUtils-F77|2011-11-07|Move to a better place via repocopy
devel/soup||2011-11-09|Has expired: Unmaintained, use devel/libsoup
graphics/clutter-qt||2011-11-09|Has expired: upstream distfile disappeared, doesn't build, and doesn't seem to be developed anymore
@@ -12955,3 +12954,4 @@ sysutils/libutempter||2019-09-11|Belong to base in all supported version of Free
databases/postgresql-plruby||2019-09-19|Has expired: Abandonware
databases/tablelog||2019-09-19|Has expired: Abandonware
databases/skytools||2019-09-19|Has expired: Abandonware
+devel/xfce4-vala||2019-09-19|Deprecated, functionality moved to xfce libraries with option VAPI on (default)
diff --git a/Mk/Uses/xfce.mk b/Mk/Uses/xfce.mk
index c67a5e5fceb7..42f62fafa5c1 100644
--- a/Mk/Uses/xfce.mk
+++ b/Mk/Uses/xfce.mk
@@ -5,7 +5,7 @@
#
# Feature: xfce
# Usage: USES=xfce or USES=xfce:ARGS
-# Valid ARGS: gtk3
+# Valid ARGS: gtk2
#
# Variables, which can be set by the port:
#
@@ -24,37 +24,40 @@ xfce_ARGS?= # empty
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
-.if ${xfce_ARGS:Mgtk3}
-libmenu_LIB_DEPENDS= libxfce4ui-2.so:x11/libxfce4menu
-libmenu_USE_XFCE_REQ= xfconf
+.if ${xfce_ARGS:Mgtk2}
+libmenu_LIB_DEPENDS= libxfce4ui-1.so:x11/libxfce4menu
+libmenu_USE_XFCE_REQ= libutil
-garcon_LIB_DEPENDS= libgarcon-gtk3-1.so:sysutils/garcon
+garcon_LIB_DEPENDS= libgarcon-gtk2-1.so:sysutils/garcon
garcon_USE_XFCE_REQ= libmenu
-panel_LIB_DEPENDS= libxfce4panel-2.0.so:x11-wm/xfce4-panel
+libexo_LIB_DEPENDS= libexo-1.so:x11/libexo
+libexo_USE_XFCE_REQ= libmenu
+
+panel_LIB_DEPENDS= libxfce4panel-1.0.so:x11-wm/xfce4-panel
panel_RUN_DEPENDS= xfce4-panel:x11-wm/xfce4-panel
panel_USE_XFCE_REQ= garcon libexo xfconf
.else
-libmenu_LIB_DEPENDS= libxfce4ui-1.so:x11/libxfce4menu
-libmenu_USE_XFCE_REQ= xfconf
+libmenu_LIB_DEPENDS= libxfce4ui-2.so:x11/libxfce4menu
+libmenu_USE_XFCE_REQ= libutil
-garcon_LIB_DEPENDS= libgarcon-gtk2-1.so:sysutils/garcon
+garcon_LIB_DEPENDS= libgarcon-gtk3-1.so:sysutils/garcon
garcon_USE_XFCE_REQ= libmenu
-panel_LIB_DEPENDS= libxfce4panel-1.0.so:x11-wm/xfce4-panel
+libexo_LIB_DEPENDS= libexo-2.so:x11/libexo
+libexo_USE_XFCE_REQ= libmenu
+
+panel_LIB_DEPENDS= libxfce4panel-2.0.so:x11-wm/xfce4-panel
panel_RUN_DEPENDS= xfce4-panel:x11-wm/xfce4-panel
panel_USE_XFCE_REQ= garcon libexo xfconf
.endif
-libexo_LIB_DEPENDS= libexo-1.so:x11/libexo
-libexo_USE_XFCE_REQ= libmenu
-
libgui_LIB_DEPENDS= libxfcegui4.so:x11-toolkits/libxfce4gui
libgui_USE_XFCE_REQ= libutil
libutil_LIB_DEPENDS= libxfce4util.so:x11/libxfce4util
-thunar_LIB_DEPENDS= libthunarx-2.so:x11-fm/thunar
+thunar_LIB_DEPENDS= libthunarx-3.so:x11-fm/thunar
thunar_RUN_DEPENDS= Thunar:x11-fm/thunar
thunar_USE_XFCE_REQ= xfconf libmenu
diff --git a/archivers/squeeze/Makefile b/archivers/squeeze/Makefile
index 743ba29c0f13..953347ae720a 100644
--- a/archivers/squeeze/Makefile
+++ b/archivers/squeeze/Makefile
@@ -3,7 +3,7 @@
PORTNAME= squeeze
PORTVERSION= 0.2.3
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= archivers xfce
MASTER_SITES= XFCE/apps
DIST_SUBDIR= xfce4
@@ -15,16 +15,16 @@ LICENSE= GPLv2
LIB_DEPENDS= libthunar-vfs-1.so:x11-fm/thunar-vfs
-SSP_UNSAFE= yes
-GNU_CONFIGURE= yes
-INSTALLS_ICONS= yes
USES= tar:bzip2 pkgconfig gmake gettext pathfix desktop-file-utils \
- libtool xfce
+ libtool xfce:gtk2 xorg
USE_XFCE= thunar
USE_XORG= x11
-USE_GNOME= gtk20 glib20 intltool intlhack
+USE_GNOME= gtk20 glib20 intltool
USE_LDCONFIG= yes
+SSP_UNSAFE= yes
+GNU_CONFIGURE= yes
+INSTALLS_ICONS= yes
CONFIGURE_ARGS=--disable-static --without-html-dir
.include <bsd.port.mk>
diff --git a/archivers/thunar-archive-plugin/Makefile b/archivers/thunar-archive-plugin/Makefile
index 66663e905b03..099411839245 100644
--- a/archivers/thunar-archive-plugin/Makefile
+++ b/archivers/thunar-archive-plugin/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= thunar-archive-plugin
-PORTVERSION= 0.3.1
-PORTREVISION= 6
+PORTVERSION= 0.4.0
CATEGORIES= archivers xfce
MASTER_SITES= XFCE/thunar-plugins
DIST_SUBDIR= xfce4
@@ -14,11 +13,8 @@ COMMENT= Archive plugin for the Thunar File Manager
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-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 intltool
+USE_GNOME= cairo gtk30 intltool
USE_XFCE= libexo thunar
GNU_CONFIGURE= yes
@@ -31,8 +27,4 @@ OPTIONS_SUB= yes
NLS_CONFIGURE_ENABLE= nls
NLS_USES= gettext-runtime
-post-install:
- ${RLN} ${STAGEDIR}${PREFIX}/libexec/thunar-archive-plugin/file-roller.tap \
- ${STAGEDIR}${PREFIX}/libexec/thunar-archive-plugin/org.gnome.FileRoller.tap
-
.include <bsd.port.mk>
diff --git a/archivers/thunar-archive-plugin/distinfo b/archivers/thunar-archive-plugin/distinfo
index e8e03d3eae50..e24b468ad73c 100644
--- a/archivers/thunar-archive-plugin/distinfo
+++ b/archivers/thunar-archive-plugin/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xfce4/thunar-archive-plugin-0.3.1.tar.bz2) = 9ad559b0c11308f6897ad56604e5a06dc8f369f649eb20120b2d3018ef5da54c
-SIZE (xfce4/thunar-archive-plugin-0.3.1.tar.bz2) = 329005
+TIMESTAMP = 1547768935
+SHA256 (xfce4/thunar-archive-plugin-0.4.0.tar.bz2) = bf82fa86a388124eb3c4854249c30712b2922e61789607268ee14548549b3115
+SIZE (xfce4/thunar-archive-plugin-0.4.0.tar.bz2) = 350011
diff --git a/archivers/thunar-archive-plugin/pkg-plist b/archivers/thunar-archive-plugin/pkg-plist
index ce0a6c2b302d..b6f1898eb207 100644
--- a/archivers/thunar-archive-plugin/pkg-plist
+++ b/archivers/thunar-archive-plugin/pkg-plist
@@ -1,11 +1,13 @@
-lib/thunarx-2/thunar-archive-plugin.so
+lib/thunarx-3/thunar-archive-plugin.so
libexec/thunar-archive-plugin/ark.tap
+libexec/thunar-archive-plugin/engrampa.tap
libexec/thunar-archive-plugin/file-roller.tap
libexec/thunar-archive-plugin/gnome-file-roller.tap
libexec/thunar-archive-plugin/org.gnome.FileRoller.tap
share/icons/hicolor/16x16/apps/tap-create.png
share/icons/hicolor/16x16/apps/tap-extract.png
share/icons/hicolor/16x16/apps/tap-extract-to.png
+%%NLS%%share/locale/am/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/ar/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/ast/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/be/LC_MESSAGES/thunar-archive-plugin.mo
@@ -15,6 +17,7 @@ share/icons/hicolor/16x16/apps/tap-extract-to.png
%%NLS%%share/locale/da/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/de/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/el/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/en_GB/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/eo/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/es/LC_MESSAGES/thunar-archive-plugin.mo
@@ -22,17 +25,22 @@ share/icons/hicolor/16x16/apps/tap-extract-to.png
%%NLS%%share/locale/fi/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/fr/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/gl/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/he/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/hr/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/hu/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/id/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/is/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/it/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/ja/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/kk/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/ko/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/lt/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/lv/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/nb/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/nl/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/pa/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/pl/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/pt/LC_MESSAGES/thunar-archive-plugin.mo
@@ -44,10 +52,14 @@ share/icons/hicolor/16x16/apps/tap-extract-to.png
%%NLS%%share/locale/sq/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/sr/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/sv/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/th/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/tr/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/ug/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/uk/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/ur/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/ur_PK/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/uz/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/uz@Latn/LC_MESSAGES/thunar-archive-plugin.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/thunar-archive-plugin.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/thunar-archive-plugin.mo
diff --git a/audio/thunar-media-tags-plugin/Makefile b/audio/thunar-media-tags-plugin/Makefile
index bd9732d3a264..0891d0bed801 100644
--- a/audio/thunar-media-tags-plugin/Makefile
+++ b/audio/thunar-media-tags-plugin/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= thunar-media-tags-plugin
-PORTVERSION= 0.2.1
-PORTREVISION= 5
+PORTVERSION= 0.3.0
CATEGORIES= audio xfce
MASTER_SITES= XFCE/thunar-plugins
DIST_SUBDIR= xfce4
@@ -14,12 +13,10 @@ COMMENT= Media tags plugin
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libtag.so:audio/taglib \
- libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2
+LIB_DEPENDS= libtag.so:audio/taglib
USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce
-USE_GNOME= cairo gdkpixbuf2 gtk20 intlhack intltool
+USE_GNOME= cairo gdkpixbuf2 gtk30 intltool
USE_XFCE= libexo thunar
GNU_CONFIGURE= yes
diff --git a/audio/thunar-media-tags-plugin/distinfo b/audio/thunar-media-tags-plugin/distinfo
index 8d0971a46ba6..5cc3155166b4 100644
--- a/audio/thunar-media-tags-plugin/distinfo
+++ b/audio/thunar-media-tags-plugin/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xfce4/thunar-media-tags-plugin-0.2.1.tar.bz2) = 056d012a10403ee3e2e55b6ff2faecb796821de9ebee000315589b95d95ed253
-SIZE (xfce4/thunar-media-tags-plugin-0.2.1.tar.bz2) = 324833
+TIMESTAMP = 1547769867
+SHA256 (xfce4/thunar-media-tags-plugin-0.3.0.tar.bz2) = e265c4415abac40337cc5566c6f706efcf0be4e97723abe22ba8b874c93a591b
+SIZE (xfce4/thunar-media-tags-plugin-0.3.0.tar.bz2) = 378993
diff --git a/audio/thunar-media-tags-plugin/pkg-plist b/audio/thunar-media-tags-plugin/pkg-plist
index 5f4765e1aeb0..53a9df5c85bb 100644
--- a/audio/thunar-media-tags-plugin/pkg-plist
+++ b/audio/thunar-media-tags-plugin/pkg-plist
@@ -1,4 +1,4 @@
-lib/thunarx-2/thunar-media-tags-plugin.so
+lib/thunarx-3/thunar-media-tags-plugin.so
%%NLS%%share/locale/ar/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/ast/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/bg/LC_MESSAGES/thunar-media-tags-plugin.mo
@@ -7,37 +7,47 @@ lib/thunarx-2/thunar-media-tags-plugin.so
%%NLS%%share/locale/da/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/de/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/el/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/en_GB/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/es/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/eu/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/fi/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/fr/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/gl/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/he/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/hr/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/hu/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/id/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/is/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/it/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/ja/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/kk/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/ko/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/lt/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/lv/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/nb/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/nl/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/pa/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/pl/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/pt/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/ru/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/sk/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/sl/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/sq/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/sr/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/sv/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/th/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/tr/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/ug/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/uk/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/ur/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/ur_PK/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/uz/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/uz@Latn/LC_MESSAGES/thunar-media-tags-plugin.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/thunar-media-tags-plugin.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/thunar-media-tags-plugin.mo
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index c24d54bfbdd0..f377d608e0f2 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xfce4-mixer
PORTVERSION= 4.11.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio xfce
MASTER_SITES= XFCE/apps
DIST_SUBDIR= xfce4
@@ -19,7 +19,8 @@ LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
-USES= gmake libtool pkgconfig gettext-tools xfce tar:bzip2
+USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 \
+ xfce:gtk2
USE_GNOME= cairo glib20 gtk20 intlhack intltool libxml2
USE_XFCE= panel
USE_GSTREAMER= good
diff --git a/audio/xfce4-mixer/files/patch-panel-plugin_Makefile.in b/audio/xfce4-mixer/files/patch-panel-plugin_Makefile.in
new file mode 100644
index 000000000000..1028c4dc64ac
--- /dev/null
+++ b/audio/xfce4-mixer/files/patch-panel-plugin_Makefile.in
@@ -0,0 +1,22 @@
+--- panel-plugin/Makefile.in.orig 2014-04-09 19:40:22 UTC
++++ panel-plugin/Makefile.in
+@@ -416,7 +416,8 @@ libmixer_la_CFLAGS = \
+ $(LIBXFCE4PANEL_CFLAGS) \
+ $(XFCONF_CFLAGS) \
+ $(GST_PLUGINS_BASE_CFLAGS) \
+- $(KEYBINDER_CFLAGS)
++ $(KEYBINDER_CFLAGS) \
++ $(DBUS_GLIB_CFLAGS)
+
+ libmixer_la_DEPENDENCIES = \
+ $(top_builddir)/libxfce4mixer/libxfce4mixer.la
+@@ -439,7 +440,8 @@ libmixer_la_LIBADD = \
+ $(GST_PLUGINS_BASE_LIBS) \
+ -lgstaudio-0.10 \
+ -lgstinterfaces-0.10 \
+- $(KEYBINDER_LIBS)
++ $(KEYBINDER_LIBS) \
++ $(DBUS_GLIB_LIBS)
+
+ desktopdir = $(datadir)/xfce4/panel/plugins
+ desktop_in_files = mixer.desktop.in
diff --git a/audio/xfce4-mixer/files/patch-xfce4-mixer_Makefile.in b/audio/xfce4-mixer/files/patch-xfce4-mixer_Makefile.in
new file mode 100644
index 000000000000..e3f8d409231f
--- /dev/null
+++ b/audio/xfce4-mixer/files/patch-xfce4-mixer_Makefile.in
@@ -0,0 +1,22 @@
+--- xfce4-mixer/Makefile.in.orig 2014-04-09 19:40:22 UTC
++++ xfce4-mixer/Makefile.in
+@@ -429,7 +429,8 @@ xfce4_mixer_CFLAGS = \
+ $(LIBXFCE4UTIL_CFLAGS) \
+ $(LIBXFCE4UI_CFLAGS) \
+ $(XFCONF_CFLAGS) \
+- $(GST_PLUGINS_BASE_CFLAGS)
++ $(GST_PLUGINS_BASE_CFLAGS) \
++ $(DBUS_GLIB_CFLAGS)
+
+ xfce4_mixer_DEPENDENCIES = \
+ $(top_builddir)/libxfce4mixer/libxfce4mixer.la
+@@ -445,7 +446,8 @@ xfce4_mixer_LDFLAGS = \
+ $(XFCONF_LIBS) \
+ $(GST_PLUGINS_BASE_LIBS) \
+ -lgstaudio-0.10 \
+- -lgstinterfaces-0.10
++ -lgstinterfaces-0.10 \
++ $(DBUS_GLIB_LIBS)
+
+ dist_man_MANS = xfce4-mixer.1
+ desktop_in_files = xfce4-mixer.desktop.in
diff --git a/audio/xfce4-mpc-plugin/Makefile b/audio/xfce4-mpc-plugin/Makefile
index f0f0aeb756cd..eba7f681f4a0 100644
--- a/audio/xfce4-mpc-plugin/Makefile
+++ b/audio/xfce4-mpc-plugin/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-mpc-plugin
-PORTVERSION= 0.5.1
+PORTVERSION= 0.5.2
CATEGORIES= audio xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
@@ -15,7 +15,7 @@ LICENSE= ISCL
LIB_DEPENDS= libmpd.so:audio/libmpd
RUN_DEPENDS= musicpd:audio/musicpd
-USES= gettext-tools gmake libtool pkgconfig tar:bzip2 xfce:gtk3
+USES= gettext-tools gmake libtool pkgconfig tar:bzip2 xfce
USE_GNOME= cairo gdkpixbuf2 gtk30 intltool
USE_XFCE= panel
diff --git a/audio/xfce4-mpc-plugin/distinfo b/audio/xfce4-mpc-plugin/distinfo
index 1326e5d33641..0228e6ec9e56 100644
--- a/audio/xfce4-mpc-plugin/distinfo
+++ b/audio/xfce4-mpc-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1544309125
-SHA256 (xfce4/xfce4-mpc-plugin-0.5.1.tar.bz2) = 635e678c9729663e9eaadfcf58426f7cea37e6d3fda5e818955fbc8ade00de01
-SIZE (xfce4/xfce4-mpc-plugin-0.5.1.tar.bz2) = 290830
+TIMESTAMP = 1565692661
+SHA256 (xfce4/xfce4-mpc-plugin-0.5.2.tar.bz2) = eefe78b7b6b95312b3a52814b7f632dc92970c1b3e9535de616315749bf67760
+SIZE (xfce4/xfce4-mpc-plugin-0.5.2.tar.bz2) = 293655
diff --git a/audio/xfce4-mpc-plugin/pkg-plist b/audio/xfce4-mpc-plugin/pkg-plist
index 50477533a399..6c1ffc23fae2 100644
--- a/audio/xfce4-mpc-plugin/pkg-plist
+++ b/audio/xfce4-mpc-plugin/pkg-plist
@@ -12,12 +12,15 @@ lib/xfce4/panel/plugins/libmpc.so
%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-mpc-plugin.mo
%%NLS%%share/locale/es/LC_MESSAGES/xfce4-mpc-plugin.mo
%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-mpc-plugin.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-mpc-plugin.mo
%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-mpc-plugin.mo
%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-mpc-plugin.mo
%%NLS%%share/locale/he/LC_MESSAGES/xfce4-mpc-plugin.mo
%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-mpc-plugin.mo
%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-mpc-plugin.mo
+%%NLS%%share/locale/hy_AM/LC_MESSAGES/xfce4-mpc-plugin.mo
%%NLS%%share/locale/id/LC_MESSAGES/xfce4-mpc-plugin.mo
+%%NLS%%share/locale/ie/LC_MESSAGES/xfce4-mpc-plugin.mo
%%NLS%%share/locale/is/LC_MESSAGES/xfce4-mpc-plugin.mo
%%NLS%%share/locale/it/LC_MESSAGES/xfce4-mpc-plugin.mo
%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-mpc-plugin.mo
diff --git a/audio/xfce4-pulseaudio-plugin/Makefile b/audio/xfce4-pulseaudio-plugin/Makefile
index 6d7bdb3924d3..e167c82ad2db 100644
--- a/audio/xfce4-pulseaudio-plugin/Makefile
+++ b/audio/xfce4-pulseaudio-plugin/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-pulseaudio-plugin
-PORTVERSION= 0.4.1
-PORTREVISION= 2
+PORTVERSION= 0.4.2
CATEGORIES= audio xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
@@ -18,7 +17,8 @@ LIB_DEPENDS= libpulse-mainloop-glib.so:audio/pulseaudio \
libdbus-glib-1.so:devel/dbus-glib
RUN_DEPENDS= pavucontrol>=2.0:audio/pavucontrol
-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 glib20 gtk30 intltool libwnck3
USE_XFCE= panel
USE_XORG= x11
diff --git a/audio/xfce4-pulseaudio-plugin/distinfo b/audio/xfce4-pulseaudio-plugin/distinfo
index 2a94fa913087..18dabf4323fc 100644
--- a/audio/xfce4-pulseaudio-plugin/distinfo
+++ b/audio/xfce4-pulseaudio-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523526880
-SHA256 (xfce4/xfce4-pulseaudio-plugin-0.4.1.tar.bz2) = 6ca88314dbac3e24c0e1bfc593fad6edb66319766be62e8256c81b0314f049f0
-SIZE (xfce4/xfce4-pulseaudio-plugin-0.4.1.tar.bz2) = 391791
+TIMESTAMP = 1565601023
+SHA256 (xfce4/xfce4-pulseaudio-plugin-0.4.2.tar.bz2) = 4ae8aebc2458675d4f885bf16f73829be359e16370a684301bbef6a23758a120
+SIZE (xfce4/xfce4-pulseaudio-plugin-0.4.2.tar.bz2) = 428504
diff --git a/audio/xfce4-pulseaudio-plugin/pkg-plist b/audio/xfce4-pulseaudio-plugin/pkg-plist
index 35e3d968ecd6..36242493b04d 100644
--- a/audio/xfce4-pulseaudio-plugin/pkg-plist
+++ b/audio/xfce4-pulseaudio-plugin/pkg-plist
@@ -9,6 +9,7 @@ share/icons/hicolor/scalable/status/microphone-sensitivity-high-symbolic.svg
share/icons/hicolor/scalable/status/microphone-sensitivity-low-symbolic.svg
share/icons/hicolor/scalable/status/microphone-sensitivity-medium-symbolic.svg
share/icons/hicolor/scalable/status/microphone-sensitivity-muted-symbolic.svg
+%%NLS%%share/locale/be/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
@@ -17,13 +18,17 @@ share/icons/hicolor/scalable/status/microphone-sensitivity-muted-symbolic.svg
%%NLS%%share/locale/el/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
%%NLS%%share/locale/es/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
%%NLS%%share/locale/ga/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
%%NLS%%share/locale/he/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/hy_AM/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
%%NLS%%share/locale/id/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
+%%NLS%%share/locale/ie/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
%%NLS%%share/locale/is/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
%%NLS%%share/locale/it/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-pulseaudio-plugin.mo
diff --git a/audio/xfmpc/Makefile b/audio/xfmpc/Makefile
index 412f51914892..b6a898ab8eb8 100644
--- a/audio/xfmpc/Makefile
+++ b/audio/xfmpc/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfmpc
PORTVERSION= 0.3.0
+PORTREVISION= 1
CATEGORIES= audio xfce
MASTER_SITES= XFCE/apps
DIST_SUBDIR= xfce4
@@ -13,11 +14,9 @@ COMMENT= Graphical MPD client focusing on low footprint
LICENSE= GPLv2
BUILD_DEPENDS= valac:lang/vala
-LIB_DEPENDS= libmpd.so:audio/libmpd \
- libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2
+LIB_DEPENDS= libmpd.so:audio/libmpd
-USES= gettext-tools gmake gnome pkgconfig tar:bzip2 xfce:gtk3
+USES= gettext-tools gmake gnome pkgconfig tar:bzip2 xfce xorg
USE_GNOME= cairo gtk30 intltool
USE_XFCE= libmenu
USE_XORG= ice sm x11
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
diff --git a/devel/Makefile b/devel/Makefile
index c90fd5674c9c..a972b72f6bbd 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -6539,7 +6539,6 @@
SUBDIR += xeus
SUBDIR += xeus-cling
SUBDIR += xfce4-dev-tools
- SUBDIR += xfce4-vala
SUBDIR += xmake
SUBDIR += xmltooling
SUBDIR += xorg-macros
diff --git a/devel/thunar-vcs-plugin/Makefile b/devel/thunar-vcs-plugin/Makefile
index 97caf7ba5f8b..84a1c43e1e96 100644
--- a/devel/thunar-vcs-plugin/Makefile
+++ b/devel/thunar-vcs-plugin/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= thunar-vcs-plugin
-PORTVERSION= 0.1.5
-PORTREVISION= 1
+PORTVERSION= 0.2.0
CATEGORIES= devel xfce
MASTER_SITES= XFCE/thunar-plugins
DIST_SUBDIR= xfce4
@@ -14,13 +13,9 @@ COMMENT= Version Control System plugin for Thunar
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2 \
- libapr-1.so:devel/apr1
-
-USES= gettext-tools gmake libtool localbase pkgconfig tar:bzip2 \
+USES= gettext-tools gmake gnome libtool localbase pkgconfig tar:bzip2 \
xfce
-USE_GNOME= cairo glib20 gtk20 intlhack intltool
+USE_GNOME= cairo gtk30 glib20 intltool
USE_XFCE= libexo thunar
GNU_CONFIGURE= yes
@@ -40,6 +35,7 @@ NLS_CONFIGURE_ENABLE= nls
NLS_USES= gettext-runtime
SVN_CONFIGURE_ENABLE= subversion
-SVN_LIB_DEPENDS= libsvn_client-1.so:devel/subversion
+SVN_LIB_DEPENDS= libsvn_client-1.so:devel/subversion \
+ libapr-1.so:devel/apr1
.include <bsd.port.mk>
diff --git a/devel/thunar-vcs-plugin/distinfo b/devel/thunar-vcs-plugin/distinfo
index 023c0c2e88a2..73fed76c0790 100644
--- a/devel/thunar-vcs-plugin/distinfo
+++ b/devel/thunar-vcs-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1467350871
-SHA256 (xfce4/thunar-vcs-plugin-0.1.5.tar.bz2) = 7094f576865957397eefcdb1b05ba9be020a396c12949077507ea1573b1ef451
-SIZE (xfce4/thunar-vcs-plugin-0.1.5.tar.bz2) = 478866
+TIMESTAMP = 1547769641
+SHA256 (xfce4/thunar-vcs-plugin-0.2.0.tar.bz2) = 368916d4c3d40862bf7cd1b3000c801c7db801ec88a236f1d8dd44ef780b4db8
+SIZE (xfce4/thunar-vcs-plugin-0.2.0.tar.bz2) = 546608
diff --git a/devel/thunar-vcs-plugin/pkg-plist b/devel/thunar-vcs-plugin/pkg-plist
index 982ac968b57f..99035452fbc5 100644
--- a/devel/thunar-vcs-plugin/pkg-plist
+++ b/devel/thunar-vcs-plugin/pkg-plist
@@ -1,4 +1,4 @@
-lib/thunarx-2/thunar-vcs-plugin.so
+lib/thunarx-3/thunar-vcs-plugin.so
%%GIT%%libexec/tvp-git-helper
%%SVN%%libexec/tvp-svn-helper
share/icons/hicolor/24x24/apps/git.png
@@ -6,6 +6,7 @@ share/icons/hicolor/24x24/apps/subversion.png
share/icons/hicolor/48x48/apps/git.png
share/icons/hicolor/48x48/apps/subversion.png
%%NLS%%share/locale/ar/LC_MESSAGES/thunar-vcs-plugin.mo
+%%NLS%%share/locale/be/LC_MESSAGES/thunar-vcs-plugin.mo
%%NLS%%share/locale/bg/LC_MESSAGES/thunar-vcs-plugin.mo
%%NLS%%share/locale/ca/LC_MESSAGES/thunar-vcs-plugin.mo
%%NLS%%share/locale/cs/LC_MESSAGES/thunar-vcs-plugin.mo
diff --git a/devel/xfce4-dev-tools/Makefile b/devel/xfce4-dev-tools/Makefile
index e3b28a2b8250..92f4b2aba0ab 100644
--- a/devel/xfce4-dev-tools/Makefile
+++ b/devel/xfce4-dev-tools/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-dev-tools
-PORTVERSION= 4.12.0
-PORTREVISION= 1
+PORTVERSION= 4.14.0
CATEGORIES= devel xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
@@ -19,9 +18,11 @@ RUN_DEPENDS= autoconf>=2.69:devel/autoconf \
libtoolize:devel/libtool \
bash:shells/bash
-GNU_CONFIGURE= yes
+USES= pkgconfig tar:bzip2 xfce
USE_GNOME= glib20
-USES= pkgconfig shebangfix tar:bzip2 xfce
-SHEBANG_FILES= scripts/xdt-commit
+
+GNU_CONFIGURE= yes
+
+PORTSCOUT= limitw:1,even
.include <bsd.port.mk>
diff --git a/devel/xfce4-dev-tools/distinfo b/devel/xfce4-dev-tools/distinfo
index a460297598de..f5a93d727f91 100644
--- a/devel/xfce4-dev-tools/distinfo
+++ b/devel/xfce4-dev-tools/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xfce4/xfce4-dev-tools-4.12.0.tar.bz2) = e2e3a654fe9110df81f8c2483c9cbfa6d656fed15d5e5e717d6ef10bd0f5b5cb
-SIZE (xfce4/xfce4-dev-tools-4.12.0.tar.bz2) = 309586
+TIMESTAMP = 1565543023
+SHA256 (xfce4/xfce4-dev-tools-4.14.0.tar.bz2) = 2c9eb8e0fe23e47dc31411a93b683fd1b7a49140e9163f0aab9e94a3d8a0b5fd
+SIZE (xfce4/xfce4-dev-tools-4.14.0.tar.bz2) = 292275
diff --git a/devel/xfce4-dev-tools/pkg-plist b/devel/xfce4-dev-tools/pkg-plist
index 95c4ef37d1b7..43ce95d8c1ee 100644
--- a/devel/xfce4-dev-tools/pkg-plist
+++ b/devel/xfce4-dev-tools/pkg-plist
@@ -1,8 +1,5 @@
bin/xdt-autogen
-bin/xdt-commit
bin/xdt-csource
share/xfce4/dev-tools/m4macros/xdt-depends.m4
share/xfce4/dev-tools/m4macros/xdt-features.m4
share/xfce4/dev-tools/m4macros/xdt-i18n.m4
-share/xfce4/dev-tools/m4macros/xdt-python.m4
-share/xfce4/dev-tools/m4macros/xdt-xfce.m4
diff --git a/devel/xfce4-vala/Makefile b/devel/xfce4-vala/Makefile
deleted file mode 100644
index 063d2634968e..000000000000
--- a/devel/xfce4-vala/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Created by: Olivier Duchateau <olivierd@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= xfce4-vala
-PORTVERSION= 4.10.3
-PORTREVISION= 5
-CATEGORIES= devel xfce
-MASTER_SITES= XFCE/bindings
-DIST_SUBDIR= xfce4
-
-MAINTAINER= xfce@FreeBSD.org
-COMMENT= Vala binding for the Xfce core libraries
-
-LICENSE= LGPL21
-
-BUILD_DEPENDS= valac:lang/vala
-
-USES= gmake gnome pathfix pkgconfig tar:bzip2 xfce
-USE_XFCE= panel
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-vala-api=0.40
-
-.include <bsd.port.mk>
diff --git a/devel/xfce4-vala/distinfo b/devel/xfce4-vala/distinfo
deleted file mode 100644
index b49945819b91..000000000000
--- a/devel/xfce4-vala/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xfce4/xfce4-vala-4.10.3.tar.bz2) = 07a8f2b7c09fcdd3d86e0c52adea3c58ca011d0142a93997a01b4af77260ae7b
-SIZE (xfce4/xfce4-vala-4.10.3.tar.bz2) = 88023
diff --git a/devel/xfce4-vala/files/patch-configure b/devel/xfce4-vala/files/patch-configure
deleted file mode 100644
index 051dbd4f6fbd..000000000000
--- a/devel/xfce4-vala/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig 2013-08-16 20:27:53 UTC
-+++ configure
-@@ -2671,7 +2671,7 @@ VALAGI=`$PKG_CONFIG --variable=vala_gen_introspect lib
-
-
-
--vapidir=`$PKG_CONFIG --variable=vapidir libvala-$vala_api`
-+vapidir=${datarootdir}/vala/vapi
-
-
-
-@@ -2684,7 +2684,7 @@ else
- fi
-
- if test x"$with_default_vapidir" == xno ; then
-- vapidir=${datarootdir}/vala-${vala_api}/vapi
-+ vapidir=${datarootdir}/vala/vapi
-
- fi
-
diff --git a/devel/xfce4-vala/pkg-descr b/devel/xfce4-vala/pkg-descr
deleted file mode 100644
index 98edb402b67f..000000000000
--- a/devel/xfce4-vala/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Xfce4 Vala provides bindings for the Xfce core libraries.
-
-WWW: https://wiki.xfce.org/vala-bindings
diff --git a/devel/xfce4-vala/pkg-plist b/devel/xfce4-vala/pkg-plist
deleted file mode 100644
index c9bf0e686ae4..000000000000
--- a/devel/xfce4-vala/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-libdata/pkgconfig/xfce4-vala.pc
-share/vala/vapi/exo-1.deps
-share/vala/vapi/exo-1.vapi
-share/vala/vapi/garcon-1.deps
-share/vala/vapi/garcon-1.vapi
-share/vala/vapi/libxfce4panel-1.0.deps
-share/vala/vapi/libxfce4panel-1.0.vapi
-share/vala/vapi/libxfce4ui-1.deps
-share/vala/vapi/libxfce4ui-1.vapi
-share/vala/vapi/libxfce4util-1.0.vapi
-share/vala/vapi/libxfconf-0.vapi
diff --git a/editors/mousepad/Makefile b/editors/mousepad/Makefile
index d2d3cb78f853..e466c6f1bf75 100644
--- a/editors/mousepad/Makefile
+++ b/editors/mousepad/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mousepad
PORTVERSION= 0.4.2
+PORTREVISION= 1
CATEGORIES= editors xfce
MASTER_SITES= XFCE/apps
DIST_SUBDIR= xfce4
@@ -13,8 +14,6 @@ COMMENT= Simple text editor for the Xfce Desktop
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libdbus-1.so:devel/dbus
-
USES= desktop-file-utils gettext-tools gmake gnome libtool perl5 \
pkgconfig tar:bzip2
USE_GNOME= cairo gdkpixbuf2 glib20 intlhack intltool
@@ -31,8 +30,8 @@ OPTIONS_SUB= yes
GTK3_CONFIGURE_ENABLE= gtk3
GTK3_USE= gnome=gtk30,gtksourceview3,dconf
GTK3_USE_OFF= gnome=gtk20,gtksourceview2
-GTK3_USES= xfce:gtk3
-GTK3_USES_OFF= xfce
+GTK3_USES= xfce
+GTK3_USES_OFF= xfce:gtk2
GTK3_CFLAGS_OFF= -I${LOCALBASE}/include/gio-unix-2.0
NLS_CONFIGURE_ENABLE= nls
diff --git a/graphics/ristretto/Makefile b/graphics/ristretto/Makefile
index 270d7bbe4b0b..66e01411ba18 100644
--- a/graphics/ristretto/Makefile
+++ b/graphics/ristretto/Makefile
@@ -3,6 +3,7 @@
PORTNAME= ristretto
PORTVERSION= 0.10.0
+PORTREVISION= 1
CATEGORIES= graphics xfce
MASTER_SITES= XFCE/apps
DIST_SUBDIR= xfce4
@@ -13,14 +14,12 @@ COMMENT= Image viewer with Xfce integration
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libexif.so:graphics/libexif \
- libdbus-glib-1.so:devel/dbus-glib \
- libdbus-1.so:devel/dbus
+LIB_DEPENDS= libexif.so:graphics/libexif
USES= desktop-file-utils gettext-tools gmake gnome pkgconfig \
- tar:bzip2 xfce:gtk3
+ tar:bzip2 xfce xorg
USE_GNOME= cairo gtk30 glib20 intltool
-USE_XFCE= libmenu
+USE_XFCE= libmenu xfconf
USE_XORG= ice sm x11
GNU_CONFIGURE= yes
diff --git a/mail/xfce4-mailwatch-plugin/Makefile b/mail/xfce4-mailwatch-plugin/Makefile
index 398b33a0ae03..582343685f65 100644
--- a/mail/xfce4-mailwatch-plugin/Makefile
+++ b/mail/xfce4-mailwatch-plugin/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xfce4-mailwatch-plugin
PORTVERSION= 1.2.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= mail xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
@@ -20,8 +20,9 @@ LIB_DEPENDS= libgnutls.so:security/gnutls \
libfontconfig.so:x11-fonts/fontconfig \
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= x11
diff --git a/math/xfce4-calculator-plugin/Makefile b/math/xfce4-calculator-plugin/Makefile
index bd03fe1489ea..5af58c82b51d 100644
--- a/math/xfce4-calculator-plugin/Makefile
+++ b/math/xfce4-calculator-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-calculator-plugin
PORTVERSION= 0.7.0
+PORTREVISION= 1
CATEGORIES= math xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
@@ -12,11 +13,8 @@ COMMENT= Simple calculator for the Xfce panel
LICENSE= GPLv2
-LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2
-
USES= gettext-tools gmake gnome libtool pkgconfig tar:bz2 \
- xfce:gtk3
+ xfce xorg
USE_GNOME= cairo gtk30 intltool
USE_XFCE= panel
USE_XORG= x11
diff --git a/misc/xfce4-appfinder/Makefile b/misc/xfce4-appfinder/Makefile
index c17e76baf3b6..6b2bf7af561e 100644
--- a/misc/xfce4-appfinder/Makefile
+++ b/misc/xfce4-appfinder/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-appfinder
-PORTVERSION= 4.12.0
-PORTREVISION= 1
+PORTVERSION= 4.14.0
CATEGORIES= misc xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
@@ -13,33 +12,18 @@ COMMENT= Application launcher and finder
LICENSE= GPLv2
-LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
- libdbus-1.so:devel/dbus \
- libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2
-
USES= gettext-tools gmake gnome pkgconfig tar:bzip2 xfce
-USE_GNOME= cairo gdkpixbuf2 glib20 intlhack intltool
-USE_XFCE= garcon
+USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool
+USE_XFCE= garcon xfconf
GNU_CONFIGURE= yes
-OPTIONS_DEFINE= GTK3 NLS
-OPTIONS_SUB= yes
+PORTSCOUT= limitw:1,even
-GTK3_CONFIGURE_ENABLE= gtk3
-GTK3_USE_OFF= gnome=gtk20
-GTK3_USE= gnome=gtk30
-GTK3_USES_OFF= xfce
-GTK3_USES= xfce:gtk3
+OPTIONS_DEFINE= NLS
+OPTIONS_SUB= yes
NLS_CONFIGURE_ENABLE= nls
NLS_USES= gettext-runtime
-post-patch:
- ${REINPLACE_CMD} -e 's|=gtk-find|=system-search|' \
- ${WRKSRC}/data/xfce4-appfinder.desktop.in
- ${REINPLACE_CMD} -e 's|=gtk-execute|=system-run|' \
- ${WRKSRC}/data/xfce4-run.desktop.in
-
.include <bsd.port.mk>
diff --git a/misc/xfce4-appfinder/distinfo b/misc/xfce4-appfinder/distinfo
index b19bb8d99b76..dfbf452adafd 100644
--- a/misc/xfce4-appfinder/distinfo
+++ b/misc/xfce4-appfinder/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xfce4/xfce4-appfinder-4.12.0.tar.bz2) = 2ad4a58019a76a6b64a816050db25f96854917c2f2e89d6a9df6c18e6c84c567
-SIZE (xfce4/xfce4-appfinder-4.12.0.tar.bz2) = 459338
+TIMESTAMP = 1565586025
+SHA256 (xfce4/xfce4-appfinder-4.14.0.tar.bz2) = 7ec175d4954fceb2e76cbfbca76ac4a4f53fe799d097a14117e7de68e88a4d98
+SIZE (xfce4/xfce4-appfinder-4.14.0.tar.bz2) = 519705
diff --git a/misc/xfce4-appfinder/pkg-plist b/misc/xfce4-appfinder/pkg-plist
index 8cae807dd1d7..8a3fc657e8e2 100644
--- a/misc/xfce4-appfinder/pkg-plist
+++ b/misc/xfce4-appfinder/pkg-plist
@@ -1,6 +1,5 @@
bin/xfce4-appfinder
bin/xfrun4
-share/appdata/xfce4-appfinder.appdata.xml
share/applications/xfce4-appfinder.desktop
share/applications/xfce4-run.desktop
%%NLS%%share/locale/am/LC_MESSAGES/xfce4-appfinder.mo
@@ -26,7 +25,9 @@ share/applications/xfce4-run.desktop
%%NLS%%share/locale/he/LC_MESSAGES/xfce4-appfinder.mo
%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-appfinder.mo
%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/hy_AM/LC_MESSAGES/xfce4-appfinder.mo
%%NLS%%share/locale/id/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/ie/LC_MESSAGES/xfce4-appfinder.mo
%%NLS%%share/locale/is/LC_MESSAGES/xfce4-appfinder.mo
%%NLS%%share/locale/it/LC_MESSAGES/xfce4-appfinder.mo
%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-appfinder.mo
@@ -62,3 +63,4 @@ share/applications/xfce4-run.desktop
%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-appfinder.mo
%%NLS%%share/locale/zh_HK/LC_MESSAGES/xfce4-appfinder.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-appfinder.mo
+share/metainfo/org.xfce.xfce4-appfinder.appdata.xml
diff --git a/misc/xfce4-weather-plugin/Makefile b/misc/xfce4-weather-plugin/Makefile
index 810257a6325e..85a85a0729cf 100644
--- a/misc/xfce4-weather-plugin/Makefile
+++ b/misc/xfce4-weather-plugin/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-weather-plugin
-PORTVERSION= 0.9.1
+PORTVERSION= 0.10.0
CATEGORIES= misc xfce geography
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
@@ -13,11 +13,9 @@ COMMENT= Weather plugin for the Xfce panel
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
- libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2
+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
USE_GNOME= cairo glib20 gtk30 intltool libxml2
USE_XFCE= panel
USE_LDCONFIG= yes
diff --git a/misc/xfce4-weather-plugin/distinfo b/misc/xfce4-weather-plugin/distinfo
index 8061a99fec03..83eb76a346c6 100644
--- a/misc/xfce4-weather-plugin/distinfo
+++ b/misc/xfce4-weather-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553349293
-SHA256 (xfce4/xfce4-weather-plugin-0.9.1.tar.bz2) = 7cdc18b8df759dee4ceaaf6ce303eff7fda48e247dbc26b78142929213506cfd
-SIZE (xfce4/xfce4-weather-plugin-0.9.1.tar.bz2) = 3018842
+TIMESTAMP = 1565601326
+SHA256 (xfce4/xfce4-weather-plugin-0.10.0.tar.bz2) = 4423a0c27830fd1f08e063aaefbf70f31d89235d75549ca841d677ab2e409572
+SIZE (xfce4/xfce4-weather-plugin-0.10.0.tar.bz2) = 3032575
diff --git a/misc/xfce4-wm-themes/Makefile b/misc/xfce4-wm-themes/Makefile
index cae415871e9c..65bab8107810 100644
--- a/misc/xfce4-wm-themes/Makefile
+++ b/misc/xfce4-wm-themes/Makefile
@@ -12,8 +12,12 @@ DIST_SUBDIR= xfce4
MAINTAINER= xfce@FreeBSD.org
COMMENT= Additional themes for xfwm4
+LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+USES= gmake tar:bzip2
+
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-USES= gmake tar:bzip2
.include <bsd.port.mk>
diff --git a/multimedia/xfce4-parole/Makefile b/multimedia/xfce4-parole/Makefile
index 23199b749df5..8f42fa2b06ac 100644
--- a/multimedia/xfce4-parole/Makefile
+++ b/multimedia/xfce4-parole/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= parole
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= multimedia xfce
MASTER_SITES= XFCE/apps
DIST_SUBDIR= xfce4
@@ -20,7 +20,7 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \
RUN_DEPENDS= xdg-screensaver:devel/xdg-utils
USES= compiler:c++11-lang desktop-file-utils gettext-tools \
- gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3
+ gmake gnome libtool pkgconfig tar:bzip2 xfce xorg
USE_GNOME= cairo gtk30 glib20 intltool
USE_GSTREAMER1= core faad flac wavpack rtmp x
USE_XFCE= panel
diff --git a/multimedia/xfce4-parole/distinfo b/multimedia/xfce4-parole/distinfo
index cc1a5cd49645..fd7896e62d83 100644
--- a/multimedia/xfce4-parole/distinfo
+++ b/multimedia/xfce4-parole/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564305185
-SHA256 (xfce4/parole-1.0.3.tar.bz2) = bfd572a37e985941475cb7e080e3a253557e562b253e3083a27c9f713c311cf3
-SIZE (xfce4/parole-1.0.3.tar.bz2) = 963822
+TIMESTAMP = 1565600450
+SHA256 (xfce4/parole-1.0.4.tar.bz2) = e92b8ec369e53d921b47d2473c2e2a1e9e04d3c5d536d419abdff40e5e136dc1
+SIZE (xfce4/parole-1.0.4.tar.bz2) = 921020
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index 07daae627b14..8757b24a5329 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xfce4-print
PORTVERSION= 4.6.1
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= print xfce
MASTER_SITES= XFCE/archive
DISTNAME= xfprint-${DISTVERSIONFULL}
@@ -17,13 +17,11 @@ LICENSE= GPLv2
BUILD_DEPENDS= a2ps:print/a2ps
RUN_DEPENDS= a2ps:print/a2ps
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:gtk2 xorg
+USE_GNOME= cairo glib20 gtk20 intltool
USE_LDCONFIG= yes
USE_XFCE= libgui xfconf
USE_XORG= x11
diff --git a/science/xfce4-equake-plugin/Makefile b/science/xfce4-equake-plugin/Makefile
index 098c828b6e9d..032b4c07416c 100644
--- a/science/xfce4-equake-plugin/Makefile
+++ b/science/xfce4-equake-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-equake-plugin
PORTVERSION= 1.3.8.1
+PORTREVISION= 1
CATEGORIES= science xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
@@ -17,7 +18,8 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libcurl.so:ftp/curl
-USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce
+USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 \
+ xfce:gtk2 xorg
USE_GNOME= cairo glib20 gtk20 intltool
USE_XFCE= panel
USE_XORG= x11
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 8b67aee08800..083883b38dc0 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1518,6 +1518,7 @@
SUBDIR += xfce4-kbdleds-plugin
SUBDIR += xfce4-mount-plugin
SUBDIR += xfce4-netload-plugin
+ SUBDIR += xfce4-places-plugin
SUBDIR += xfce4-power-manager
SUBDIR += xfce4-settings
SUBDIR += xfce4-systemload-plugin
diff --git a/sysutils/garcon/Makefile b/sysutils/garcon/Makefile
index 814b902d00b1..5080a173b281 100644
--- a/sysutils/garcon/Makefile
+++ b/sysutils/garcon/Makefile
@@ -3,6 +3,7 @@
PORTNAME= garcon
PORTVERSION= 0.6.4
+PORTREVISION= 1
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
@@ -18,7 +19,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
USES= gettext-tools gmake gnome libtool pathfix pkgconfig \
- tar:bzip2 xfce:gtk3
+ tar:bzip2 xfce
USE_GNOME= cairo gdkpixbuf2 glib20 gtk20 gtk30 intltool
USE_XFCE= libmenu
USE_LDCONFIG= yes
diff --git a/sysutils/gigolo/Makefile b/sysutils/gigolo/Makefile
index 18a4f3ed6f32..871d12e9908c 100644
--- a/sysutils/gigolo/Makefile
+++ b/sysutils/gigolo/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gigolo
-PORTVERSION= 0.4.91
+PORTVERSION= 0.5.0
CATEGORIES= sysutils
MASTER_SITES= XFCE/apps
@@ -16,8 +16,8 @@ ONLY_FOR_ARCHS_REASON= Does not compile
BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser
-USES= fuse gettext-tools gmake pkgconfig tar:bzip2 xfce:gtk3
-USE_GNOME= cairo gdkpixbuf2 gtk30 gvfs intlhack
+USES= fuse gettext-tools gmake pkgconfig tar:bzip2 xfce xorg
+USE_GNOME= cairo gdkpixbuf2 gtk30 gvfs intltool
USE_XORG= x11
GNU_CONFIGURE= yes
diff --git a/sysutils/gigolo/distinfo b/sysutils/gigolo/distinfo
index 3931d2f5dc20..db170e5d23ac 100644
--- a/sysutils/gigolo/distinfo
+++ b/sysutils/gigolo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1551778875
-SHA256 (gigolo-0.4.91.tar.bz2) = 8917dc2f4f74645b79262512e5b91936c7e6f962646057d99d4b4f4e7fd70ae6
-SIZE (gigolo-0.4.91.tar.bz2) = 248666
+TIMESTAMP = 1565689522
+SHA256 (gigolo-0.5.0.tar.bz2) = 97a301aff012a143d0b99e7ecbb27084d3872aa203a74745e8357aab3a1880dc
+SIZE (gigolo-0.5.0.tar.bz2) = 246473
diff --git a/sysutils/gigolo/pkg-plist b/sysutils/gigolo/pkg-plist
index 9fa88d121991..aab0deb72522 100644
--- a/sysutils/gigolo/pkg-plist
+++ b/sysutils/gigolo/pkg-plist
@@ -22,7 +22,9 @@ share/applications/gigolo.desktop
%%NLS%%share/locale/he/LC_MESSAGES/gigolo.mo
%%NLS%%share/locale/hr/LC_MESSAGES/gigolo.mo
%%NLS%%share/locale/hu/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/hy_AM/LC_MESSAGES/gigolo.mo
%%NLS%%share/locale/id/LC_MESSAGES/gigolo.mo
+%%NLS%%share/locale/ie/LC_MESSAGES/gigolo.mo
%%NLS%%share/locale/is/LC_MESSAGES/gigolo.mo
%%NLS%%share/locale/it/LC_MESSAGES/gigolo.mo
%%NLS%%share/locale/ja/LC_MESSAGES/gigolo.mo
diff --git a/sysutils/xfburn/Makefile b/sysutils/xfburn/Makefile
index 1a8e7bca497e..c4c75d2ddd70 100644
--- a/sysutils/xfburn/Makefile
+++ b/sysutils/xfburn/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xfburn
PORTVERSION= 0.5.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= XFCE/apps
DIST_SUBDIR= xfce4
@@ -22,8 +22,8 @@ RUN_DEPENDS= cdrdao:sysutils/cdrdao \
${LOCALBASE}/include/libisofs/libisofs.h:devel/libisofs
USES= desktop-file-utils gettext-tools gmake gnome pkgconfig \
- tar:bzip2 xfce
-USE_GNOME= cairo glib20 gtk20 intlhack intltool
+ tar:bzip2 xfce:gtk2
+USE_GNOME= cairo glib20 gtk20 intltool
USE_XFCE= libexo
GNU_CONFIGURE= yes
diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile
index c723de90aff3..061470434e1f 100644
--- a/sysutils/xfce4-battery-plugin/Makefile
+++ b/sysutils/xfce4-battery-plugin/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-battery-plugin
-PORTVERSION= 1.1.2
+PORTVERSION= 1.1.3
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
@@ -15,7 +15,7 @@ LICENSE= GPLv2
ONLY_FOR_ARCHS= amd64 i386
USES= alias gettext-tools gmake gnome libtool pkgconfig \
- tar:bzip2 xfce:gtk3
+ tar:bzip2 xfce
USE_GNOME= cairo gtk30 glib20 intltool
USE_XFCE= panel
USE_LDCONFIG= yes
diff --git a/sysutils/xfce4-battery-plugin/distinfo b/sysutils/xfce4-battery-plugin/distinfo
index c07b2dcacb1a..d2388f121534 100644
--- a/sysutils/xfce4-battery-plugin/distinfo
+++ b/sysutils/xfce4-battery-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1547414549
-SHA256 (xfce4/xfce4-battery-plugin-1.1.2.tar.bz2) = d601349fa9a979dae99ace39b24d99b97f62b80f42ac5dea5a99e5af3e88d7db
-SIZE (xfce4/xfce4-battery-plugin-1.1.2.tar.bz2) = 464077
+TIMESTAMP = 1565693839
+SHA256 (xfce4/xfce4-battery-plugin-1.1.3.tar.bz2) = 12be0a44d16bd1e1618513ee64f946814925872db7d1c1188ab1454b00d040a3
+SIZE (xfce4/xfce4-battery-plugin-1.1.3.tar.bz2) = 431118
diff --git a/sysutils/xfce4-battery-plugin/files/patch-panel-plugin_libacpi.c b/sysutils/xfce4-battery-plugin/files/patch-panel-plugin_libacpi.c
deleted file mode 100644
index d14d1feeb565..000000000000
--- a/sysutils/xfce4-battery-plugin/files/patch-panel-plugin_libacpi.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- panel-plugin/libacpi.c.orig 2018-12-31 22:14:28 UTC
-+++ panel-plugin/libacpi.c
-@@ -100,7 +100,7 @@ oidfmt(int *oid, int len, char *fmt, u_int *kind)
- j = sizeof(buf);
- i = sysctl(qoid, len + 2, buf, &j, 0, 0);
- if (i)
-- err(1, "sysctl fmt %d %d %d", i, j, errno);
-+ err(1, "sysctl fmt %d %zu %d", i, j, errno);
-
- if (kind)
- *kind = *(u_int *)buf;
-@@ -129,7 +129,7 @@ get_var(int *oid, int nlen)
- j = sizeof(name);
- i = sysctl(qoid, nlen + 2, name, &j, 0, 0);
- if (i || !j)
-- err(1, "sysctl name %d %d %d", i, j, errno);
-+ err(1, "sysctl name %d %zu %d", i, j, errno);
-
- sep = "=";
-
-@@ -145,7 +145,7 @@ get_var(int *oid, int nlen)
- return (1);
-
- val[len] = '\0';
-- fmt = buf;
-+ fmt = (char *)buf;
- oidfmt(oid, nlen, fmt, &kind);
- p = val;
- switch (*fmt) {
-@@ -170,7 +170,7 @@ get_var(int *oid, int nlen)
- return (retval);
- default:
- printf("%s%s", name, sep);
-- printf("Format:%s Length:%d Dump:0x", fmt, len);
-+ printf("Format:%s Length:%zu Dump:0x", fmt, len);
- while (len-- && (p < val + 16))
- printf("%02x", *p++);
- if (len > 16)
diff --git a/sysutils/xfce4-battery-plugin/pkg-plist b/sysutils/xfce4-battery-plugin/pkg-plist
index 375f1bfd584b..566ba2c452e9 100644
--- a/sysutils/xfce4-battery-plugin/pkg-plist
+++ b/sysutils/xfce4-battery-plugin/pkg-plist
@@ -59,6 +59,7 @@ share/icons/hicolor/scalable/apps/xfce4-battery-plugin.svg
%%NLS%%share/locale/he/LC_MESSAGES/xfce4-battery-plugin.mo
%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-battery-plugin.mo
%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-battery-plugin.mo
+%%NLS%%share/locale/hy_AM/LC_MESSAGES/xfce4-battery-plugin.mo
%%NLS%%share/locale/id/LC_MESSAGES/xfce4-battery-plugin.mo
%%NLS%%share/locale/is/LC_MESSAGES/xfce4-battery-plugin.mo
%%NLS%%share/locale/it/LC_MESSAGES/xfce4-battery-plugin.mo
diff --git a/sysutils/xfce4-bsdcpufreq-plugin/Makefile b/sysutils/xfce4-bsdcpufreq-plugin/Makefile
index 49b0015ab101..375f358f3f19 100644
--- a/sysutils/xfce4-bsdcpufreq-plugin/Makefile
+++ b/sysutils/xfce4-bsdcpufreq-plugin/Makefile
@@ -4,7 +4,7 @@
PORTNAME= xfce4-bsdcpufreq-plugin
PORTVERSION= 0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils xfce
MAINTAINER= riggs@FreeBSD.org
@@ -13,7 +13,10 @@ COMMENT= Displays the current CPU clock frequency in the panel
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= pkgconfig xfce
+LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2
+
+USES= pkgconfig xfce:gtk2
USE_XFCE= panel
USE_GNOME= cairo gdkpixbuf2 gtk20
diff --git a/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile
index 8c3b4fa95bf1..4bcef1cbc8bc 100644
--- a/sysutils/xfce4-cpugraph-plugin/Makefile
+++ b/sysutils/xfce4-cpugraph-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-cpugraph-plugin
PORTVERSION= 1.1.0
+PORTREVISION= 1
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
@@ -12,11 +13,8 @@ COMMENT= Graphical representation of the CPU load
LICENSE= GPLv2
-LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2
-
USES= gettext-tools gmake gnome libtool pkgconfig \
- tar:bzip2 xfce:gtk3
+ tar:bzip2 xfce
USE_CSTD= c99
USE_GNOME= cairo gtk30 intltool
USE_XFCE= panel
diff --git a/sysutils/xfce4-diskperf-plugin/Makefile b/sysutils/xfce4-diskperf-plugin/Makefile
index 897173617eae..fedf25baf033 100644
--- a/sysutils/xfce4-diskperf-plugin/Makefile
+++ b/sysutils/xfce4-diskperf-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-diskperf-plugin
PORTVERSION= 2.6.2
+PORTREVISION= 1
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
@@ -13,12 +14,13 @@ COMMENT= Graphical representation of the disk IO
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= gettext-tools gnome gmake libtool pkgconfig tar:bzip2 xfce:gtk3
+USES= gettext-tools gnome gmake libtool pkgconfig tar:bzip2 xfce
+USE_GNOME= cairo gtk30 intltool
+USE_XFCE= panel
+
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
INSTALL_TARGET= install-strip
-USE_GNOME= gtk30 intltool cairo
-USE_XFCE= panel
LIBS+= -ldevstat
diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index db4444274756..eed525a24c0e 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-fsguard-plugin
-PORTVERSION= 1.1.0
+PORTVERSION= 1.1.1
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
@@ -13,7 +13,8 @@ COMMENT= Panel plugin which displays free space of mountpoint
# COPYING file is wrong compared to license header
LICENSE= BSD2CLAUSE
-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
USE_XFCE= panel
USE_XORG= x11
diff --git a/sysutils/xfce4-fsguard-plugin/distinfo b/sysutils/xfce4-fsguard-plugin/distinfo
index 4127caf3d206..ccad4de21393 100644
--- a/sysutils/xfce4-fsguard-plugin/distinfo
+++ b/sysutils/xfce4-fsguard-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488101299
-SHA256 (xfce4/xfce4-fsguard-plugin-1.1.0.tar.bz2) = 6b038322b49d29625219e6a54497085b8f834b9c1fd15282ce286a6529d7c445
-SIZE (xfce4/xfce4-fsguard-plugin-1.1.0.tar.bz2) = 360463
+TIMESTAMP = 1565692437
+SHA256 (xfce4/xfce4-fsguard-plugin-1.1.1.tar.bz2) = d6d05d0a90a68453d65cdceec5ca7eeaef864393ab62eef532a7ba58f374d516
+SIZE (xfce4/xfce4-fsguard-plugin-1.1.1.tar.bz2) = 367902
diff --git a/sysutils/xfce4-fsguard-plugin/files/patch-panel-plugin_fsguard.c b/sysutils/xfce4-fsguard-plugin/files/patch-panel-plugin_fsguard.c
deleted file mode 100644
index 77586f71c9b3..000000000000
--- a/sysutils/xfce4-fsguard-plugin/files/patch-panel-plugin_fsguard.c
+++ /dev/null
@@ -1,148 +0,0 @@
---- panel-plugin/fsguard.c.orig 2016-10-29 06:43:10 UTC
-+++ panel-plugin/fsguard.c
-@@ -70,6 +70,7 @@ typedef struct
- XfcePanelPlugin *plugin;
- gboolean seen;
- gint icon_id;
-+ gchar *css_class;
- gint timeout;
- guint limit_warning;
- guint limit_urgent;
-@@ -135,6 +136,7 @@ fsguard_set_icon (FsGuard *fsguard, gint
- if (id == fsguard->icon_id)
- return;
-
-+ DBG ("icon id: new=%d, cur=%d", id, fsguard->icon_id);
- fsguard->icon_id = id;
- size = xfce_panel_plugin_get_size (fsguard->plugin);
- size /= xfce_panel_plugin_get_nrows (fsguard->plugin);
-@@ -177,7 +179,7 @@ fsguard_refresh_icon (FsGuard *fsguard)
- }
-
- static void
--fsguard_refresh_monitor (FsGuard *fsguard)
-+fsguard_refresh_monitor_color (FsGuard *fsguard, gchar *css_class)
- {
- GdkRGBA color;
-
-@@ -197,23 +199,15 @@ fsguard_refresh_monitor (FsGuard *fsguar
- }
-
- #if GTK_CHECK_VERSION (3, 16, 0)
-- GtkCssProvider *css_provider;
--#if GTK_CHECK_VERSION (3, 20, 0)
-- gchar * css = g_strdup_printf("progressbar trough { min-width: 4px; min-height: 4px; } \
-- progressbar progress { min-width: 4px; min-height: 4px; \
-- background-color: %s; background-image: none; }",
--#else
-- gchar * css = g_strdup_printf(".progressbar { background-color: %s; background-image: none; }",
--#endif
-- gdk_rgba_to_string(&color));
-- /* Setup Gtk style */
-- css_provider = gtk_css_provider_new ();
-- gtk_css_provider_load_from_data (css_provider, css, strlen(css), NULL);
-- gtk_style_context_add_provider (
-- GTK_STYLE_CONTEXT (gtk_widget_get_style_context (GTK_WIDGET (fsguard->progress_bar))),
-- GTK_STYLE_PROVIDER (css_provider),
-- GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-- g_free(css);
-+ DBG("removing class %s, adding %s", fsguard->css_class, css_class);
-+ gtk_style_context_remove_class (
-+ GTK_STYLE_CONTEXT(gtk_widget_get_style_context (GTK_WIDGET (fsguard->progress_bar))),
-+ fsguard->css_class);
-+ gtk_style_context_add_class (
-+ GTK_STYLE_CONTEXT(gtk_widget_get_style_context (GTK_WIDGET (fsguard->progress_bar))),
-+ css_class);
-+ g_free(fsguard->css_class);
-+ fsguard->css_class = g_strdup(css_class);
- #else
- gtk_widget_override_background_color (GTK_WIDGET (fsguard->progress_bar),
- GTK_STATE_PRELIGHT,
-@@ -270,6 +264,7 @@ fsguard_check_fs (FsGuard *fsguard)
- float totalblocks = 0;
- long blocksize = 0;
- int err;
-+ gchar *css_class = "normal";
- gchar msg_size[100], msg_total_size[100], msg[100];
- gint icon_id = ICON_INSENSITIVE;
- static struct statfs fsd;
-@@ -285,10 +280,13 @@ fsguard_check_fs (FsGuard *fsguard)
-
- if (freespace > (total * fsguard->limit_warning / 100)) {
- icon_id = ICON_NORMAL;
-+ css_class = "normal";
- } else if (freespace > (total * fsguard->limit_urgent / 100) && freespace <= (total * fsguard->limit_warning / 100)) {
- icon_id = ICON_WARNING;
-+ css_class = "warning";
- } else {
- icon_id = ICON_URGENT;
-+ css_class = "urgent";
- }
- }
- g_snprintf (msg, sizeof (msg),
-@@ -316,7 +314,8 @@ fsguard_check_fs (FsGuard *fsguard)
- if (fsguard->show_progress_bar) {
- gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(fsguard->progress_bar),
- (total > 0 ) ? 1.0 - (freespace / total) : 0.0);
-- fsguard_refresh_monitor (fsguard);
-+ if (icon_id != fsguard->icon_id)
-+ fsguard_refresh_monitor_color (fsguard, css_class);
- }
-
- gtk_widget_set_tooltip_text(fsguard->ebox, msg);
-@@ -347,6 +346,7 @@ fsguard_read_config (FsGuard *fsguard)
- fsguard->name = g_strdup ("");
- fsguard->show_name = FALSE;
- fsguard->path = g_strdup ("/");
-+ fsguard->css_class = g_strdup ("normal");
- fsguard->show_size = TRUE;
- fsguard->show_progress_bar = TRUE;
- fsguard->hide_button = FALSE;
-@@ -406,6 +406,9 @@ fsguard_write_config (XfcePanelPlugin *p
- static FsGuard *
- fsguard_new (XfcePanelPlugin *plugin)
- {
-+#if GTK_CHECK_VERSION (3, 16, 0)
-+ GtkCssProvider *css_provider;
-+#endif
- FsGuard *fsguard = g_new0(FsGuard, 1);
-
- fsguard->plugin = plugin;
-@@ -429,6 +432,37 @@ fsguard_new (XfcePanelPlugin *plugin)
- fsguard->icon_panel = gtk_image_new ();
-
- fsguard->progress_bar = gtk_progress_bar_new ();
-+#if GTK_CHECK_VERSION (3, 16, 0)
-+ css_provider = gtk_css_provider_new ();
-+#if GTK_CHECK_VERSION (3, 20, 0)
-+ gtk_css_provider_load_from_data (css_provider, "\
-+ progressbar.horizontal trough { min-height: 4px; }\
-+ progressbar.horizontal progress { min-height: 4px; }\
-+ progressbar.vertical trough { min-width: 4px; }\
-+ progressbar.vertical progress { min-width: 4px; }\
-+ .normal progress { background-color: " COLOR_NORMAL " ; background-image: none; }\
-+ .warning progress { background-color: " COLOR_WARNING " ; background-image: none; }\
-+ .urgent progress { background-color: " COLOR_URGENT " ; background-image: none; }",
-+ -1, NULL);
-+#else
-+ gtk_css_provider_load_from_data (css_provider, "\
-+ .progressbar.horizontal trough { min-height: 4px; }\
-+ .progressbar.horizontal progress { min-height: 4px; }\
-+ .progressbar.vertical trough { min-width: 4px; }\
-+ .progressbar.vertical progress { min-width: 4px; }\
-+ .normal progress { background-color: " COLOR_NORMAL " ; background-image: none; }\
-+ .warning progress { background-color: " COLOR_WARNING " ; background-image: none; }\
-+ .urgent progress { background-color: " COLOR_URGENT " ; background-image: none; }",
-+ -1, NULL);
-+#endif
-+ gtk_style_context_add_provider (
-+ GTK_STYLE_CONTEXT (gtk_widget_get_style_context (GTK_WIDGET (fsguard->progress_bar))),
-+ GTK_STYLE_PROVIDER (css_provider),
-+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-+ gtk_style_context_add_class (
-+ GTK_STYLE_CONTEXT(gtk_widget_get_style_context (GTK_WIDGET (fsguard->progress_bar))),
-+ fsguard->css_class);
-+#endif
- gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(fsguard->progress_bar), 0.0);
- gtk_progress_bar_set_inverted (GTK_PROGRESS_BAR(fsguard->progress_bar), (orientation == GTK_ORIENTATION_HORIZONTAL));
- gtk_orientable_set_orientation (GTK_ORIENTABLE(fsguard->progress_bar), !orientation);
diff --git a/sysutils/xfce4-fsguard-plugin/pkg-plist b/sysutils/xfce4-fsguard-plugin/pkg-plist
index f2bc7bf27cb1..1bc13d39c70d 100644
--- a/sysutils/xfce4-fsguard-plugin/pkg-plist
+++ b/sysutils/xfce4-fsguard-plugin/pkg-plist
@@ -22,6 +22,7 @@ share/icons/hicolor/scalable/apps/xfce4-fsguard-plugin-warning.svg
share/icons/hicolor/scalable/apps/xfce4-fsguard-plugin.svg
%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-fsguard-plugin.mo
%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-fsguard-plugin.mo
+%%NLS%%share/locale/be/LC_MESSAGES/xfce4-fsguard-plugin.mo
%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-fsguard-plugin.mo
%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-fsguard-plugin.mo
%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-fsguard-plugin.mo
@@ -39,6 +40,7 @@ share/icons/hicolor/scalable/apps/xfce4-fsguard-plugin.svg
%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-fsguard-plugin.mo
%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-fsguard-plugin.mo
%%NLS%%share/locale/id/LC_MESSAGES/xfce4-fsguard-plugin.mo
+%%NLS%%share/locale/ie/LC_MESSAGES/xfce4-fsguard-plugin.mo
%%NLS%%share/locale/is/LC_MESSAGES/xfce4-fsguard-plugin.mo
%%NLS%%share/locale/it/LC_MESSAGES/xfce4-fsguard-plugin.mo
%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-fsguard-plugin.mo
diff --git a/sysutils/xfce4-genmon-plugin/Makefile b/sysutils/xfce4-genmon-plugin/Makefile
index 427b7e28c1c0..840b8df09a39 100644
--- a/sysutils/xfce4-genmon-plugin/Makefile
+++ b/sysutils/xfce4-genmon-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-genmon-plugin
PORTVERSION= 4.0.1
+PORTREVISION= 1
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
@@ -13,7 +14,7 @@ COMMENT= Generic Monitor Xfce4 panel plugin
LICENSE= LGPL21
USES= gettext-tools gmake gnome libtool pkgconfig \
- tar:bzip2 xfce:gtk3
+ tar:bzip2 xfce
USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool
USE_XFCE= panel
diff --git a/sysutils/xfce4-mount-plugin/Makefile b/sysutils/xfce4-mount-plugin/Makefile
index ab3142c89dde..a94a832785fc 100644
--- a/sysutils/xfce4-mount-plugin/Makefile
+++ b/sysutils/xfce4-mount-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-mount-plugin
PORTVERSION= 1.1.3
+PORTREVISION= 1
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
@@ -12,10 +13,7 @@ COMMENT= Mount and umount utility for the Xfce4 panel
LICENSE= GPLv2
-LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2
-
-USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3
+USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce
USE_GNOME= cairo gtk30 intltool
USE_LDCONFIG= yes
USE_XFCE= panel
diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile
index 37cf5b7c5886..71fd984f2b11 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-netload-plugin
-PORTVERSION= 1.3.1
+PORTVERSION= 1.3.2
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
@@ -13,7 +13,7 @@ COMMENT= Network Load plugin for Xfce4
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3
+USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce
USE_GNOME= cairo gtk30 intltool
USE_XFCE= panel
diff --git a/sysutils/xfce4-netload-plugin/distinfo b/sysutils/xfce4-netload-plugin/distinfo
index c2065e4804f2..f9dae0007e9a 100644
--- a/sysutils/xfce4-netload-plugin/distinfo
+++ b/sysutils/xfce4-netload-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488042852
-SHA256 (xfce4/xfce4-netload-plugin-1.3.1.tar.bz2) = 99762781099d1e0ab9aa6a7b30c2bd94d8f658dbe61c760410d5d42d0766391c
-SIZE (xfce4/xfce4-netload-plugin-1.3.1.tar.bz2) = 367844
+TIMESTAMP = 1565692965
+SHA256 (xfce4/xfce4-netload-plugin-1.3.2.tar.bz2) = 22e40425cfe1e07b01fe275b1afddc7c788af34d9c2c7e2842166963cb41215d
+SIZE (xfce4/xfce4-netload-plugin-1.3.2.tar.bz2) = 380571
diff --git a/sysutils/xfce4-netload-plugin/pkg-plist b/sysutils/xfce4-netload-plugin/pkg-plist
index fd383b5adbb2..99de613f32a1 100644
--- a/sysutils/xfce4-netload-plugin/pkg-plist
+++ b/sysutils/xfce4-netload-plugin/pkg-plist
@@ -4,6 +4,7 @@ share/icons/hicolor/48x48/apps/xfce4-netload-plugin.png
share/icons/hicolor/scalable/apps/xfce4-netload-plugin.svg
%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-netload-plugin.mo
%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-netload-plugin.mo
+%%NLS%%share/locale/be/LC_MESSAGES/xfce4-netload-plugin.mo
%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-netload-plugin.mo
%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-netload-plugin.mo
%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-netload-plugin.mo
diff --git a/sysutils/xfce4-places-plugin/Makefile b/sysutils/xfce4-places-plugin/Makefile
new file mode 100644
index 000000000000..af497e83cfec
--- /dev/null
+++ b/sysutils/xfce4-places-plugin/Makefile
@@ -0,0 +1,31 @@
+# $FreeBSD$
+
+PORTNAME= xfce4-places-plugin
+PORTVERSION= 1.8.1
+CATEGORIES= sysutils xfce
+MASTER_SITES= XFCE/panel-plugins
+DIST_SUBDIR= xfce4
+
+MAINTAINER= xfce@FreeBSD.org
+COMMENT= File browser launcher for Xfce4 panel plugin
+
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+LIB_DEPENDS= libnotify.so:devel/libnotify
+
+USES= gettext-tools gmake gnome libtool pkgconfig \
+ tar:bzip2 xfce xorg
+USE_GNOME= cairo gdkpixbuf2 gtk30 intltool
+USE_XFCE= panel thunar
+USE_XORG= ice sm x11
+
+GNU_CONFIGURE= yes
+INSTALL_TARGET= install-strip
+
+OPTIONS_DEFINE= NLS
+OPTIONS_SUB= yes
+
+NLS_USES= gettext-runtime
+
+.include <bsd.port.mk>
diff --git a/sysutils/xfce4-places-plugin/distinfo b/sysutils/xfce4-places-plugin/distinfo
new file mode 100644
index 000000000000..469f0c52de0c
--- /dev/null
+++ b/sysutils/xfce4-places-plugin/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1565600951
+SHA256 (xfce4/xfce4-places-plugin-1.8.1.tar.bz2) = f211219f03c9260f624370e18c79e4176c9d35a8247158e77e5d811327610ab2
+SIZE (xfce4/xfce4-places-plugin-1.8.1.tar.bz2) = 380906
diff --git a/sysutils/xfce4-places-plugin/pkg-descr b/sysutils/xfce4-places-plugin/pkg-descr
new file mode 100644
index 000000000000..181b4f392f60
--- /dev/null
+++ b/sysutils/xfce4-places-plugin/pkg-descr
@@ -0,0 +1,9 @@
+The xfce4-places-plugin brings much of the functionality of the GNOME Places
+menu to Xfce. The plugin looks a lot like a launcher with multiple items in a
+menu. The main "launcher" button opens up Thunar at the user's home directory.
+The arrow button opens up a menu with two sections: system- and user-defined
+locations. The system-defined locations are consistent with Thunar (including
+their icons). For user-defined bookmarks, the ~/.gtk-bookmarks file is being
+read in order to share bookmarks with Thunar, Nautilus, the GNOME Panel, etc.
+
+WWW: https://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin
diff --git a/sysutils/xfce4-places-plugin/pkg-plist b/sysutils/xfce4-places-plugin/pkg-plist
new file mode 100644
index 000000000000..69b8ad294f08
--- /dev/null
+++ b/sysutils/xfce4-places-plugin/pkg-plist
@@ -0,0 +1,57 @@
+bin/xfce4-popup-places
+lib/xfce4/panel/plugins/libplaces.so
+%%NLS%%share/locale/am/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/be/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/et/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/ie/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/is/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/th/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-places-plugin.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-places-plugin.mo
+share/xfce4/panel/plugins/places.desktop
diff --git a/sysutils/xfce4-power-manager/Makefile b/sysutils/xfce4-power-manager/Makefile
index 5a41b2db9f34..0791e84305ee 100644
--- a/sysutils/xfce4-power-manager/Makefile
+++ b/sysutils/xfce4-power-manager/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-power-manager
-PORTVERSION= 1.6.4
+PORTVERSION= 1.6.5
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
@@ -13,13 +13,11 @@ COMMENT= Power manager for the Xfce Desktop
LICENSE= GPLv2
LIB_DEPENDS= libnotify.so:devel/libnotify \
- libdbus-1.so:devel/dbus \
- libdbus-glib-1.so:devel/dbus-glib \
- libpolkit-gobject-1.so:sysutils/polkit \
libupower-glib.so:sysutils/upower
-USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3
-USE_GNOME= cairo glib20 gtk30 intlhack intltool
+USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 \
+ xfce xorg
+USE_GNOME= cairo glib20 gtk30 intltool
USE_XFCE= panel
USE_XORG= ice sm xrandr x11 xext xtst xscrnsaver
diff --git a/sysutils/xfce4-power-manager/distinfo b/sysutils/xfce4-power-manager/distinfo
index 6d2b38844896..a4e189f394c9 100644
--- a/sysutils/xfce4-power-manager/distinfo
+++ b/sysutils/xfce4-power-manager/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564324793
-SHA256 (xfce4/xfce4-power-manager-1.6.4.tar.bz2) = 078df808e68f745769b4c34a4719cfe289d4bf89ca2cd4ed4680f2551a00039e
-SIZE (xfce4/xfce4-power-manager-1.6.4.tar.bz2) = 1216948
+TIMESTAMP = 1565601450
+SHA256 (xfce4/xfce4-power-manager-1.6.5.tar.bz2) = 10adb67899b181ca5fc577fc9bb7a698fb94e42073585f7e2be642c7db127a74
+SIZE (xfce4/xfce4-power-manager-1.6.5.tar.bz2) = 1205473
diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile
index 0be50f9f96d7..b62cc51b55e4 100644
--- a/sysutils/xfce4-settings/Makefile
+++ b/sysutils/xfce4-settings/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-settings
-PORTVERSION= 4.12.4
-PORTREVISION= 3
+PORTVERSION= 4.14.1
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
@@ -14,23 +13,22 @@ COMMENT= Xfce 4 settings application
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libdbus-1.so:devel/dbus \
- libdbus-glib-1.so:devel/dbus-glib \
+LIB_DEPENDS= libcolord.so:graphics/colord \
libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2 \
libxklavier.so:x11/libxklavier
-USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce
-USE_GNOME= cairo glib20 gtk20 intlhack intltool
-USE_XFCE= garcon libexo
+USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 \
+ xfce xorg
+USE_GNOME= cairo glib20 gtk30 intltool
+USE_XFCE= garcon libexo xfconf
USE_XORG= xorgproto x11 xcursor xi xrandr
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-debug=yes \
- --disable-xorg-libinput
+CONFIGURE_ARGS= --disable-xorg-libinput \
+ --enable-pluggable-dialogs
INSTALLS_ICONS= yes
-PORTSCOUT= limit:^4\.12\.
+PORTSCOUT= limitw:1,even
OPTIONS_DEFINE= NOTIFY NLS UPOWER
OPTIONS_DEFAULT= NOTIFY
@@ -47,11 +45,14 @@ NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify
UPOWER_CONFIGURE_ENABLE= upower-glib
UPOWER_LIB_DEPENDS= libupower-glib.so:sysutils/upower
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+= --enable-debug=yes
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|Rodent|Adwaita|g' \
${WRKSRC}/dialogs/appearance-settings/main.c
- @${REINPLACE_CMD} -e 's|IconThemeName" type="empty|IconThemeName" type="string" value="Adwaita|; \
- s|"ThemeName" type="empty|"ThemeName" type="string" value="Xfce|' \
+ @${REINPLACE_CMD} -e 's|IconThemeName" type="empty|IconThemeName" type="string" value="Adwaita|' \
${WRKSRC}/xfsettingsd/xsettings.xml
.include <bsd.port.mk>
diff --git a/sysutils/xfce4-settings/distinfo b/sysutils/xfce4-settings/distinfo
index e327ce54351c..5ebb563dbe5e 100644
--- a/sysutils/xfce4-settings/distinfo
+++ b/sysutils/xfce4-settings/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1529575306
-SHA256 (xfce4/xfce4-settings-4.12.4.tar.bz2) = e2a04cad48bf9e951409d0c841829fa3b4ce632cd799082ef82d0506618b6f9b
-SIZE (xfce4/xfce4-settings-4.12.4.tar.bz2) = 1036773
+TIMESTAMP = 1566458209
+SHA256 (xfce4/xfce4-settings-4.14.1.tar.bz2) = e873e9f6b8e801fd9304ee100c4c76ed9987446c38429d02477c086431c0bf7a
+SIZE (xfce4/xfce4-settings-4.14.1.tar.bz2) = 1187352
diff --git a/sysutils/xfce4-settings/pkg-message b/sysutils/xfce4-settings/pkg-message
new file mode 100644
index 000000000000..23391e2cb09c
--- /dev/null
+++ b/sysutils/xfce4-settings/pkg-message
@@ -0,0 +1,30 @@
+[
+{
+ type: upgrade
+ maximum_version: "4.14.0"
+ message: <<EOD
+Since XFCE 4.14 was updated to use gtk3 it is suggested to move to
+a gtk3 compliant theme.
+
+By default XFCE is installed "unthemed", but the Greybird theme is
+installed by the metaport.
+
+The icon theme installed and configured by default is Adwaita. Other
+icon themes are available in the ports tree under the x11-themes
+category.
+
+To switch to the greybird theme you can:
+
+Launch 'xfce4-appearance-settings', also available in the applications
+menu, under settings/appearence, and go to the 'Style' tab to select
+the greybird theme.
+
+Then go to 'Window Manager' or launch 'xfwm4-settings' and select the
+greybird theme.
+
+Or launch these command in a shell:
+ xfconf-query -c xsettings -p /Net/ThemeName -t string -s "Greybird"
+ xfconf-query -c xfwm4 -p /general/theme -t string -s "Greybird"
+EOD
+}
+]
diff --git a/sysutils/xfce4-settings/pkg-plist b/sysutils/xfce4-settings/pkg-plist
index 50f6ce92b33a..b9950f876a3a 100644
--- a/sysutils/xfce4-settings/pkg-plist
+++ b/sysutils/xfce4-settings/pkg-plist
@@ -1,5 +1,6 @@
bin/xfce4-accessibility-settings
bin/xfce4-appearance-settings
+bin/xfce4-color-settings
bin/xfce4-display-settings
bin/xfce4-find-cursor
bin/xfce4-keyboard-settings
@@ -9,21 +10,28 @@ bin/xfce4-settings-editor
bin/xfce4-settings-manager
bin/xfsettingsd
etc/xdg/autostart/xfsettingsd.desktop
-etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
etc/xdg/menus/xfce-settings-manager.menu
+etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
lib/xfce4/settings/appearance-install-theme
share/applications/xfce-display-settings.desktop
share/applications/xfce-keyboard-settings.desktop
-share/applications/xfce4-mime-settings.desktop
share/applications/xfce-mouse-settings.desktop
share/applications/xfce-settings-manager.desktop
share/applications/xfce-ui-settings.desktop
share/applications/xfce4-accessibility-settings.desktop
+share/applications/xfce4-color-settings.desktop
+share/applications/xfce4-mime-settings.desktop
share/applications/xfce4-settings-editor.desktop
share/icons/hicolor/128x128/devices/xfce-display-extend.png
share/icons/hicolor/128x128/devices/xfce-display-external.png
share/icons/hicolor/128x128/devices/xfce-display-internal.png
share/icons/hicolor/128x128/devices/xfce-display-mirror.png
+share/icons/hicolor/128x128/devices/xfce-display-profile.png
+share/icons/hicolor/24x24/apps/xfce4-color-settings.png
+share/icons/hicolor/48x48/apps/xfce4-color-settings.png
+share/icons/hicolor/64x64/apps/xfce4-color-settings.png
+share/icons/hicolor/scalable/apps/xfce4-color-settings.svg
+%%NLS%%share/locale/am/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/be/LC_MESSAGES/xfce4-settings.mo
@@ -35,6 +43,7 @@ share/icons/hicolor/128x128/devices/xfce-display-mirror.png
%%NLS%%share/locale/de/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/el/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/en_CA/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/es/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-settings.mo
@@ -44,7 +53,9 @@ share/icons/hicolor/128x128/devices/xfce-display-mirror.png
%%NLS%%share/locale/he/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/hy_AM/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/id/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/ie/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/is/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/it/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-settings.mo
@@ -59,13 +70,14 @@ share/icons/hicolor/128x128/devices/xfce-display-mirror.png
%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/pa/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-settings.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/ro/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/si/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/sl/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/sr/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/te/LC_MESSAGES/xfce4-settings.mo
@@ -73,8 +85,8 @@ share/icons/hicolor/128x128/devices/xfce-display-mirror.png
%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-settings.mo
-%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/zh_HK/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-settings.mo
diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index a15cb530591f..025d6b72e533 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-systemload-plugin
-PORTVERSION= 1.2.2
-PORTREVISION= 1
+PORTVERSION= 1.2.3
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
@@ -13,7 +12,7 @@ COMMENT= System Load plugin for Xfce4 panel
LICENSE= BSD2CLAUSE
-USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3
+USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce
USE_GNOME= cairo gdkpixbuf2 gtk30 intltool
USE_XFCE= panel
diff --git a/sysutils/xfce4-systemload-plugin/distinfo b/sysutils/xfce4-systemload-plugin/distinfo
index 6781fc9cc325..2f4da0385065 100644
--- a/sysutils/xfce4-systemload-plugin/distinfo
+++ b/sysutils/xfce4-systemload-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1543513700
-SHA256 (xfce4/xfce4-systemload-plugin-1.2.2.tar.bz2) = 3c67dfeb042eaea5aca440de9c6b3ecf99be0fbaa1cf7fdf9e6528233b46c99e
-SIZE (xfce4/xfce4-systemload-plugin-1.2.2.tar.bz2) = 344197
+TIMESTAMP = 1565692810
+SHA256 (xfce4/xfce4-systemload-plugin-1.2.3.tar.bz2) = 052407c575203da4de2db6f4a5e997220d95ec655d393dc3875a0d5a20520775
+SIZE (xfce4/xfce4-systemload-plugin-1.2.3.tar.bz2) = 349074
diff --git a/sysutils/xfce4-systemload-plugin/files/patch-fix-crash-on-properties-dialog b/sysutils/xfce4-systemload-plugin/files/patch-fix-crash-on-properties-dialog
deleted file mode 100644
index 51fcdaadcbed..000000000000
--- a/sysutils/xfce4-systemload-plugin/files/patch-fix-crash-on-properties-dialog
+++ /dev/null
@@ -1,31 +0,0 @@
-From b35286b81e2b6166338008cb9330cf54b0d82250 Mon Sep 17 00:00:00 2001
-From: Landry Breuil <landry@xfce.org>
-Date: Mon, 10 Dec 2018 09:57:58 +0100
-Subject: Fix a crash when opening the properties dialog
-
-introduced in dd5397b3, crash witnessed on OpenBSD and FreeBSD - better setting
-the mnemonic widget when the widget has been created.
----
- panel-plugin/systemload.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/panel-plugin/systemload.c b/panel-plugin/systemload.c
-index 089b704..ee11297 100644
---- panel-plugin/systemload.c.orig 2018-11-29 16:44:33 UTC
-+++ panel-plugin/systemload.c
-@@ -806,7 +806,6 @@ static void new_monitor_setting(t_global_monitor *glob
- gtk_widget_set_halign (label, GTK_ALIGN_START);
- gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
- gtk_widget_set_margin_start (label, 12);
-- gtk_label_set_mnemonic_widget (GTK_LABEL (label), button);
- gtk_grid_attach (GTK_GRID(subgrid), label, 0, 0, 1, 1);
-
- /* Entry for the optional monitor label */
-@@ -822,6 +821,7 @@ static void new_monitor_setting(t_global_monitor *glob
-
- /* Colorbutton to set the progressbar color */
- button = gtk_color_button_new_with_rgba(colorvar);
-+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), button);
- gtk_widget_set_halign(button, GTK_ALIGN_START);
- g_object_set_data(G_OBJECT(button), "colorvar", colorvar);
- g_signal_connect(G_OBJECT(button), "color-set",
diff --git a/sysutils/xfce4-wavelan-plugin/Makefile b/sysutils/xfce4-wavelan-plugin/Makefile
index fc2fd698e9a6..3682e0944a78 100644
--- a/sysutils/xfce4-wavelan-plugin/Makefile
+++ b/sysutils/xfce4-wavelan-plugin/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-wavelan-plugin
-PORTVERSION= 0.6.0
-PORTREVISION= 1
+PORTVERSION= 0.6.1
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
@@ -13,7 +12,7 @@ COMMENT= Displays various information about a WaveLAN device
LICENSE= BSD3CLAUSE
-USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3
+USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce
USE_GNOME= cairo gdkpixbuf2 gtk30 glib20 intltool
USE_XFCE= panel
diff --git a/sysutils/xfce4-wavelan-plugin/distinfo b/sysutils/xfce4-wavelan-plugin/distinfo
index 94049a17a828..9bc1d512481b 100644
--- a/sysutils/xfce4-wavelan-plugin/distinfo
+++ b/sysutils/xfce4-wavelan-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488044086
-SHA256 (xfce4/xfce4-wavelan-plugin-0.6.0.tar.bz2) = 4d5bd6654cfd077f3432b08d296f7bd052e765e51b77c629886a9542f4e5ecdc
-SIZE (xfce4/xfce4-wavelan-plugin-0.6.0.tar.bz2) = 303220
+TIMESTAMP = 1565693099
+SHA256 (xfce4/xfce4-wavelan-plugin-0.6.1.tar.bz2) = f41f81ea063ae3c7d7904e1ee647a6b5efafc7436f47caed662ee417038eed17
+SIZE (xfce4/xfce4-wavelan-plugin-0.6.1.tar.bz2) = 328287
diff --git a/sysutils/xfce4-wavelan-plugin/files/patch-panel-plugin_wavelan.c b/sysutils/xfce4-wavelan-plugin/files/patch-panel-plugin_wavelan.c
index cc269cb51079..2362c4b1c06a 100644
--- a/sysutils/xfce4-wavelan-plugin/files/patch-panel-plugin_wavelan.c
+++ b/sysutils/xfce4-wavelan-plugin/files/patch-panel-plugin_wavelan.c
@@ -1,79 +1,30 @@
---- panel-plugin/wavelan.c.orig 2016-10-29 06:46:02 UTC
+--- panel-plugin/wavelan.c.orig 2019-08-13 10:29:17 UTC
+++ panel-plugin/wavelan.c
-@@ -64,6 +64,9 @@ typedef struct
- GtkWidget *image;
- GtkWidget *signal;
- GtkWidget *tooltip_text;
-+#if GTK_CHECK_VERSION (3, 16, 0)
-+ GtkCssProvider *css_provider;
-+#endif
-
- XfcePanelPlugin *plugin;
-
-@@ -77,7 +80,6 @@ wavelan_set_state(t_wavelan *wavelan, gint state)
- {
- GdkRGBA color;
- #if GTK_CHECK_VERSION (3, 16, 0)
-- GtkCssProvider *css_provider;
- gchar *css;
- #endif
-
-@@ -99,11 +101,11 @@ wavelan_set_state(t_wavelan *wavelan, gint state)
-
- if (wavelan->signal_colors) {
- /* set color */
-- if (state > 70)
-+ if (state > 75)
- gdk_rgba_parse(&color, signal_color_strong);
-- else if (state > 55)
-+ else if (state > 50)
- gdk_rgba_parse(&color, signal_color_good);
-- else if (state > 40)
-+ else if (state > 25)
- gdk_rgba_parse(&color, signal_color_weak);
- else
- gdk_rgba_parse(&color, signal_color_bad);
-@@ -118,12 +120,7 @@ wavelan_set_state(t_wavelan *wavelan, gint state)
- #endif
- gdk_rgba_to_string(&color));
- /* Setup Gtk style */
-- css_provider = gtk_css_provider_new ();
-- gtk_css_provider_load_from_data (css_provider, css, strlen(css), NULL);
-- gtk_style_context_add_provider (
-- GTK_STYLE_CONTEXT (gtk_widget_get_style_context (GTK_WIDGET (wavelan->signal))),
-- GTK_STYLE_PROVIDER (css_provider),
-- GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-+ gtk_css_provider_load_from_data (wavelan->css_provider, css, strlen(css), NULL);
- g_free(css);
- #else
- gtk_widget_override_background_color(GTK_WIDGET(wavelan->signal),
-@@ -183,7 +180,15 @@ wavelan_timer(gpointer data)
- }
- }
- else {
-- wavelan_set_state(wavelan, stats.ws_quality);
-+ /*
-+ * Usual formula is: qual = 4 * (signal - noise)
-+ * where noise is typically about -96dBm, but we don't have
-+ * the actual noise value here, so approximate one.
-+ */
-+ if (strcmp(stats.ws_qunit, "dBm") == 0)
-+ wavelan_set_state(wavelan, 4 * (stats.ws_quality - (-96)));
-+ else
-+ wavelan_set_state(wavelan, stats.ws_quality);
+@@ -108,11 +108,11 @@ wavelan_set_state(t_wavelan *wavelan, gint state)
- if (strlen(stats.ws_netname) > 0)
- /* Translators: net_name: quality quality_unit at rate Mb/s*/
-@@ -338,6 +343,13 @@ wavelan_new(XfcePanelPlugin *plugin)
+ if (wavelan->signal_colors) {
+ /* set color */
+- if (state > 70)
++ if (state > 75)
+ gdk_rgba_parse(&color, signal_color_strong);
+- else if (state > 55)
++ else if (state > 50)
+ gdk_rgba_parse(&color, signal_color_good);
+- else if (state > 40)
++ else if (state > 25)
+ gdk_rgba_parse(&color, signal_color_weak);
+ else
+ gdk_rgba_parse(&color, signal_color_bad);
+@@ -357,11 +357,13 @@ wavelan_new(XfcePanelPlugin *plugin)
/* setup progressbar */
wavelan->signal = gtk_progress_bar_new();
+#if GTK_CHECK_VERSION (3, 16, 0)
-+ wavelan->css_provider = gtk_css_provider_new ();
-+ gtk_style_context_add_provider (
-+ GTK_STYLE_CONTEXT (gtk_widget_get_style_context (GTK_WIDGET (wavelan->signal))),
-+ GTK_STYLE_PROVIDER (wavelan->css_provider),
-+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+ wavelan->css_provider = gtk_css_provider_new ();
+ gtk_style_context_add_provider (
+ GTK_STYLE_CONTEXT (gtk_widget_get_style_context (GTK_WIDGET (wavelan->signal))),
+ GTK_STYLE_PROVIDER (wavelan->css_provider),
+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+#endif
wavelan->image = GTK_WIDGET(xfce_panel_image_new_from_source("network-wireless"));
diff --git a/sysutils/xfce4-wavelan-plugin/files/patch-panel-plugin_wi__bsd.c b/sysutils/xfce4-wavelan-plugin/files/patch-panel-plugin_wi__bsd.c
deleted file mode 100644
index 1b2017b8f955..000000000000
--- a/sysutils/xfce4-wavelan-plugin/files/patch-panel-plugin_wi__bsd.c
+++ /dev/null
@@ -1,251 +0,0 @@
---- panel-plugin/wi_bsd.c.orig 2016-05-01 15:53:40 UTC
-+++ panel-plugin/wi_bsd.c
-@@ -3,6 +3,8 @@
- * (OpenBSD support)
- * 2008 Pietro Cerutti <gahr@gahr.ch>
- * (FreeBSD > 700000 adaptation)
-+ * 2014 J.R. Oldroyd <fbsd@opal.com>
-+ * (Enhance FreeBSD support)
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
-@@ -26,14 +28,9 @@
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
--#if !defined(__FreeBSD_kernel__) && defined(__FreeBSD__)
--#define __FreeBSD_kernel__ __FreeBSD__
--#endif
--#if !defined(__FreeBSD_kernel_version) && defined(__FreeBSD_version)
--#define __FreeBSD_kernel_version __FreeBSD_version
--#endif
-+#include <sys/param.h>
-
--#if defined(__NetBSD__) || defined(__FreeBSD_kernel__) || defined(__FreeBSD_kernel_kernel__) || defined(__OpenBSD__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
-
- #include <sys/types.h>
- #include <sys/cdefs.h>
-@@ -44,20 +41,14 @@
-
- #include <net/if.h>
- #include <net/if_media.h>
--#ifdef __FreeBSD_kernel__
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- #include <netinet/in.h>
- #include <netinet/if_ether.h>
- #include <sys/endian.h>
--#if __FreeBSD_kernel_version >= 700000
- #include <sys/types.h>
- #include <sys/sysctl.h>
- #include <net80211/ieee80211_ioctl.h>
- #else
--#include <net/if_var.h>
--#include <net/ethernet.h>
--#include <dev/wi/if_wavelan_ieee.h>
--#endif
--#else
- #ifdef __NetBSD__
- #include <net80211/ieee80211.h>
- #include <net80211/ieee80211_ioctl.h>
-@@ -107,14 +98,10 @@ struct wi_device
- };
-
- static int _wi_carrier(const struct wi_device *);
--#if defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- static int _wi_vendor(const struct wi_device *, char *, size_t);
--#if __FreeBSD_kernel_version > 700000
- static int _wi_getval(const struct wi_device *, struct ieee80211req_scan_result *);
--#else
--static int _wi_getval(const struct wi_device *, struct wi_req *);
- #endif
--#endif
- static int _wi_netname(const struct wi_device *, char *, size_t);
- static int _wi_quality(const struct wi_device *, int *);
- static int _wi_rate(const struct wi_device *, int *);
-@@ -164,7 +151,7 @@ wi_query(struct wi_device *device, struct wi_stats *st
- strlcpy(stats->ws_qunit, "dBm", 4);
- #endif
- /* check vendor (independent of carrier state) */
--#if defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- if ((result = _wi_vendor(device, stats->ws_vendor, WI_MAXSTRLEN)) != WI_OK)
- return(result);
- #endif
-@@ -305,12 +292,10 @@ _wi_rate(const struct wi_device *device, int *rate)
- }
- #endif
-
--/* seems only FreeBSD supports this operation */
--#if defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- static int
- _wi_vendor(const struct wi_device *device, char *buffer, size_t len)
- {
--#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 700000
- /*
- * We use sysctl to get a device description
- */
-@@ -327,59 +312,30 @@ _wi_vendor(const struct wi_device *device, char *buffe
- dev_number = (int)strtol(c, NULL, 10);
- *c = '\0';
-
-+ /*
-+ * Also, wlan doesn't present dev.wlan.N.%desc, need to use
-+ * underlying driver name, instead: dev.ath.0.%desc, so we
-+ * need to get the parent's name.
-+ */
-+ if(strcmp(dev_name, "wlan") == 0) {
-+ snprintf(mib, sizeof(mib), "net.%s.%d.%%parent", dev_name, dev_number);
-+ if(sysctlbyname(mib, dev_name, &len, NULL, 0) == -1)
-+ return (WI_NOSUCHDEV);
-+
-+ c = dev_name;
-+ while(!isdigit(*c)) c++;
-+ dev_number = (int)strtol(c, NULL, 10);
-+ *c = '\0';
-+ len = WI_MAXSTRLEN;
-+ }
-+
- snprintf(mib, sizeof(mib), "dev.%s.%d.%%desc", dev_name, dev_number);
- if(sysctlbyname(mib, buffer, &len, NULL, 0) == -1)
- return (WI_NOSUCHDEV);
--#else
--#define WI_RID_STA_IDENTITY_LUCENT 0x1
--#define WI_RID_STA_IDENTITY_PRISMII 0x2
--#define WI_RID_STA_IDENTITY_SAMSUNG 0x3
--#define WI_RID_STA_IDENTITY_DLINK 0x6
-- const char* vendor = "Unknown";
-- struct wi_req wr;
-- int result;
-
-- bzero((void*)&wr, sizeof(wr));
-- wr.wi_len = WI_MAX_DATALEN;
-- wr.wi_type = WI_RID_STA_IDENTITY;
--
-- if ((result = _wi_getval(device, &wr)) != WI_OK){
-- /* For the Atheros, IDENTITY does not work. */
-- if (strcmp(device->interface, "ath") != 0)
-- return(result);
-- }
-- else if (wr.wi_len < 4)
-- return(WI_NOSUCHDEV);
--
-- switch (wr.wi_val[1]) {
-- case WI_RID_STA_IDENTITY_LUCENT:
-- vendor = "Lucent";
-- break;
--
-- case WI_RID_STA_IDENTITY_PRISMII:
-- vendor = "generic PRISM II";
-- break;
--
-- case WI_RID_STA_IDENTITY_SAMSUNG:
-- vendor = "Samsung";
-- break;
-- case WI_RID_STA_IDENTITY_DLINK:
-- vendor = "D-Link";
-- break;
-- }
--
-- snprintf(buffer, len, "%s (ID %d, version %d.%d)", vendor,
-- wr.wi_val[0], wr.wi_val[2], wr.wi_val[3]);
--#endif
--
- return(WI_OK);
- }
--#endif /* wi_vendor */
-
--/* NetBSD and FreeBSD 6.x uses old wi_* API */
--#if defined(__NetBSD__) || defined(__FreeBSD_kernel__)
--/* FreeBSD 7.x use its own new iee80211 API */
--#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 700000
- static int
- _wi_getval(const struct wi_device *device, struct ieee80211req_scan_result *scan)
- {
-@@ -404,7 +360,9 @@ _wi_getval(const struct wi_device *device, struct ieee
-
- return(WI_OK);
- }
--#else
-+#endif
-+
-+#if defined(__NetBSD__)
- static int
- _wi_getval(const struct wi_device *device, struct wi_req *wr)
- {
-@@ -420,10 +378,11 @@ _wi_getval(const struct wi_device *device, struct wi_r
- return(WI_OK);
- }
- #endif
-+
- static int
- _wi_netname(const struct wi_device *device, char *buffer, size_t len)
- {
--#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 700000
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- struct ieee80211req ireq;
-
- memset(&ireq, 0, sizeof(ireq));
-@@ -434,7 +393,7 @@ _wi_netname(const struct wi_device *device, char *buff
- ireq.i_len = len;
- if (ioctl(device->socket, SIOCG80211, &ireq) < 0)
- return WI_NOSUCHDEV;
--#else
-+#elif defined(__NetBSD__)
- struct wi_req wr;
- int result;
-
-@@ -454,7 +413,7 @@ _wi_netname(const struct wi_device *device, char *buff
- static int
- _wi_quality(const struct wi_device *device, int *quality)
- {
--#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 700000
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- struct ieee80211req_scan_result req;
- int result;
- bzero(&req, sizeof(req));
-@@ -462,8 +421,16 @@ _wi_quality(const struct wi_device *device, int *quali
- if((result = _wi_getval(device, &req)) != WI_OK)
- return (result);
-
-- *quality = req.isr_rssi;
--#else
-+ /*
-+ * FreeBSD's wlan stats:
-+ * signal (in dBm) = rssi * 2 + noise;
-+ * quality_bars = 4 * (signal - noise);
-+ * or
-+ * quality_bars = rssi * 8;
-+ * but, per wi_query(), above, we need to return strength in dBm, so...
-+ */
-+ *quality = req.isr_rssi * 2 + req.isr_noise;
-+#elif defined(__NetBSD__)
- struct wi_req wr;
- int result;
-
-@@ -486,7 +453,7 @@ _wi_quality(const struct wi_device *device, int *quali
- static int
- _wi_rate(const struct wi_device *device, int *rate)
- {
--#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 700000
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- struct ieee80211req_scan_result req;
- int result, i, high;
- bzero(&req, sizeof(req));
-@@ -499,7 +466,7 @@ _wi_rate(const struct wi_device *device, int *rate)
- high = req.isr_rates[i] & IEEE80211_RATE_VAL;
-
- *rate = high / 2;
--#else
-+#elif defined(__NetBSD__)
- struct wi_req wr;
- int result;
-
-@@ -516,5 +483,4 @@ _wi_rate(const struct wi_device *device, int *rate)
- return(WI_OK);
- }
-
--#endif /* defined(__NetBSD__) || defined(__FreeBSD_kernel__) */
- #endif
diff --git a/textproc/xfce4-dict-plugin/Makefile b/textproc/xfce4-dict-plugin/Makefile
index c90692f22492..d2e27996de50 100644
--- a/textproc/xfce4-dict-plugin/Makefile
+++ b/textproc/xfce4-dict-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-dict
PORTVERSION= 0.8.2
+PORTREVISION= 1
CATEGORIES= textproc xfce
MASTER_SITES= XFCE/apps
PKGNAMESUFFIX= -plugin
@@ -14,7 +15,8 @@ COMMENT= Xfce4 plugin to query different dictionaries
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-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 glib20 gtk30 intltool
USE_XFCE= panel
USE_XORG= x11
diff --git a/www/midori/Makefile b/www/midori/Makefile
index 0bbc4081e6f3..dd08174d41ac 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS= libnotify.so:devel/libnotify \
RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
USES= cmake compiler:c++11-lang desktop-file-utils gettext gnome \
- libarchive localbase:ldflags pkgconfig sqlite tar:bzip2
+ libarchive localbase:ldflags pkgconfig sqlite tar:bzip2 xorg
USE_GNOME= cairo glib20 gtk30 intltool introspection libxml2
USE_XORG= xscrnsaver
diff --git a/www/xfce4-smartbookmark-plugin/Makefile b/www/xfce4-smartbookmark-plugin/Makefile
index d9d651e3e2ef..9d56ffeae5e2 100644
--- a/www/xfce4-smartbookmark-plugin/Makefile
+++ b/www/xfce4-smartbookmark-plugin/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-smartbookmark-plugin
-PORTVERSION= 0.5.0
+PORTVERSION= 0.5.1
CATEGORIES= www xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
@@ -14,7 +14,7 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 \
- xfce:gtk3
+ xfce
USE_GNOME= cairo gdkpixbuf2 gtk30 intltool
USE_XFCE= panel
diff --git a/www/xfce4-smartbookmark-plugin/distinfo b/www/xfce4-smartbookmark-plugin/distinfo
index 95f150a0bef0..4e6df47f17bc 100644
--- a/www/xfce4-smartbookmark-plugin/distinfo
+++ b/www/xfce4-smartbookmark-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488046874
-SHA256 (xfce4/xfce4-smartbookmark-plugin-0.5.0.tar.bz2) = 139539c58d54d878de86ef8a882c793cd909981e6b888f7f9d5e230a8fe310a4
-SIZE (xfce4/xfce4-smartbookmark-plugin-0.5.0.tar.bz2) = 280988
+TIMESTAMP = 1565693710
+SHA256 (xfce4/xfce4-smartbookmark-plugin-0.5.1.tar.bz2) = 3e28fb7cd2e2251e89a8715684081b862406e3fb4e6d8c0caa1b798a97703600
+SIZE (xfce4/xfce4-smartbookmark-plugin-0.5.1.tar.bz2) = 302735
diff --git a/www/xfce4-smartbookmark-plugin/pkg-plist b/www/xfce4-smartbookmark-plugin/pkg-plist
index 47ecd403d4ea..eaf886a642d4 100644
--- a/www/xfce4-smartbookmark-plugin/pkg-plist
+++ b/www/xfce4-smartbookmark-plugin/pkg-plist
@@ -1,6 +1,7 @@
lib/xfce4/panel/plugins/libsmartbookmark.so
%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/be/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
@@ -11,6 +12,7 @@ lib/xfce4/panel/plugins/libsmartbookmark.so
%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
%%NLS%%share/locale/es/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
%%NLS%%share/locale/he/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
@@ -21,6 +23,7 @@ lib/xfce4/panel/plugins/libsmartbookmark.so
%%NLS%%share/locale/it/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
%%NLS%%share/locale/ko/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/ku/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
%%NLS%%share/locale/lt/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
diff --git a/x11-clocks/Makefile b/x11-clocks/Makefile
index c5e736fbd641..6a0d35ffe752 100644
--- a/x11-clocks/Makefile
+++ b/x11-clocks/Makefile
@@ -46,6 +46,7 @@
SUBDIR += xclock
SUBDIR += xdaliclock
SUBDIR += xfce4-datetime-plugin
+ SUBDIR += xfce4-stopwatch-plugin
SUBDIR += xfce4-timer-out-plugin
SUBDIR += xfce4-timer-plugin
SUBDIR += xtimer
diff --git a/x11-clocks/xfce4-datetime-plugin/Makefile b/x11-clocks/xfce4-datetime-plugin/Makefile
index fb6d6860da69..bff05a6ce97f 100644
--- a/x11-clocks/xfce4-datetime-plugin/Makefile
+++ b/x11-clocks/xfce4-datetime-plugin/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-datetime-plugin
-PORTVERSION= 0.7.0
+PORTVERSION= 0.8.0
CATEGORIES= x11-clocks xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
@@ -12,7 +12,7 @@ COMMENT= Datetime panel plugin for the Xfce desktop
LICENSE= GPLv2
-USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3
+USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce
USE_GNOME= cairo gtk30 intltool
USE_XFCE= panel
diff --git a/x11-clocks/xfce4-datetime-plugin/distinfo b/x11-clocks/xfce4-datetime-plugin/distinfo
index 55ca24431997..f29b4965ed3f 100644
--- a/x11-clocks/xfce4-datetime-plugin/distinfo
+++ b/x11-clocks/xfce4-datetime-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488047483
-SHA256 (xfce4/xfce4-datetime-plugin-0.7.0.tar.bz2) = 297f3077f7aee52a237449fbd8595e232267bc600b5b9e7ddc5baab306ed67b9
-SIZE (xfce4/xfce4-datetime-plugin-0.7.0.tar.bz2) = 283142
+TIMESTAMP = 1565600898
+SHA256 (xfce4/xfce4-datetime-plugin-0.8.0.tar.bz2) = cd358bc2ff0707b8ef1504396a19b0a27f802c2ec7bceb5cebe2c7baf6adebd4
+SIZE (xfce4/xfce4-datetime-plugin-0.8.0.tar.bz2) = 334063
diff --git a/x11-clocks/xfce4-datetime-plugin/pkg-plist b/x11-clocks/xfce4-datetime-plugin/pkg-plist
index 1bf334aca622..aebf8994bab4 100644
--- a/x11-clocks/xfce4-datetime-plugin/pkg-plist
+++ b/x11-clocks/xfce4-datetime-plugin/pkg-plist
@@ -2,6 +2,7 @@ lib/xfce4/panel/plugins/libdatetime.so
%%NLS%%share/locale/am/LC_MESSAGES/xfce4-datetime-plugin.mo
%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-datetime-plugin.mo
%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/be/LC_MESSAGES/xfce4-datetime-plugin.mo
%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-datetime-plugin.mo
%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-datetime-plugin.mo
%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-datetime-plugin.mo
@@ -12,12 +13,15 @@ lib/xfce4/panel/plugins/libdatetime.so
%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-datetime-plugin.mo
%%NLS%%share/locale/es/LC_MESSAGES/xfce4-datetime-plugin.mo
%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-datetime-plugin.mo
%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-datetime-plugin.mo
%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-datetime-plugin.mo
%%NLS%%share/locale/he/LC_MESSAGES/xfce4-datetime-plugin.mo
%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-datetime-plugin.mo
%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/hy_AM/LC_MESSAGES/xfce4-datetime-plugin.mo
%%NLS%%share/locale/id/LC_MESSAGES/xfce4-datetime-plugin.mo
+%%NLS%%share/locale/ie/LC_MESSAGES/xfce4-datetime-plugin.mo
%%NLS%%share/locale/is/LC_MESSAGES/xfce4-datetime-plugin.mo
%%NLS%%share/locale/it/LC_MESSAGES/xfce4-datetime-plugin.mo
%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-datetime-plugin.mo
diff --git a/x11-clocks/xfce4-stopwatch-plugin/Makefile b/x11-clocks/xfce4-stopwatch-plugin/Makefile
new file mode 100644
index 000000000000..372c8a2a83c9
--- /dev/null
+++ b/x11-clocks/xfce4-stopwatch-plugin/Makefile
@@ -0,0 +1,29 @@
+# $FreeBSD$
+
+PORTNAME= xfce4-stopwatch-plugin
+PORTVERSION= 0.3.1
+CATEGORIES= x11-clocks xfce
+MASTER_SITES= XFCE/panel-plugins
+DIST_SUBDIR= xfce4
+
+MAINTAINER= xfce@FreeBSD.org
+COMMENT= XFCE panel plugin to keep track of elapsed time
+
+LICENSE= BSD2CLAUSE
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce
+USE_GNOME= cairo gtk30 intltool
+USE_XFCE= panel
+
+GNU_CONFIGURE= yes
+INSTALLS_ICONS= yes
+INSTALL_TARGET= install-strip
+
+OPTIONS_DEFINE= NLS
+OPTIONS_SUB= yes
+
+NLS_USES= gettext-runtime
+NLS_CONFIGURE_ENABLE= nls
+
+.include <bsd.port.mk>
diff --git a/x11-clocks/xfce4-stopwatch-plugin/distinfo b/x11-clocks/xfce4-stopwatch-plugin/distinfo
new file mode 100644
index 000000000000..1eba6b091918
--- /dev/null
+++ b/x11-clocks/xfce4-stopwatch-plugin/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1560170458
+SHA256 (xfce4/xfce4-stopwatch-plugin-0.3.1.tar.bz2) = 50c46eee58b0fe8d22cd5ddd630a82014c0b0c17911c890f27c4d31ddf6eaa1d
+SIZE (xfce4/xfce4-stopwatch-plugin-0.3.1.tar.bz2) = 323681
diff --git a/x11-clocks/xfce4-stopwatch-plugin/pkg-descr b/x11-clocks/xfce4-stopwatch-plugin/pkg-descr
new file mode 100644
index 000000000000..e88f5707bf4a
--- /dev/null
+++ b/x11-clocks/xfce4-stopwatch-plugin/pkg-descr
@@ -0,0 +1,3 @@
+This plugin keeps track of elapsed time - right on your panel.
+
+WWW: https://goodies.xfce.org/projects/panel-plugins/xfce4-stopwatch-plugin
diff --git a/x11-clocks/xfce4-stopwatch-plugin/pkg-plist b/x11-clocks/xfce4-stopwatch-plugin/pkg-plist
new file mode 100644
index 000000000000..aa123bf7429c
--- /dev/null
+++ b/x11-clocks/xfce4-stopwatch-plugin/pkg-plist
@@ -0,0 +1,53 @@
+libexec/xfce4/panel/plugins/libstopwatch.so
+libexec/xfce4/panel/plugins/libstopwatch.so.0
+libexec/xfce4/panel/plugins/libstopwatch.so.0.0.0
+share/icons/hicolor/16x16/apps/xfce4-stopwatch-plugin.png
+share/icons/hicolor/22x22/apps/xfce4-stopwatch-plugin.png
+share/icons/hicolor/24x24/apps/xfce4-stopwatch-plugin.png
+share/icons/hicolor/32x32/apps/xfce4-stopwatch-plugin.png
+share/icons/hicolor/scalable/apps/xfce4-stopwatch-plugin.svg
+%%NLS%%share/locale/am/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/be/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/is/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-stopwatch-plugin.mo
+share/xfce4/panel/plugins/xfce4-stopwatch-plugin.desktop
diff --git a/x11-clocks/xfce4-timer-out-plugin/Makefile b/x11-clocks/xfce4-timer-out-plugin/Makefile
index 422376fc0340..fe2f2386e7b9 100644
--- a/x11-clocks/xfce4-timer-out-plugin/Makefile
+++ b/x11-clocks/xfce4-timer-out-plugin/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-time-out-plugin
-PORTVERSION= 1.0.2
-PORTREVISION= 2
+PORTVERSION= 1.0.3
CATEGORIES= x11-clocks xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
@@ -16,8 +15,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 gtk20 intlhack intltool
+USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 \
+ xfce:gtk2 xorg
+USE_GNOME= cairo gtk20 intltool
USE_XFCE= panel
USE_XORG= x11
diff --git a/x11-clocks/xfce4-timer-out-plugin/distinfo b/x11-clocks/xfce4-timer-out-plugin/distinfo
index 591308d93f57..17a5f703ad64 100644
--- a/x11-clocks/xfce4-timer-out-plugin/distinfo
+++ b/x11-clocks/xfce4-timer-out-plugin/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xfce4/xfce4-time-out-plugin-1.0.2.tar.bz2) = c69fb7218c685e516454810291c5245c49a80d774a6bded59c645a1af427c4e5
-SIZE (xfce4/xfce4-time-out-plugin-1.0.2.tar.bz2) = 337382
+TIMESTAMP = 1565694293
+SHA256 (xfce4/xfce4-time-out-plugin-1.0.3.tar.bz2) = 7f9cd4694e83d9cc5e41140d174dcc5ffe00fd546f2706f619031039ad7e0f6b
+SIZE (xfce4/xfce4-time-out-plugin-1.0.3.tar.bz2) = 362390
diff --git a/x11-clocks/xfce4-timer-out-plugin/pkg-plist b/x11-clocks/xfce4-timer-out-plugin/pkg-plist
index 14f7e929f195..5114177caafd 100644
--- a/x11-clocks/xfce4-timer-out-plugin/pkg-plist
+++ b/x11-clocks/xfce4-timer-out-plugin/pkg-plist
@@ -3,6 +3,7 @@ share/icons/hicolor/48x48/apps/xfce4-time-out-plugin.png
share/icons/hicolor/scalable/apps/xfce4-time-out-plugin.svg
%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-time-out-plugin.mo
%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/be/LC_MESSAGES/xfce4-time-out-plugin.mo
%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-time-out-plugin.mo
%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-time-out-plugin.mo
%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-time-out-plugin.mo
@@ -10,6 +11,7 @@ share/icons/hicolor/scalable/apps/xfce4-time-out-plugin.svg
%%NLS%%share/locale/de/LC_MESSAGES/xfce4-time-out-plugin.mo
%%NLS%%share/locale/el/LC_MESSAGES/xfce4-time-out-plugin.mo
%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/xfce4-time-out-plugin.mo
%%NLS%%share/locale/es/LC_MESSAGES/xfce4-time-out-plugin.mo
%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-time-out-plugin.mo
%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-time-out-plugin.mo
@@ -18,6 +20,7 @@ share/icons/hicolor/scalable/apps/xfce4-time-out-plugin.svg
%%NLS%%share/locale/he/LC_MESSAGES/xfce4-time-out-plugin.mo
%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-time-out-plugin.mo
%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-time-out-plugin.mo
+%%NLS%%share/locale/hy_AM/LC_MESSAGES/xfce4-time-out-plugin.mo
%%NLS%%share/locale/id/LC_MESSAGES/xfce4-time-out-plugin.mo
%%NLS%%share/locale/is/LC_MESSAGES/xfce4-time-out-plugin.mo
%%NLS%%share/locale/it/LC_MESSAGES/xfce4-time-out-plugin.mo
diff --git a/x11-clocks/xfce4-timer-plugin/Makefile b/x11-clocks/xfce4-timer-plugin/Makefile
index 5dbc09709839..7d8744bc3222 100644
--- a/x11-clocks/xfce4-timer-plugin/Makefile
+++ b/x11-clocks/xfce4-timer-plugin/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xfce4-timer-plugin
PORTVERSION= 1.7.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-clocks xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
@@ -13,7 +13,7 @@ COMMENT= Timer plugin for Xfce
LICENSE= GPLv2
-USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce:gtk3
+USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce
USE_GNOME= cairo gtk30 intltool
USE_XFCE= panel
diff --git a/x11-fm/thunar-vfs/Makefile b/x11-fm/thunar-vfs/Makefile
index 5249f0ea9d7a..4c3e76f76267 100644
--- a/x11-fm/thunar-vfs/Makefile
+++ b/x11-fm/thunar-vfs/Makefile
@@ -3,13 +3,16 @@
PORTNAME= thunar-vfs
PORTVERSION= 1.2.0
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= x11-fm xfce
MASTER_SITES= XFCE/archive
DIST_SUBDIR= xfce4
MAINTAINER= xfce@FreeBSD.org
-COMMENT= The virtual filesystem for Thunar
+COMMENT= Virtual filesystem for Thunar
+
+DEPRECATED= Functionality included in Thunar
+EXPIRATION_DATE=2019-11-01
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
@@ -20,9 +23,9 @@ LIB_DEPENDS= libpng.so:graphics/png \
libgamin-1.so:devel/gamin \
libdbus-1.so:devel/dbus
-USES= desktop-file-utils gettext-tools gmake gnome jpeg libtool pathfix \
- perl5 pkgconfig tar:bzip2 xfce
-USE_GNOME= cairo gdkpixbuf2 glib20 gtk20 intlhack intltool
+USES= gettext-tools gmake gnome jpeg libtool pathfix \
+ perl5 pkgconfig tar:bzip2 xfce:gtk2 xorg
+USE_GNOME= cairo gdkpixbuf2 glib20 gtk20 intltool
USE_XFCE= libexo
USE_XORG= ice x11 sm
USE_LDCONFIG= yes
diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile
index 4e2b92e52836..c2fdb0bbb656 100644
--- a/x11-fm/thunar/Makefile
+++ b/x11-fm/thunar/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Thunar
-DISTVERSION= 1.6.17
+DISTVERSION= 1.8.9
CATEGORIES= x11-fm xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
@@ -15,36 +15,30 @@ LICENSE_COMB= multi
LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING
LICENSE_FILE_LGPL20= ${WRKSRC}/COPYING.LIB
-LIB_DEPENDS= libtumbler-1.so:deskutils/xfce4-tumbler \
- libdbus-1.so:devel/dbus \
- libdbus-glib-1.so:devel/dbus-glib \
- libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2
+LIB_DEPENDS= libtumbler-1.so:deskutils/xfce4-tumbler
RUN_DEPENDS= pkexec:sysutils/polkit
USES= desktop-file-utils gettext-tools gmake gnome libtool pathfix \
- perl5 pkgconfig tar:bzip2 xfce
-USE_GNOME= cairo gdkpixbuf2 glib20 gtk20 intltool
+ perl5 pkgconfig tar:bzip2 xfce xorg
+USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool
USE_LDCONFIG= yes
USE_XFCE= libexo
USE_XORG= ice sm x11
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--enable-gio-unix \
- --disable-gudev \
- --enable-dbus
+CONFIGURE_ARGS= --enable-gio-unix \
+ --disable-gudev
INSTALLS_ICONS= yes
INSTALL_TARGET= install-strip
-PORTSCOUT= limit:^1\.6\.
-
-OPTIONS_DEFINE= NLS NOTIFY
+OPTIONS_DEFINE= GIR NLS NOTIFY
OPTIONS_GROUP= PLUGINS
OPTIONS_GROUP_PLUGINS= PLUG_APR PLUG_SBR PLUG_TPA PLUG_UCA PLUG_WALL
OPTIONS_DEFAULT= NOTIFY PLUG_APR PLUG_SBR PLUG_TPA PLUG_UCA PLUG_WALL
OPTIONS_SUB= yes
# Override NOTIFY_DESC
+GIR_DESC= Use Gobject Introspection
NOTIFY_DESC= Display notifications
PLUG_APR_DESC= Advanced Properties plugin
PLUG_SBR_DESC= Simple Builtin Renamers plugin
@@ -52,6 +46,10 @@ PLUG_TPA_DESC= Trash Panel Applet plugin
PLUG_UCA_DESC= User Customizable Actions plugin
PLUG_WALL_DESC= Wallpaper plugin
+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
@@ -71,9 +69,13 @@ PLUG_UCA_CONFIGURE_ENABLE= uca-plugin
PLUG_WALL_CONFIGURE_ENABLE= wallpaper-plugin
post-patch:
- @${REINPLACE_CMD} -e 's|internet-mail|emblem-mail|' \
+ @${REINPLACE_CMD} -e 's|mail-send|emblem-mail|' \
${WRKSRC}/plugins/thunar-sendto-email/thunar-sendto-email.desktop.in.in
+post-install:
+ ${RM} ${STAGEDIR}${PREFIX}/lib/systemd/user/thunar.service
+ (cd ${STAGEDIR}${PREFIX}/lib && ${RMDIR} -p systemd/user)
+
.include <bsd.port.pre.mk>
.if defined(WITH_DEBUG)
diff --git a/x11-fm/thunar/distinfo b/x11-fm/thunar/distinfo
index e2eb3d8b6d8d..92d60a72ee3f 100644
--- a/x11-fm/thunar/distinfo
+++ b/x11-fm/thunar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1558167310
-SHA256 (xfce4/Thunar-1.6.17.tar.bz2) = ced9f64db447f24e1a5a5376f413648b35da376c3fa1a471a0d7f680d792338d
-SIZE (xfce4/Thunar-1.6.17.tar.bz2) = 1995398
+TIMESTAMP = 1565594323
+SHA256 (xfce4/Thunar-1.8.9.tar.bz2) = 7a758e7ac03501c520c304f8845353315c954d429b17d591b8eea8b14f1350b9
+SIZE (xfce4/Thunar-1.8.9.tar.bz2) = 2375302
diff --git a/x11-fm/thunar/pkg-plist b/x11-fm/thunar/pkg-plist
index 1b1e97b54573..df74eabeb27f 100644
--- a/x11-fm/thunar/pkg-plist
+++ b/x11-fm/thunar/pkg-plist
@@ -2,38 +2,78 @@ bin/Thunar
bin/thunar
bin/thunar-settings
%%PLUG_UCA%%etc/xdg/Thunar/uca.xml
-include/thunarx-2/thunarx/thunarx-config.h
-include/thunarx-2/thunarx/thunarx-file-info.h
-include/thunarx-2/thunarx/thunarx-menu-provider.h
-include/thunarx-2/thunarx/thunarx-preferences-provider.h
-include/thunarx-2/thunarx/thunarx-property-page-provider.h
-include/thunarx-2/thunarx/thunarx-property-page.h
-include/thunarx-2/thunarx/thunarx-provider-factory.h
-include/thunarx-2/thunarx/thunarx-provider-plugin.h
-include/thunarx-2/thunarx/thunarx-renamer-provider.h
-include/thunarx-2/thunarx/thunarx-renamer.h
-include/thunarx-2/thunarx/thunarx.h
+include/thunarx-3/thunarx/thunarx-config.h
+include/thunarx-3/thunarx/thunarx-file-info.h
+include/thunarx-3/thunarx/thunarx-menu-item.h
+include/thunarx-3/thunarx/thunarx-menu-provider.h
+include/thunarx-3/thunarx/thunarx-menu.h
+include/thunarx-3/thunarx/thunarx-preferences-provider.h
+include/thunarx-3/thunarx/thunarx-property-page-provider.h
+include/thunarx-3/thunarx/thunarx-property-page.h
+include/thunarx-3/thunarx/thunarx-provider-factory.h
+include/thunarx-3/thunarx/thunarx-provider-module.h
+include/thunarx-3/thunarx/thunarx-provider-plugin.h
+include/thunarx-3/thunarx/thunarx-renamer-provider.h
+include/thunarx-3/thunarx/thunarx-renamer.h
+include/thunarx-3/thunarx/thunarx.h
lib/Thunar/ThunarBulkRename
lib/Thunar/thunar-sendto-email
-lib/libthunarx-2.so
-lib/libthunarx-2.so.0
-lib/libthunarx-2.so.0.0.0
-%%PLUG_APR%%lib/thunarx-2/thunar-apr.so
-%%PLUG_SBR%%lib/thunarx-2/thunar-sbr.so
-%%PLUG_UCA%%lib/thunarx-2/thunar-uca.so
-%%PLUG_WALL%%lib/thunarx-2/thunar-wallpaper-plugin.so
+%%GIR%%lib/girepository-1.0/Thunarx-3.0.typelib
+lib/libthunarx-3.so
+lib/libthunarx-3.so.0
+lib/libthunarx-3.so.0.0.0
+%%PLUG_APR%%lib/thunarx-3/thunar-apr.so
+%%PLUG_SBR%%lib/thunarx-3/thunar-sbr.so
+%%PLUG_UCA%%lib/thunarx-3/thunar-uca.so
+%%PLUG_WALL%%lib/thunarx-3/thunar-wallpaper-plugin.so
%%PLUG_TPA%%lib/xfce4/panel/plugins/libthunar-tpa.so
-libdata/pkgconfig/thunarx-2.pc
+libdata/pkgconfig/thunarx-3.pc
man/man1/Thunar.1.gz
share/Thunar/sendto/thunar-sendto-email.desktop
-share/appdata/thunar.appdata.xml
share/applications/Thunar-bulk-rename.desktop
share/applications/Thunar-folder-handler.desktop
share/applications/Thunar.desktop
share/applications/thunar-settings.desktop
+share/dbus-1/services/org.xfce.Thunar.FileManager1.service
share/dbus-1/services/org.xfce.FileManager.service
share/dbus-1/services/org.xfce.Thunar.service
%%DOCSDIR%%/README.gtkrc
+%%GIR%%share/gir-1.0/Thunarx-3.0.gir
+share/gtk-doc/html/thunarx/ThunarxFileInfo.html
+share/gtk-doc/html/thunarx/ThunarxMenu.html
+share/gtk-doc/html/thunarx/ThunarxMenuItem.html
+share/gtk-doc/html/thunarx/ThunarxMenuProvider.html
+share/gtk-doc/html/thunarx/ThunarxPreferencesProvider.html
+share/gtk-doc/html/thunarx/ThunarxPropertyPage.html
+share/gtk-doc/html/thunarx/ThunarxPropertyPageProvider.html
+share/gtk-doc/html/thunarx/ThunarxProviderFactory.html
+share/gtk-doc/html/thunarx/ThunarxProviderPlugin.html
+share/gtk-doc/html/thunarx/ThunarxRenamer.html
+share/gtk-doc/html/thunarx/ThunarxRenamerProvider.html
+share/gtk-doc/html/thunarx/abstraction.png
+share/gtk-doc/html/thunarx/bulk-rename.png
+share/gtk-doc/html/thunarx/home.png
+share/gtk-doc/html/thunarx/index.html
+share/gtk-doc/html/thunarx/ix01.html
+share/gtk-doc/html/thunarx/left-insensitive.png
+share/gtk-doc/html/thunarx/left.png
+share/gtk-doc/html/thunarx/menu-provider.png
+share/gtk-doc/html/thunarx/right-insensitive.png
+share/gtk-doc/html/thunarx/right.png
+share/gtk-doc/html/thunarx/say-hello.png
+share/gtk-doc/html/thunarx/style.css
+share/gtk-doc/html/thunarx/thunarx-Variables-and-functions-to-check-the-library-version.html
+share/gtk-doc/html/thunarx/thunarx-abstraction-layer.html
+share/gtk-doc/html/thunarx/thunarx-fundamentals.html
+share/gtk-doc/html/thunarx/thunarx-overview.html
+share/gtk-doc/html/thunarx/thunarx-providers.html
+share/gtk-doc/html/thunarx/thunarx-using-extensions.html
+share/gtk-doc/html/thunarx/thunarx-writing-extensions-advanced-topics.html
+share/gtk-doc/html/thunarx/thunarx-writing-extensions-getting-started.html
+share/gtk-doc/html/thunarx/thunarx-writing-extensions.html
+share/gtk-doc/html/thunarx/thunarx.devhelp2
+share/gtk-doc/html/thunarx/up-insensitive.png
+share/gtk-doc/html/thunarx/up.png
share/icons/hicolor/16x16/apps/Thunar.png
share/icons/hicolor/16x16/stock/navigation/stock_folder-copy.png
share/icons/hicolor/16x16/stock/navigation/stock_folder-move.png
@@ -69,6 +109,8 @@ share/icons/hicolor/scalable/apps/Thunar.svg
%%NLS%%share/locale/he/LC_MESSAGES/Thunar.mo
%%NLS%%share/locale/hr/LC_MESSAGES/Thunar.mo
%%NLS%%share/locale/hu/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/hy/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/hy_AM/LC_MESSAGES/Thunar.mo
%%NLS%%share/locale/id/LC_MESSAGES/Thunar.mo
%%NLS%%share/locale/ie/LC_MESSAGES/Thunar.mo
%%NLS%%share/locale/is/LC_MESSAGES/Thunar.mo
@@ -106,6 +148,7 @@ share/icons/hicolor/scalable/apps/Thunar.svg
%%NLS%%share/locale/zh_CN/LC_MESSAGES/Thunar.mo
%%NLS%%share/locale/zh_HK/LC_MESSAGES/Thunar.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/Thunar.mo
+share/metainfo/org.xfce.thunar.appdata.xml
share/pixmaps/Thunar/Thunar-about-logo.png
share/polkit-1/actions/org.xfce.thunar.policy
%%PLUG_TPA%%share/xfce4/panel/plugins/thunar-tpa.desktop
diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
index 3a8f4f2a16f4..a261678ce154 100644
--- a/x11-toolkits/libxfce4gui/Makefile
+++ b/x11-toolkits/libxfce4gui/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libxfce4gui
PORTVERSION= 4.10.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-toolkits xfce
MASTER_SITES= XFCE/archive
DISTNAME= libxfcegui4-${DISTVERSIONFULL}
@@ -17,8 +17,9 @@ LICENSE= GPLv2
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
-USES= gettext-tools gmake gnome libtool pathfix pkgconfig tar:bzip2 xfce
-USE_GNOME= cairo gtk20 intlhack intltool libglade2
+USES= gettext-tools gmake gnome libtool pathfix pkgconfig \
+ tar:bzip2 xfce:gtk2 xorg
+USE_GNOME= cairo gtk20 intltool libglade2
USE_XFCE= libutil
USE_XORG= ice sm x11
USE_LDCONFIG= yes
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index 7f97cc13ef09..e068e89c190c 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-desktop
-PORTVERSION= 4.12.5
+PORTVERSION= 4.14.1
CATEGORIES= x11-wm xfce
MASTER_SITES= XFCE
DISTNAME= xfdesktop-${DISTVERSIONFULL}
@@ -14,14 +14,10 @@ COMMENT= Xfce's desktop manager
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libdbus-1.so:devel/dbus \
- libdbus-glib-1.so:devel/dbus-glib \
- libnotify.so:devel/libnotify \
- libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2
+LIB_DEPENDS= libnotify.so:devel/libnotify
-USES= gettext-tools gmake gnome pkgconfig tar:bzip2 xfce
-USE_GNOME= cairo glib20 gtk20 intltool libwnck
+USES= gettext-tools gmake gnome pkgconfig tar:bzip2 xfce xorg
+USE_GNOME= cairo glib20 gtk30 intltool libwnck3
USE_XFCE= garcon libexo
USE_XORG= ice sm x11
@@ -45,7 +41,4 @@ THUNAR_CONFIGURE_ENABLE= thunarx
THUNAR_CONFIGURE_WITH= file-manager-fallback=Thunar
THUNAR_USE= xfce=thunar
-post-patch-NLS-off:
- @${REINPLACE_CMD} -e 's|po ||' ${WRKSRC}/Makefile.in
-
.include <bsd.port.mk>
diff --git a/x11-wm/xfce4-desktop/distinfo b/x11-wm/xfce4-desktop/distinfo
index 300910d1a67c..d30ab8804055 100644
--- a/x11-wm/xfce4-desktop/distinfo
+++ b/x11-wm/xfce4-desktop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559682890
-SHA256 (xfce4/xfdesktop-4.12.5.tar.bz2) = 3f2426ac28b94cfe5d6fd187c59b4e78f40e66c2842318e158ecd82abe2e7c0a
-SIZE (xfce4/xfdesktop-4.12.5.tar.bz2) = 1442736
+TIMESTAMP = 1565596565
+SHA256 (xfce4/xfdesktop-4.14.1.tar.bz2) = f705a016246ec54ab0c688d1a0577f6c2b45a446690aa8d9e5a7ac23efebf882
+SIZE (xfce4/xfdesktop-4.14.1.tar.bz2) = 1533788
diff --git a/x11-wm/xfce4-desktop/pkg-plist b/x11-wm/xfce4-desktop/pkg-plist
index c20a0a32efe3..dc36a8ddd796 100644
--- a/x11-wm/xfce4-desktop/pkg-plist
+++ b/x11-wm/xfce4-desktop/pkg-plist
@@ -3,6 +3,7 @@ bin/xfdesktop-settings
man/man1/xfdesktop.1.gz
share/applications/xfce-backdrop-settings.desktop
share/backgrounds/xfce/xfce-blue.jpg
+share/backgrounds/xfce/xfce-stripes.png
share/backgrounds/xfce/xfce-teal.jpg
share/icons/hicolor/32x32/apps/xfce4-backdrop.png
share/icons/hicolor/32x32/apps/xfce4-menueditor.png
@@ -22,6 +23,7 @@ share/icons/hicolor/scalable/apps/xfce4-menueditor.svg
%%NLS%%share/locale/de/LC_MESSAGES/xfdesktop.mo
%%NLS%%share/locale/el/LC_MESSAGES/xfdesktop.mo
%%NLS%%share/locale/en_AU/LC_MESSAGES/xfdesktop.mo
+%%NLS%%share/locale/en_CA/LC_MESSAGES/xfdesktop.mo
%%NLS%%share/locale/en_GB/LC_MESSAGES/xfdesktop.mo
%%NLS%%share/locale/eo/LC_MESSAGES/xfdesktop.mo
%%NLS%%share/locale/es/LC_MESSAGES/xfdesktop.mo
@@ -34,7 +36,9 @@ share/icons/hicolor/scalable/apps/xfce4-menueditor.svg
%%NLS%%share/locale/he/LC_MESSAGES/xfdesktop.mo
%%NLS%%share/locale/hr/LC_MESSAGES/xfdesktop.mo
%%NLS%%share/locale/hu/LC_MESSAGES/xfdesktop.mo
+%%NLS%%share/locale/hy_AM/LC_MESSAGES/xfdesktop.mo
%%NLS%%share/locale/id/LC_MESSAGES/xfdesktop.mo
+%%NLS%%share/locale/ie/LC_MESSAGES/xfdesktop.mo
%%NLS%%share/locale/is/LC_MESSAGES/xfdesktop.mo
%%NLS%%share/locale/it/LC_MESSAGES/xfdesktop.mo
%%NLS%%share/locale/ja/LC_MESSAGES/xfdesktop.mo
@@ -44,6 +48,7 @@ share/icons/hicolor/scalable/apps/xfce4-menueditor.svg
%%NLS%%share/locale/lv/LC_MESSAGES/xfdesktop.mo
%%NLS%%share/locale/ms/LC_MESSAGES/xfdesktop.mo
%%NLS%%share/locale/nb/LC_MESSAGES/xfdesktop.mo
+%%NLS%%share/locale/ne/LC_MESSAGES/xfdesktop.mo
%%NLS%%share/locale/nl/LC_MESSAGES/xfdesktop.mo
%%NLS%%share/locale/nn/LC_MESSAGES/xfdesktop.mo
%%NLS%%share/locale/oc/LC_MESSAGES/xfdesktop.mo
diff --git a/x11-wm/xfce4-panel-profiles/Makefile b/x11-wm/xfce4-panel-profiles/Makefile
index 98aa794e7530..1230f732ed56 100644
--- a/x11-wm/xfce4-panel-profiles/Makefile
+++ b/x11-wm/xfce4-panel-profiles/Makefile
@@ -11,9 +11,10 @@ COMMENT= Xfce's panel multiple layouts manager
LICENSE= GPLv3
-USES= gettext gmake gnome python:3.3+ shebangfix tar:bz2
+USES= gettext gmake gnome python:3.3+ shebangfix tar:bz2 xfce
USE_GNOME= gtk30 intltool
USE_XFCE= panel
+
NO_ARCH= yes
HAS_CONFIGURE= yes
SHEBANG_FILES= xfce4-panel-profiles/xfce4-panel-profiles.py \
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index 878ea4d67f7e..4757d2e5c906 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-panel
-PORTVERSION= 4.12.2
+PORTVERSION= 4.14.0
CATEGORIES= x11-wm xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
@@ -15,35 +15,41 @@ LICENSE_COMB= multi
LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING
LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LIB
-LIB_DEPENDS= libdbus-1.so:devel/dbus \
- libdbus-glib-1.so:devel/dbus-glib \
- libfontconfig.so:x11-fonts/fontconfig \
+LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
USES= desktop-file-utils gettext-tools gmake gnome libtool pathfix \
- perl5 pkgconfig tar:bzip2
-USE_GNOME= cairo glib20 gtk20 intlhack intltool libwnck
+ perl5 pkgconfig tar:bzip2 xfce xorg
+USE_GNOME= cairo glib20 gtk30 intltool libwnck3
USE_LDCONFIG= yes
-USE_XFCE= garcon libexo
+USE_XFCE= garcon libexo xfconf
USE_XORG= ice sm x11 xext
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
INSTALL_TARGET= install-strip
-CONFIGURE_ARGS+=--enable-gio-unix --without-html-dir
+CONFIGURE_ARGS= --enable-gio-unix --without-html-dir
-PORTSCOUT= limit:^4\.12\.
+PORTSCOUT= limitw:1,even
-OPTIONS_DEFINE= GTK3 NLS
-OPTIONS_DEFAULT= GTK3
+OPTIONS_DEFINE= GIR GTK2 NLS VAPI
+OPTIONS_DEFAULT= GIR GTK2 VAPI
OPTIONS_SUB= yes
-GTK3_CONFIGURE_ENABLE= gtk3
-GTK3_USE= gnome=gtk30
-GTK3_USES_OFF= xfce
-GTK3_USES= xfce:gtk3
+GIR_DESC= Use Gobject Introspection
+
+GIR_USE= gnome=introspection:build
+GIR_CONFIGURE_ON= --enable-introspection=yes
+GIR_CONFIGURE_OFF= --enable-introspection=no
+
+GTK2_USE= gnome=gtk20
+GTK2_CONFIGURE_ENABLE= gtk2
NLS_CONFIGURE_ENABLE= nls
NLS_USES= gettext-runtime
+VAPI_BUILD_DEPENDS= vapigen:lang/vala
+VAPI_CONFIGURE_ENABLE= vala
+VAPA_IMPLIES= GIR
+
.include <bsd.port.mk>
diff --git a/x11-wm/xfce4-panel/distinfo b/x11-wm/xfce4-panel/distinfo
index 2a22eaaf6db9..ab964127fb8d 100644
--- a/x11-wm/xfce4-panel/distinfo
+++ b/x11-wm/xfce4-panel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1513239842
-SHA256 (xfce4/xfce4-panel-4.12.2.tar.bz2) = 42058abb81b8f87691d3999627447de71c3285bcf055f308aab5cefab2de0ce9
-SIZE (xfce4/xfce4-panel-4.12.2.tar.bz2) = 1167175
+TIMESTAMP = 1565592592
+SHA256 (xfce4/xfce4-panel-4.14.0.tar.bz2) = d5f8f3bd7e142139987e5e62cda26135a424baabb5e47aa0c23b4169d0a66ef4
+SIZE (xfce4/xfce4-panel-4.14.0.tar.bz2) = 1291792
diff --git a/x11-wm/xfce4-panel/files/patch-plugins_applicationsmenu_applicationsmenu.c b/x11-wm/xfce4-panel/files/patch-plugins_applicationsmenu_applicationsmenu.c
new file mode 100644
index 000000000000..c8bb24f19bbc
--- /dev/null
+++ b/x11-wm/xfce4-panel/files/patch-plugins_applicationsmenu_applicationsmenu.c
@@ -0,0 +1,58 @@
+--- plugins/applicationsmenu/applicationsmenu.c.orig 2019-04-05 19:49:05 UTC
++++ plugins/applicationsmenu/applicationsmenu.c
+@@ -72,6 +72,7 @@ struct _ApplicationsMenuPlugin
+
+ gulong style_set_id;
+ gulong screen_changed_id;
++ gulong theme_changed_id;
+ };
+
+ enum
+@@ -209,9 +210,13 @@ applications_menu_plugin_class_init (ApplicationsMenuP
+ static void
+ applications_menu_plugin_init (ApplicationsMenuPlugin *plugin)
+ {
++ GtkIconTheme *icon_theme;
++
+ /* init garcon environment */
+ garcon_set_environment_xdg (GARCON_ENVIRONMENT_XFCE);
+
++ icon_theme = gtk_icon_theme_get_default ();
++
+ plugin->button = xfce_panel_create_toggle_button ();
+ xfce_panel_plugin_add_action_widget (XFCE_PANEL_PLUGIN (plugin), plugin->button);
+ gtk_container_add (GTK_CONTAINER (plugin), plugin->button);
+@@ -244,6 +249,10 @@ applications_menu_plugin_init (ApplicationsMenuPlugin
+ G_CALLBACK (applications_menu_button_theme_changed), plugin);
+ plugin->screen_changed_id = g_signal_connect_swapped (G_OBJECT (plugin->button), "screen-changed",
+ G_CALLBACK (applications_menu_button_theme_changed), plugin);
++ plugin->theme_changed_id = g_signal_connect_swapped (G_OBJECT (icon_theme),
++ "changed",
++ G_CALLBACK (applications_menu_plugin_set_garcon_menu),
++ plugin);
+ }
+
+
+@@ -443,6 +452,7 @@ static void
+ applications_menu_plugin_free_data (XfcePanelPlugin *panel_plugin)
+ {
+ ApplicationsMenuPlugin *plugin = XFCE_APPLICATIONS_MENU_PLUGIN (panel_plugin);
++ GtkIconTheme *icon_theme;
+
+ if (plugin->menu != NULL)
+ gtk_widget_destroy (plugin->menu);
+@@ -457,6 +467,14 @@ applications_menu_plugin_free_data (XfcePanelPlugin *p
+ {
+ g_signal_handler_disconnect (plugin->button, plugin->screen_changed_id);
+ plugin->screen_changed_id = 0;
++ }
++
++ if (plugin->theme_changed_id != 0)
++ {
++ icon_theme = gtk_icon_theme_get_default ();
++ g_signal_handler_disconnect (G_OBJECT (icon_theme),
++ plugin->theme_changed_id);
++ plugin->theme_changed_id = 0;
+ }
+
+ g_free (plugin->button_title);
diff --git a/x11-wm/xfce4-panel/files/patch-plugins_pager_pager.c b/x11-wm/xfce4-panel/files/patch-plugins_pager_pager.c
new file mode 100644
index 000000000000..64a605c24887
--- /dev/null
+++ b/x11-wm/xfce4-panel/files/patch-plugins_pager_pager.c
@@ -0,0 +1,25 @@
+From 88d469cb47e58865370b26e6a4d6a7f8891d2949 Mon Sep 17 00:00:00 2001
+From: Andre Miranda <andreldm@xfce.org>
+Date: Sun, 25 Aug 2019 19:16:03 -0300
+Subject: [PATCH] pager: Override WnckPager scroll-event handler (Bug #15886)
+
+---
+ plugins/pager/pager.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/plugins/pager/pager.c b/plugins/pager/pager.c
+index 5637bea6..3a64496e 100644
+--- plugins/pager/pager.c
++++ plugins/pager/pager.c
+@@ -445,6 +445,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS
+ G_CALLBACK (pager_plugin_drag_begin_event), plugin);
+ g_signal_connect_after (G_OBJECT (plugin->pager), "drag-end",
+ G_CALLBACK (pager_plugin_drag_end_event), plugin);
++ g_signal_connect_swapped (G_OBJECT (plugin->pager), "scroll-event",
++ G_CALLBACK (pager_plugin_scroll_event), plugin);
+ }
+ else
+ {
+--
+2.23.0
+
diff --git a/x11-wm/xfce4-panel/pkg-plist b/x11-wm/xfce4-panel/pkg-plist
index b0d981fdffb4..0466a806b547 100644
--- a/x11-wm/xfce4-panel/pkg-plist
+++ b/x11-wm/xfce4-panel/pkg-plist
@@ -3,35 +3,36 @@ bin/xfce4-popup-applicationsmenu
bin/xfce4-popup-directorymenu
bin/xfce4-popup-windowmenu
etc/xdg/xfce4/panel/default.xml
-include/xfce4/libxfce4panel-1.0/libxfce4panel/libxfce4panel-config.h
-include/xfce4/libxfce4panel-1.0/libxfce4panel/libxfce4panel-enum-types.h
-include/xfce4/libxfce4panel-1.0/libxfce4panel/libxfce4panel-enums.h
-include/xfce4/libxfce4panel-1.0/libxfce4panel/libxfce4panel.h
-include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-arrow-button.h
-include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-hvbox.h
-include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-convenience.h
-include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-image.h
-include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-macros-46.h
-include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-macros.h
-include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-plugin-provider.h
-include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-plugin.h
-%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/libxfce4panel-config.h
-%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/libxfce4panel-enum-types.h
-%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/libxfce4panel-enums.h
-%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/libxfce4panel.h
-%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-arrow-button.h
-%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-convenience.h
-%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-image.h
-%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-macros-46.h
-%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-macros.h
-%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-plugin-provider.h
-%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-plugin.h
-lib/libxfce4panel-1.0.so
-lib/libxfce4panel-1.0.so.4
-lib/libxfce4panel-1.0.so.4.0.0
-%%GTK3%%lib/libxfce4panel-2.0.so
-%%GTK3%%lib/libxfce4panel-2.0.so.4
-%%GTK3%%lib/libxfce4panel-2.0.so.4.0.0
+%%GTK2%%include/xfce4/libxfce4panel-1.0/libxfce4panel/libxfce4panel-config.h
+%%GTK2%%include/xfce4/libxfce4panel-1.0/libxfce4panel/libxfce4panel-enum-types.h
+%%GTK2%%include/xfce4/libxfce4panel-1.0/libxfce4panel/libxfce4panel-enums.h
+%%GTK2%%include/xfce4/libxfce4panel-1.0/libxfce4panel/libxfce4panel.h
+%%GTK2%%include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-arrow-button.h
+%%GTK2%%include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-hvbox.h
+%%GTK2%%include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-convenience.h
+%%GTK2%%include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-image.h
+%%GTK2%%include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-macros-46.h
+%%GTK2%%include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-macros.h
+%%GTK2%%include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-plugin-provider.h
+%%GTK2%%include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-plugin.h
+include/xfce4/libxfce4panel-2.0/libxfce4panel/libxfce4panel-config.h
+include/xfce4/libxfce4panel-2.0/libxfce4panel/libxfce4panel-enum-types.h
+include/xfce4/libxfce4panel-2.0/libxfce4panel/libxfce4panel-enums.h
+include/xfce4/libxfce4panel-2.0/libxfce4panel/libxfce4panel.h
+include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-arrow-button.h
+include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-convenience.h
+include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-image.h
+include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-macros-46.h
+include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-macros.h
+include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-plugin-provider.h
+include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-plugin.h
+%%GIR%%lib/girepository-1.0/libxfce4panel-2.0.typelib
+%%GTK2%%lib/libxfce4panel-1.0.so
+%%GTK2%%lib/libxfce4panel-1.0.so.4
+%%GTK2%%lib/libxfce4panel-1.0.so.4.0.0
+lib/libxfce4panel-2.0.so
+lib/libxfce4panel-2.0.so.4
+lib/libxfce4panel-2.0.so.4.0.0
lib/xfce4/panel/migrate
lib/xfce4/panel/plugins/libactions.so
lib/xfce4/panel/plugins/libapplicationsmenu.so
@@ -44,12 +45,13 @@ lib/xfce4/panel/plugins/libshowdesktop.so
lib/xfce4/panel/plugins/libsystray.so
lib/xfce4/panel/plugins/libtasklist.so
lib/xfce4/panel/plugins/libwindowmenu.so
-lib/xfce4/panel/wrapper-1.0
-%%GTK3%%lib/xfce4/panel/wrapper-2.0
-libdata/pkgconfig/libxfce4panel-1.0.pc
-%%GTK3%%libdata/pkgconfig/libxfce4panel-2.0.pc
+%%GTK2%%lib/xfce4/panel/wrapper-1.0
+lib/xfce4/panel/wrapper-2.0
+%%GTK2%%libdata/pkgconfig/libxfce4panel-1.0.pc
+libdata/pkgconfig/libxfce4panel-2.0.pc
share/applications/panel-desktop-handler.desktop
share/applications/panel-preferences.desktop
+%%GIR%%share/gir-1.0/libxfce4panel-2.0.gir
share/icons/hicolor/16x16/apps/xfce4-panel-menu.png
share/icons/hicolor/16x16/apps/xfce4-panel.png
share/icons/hicolor/22x22/apps/xfce4-panel-menu.png
@@ -84,7 +86,9 @@ share/icons/hicolor/scalable/apps/xfce4-panel.svg
%%NLS%%share/locale/he/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/hy_AM/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/id/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/ie/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/is/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/it/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-panel.mo
@@ -131,3 +135,5 @@ share/xfce4/panel/plugins/showdesktop.desktop
share/xfce4/panel/plugins/systray.desktop
share/xfce4/panel/plugins/tasklist.desktop
share/xfce4/panel/plugins/windowmenu.desktop
+%%VAPI%%share/vala/vapi/libxfce4panel-2.0.deps
+%%VAPI%%share/vala/vapi/libxfce4panel-2.0.vapi
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index 89b3bd019343..79f4bdc355cc 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-session
-PORTVERSION= 4.12.1
-PORTREVISION= 6
+PORTVERSION= 4.14.0
CATEGORIES= x11-wm xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
@@ -16,18 +15,13 @@ LICENSE= GPLv2
BUILD_DEPENDS= iceauth:x11/iceauth
RUN_DEPENDS= iceauth:x11/iceauth \
console-kit-daemon:sysutils/consolekit2
-LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
- libdbus-1.so:devel/dbus \
- libupower-glib.so:sysutils/upower \
- libpolkit-gobject-1.so:sysutils/polkit \
- libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2
+LIB_DEPENDS= libupower-glib.so:sysutils/upower \
+ libpolkit-gobject-1.so:sysutils/polkit
USES= gettext-tools gmake gnome libtool pathfix pkgconfig \
- tar:bzip2 xfce
-USE_GNOME= cairo gtk20 glib20 intlhack intltool libwnck
-USE_LDCONFIG= yes
-USE_XFCE= libmenu
+ tar:bzip2 xfce xorg
+USE_GNOME= cairo gtk30 glib20 intltool libwnck3
+USE_XFCE= libexo xfconf
USE_XORG= ice sm x11
GNU_CONFIGURE= yes
@@ -35,17 +29,14 @@ INSTALLS_ICONS= yes
CONFIGURE_ARGS= --enable-legacy-sm \
--with-xsession-prefix=${PREFIX}
SUB_FILES= pkg-message
-PLIST_SUB= VERSION="4.6"
INSTALL_TARGET= install-strip
+PORTSCOUT= limitw:1,even
+
OPTIONS_DEFINE= NLS
OPTIONS_SUB= yes
NLS_CONFIGURE_ENABLE= nls
NLS_USES= gettext-runtime
-post-patch:
- @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
- ${WRKSRC}/scripts/xflock4
-
.include <bsd.port.mk>
diff --git a/x11-wm/xfce4-session/distinfo b/x11-wm/xfce4-session/distinfo
index f1a0a4e10168..b63d01ebd36e 100644
--- a/x11-wm/xfce4-session/distinfo
+++ b/x11-wm/xfce4-session/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xfce4/xfce4-session-4.12.1.tar.bz2) = 97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd
-SIZE (xfce4/xfce4-session-4.12.1.tar.bz2) = 1289284
+TIMESTAMP = 1565566343
+SHA256 (xfce4/xfce4-session-4.14.0.tar.bz2) = 14fb6db74eb69eb400673856ba307a0e57f577cf77c3561a5910151e3d52043f
+SIZE (xfce4/xfce4-session-4.14.0.tar.bz2) = 826950
diff --git a/x11-wm/xfce4-session/files/patch-scripts_xflock4 b/x11-wm/xfce4-session/files/patch-scripts_xflock4
index 7b2ad00a3cc5..32cedb702b8a 100644
--- a/x11-wm/xfce4-session/files/patch-scripts_xflock4
+++ b/x11-wm/xfce4-session/files/patch-scripts_xflock4
@@ -1,23 +1,6 @@
---- scripts/xflock4.orig 2014-08-30 18:24:02 UTC
+--- scripts/xflock4.orig 2019-05-10 20:05:58 UTC
+++ scripts/xflock4
-@@ -21,13 +21,14 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- #
-
--PATH=/bin:/usr/bin
-+PATH=/bin:/usr/bin:%%LOCALBASE%%/bin
- export PATH
-
- # Lock by xscreensaver or gnome-screensaver, if a respective daemon is running
- for lock_cmd in \
- "xscreensaver-command -lock" \
-- "gnome-screensaver-command --lock"
-+ "gnome-screensaver-command --lock" \
-+ "xfce4-screensaver-command --lock"
- do
- $lock_cmd >/dev/null 2>&1 && exit
- done
-@@ -35,12 +36,14 @@ done
+@@ -39,12 +39,14 @@ done
# else run another access locking utility, if installed
for lock_cmd in \
"xlock -mode blank" \
@@ -29,7 +12,7 @@
if command -v -- $1 >/dev/null 2>&1; then
$lock_cmd >/dev/null 2>&1 &
# turn off display backlight:
-+ sleep 1
++ sleep 1
xset dpms force off
exit
fi
diff --git a/x11-wm/xfce4-session/files/patch-xfce4-session_xfsm-global.h b/x11-wm/xfce4-session/files/patch-xfce4-session_xfsm-global.h
deleted file mode 100644
index 71ab36ef6302..000000000000
--- a/x11-wm/xfce4-session/files/patch-xfce4-session_xfsm-global.h
+++ /dev/null
@@ -1,16 +0,0 @@
-Make verbose logging conditional (Bug #11698)
-
---- xfce4-session/xfsm-global.h.orig 2014-09-28 14:51:01 UTC
-+++ xfce4-session/xfsm-global.h
-@@ -49,7 +49,10 @@ extern XfsmSplashScreen *splash_screen;
- #if defined(G_HAVE_ISO_VARARGS)
-
- #define xfsm_verbose(...)\
-- xfsm_verbose_real (__func__, __FILE__, __LINE__, __VA_ARGS__)
-+G_STMT_START{ \
-+ if (G_UNLIKELY (verbose)) \
-+ xfsm_verbose_real (__func__, __FILE__, __LINE__, __VA_ARGS__); \
-+}G_STMT_END
-
- #else
-
diff --git a/x11-wm/xfce4-session/pkg-plist b/x11-wm/xfce4-session/pkg-plist
index 98be06bb06ce..2c60daec8fbc 100644
--- a/x11-wm/xfce4-session/pkg-plist
+++ b/x11-wm/xfce4-session/pkg-plist
@@ -7,38 +7,19 @@ etc/xdg/autostart/xscreensaver.desktop
etc/xdg/xfce4/Xft.xrdb
etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
etc/xdg/xfce4/xinitrc
-include/xfce4/xfce4-session-%%VERSION%%/libxfsm/xfsm-splash-engine.h
-include/xfce4/xfce4-session-%%VERSION%%/libxfsm/xfsm-splash-rc.h
-lib/libxfsm-%%VERSION%%.so
-lib/libxfsm-%%VERSION%%.so.0
-lib/libxfsm-%%VERSION%%.so.0.0.0
-lib/xfce4/session/balou-export-theme
-lib/xfce4/session/balou-install-theme
-lib/xfce4/session/splash-engines/libbalou.so
-lib/xfce4/session/splash-engines/libmice.so
-lib/xfce4/session/splash-engines/libsimple.so
lib/xfce4/session/xfsm-shutdown-helper
-libdata/pkgconfig/xfce4-session-2.0.pc
man/man1/xfce4-session-logout.1.gz
man/man1/xfce4-session.1.gz
share/applications/xfce-session-settings.desktop
share/applications/xfce4-session-logout.desktop
share/icons/hicolor/128x128/apps/xfce4-session.png
-share/icons/hicolor/48x48/apps/system-hibernate.png
-share/icons/hicolor/48x48/apps/system-log-out.png
-share/icons/hicolor/48x48/apps/system-reboot.png
-share/icons/hicolor/48x48/apps/system-shutdown.png
-share/icons/hicolor/48x48/apps/system-suspend.png
+share/icons/hicolor/48x48/actions/xfsm-hibernate.png
+share/icons/hicolor/48x48/actions/xfsm-logout.png
+share/icons/hicolor/48x48/actions/xfsm-reboot.png
+share/icons/hicolor/48x48/actions/xfsm-shutdown.png
+share/icons/hicolor/48x48/actions/xfsm-suspend.png
share/icons/hicolor/48x48/apps/xfce4-session.png
-share/icons/hicolor/48x48/apps/xfce4-splash.png
-share/icons/hicolor/48x48/apps/xfsm-hibernate.png
-share/icons/hicolor/48x48/apps/xfsm-logout.png
-share/icons/hicolor/48x48/apps/xfsm-reboot.png
-share/icons/hicolor/48x48/apps/xfsm-shutdown.png
-share/icons/hicolor/48x48/apps/xfsm-suspend.png
-share/icons/hicolor/scalable/apps/system-shutdown.svg
share/icons/hicolor/scalable/apps/xfce4-session.svg
-share/icons/hicolor/scalable/apps/xfsm-shutdown.svg
%%NLS%%share/locale/am/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-session.mo
@@ -62,7 +43,9 @@ share/icons/hicolor/scalable/apps/xfsm-shutdown.svg
%%NLS%%share/locale/he/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/hy_AM/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/id/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/ie/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/is/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/it/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-session.mo
@@ -99,6 +82,4 @@ share/icons/hicolor/scalable/apps/xfsm-shutdown.svg
%%NLS%%share/locale/zh_HK/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-session.mo
share/polkit-1/actions/org.xfce.session.policy
-share/themes/Default/balou/logo.png
-share/themes/Default/balou/themerc
share/xsessions/xfce.desktop
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index 045e39967c04..353cec934a30 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-wm
-PORTVERSION= 4.12.5
-PORTREVISION= 1
+PORTVERSION= 4.14.0
CATEGORIES= x11-wm xfce
MASTER_SITES= XFCE
DISTNAME= xfwm4-${DISTVERSIONFULL}
@@ -14,15 +13,12 @@ COMMENT= Xfce's window manager
LICENSE= GPLv2
-LIB_DEPENDS= libdbus-1.so:devel/dbus \
- libdbus-glib-1.so:devel/dbus-glib \
- libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2
+LIB_DEPENDS= libepoxy.so:graphics/libepoxy
-USES= gettext-tools gmake gnome pkgconfig tar:bzip2 xfce
-USE_GNOME= cairo gtk20 intltool libwnck
-USE_XFCE= libmenu
-USE_XORG= ice sm x11 xcomposite xdamage xext xfixes xinerama \
+USES= gettext-tools gmake gnome pkgconfig tar:bzip2 xfce xorg
+USE_GNOME= cairo gtk30 intltool libwnck3
+USE_XFCE= libmenu xfconf
+USE_XORG= ice sm x11 xcomposite xdamage xext xfixes xi xinerama \
xrandr xrender
CONFIGURE_ARGS= --enable-xsync \
@@ -34,20 +30,22 @@ GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
DATADIR= ${PREFIX}/share/xfwm4
-OPTIONS_DEFINE= DRM NLS STARTUP
+PORTSCOUT= limitw:1,even
+
+OPTIONS_DEFINE= NLS STARTUP
OPTIONS_DEFAULT= STARTUP
OPTIONS_SUB= yes
-DRM_DESC= Direct Rendering Module service
STARTUP_DESC= Startup notification
-DRM_CONFIGURE_ENABLE= libdrm
-DRM_LIB_DEPENDS= libdrm.so:graphics/libdrm
-
NLS_CONFIGURE_ENABLE= nls
NLS_USES= gettext-runtime
STARTUP_CONFIGURE_ENABLE= startup-notification
STARTUP_LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification
+post-patch:
+ @${REINPLACE_CMD} -e 's|Default|Greybird|' \
+ ${WRKSRC}/settings-dialogs/xfwm4-settings.c
+
.include <bsd.port.mk>
diff --git a/x11-wm/xfce4-wm/distinfo b/x11-wm/xfce4-wm/distinfo
index c6257db4e392..574ab21a9450 100644
--- a/x11-wm/xfce4-wm/distinfo
+++ b/x11-wm/xfce4-wm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1532869895
-SHA256 (xfce4/xfwm4-4.12.5.tar.bz2) = 7775c02216666c2d023275e7ed6d85e57d965e5cc1407bb6a05c53cc38d8caca
-SIZE (xfce4/xfwm4-4.12.5.tar.bz2) = 1215450
+TIMESTAMP = 1565567052
+SHA256 (xfce4/xfwm4-4.14.0.tar.bz2) = b4182bf8dc63d092f120a51fcae0eb54b9bd4aa4f8486f47e5a65a108322b615
+SIZE (xfce4/xfwm4-4.14.0.tar.bz2) = 1122735
diff --git a/x11-wm/xfce4-wm/pkg-plist b/x11-wm/xfce4-wm/pkg-plist
index a24eb617632a..92f278c82abf 100644
--- a/x11-wm/xfce4-wm/pkg-plist
+++ b/x11-wm/xfce4-wm/pkg-plist
@@ -17,6 +17,7 @@ share/icons/hicolor/22x22/actions/xfce-wm-unshade.png
share/icons/hicolor/22x22/actions/xfce-wm-unstick.png
share/icons/hicolor/48x48/apps/wmtweaks.png
share/icons/hicolor/48x48/apps/xfce4-workspaces.png
+share/icons/hicolor/48x48/apps/xfwm4-default.png
share/icons/hicolor/48x48/apps/xfwm4.png
share/icons/hicolor/scalable/actions/xfce-wm-close.svg
share/icons/hicolor/scalable/actions/xfce-wm-maximize.svg
@@ -29,6 +30,7 @@ share/icons/hicolor/scalable/actions/xfce-wm-unshade.svg
share/icons/hicolor/scalable/actions/xfce-wm-unstick.svg
share/icons/hicolor/scalable/apps/wmtweaks.svg
share/icons/hicolor/scalable/apps/xfce4-workspaces.svg
+share/icons/hicolor/scalable/apps/xfwm4-default.svg
share/icons/hicolor/scalable/apps/xfwm4.svg
%%NLS%%share/locale/am/LC_MESSAGES/xfwm4.mo
%%NLS%%share/locale/ar/LC_MESSAGES/xfwm4.mo
@@ -42,6 +44,7 @@ share/icons/hicolor/scalable/apps/xfwm4.svg
%%NLS%%share/locale/de/LC_MESSAGES/xfwm4.mo
%%NLS%%share/locale/el/LC_MESSAGES/xfwm4.mo
%%NLS%%share/locale/en_AU/LC_MESSAGES/xfwm4.mo
+%%NLS%%share/locale/en_CA/LC_MESSAGES/xfwm4.mo
%%NLS%%share/locale/en_GB/LC_MESSAGES/xfwm4.mo
%%NLS%%share/locale/eo/LC_MESSAGES/xfwm4.mo
%%NLS%%share/locale/es/LC_MESSAGES/xfwm4.mo
@@ -53,7 +56,9 @@ share/icons/hicolor/scalable/apps/xfwm4.svg
%%NLS%%share/locale/he/LC_MESSAGES/xfwm4.mo
%%NLS%%share/locale/hr/LC_MESSAGES/xfwm4.mo
%%NLS%%share/locale/hu/LC_MESSAGES/xfwm4.mo
+%%NLS%%share/locale/hy_AM/LC_MESSAGES/xfwm4.mo
%%NLS%%share/locale/id/LC_MESSAGES/xfwm4.mo
+%%NLS%%share/locale/ie/LC_MESSAGES/xfwm4.mo
%%NLS%%share/locale/is/LC_MESSAGES/xfwm4.mo
%%NLS%%share/locale/it/LC_MESSAGES/xfwm4.mo
%%NLS%%share/locale/ja/LC_MESSAGES/xfwm4.mo
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index 43cbeb07e643..508b616a5faa 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -2,42 +2,44 @@
# $FreeBSD$
PORTNAME= xfce
-PORTVERSION= 4.12
-PORTREVISION= 1
+PORTVERSION= 4.14
CATEGORIES= x11-wm xfce
MAINTAINER= xfce@FreeBSD.org
-COMMENT= The "meta-port" for the Xfce Desktop Environment
+COMMENT= meta-port for the Xfce Desktop Environment
RUN_DEPENDS= xfwm4:x11-wm/xfce4-wm \
xfce4-session:x11-wm/xfce4-session \
xfce4-panel:x11-wm/xfce4-panel \
xfdesktop:x11-wm/xfce4-desktop \
- xfsettingsd:sysutils/xfce4-settings \
- gtk-xfce-engine>0:x11-themes/gtk-xfce-engine
+ xfsettingsd:sysutils/xfce4-settings
USES= metaport
-OPTIONS_DEFINE= APPFINDER ICONS MIXER MOUSEPAD NOTIFY ORAGE PRINT SLIM SQUEEZE TERMINAL XPM
-OPTIONS_DEFAULT= APPFINDER ICONS MOUSEPAD NOTIFY ORAGE TERMINAL
+OPTIONS_DEFINE= APPFINDER GREYBIRD GTK2ENGINE ICONS LIGHTDM MOUSEPAD NOTIFY ORAGE PRINT SQUEEZE \
+ TERMINAL XPM
+OPTIONS_DEFAULT= APPFINDER GREYBIRD ICONS MOUSEPAD NOTIFY TERMINAL
APPFINDER_RUN_DEPENDS= xfce4-appfinder:misc/xfce4-appfinder
-APPFINDER_DESC= Launcher and finder
+APPFINDER_DESC= Launcher and finder
+GREYBIRD_DESC= Install Greybird theme
+GREYBIRD_RUN_DEPENDS= greybird-theme>0:x11-themes/greybird-theme
+GTK2ENGINE_DESC= Install old gtk2 only engine theme
+GTK2ENGINE_RUN_DEPENDS= gtk-xfce-engine>0:x11-themes/gtk-xfce-engine
ICONS_RUN_DEPENDS= adwaita-icon-theme>0:x11-themes/adwaita-icon-theme
-MIXER_RUN_DEPENDS= xfce4-mixer:audio/xfce4-mixer
+LIGHTDM_RUN_DEPENDS= lightdm-gtk-greeter:x11/lightdm-gtk-greeter
+LIGHTDM_DESC= LightDM display manger
MOUSEPAD_RUN_DEPENDS= mousepad:editors/mousepad
-MOUSEPAD_DESC= Text editor
+MOUSEPAD_DESC= Text editor
NOTIFY_RUN_DEPENDS= xfce4-notifyd-config:deskutils/xfce4-notifyd
ORAGE_RUN_DEPENDS= orage:deskutils/orage
-ORAGE_DESC= Calendar
+ORAGE_DESC= Calendar
PRINT_RUN_DEPENDS= xfprint4:print/xfce4-print
-SLIM_RUN_DEPENDS= slim:x11/slim
-SLIM_DESC= SLiM, login manager
SQUEEZE_RUN_DEPENDS= squeeze:archivers/squeeze
-SQUEEZE_DESC= Archive manager
+SQUEEZE_DESC= Archive manager
TERMINAL_RUN_DEPENDS= xfce4-terminal:x11/xfce4-terminal
-TERMINAL_DESC= Terminal emulator
+TERMINAL_DESC= Terminal emulator
XPM_RUN_DEPENDS= xfce4-power-manager:sysutils/xfce4-power-manager
-XPM_DESC= Power manager
+XPM_DESC= Power manager
do-install: # empty
diff --git a/x11-wm/xfce4/pkg-descr b/x11-wm/xfce4/pkg-descr
index e2221fb8aa58..fb96f48ba806 100644
--- a/x11-wm/xfce4/pkg-descr
+++ b/x11-wm/xfce4/pkg-descr
@@ -3,4 +3,4 @@ Xfce Desktop Environment
This package does not contain anything by itself - it is a "meta-port" that
depends on other Xfce packages.
-WWW: http://www.xfce.org/
+WWW: https://www.xfce.org/
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