aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Falsi <madpilot@FreeBSD.org>2021-01-02 16:36:33 +0000
committerGuido Falsi <madpilot@FreeBSD.org>2021-01-02 16:36:33 +0000
commitb2f2269daff8c7e224099d352e652241fbdfcb7b (patch)
tree27b902ea7af0a7d6abc54b964847536e36093b87
parent0a2af555796c3880231fff24f17bf146795a8887 (diff)
downloadports-b2f2269daff8c7e224099d352e652241fbdfcb7b.tar.gz
ports-b2f2269daff8c7e224099d352e652241fbdfcb7b.zip
Welcome XFCE 4.16 to the FreeBSD ports tree!
Upstream announce: https://xfce.org/about/news/?post=1608595200 This XFCE release dropped support for GTK2 plugins and also dropped GTK2 from all components. WARNING: please check UPDATING before upgrading your packages. In case of problems also read the libexo pkg-message. Due to this some panel plugins and libraries will be removed since they cannot compile anymore: - print/xfce4-print - x11/xfce4-quicklauncher-plugin - x11/xfce4-wmdock-plugin - x11-toolkits/libxfce4gui These further components also fail to build or work and are being marked BROKEN, deprecated and marked for removal: - science/xfce4-equake-plugin - x11/xfce4-embed-plugin - deskutils/orage - deskutils/xfce4-volumed [1] deskutils/xfce4-notes-plugin will be also marked BROKEN, but there is active development in it's upstream repository and a fixed release is expected soon. deskutils/xfce4-generic-slider will also be marked broken, since it fails to compile. [2] Thanks also to riggs, Olivier Duchateau <duchateau.olivier@gmail.com> and the people in Approved and Reviewed lines below for help and contributions. Reviewed by: woodsb02 Approved by: sergey.dyatko@gmail.com (maintainer) [1], ehaupt [2] Differential Revision: https://reviews.freebsd.org/D27846
Notes
Notes: svn path=/head/; revision=559953
-rw-r--r--MOVED4
-rw-r--r--Mk/Uses/xfce.mk27
-rw-r--r--UPDATING22
-rw-r--r--archivers/thunar-archive-plugin/Makefile1
-rw-r--r--audio/thunar-media-tags-plugin/Makefile1
-rw-r--r--audio/xfce4-pulseaudio-plugin/Makefile4
-rw-r--r--deskutils/orage/Makefile4
-rw-r--r--deskutils/orage/pkg-descr4
-rw-r--r--deskutils/orage/pkg-plist2
-rw-r--r--deskutils/xfce4-generic-slider/Makefile2
-rw-r--r--deskutils/xfce4-notes-plugin/Makefile2
-rw-r--r--deskutils/xfce4-notifyd/Makefile2
-rw-r--r--deskutils/xfce4-tumbler/Makefile15
-rw-r--r--deskutils/xfce4-tumbler/distinfo6
-rw-r--r--deskutils/xfce4-tumbler/pkg-plist5
-rw-r--r--deskutils/xfce4-volumed-pulse/Makefile2
-rw-r--r--deskutils/xfce4-volumed/Makefile4
-rw-r--r--deskutils/xfce4-xkb-plugin/Makefile1
-rw-r--r--devel/xfce4-dev-tools/Makefile6
-rw-r--r--devel/xfce4-dev-tools/distinfo6
-rw-r--r--devel/xfce4-dev-tools/pkg-plist13
-rw-r--r--editors/mousepad/Makefile1
-rw-r--r--graphics/ristretto/Makefile2
-rw-r--r--mail/xfce4-mailwatch-plugin/Makefile1
-rw-r--r--math/xfce4-calculator-plugin/Makefile1
-rw-r--r--misc/xfce4-appfinder/Makefile2
-rw-r--r--misc/xfce4-appfinder/distinfo6
-rw-r--r--misc/xfce4-appfinder/pkg-plist9
-rw-r--r--misc/xfce4-weather-plugin/Makefile1
-rw-r--r--misc/xfce4-wm-themes/Makefile2
-rw-r--r--multimedia/xfce4-parole/Makefile1
-rw-r--r--print/Makefile1
-rw-r--r--print/xfce4-print/Makefile57
-rw-r--r--print/xfce4-print/distinfo2
-rw-r--r--print/xfce4-print/pkg-descr4
-rw-r--r--print/xfce4-print/pkg-plist110
-rw-r--r--science/xfce4-equake-plugin/Makefile4
-rw-r--r--sysutils/catfish/Makefile4
-rw-r--r--sysutils/catfish/distinfo6
-rw-r--r--sysutils/catfish/pkg-plist11
-rw-r--r--sysutils/garcon/Makefile9
-rw-r--r--sysutils/garcon/distinfo6
-rw-r--r--sysutils/garcon/pkg-plist9
-rw-r--r--sysutils/xfburn/Makefile1
-rw-r--r--sysutils/xfce4-battery-plugin/Makefile1
-rw-r--r--sysutils/xfce4-bsdcpufreq-plugin/Makefile1
-rw-r--r--sysutils/xfce4-cpugraph-plugin/Makefile1
-rw-r--r--sysutils/xfce4-diskperf-plugin/Makefile1
-rw-r--r--sysutils/xfce4-fsguard-plugin/Makefile1
-rw-r--r--sysutils/xfce4-genmon-plugin/Makefile1
-rw-r--r--sysutils/xfce4-mount-plugin/Makefile1
-rw-r--r--sysutils/xfce4-netload-plugin/Makefile1
-rw-r--r--sysutils/xfce4-places-plugin/Makefile1
-rw-r--r--sysutils/xfce4-power-manager/Makefile4
-rw-r--r--sysutils/xfce4-power-manager/distinfo6
-rw-r--r--sysutils/xfce4-power-manager/files/patch-src_xfpm-backlight-helper.c56
-rw-r--r--sysutils/xfce4-power-manager/files/patch-src_xfpm-dpms.c22
-rw-r--r--sysutils/xfce4-power-manager/pkg-plist30
-rw-r--r--sysutils/xfce4-settings/Makefile8
-rw-r--r--sysutils/xfce4-settings/distinfo6
-rw-r--r--sysutils/xfce4-settings/pkg-plist147
-rw-r--r--sysutils/xfce4-systemload-plugin/Makefile1
-rw-r--r--sysutils/xfce4-wavelan-plugin/Makefile1
-rw-r--r--textproc/xfce4-dict-plugin/Makefile1
-rw-r--r--www/xfce4-smartbookmark-plugin/Makefile1
-rw-r--r--x11-clocks/xfce4-datetime-plugin/Makefile1
-rw-r--r--x11-clocks/xfce4-stopwatch-plugin/Makefile1
-rw-r--r--x11-clocks/xfce4-stopwatch-plugin/files/patch-panel416fix13
-rw-r--r--x11-clocks/xfce4-time-out-plugin/Makefile1
-rw-r--r--x11-clocks/xfce4-timer-plugin/Makefile1
-rw-r--r--x11-fm/thunar/Makefile4
-rw-r--r--x11-fm/thunar/distinfo6
-rw-r--r--x11-fm/thunar/files/patch-thunar_thunar-list-model.c11
-rw-r--r--x11-fm/thunar/pkg-plist12
-rw-r--r--x11-toolkits/Makefile1
-rw-r--r--x11-toolkits/libxfce4gui/Makefile45
-rw-r--r--x11-toolkits/libxfce4gui/distinfo2
-rw-r--r--x11-toolkits/libxfce4gui/files/patch-libxfcegui4_xfce-exec.c11
-rw-r--r--x11-toolkits/libxfce4gui/pkg-descr3
-rw-r--r--x11-toolkits/libxfce4gui/pkg-plist125
-rw-r--r--x11-wm/xfce4-desktop/Makefile2
-rw-r--r--x11-wm/xfce4-desktop/distinfo6
-rw-r--r--x11-wm/xfce4-desktop/pkg-plist15
-rw-r--r--x11-wm/xfce4-panel/Makefile12
-rw-r--r--x11-wm/xfce4-panel/distinfo6
-rw-r--r--x11-wm/xfce4-panel/files/patch-plugins_pager_pager.c13
-rw-r--r--x11-wm/xfce4-panel/pkg-plist55
-rw-r--r--x11-wm/xfce4-session/Makefile2
-rw-r--r--x11-wm/xfce4-session/distinfo6
-rw-r--r--x11-wm/xfce4-session/pkg-plist21
-rw-r--r--x11-wm/xfce4-wm/Makefile3
-rw-r--r--x11-wm/xfce4-wm/distinfo6
-rw-r--r--x11-wm/xfce4-wm/files/patch-XFixes-XError44
-rw-r--r--x11-wm/xfce4-wm/files/patch-XKillClient-XError24
-rw-r--r--x11-wm/xfce4-wm/files/patch-Xsync-XError30
-rw-r--r--x11-wm/xfce4-wm/pkg-plist18
-rw-r--r--x11-wm/xfce4/Makefile169
-rw-r--r--x11/Makefile2
-rw-r--r--x11/libexo/Makefile10
-rw-r--r--x11/libexo/distinfo6
-rw-r--r--x11/libexo/pkg-message15
-rw-r--r--x11/libexo/pkg-plist220
-rw-r--r--x11/libxfce4menu/Makefile18
-rw-r--r--x11/libxfce4menu/distinfo6
-rw-r--r--x11/libxfce4menu/files/patch-libxfce4kbd-private_xfce-shortcuts-grabber.c74
-rw-r--r--x11/libxfce4menu/pkg-plist37
-rw-r--r--x11/libxfce4util/Makefile2
-rw-r--r--x11/libxfce4util/distinfo6
-rw-r--r--x11/libxfce4util/pkg-plist7
-rw-r--r--x11/xfce4-clipman-plugin/Makefile1
-rw-r--r--x11/xfce4-conf/Makefile15
-rw-r--r--x11/xfce4-conf/distinfo6
-rw-r--r--x11/xfce4-conf/pkg-plist9
-rw-r--r--x11/xfce4-dashboard/Makefile2
-rw-r--r--x11/xfce4-dashboard/distinfo6
-rw-r--r--x11/xfce4-dashboard/pkg-plist30
-rw-r--r--x11/xfce4-embed-plugin/Makefile4
-rw-r--r--x11/xfce4-goodies/Makefile44
-rw-r--r--x11/xfce4-quicklauncher-plugin/Makefile30
-rw-r--r--x11/xfce4-quicklauncher-plugin/distinfo2
-rw-r--r--x11/xfce4-quicklauncher-plugin/pkg-descr9
-rw-r--r--x11/xfce4-quicklauncher-plugin/pkg-plist12
-rw-r--r--x11/xfce4-screensaver/Makefile1
-rw-r--r--x11/xfce4-taskmanager/Makefile1
-rw-r--r--x11/xfce4-terminal/Makefile1
-rw-r--r--x11/xfce4-verve-plugin/Makefile1
-rw-r--r--x11/xfce4-whiskermenu-plugin/Makefile1
-rw-r--r--x11/xfce4-wmdock-plugin/Makefile34
-rw-r--r--x11/xfce4-wmdock-plugin/distinfo2
-rw-r--r--x11/xfce4-wmdock-plugin/pkg-descr5
-rw-r--r--x11/xfce4-wmdock-plugin/pkg-plist28
131 files changed, 767 insertions, 1224 deletions
diff --git a/MOVED b/MOVED
index cfe65a013746..4587e6bf6408 100644
--- a/MOVED
+++ b/MOVED
@@ -16003,3 +16003,7 @@ sysutils/osquery||2021-01-02|Has expired: Uses Python 2.7 which is EOLed upstrea
www/cliqz||2021-01-02|Has expired: Uses deprecated version of python
www/trac||2021-01-02|Has expired: Uses Python 2.7 which is EOLed upstream
www/trac-accountmanager||2021-01-02|Has expired: Uses Python 2.7 which is EOLed upstream
+print/xfce4-print||2021-01-02|Unmaintained, depends on dropped XFCE GTK2 support
+x11/xfce4-quicklauncher-plugin||2021-01-02|Unmaintained, depends on dropped XFCE GTK2 support
+x11/xfce4-wmdock-plugin||2021-01-02|Unmaintained, depends on dropped XFCE GTK2 support
+x11-toolkits/libxfce4gui||2012-01-02|Unmaintained, depends on dropped XFCE GTK2 support
diff --git a/Mk/Uses/xfce.mk b/Mk/Uses/xfce.mk
index 42f62fafa5c1..5ac39863e818 100644
--- a/Mk/Uses/xfce.mk
+++ b/Mk/Uses/xfce.mk
@@ -4,8 +4,7 @@
# Provide support for Xfce related ports.
#
# Feature: xfce
-# Usage: USES=xfce or USES=xfce:ARGS
-# Valid ARGS: gtk2
+# Usage: USES=xfce or USES=xfce
#
# Variables, which can be set by the port:
#
@@ -17,27 +16,13 @@
_INCLUDE_USES_XFCE_Mk= yes
_USES_POST+= xfce
-_USE_XFCE_ALL= garcon libexo libgui libmenu libutil panel thunar xfconf
+_USE_XFCE_ALL= garcon libexo libmenu libutil panel thunar xfconf
xfce_ARGS?= # empty
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
-.if ${xfce_ARGS:Mgtk2}
-libmenu_LIB_DEPENDS= libxfce4ui-1.so:x11/libxfce4menu
-libmenu_USE_XFCE_REQ= libutil
-
-garcon_LIB_DEPENDS= libgarcon-gtk2-1.so:sysutils/garcon
-garcon_USE_XFCE_REQ= libmenu
-
-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-2.so:x11/libxfce4menu
libmenu_USE_XFCE_REQ= libutil
@@ -50,10 +35,6 @@ 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
-
-libgui_LIB_DEPENDS= libxfcegui4.so:x11-toolkits/libxfce4gui
-libgui_USE_XFCE_REQ= libutil
libutil_LIB_DEPENDS= libxfce4util.so:x11/libxfce4util
@@ -97,10 +78,6 @@ RUN_DEPENDS+= ${${comp}_RUN_DEPENDS}
. endif
.endfor
-. if ${USE_XFCE:M*gui} == libgui
-DEPRECATED?= Depends on unmaintained x11-toolkits/libxfce4gui
-. endif
-
.endif # end of defined(USE_XFCE)
.endif
diff --git a/UPDATING b/UPDATING
index a5771fa0de82..1bbf6a5cc90a 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,28 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20210102:
+ AFFECTS: x11/libexo, XFCE4 desktop users
+ AUTHOR: madpilot@FreeBSD.org
+
+ XFCE4 has been updated to version 4.16. Unluckily due to how the
+ update works out it interacts badly with a defect in pkg which can
+ cause files from the libexo package to be absent after upgrade.
+
+ To avoid the issue, before upgrading all packages, please update
+ libexo by itself:
+
+ # pkg upgrade libexo
+ # pkg upgrade
+
+ If you have already upgraded and you notice XFCE issues due to
+ missing libraries you can recover easily by forcing reinstallation
+ of libexo:
+
+ # pkg upgrade -f libexo
+
+ Users upgrading via ports should not be affected.
+
20201228:
AFFECTS: www/py-flexget
AUTHOR: jbeich@FreeBSD.org
diff --git a/archivers/thunar-archive-plugin/Makefile b/archivers/thunar-archive-plugin/Makefile
index 60ca31e0e8bd..6715f5a67ff5 100644
--- a/archivers/thunar-archive-plugin/Makefile
+++ b/archivers/thunar-archive-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= thunar-archive-plugin
PORTVERSION= 0.4.0
+PORTREVISION= 1
CATEGORIES= archivers xfce
MASTER_SITES= XFCE/thunar-plugins
DIST_SUBDIR= xfce4
diff --git a/audio/thunar-media-tags-plugin/Makefile b/audio/thunar-media-tags-plugin/Makefile
index e68cc196b88d..02e06e4bb9fe 100644
--- a/audio/thunar-media-tags-plugin/Makefile
+++ b/audio/thunar-media-tags-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= thunar-media-tags-plugin
PORTVERSION= 0.3.0
+PORTREVISION= 1
CATEGORIES= audio xfce
MASTER_SITES= XFCE/thunar-plugins
DIST_SUBDIR= xfce4
diff --git a/audio/xfce4-pulseaudio-plugin/Makefile b/audio/xfce4-pulseaudio-plugin/Makefile
index f9a8c86dd260..0a78eb42d7c0 100644
--- a/audio/xfce4-pulseaudio-plugin/Makefile
+++ b/audio/xfce4-pulseaudio-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-pulseaudio-plugin
PORTVERSION= 0.4.3
+PORTREVISION= 1
CATEGORIES= audio xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
@@ -14,7 +15,8 @@ LICENSE= GPLv2
LIB_DEPENDS= libpulse-mainloop-glib.so:audio/pulseaudio \
libdbus-1.so:devel/dbus \
- libdbus-glib-1.so:devel/dbus-glib
+ libdbus-glib-1.so:devel/dbus-glib \
+ libnotify.so:devel/libnotify
RUN_DEPENDS= pavucontrol>=2.0:audio/pavucontrol
USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \
diff --git a/deskutils/orage/Makefile b/deskutils/orage/Makefile
index e61647582786..f8985e2ed242 100644
--- a/deskutils/orage/Makefile
+++ b/deskutils/orage/Makefile
@@ -14,6 +14,10 @@ COMMENT= Calendar application for the Xfce Desktop
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+BROKEN= Fails to build proper package with XFCE 4.16
+DEPRECATED= Unsupported upstream, cannot work with XFCE 4.16
+EXPIRATION_DATE= 2021-01-31
+
LIB_DEPENDS= libpopt.so:devel/popt \
libdbus-glib-1.so:devel/dbus-glib \
libdbus-1.so:devel/dbus \
diff --git a/deskutils/orage/pkg-descr b/deskutils/orage/pkg-descr
index 1b8ceb49b6a6..6460df32de74 100644
--- a/deskutils/orage/pkg-descr
+++ b/deskutils/orage/pkg-descr
@@ -1,5 +1,5 @@
-Orage provides a calendar which integrates nicely into the Xfce desktop
-environment. It is highly configurable and supports alerts based on dates.
+Orage provides an highly configurable calendar and supports alerts based
+on dates.
It warns you with popup or audio alarm. As it is an application kind-of
every day use it launches itself in the background as a daemon.
diff --git a/deskutils/orage/pkg-plist b/deskutils/orage/pkg-plist
index 66e692183193..0e463b269fab 100644
--- a/deskutils/orage/pkg-plist
+++ b/deskutils/orage/pkg-plist
@@ -1,7 +1,6 @@
bin/globaltime
bin/orage
bin/tz_convert
-lib/xfce4/panel/plugins/liborageclock.so
man/man1/globaltime.1.gz
man/man1/orage.1.gz
man/man1/tz_convert.1.gz
@@ -97,4 +96,3 @@ share/icons/hicolor/scalable/apps/xfcalendar.svg
%%DATADIR%%/sounds/Spo.wav
%%DATADIR%%/sounds/Tear.wav
%%DATADIR%%/sounds/Wall_c.wav
-share/xfce4/panel/plugins/xfce4-orageclock-plugin.desktop
diff --git a/deskutils/xfce4-generic-slider/Makefile b/deskutils/xfce4-generic-slider/Makefile
index 989294c81476..26699eca7dcc 100644
--- a/deskutils/xfce4-generic-slider/Makefile
+++ b/deskutils/xfce4-generic-slider/Makefile
@@ -11,6 +11,8 @@ COMMENT= Slider plugin to adjust and/or monitor any numeric variable
LICENSE= GPLv3
+BROKEN= Depends on removed XFCE GTK2 support
+
BUILD_DEPENDS= xdt-autogen:devel/xfce4-dev-tools
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
diff --git a/deskutils/xfce4-notes-plugin/Makefile b/deskutils/xfce4-notes-plugin/Makefile
index 422432d7c819..233297216bfb 100644
--- a/deskutils/xfce4-notes-plugin/Makefile
+++ b/deskutils/xfce4-notes-plugin/Makefile
@@ -13,6 +13,8 @@ COMMENT= Notes plugin for the Xfce panel
LICENSE= GPLv2
+BROKEN= Depends on removed XFCE GTK2 support
+
LIB_DEPENDS= libunique-1.0.so:x11-toolkits/unique \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
diff --git a/deskutils/xfce4-notifyd/Makefile b/deskutils/xfce4-notifyd/Makefile
index 02ea0d6f2ac8..c8a792631cd9 100644
--- a/deskutils/xfce4-notifyd/Makefile
+++ b/deskutils/xfce4-notifyd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-notifyd
PORTVERSION= 0.6.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils xfce
MASTER_SITES= XFCE/apps
DIST_SUBDIR= xfce4
diff --git a/deskutils/xfce4-tumbler/Makefile b/deskutils/xfce4-tumbler/Makefile
index 80906afd2b68..512dce6bd629 100644
--- a/deskutils/xfce4-tumbler/Makefile
+++ b/deskutils/xfce4-tumbler/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= tumbler
-PORTVERSION= 0.2.9
-PORTREVISION= 6
+PORTVERSION= 4.16.0
CATEGORIES= deskutils xfce
MASTER_SITES= XFCE
PKGNAMEPREFIX= xfce4-
@@ -31,18 +30,24 @@ CONFIGURE_ARGS= --enable-xdg-cache \
--disable-gtk-doc-html \
--without-html-dir
+PORTSCOUT= limitw:1,even
+
OPTIONS_DEFINE= NLS FONTS JPEG FFMPEG POPPLER \
- GSTREAMER ODF COVER
-OPTIONS_DEFAULT= FONTS JPEG POPPLER GSTREAMER ODF
+ GSTREAMER ODF COVER EPUB
+OPTIONS_DEFAULT= FONTS EPUB JPEG POPPLER GSTREAMER ODF
OPTIONS_SUB= yes
-FONTS_DESC= Fonts thumbnailer plugin
COVER_DESC= Open Movie Database plugin (check pkg-message)
+EPUB_DESC= EPUB thumbnailer plugin
+FONTS_DESC= Fonts thumbnailer plugin
GSTREAMER_DESC= GStreamer thumbnailer plugin
COVER_CONFIGURE_ENABLE= cover-thumbnailer
COVER_LIB_DEPENDS= libcurl.so:ftp/curl
+EPUB_CONFIGURE_ENABLE= gepub-thumbnailer
+EPUB_LIB_DEPENDS= libgepub-0.6.so:textproc/libgepub
+
FFMPEG_CONFIGURE_ENABLE= ffmpeg-thumbnailer
FFMPEG_LIB_DEPENDS= libffmpegthumbnailer.so:multimedia/ffmpegthumbnailer
diff --git a/deskutils/xfce4-tumbler/distinfo b/deskutils/xfce4-tumbler/distinfo
index cc48f1ca6251..9f10ef97a74b 100644
--- a/deskutils/xfce4-tumbler/distinfo
+++ b/deskutils/xfce4-tumbler/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1596717257
-SHA256 (xfce4/tumbler-0.2.9.tar.bz2) = 6508906f03e5a6ae3f6503b71b056df47d336d5504f39df6ce0bb9c5248007b6
-SIZE (xfce4/tumbler-0.2.9.tar.bz2) = 557794
+TIMESTAMP = 1608683055
+SHA256 (xfce4/tumbler-4.16.0.tar.bz2) = 9b0b7fed0c64041733d490b1b307297984629d0dd85369749617a8766850af66
+SIZE (xfce4/tumbler-4.16.0.tar.bz2) = 607640
diff --git a/deskutils/xfce4-tumbler/pkg-plist b/deskutils/xfce4-tumbler/pkg-plist
index 8f6a86432d61..b461c7479f01 100644
--- a/deskutils/xfce4-tumbler/pkg-plist
+++ b/deskutils/xfce4-tumbler/pkg-plist
@@ -26,6 +26,7 @@ lib/tumbler-1/plugins/tumbler-desktop-thumbnailer.so
%%FFMPEG%%lib/tumbler-1/plugins/tumbler-ffmpeg-thumbnailer.so
%%FONTS%%lib/tumbler-1/plugins/tumbler-font-thumbnailer.so
%%JPEG%%lib/tumbler-1/plugins/tumbler-jpeg-thumbnailer.so
+%%EPUB%%lib/tumbler-1/plugins/tumbler-gepub-thumbnailer.so
%%GSTREAMER%%lib/tumbler-1/plugins/tumbler-gst-thumbnailer.so
%%ODF%%lib/tumbler-1/plugins/tumbler-odf-thumbnailer.so
lib/tumbler-1/plugins/tumbler-pixbuf-thumbnailer.so
@@ -35,6 +36,7 @@ libdata/pkgconfig/tumbler-1.pc
share/dbus-1/services/org.xfce.Tumbler.Cache1.service
share/dbus-1/services/org.xfce.Tumbler.Manager1.service
share/dbus-1/services/org.xfce.Tumbler.Thumbnailer1.service
+share/icons/hicolor/32x32/apps/org.xfce.tumbler.png
%%NLS%%share/locale/ar/LC_MESSAGES/tumbler.mo
%%NLS%%share/locale/ast/LC_MESSAGES/tumbler.mo
%%NLS%%share/locale/be/LC_MESSAGES/tumbler.mo
@@ -48,14 +50,17 @@ share/dbus-1/services/org.xfce.Tumbler.Thumbnailer1.service
%%NLS%%share/locale/en_AU/LC_MESSAGES/tumbler.mo
%%NLS%%share/locale/en_GB/LC_MESSAGES/tumbler.mo
%%NLS%%share/locale/es/LC_MESSAGES/tumbler.mo
+%%NLS%%share/locale/et/LC_MESSAGES/tumbler.mo
%%NLS%%share/locale/eu/LC_MESSAGES/tumbler.mo
%%NLS%%share/locale/fi/LC_MESSAGES/tumbler.mo
%%NLS%%share/locale/fr/LC_MESSAGES/tumbler.mo
%%NLS%%share/locale/gl/LC_MESSAGES/tumbler.mo
%%NLS%%share/locale/he/LC_MESSAGES/tumbler.mo
+%%NLS%%share/locale/hi/LC_MESSAGES/tumbler.mo
%%NLS%%share/locale/hr/LC_MESSAGES/tumbler.mo
%%NLS%%share/locale/hu/LC_MESSAGES/tumbler.mo
%%NLS%%share/locale/hy_AM/LC_MESSAGES/tumbler.mo
+%%NLS%%share/locale/hye/LC_MESSAGES/tumbler.mo
%%NLS%%share/locale/id/LC_MESSAGES/tumbler.mo
%%NLS%%share/locale/is/LC_MESSAGES/tumbler.mo
%%NLS%%share/locale/it/LC_MESSAGES/tumbler.mo
diff --git a/deskutils/xfce4-volumed-pulse/Makefile b/deskutils/xfce4-volumed-pulse/Makefile
index 587e6936ebbd..4a8c1444bd33 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= 3
+PORTREVISION= 4
CATEGORIES= deskutils xfce
MASTER_SITES= XFCE/apps
DIST_SUBDIR= xfce4
diff --git a/deskutils/xfce4-volumed/Makefile b/deskutils/xfce4-volumed/Makefile
index 05a66d745fe8..ef02496a9b25 100644
--- a/deskutils/xfce4-volumed/Makefile
+++ b/deskutils/xfce4-volumed/Makefile
@@ -13,6 +13,10 @@ COMMENT= Volume management daemon for the Xfce desktop
LICENSE= GPLv3
+BROKEN= Fails to compile with XFCE 4.16
+DEPRECATED= Unsupported upstream, cannot work with XFCE 4.16
+EXPIRATION_DATE= 2021-01-31
+
LIB_DEPENDS= libnotify.so:devel/libnotify \
libkeybinder.so:x11/keybinder \
libfontconfig.so:x11-fonts/fontconfig \
diff --git a/deskutils/xfce4-xkb-plugin/Makefile b/deskutils/xfce4-xkb-plugin/Makefile
index bcb660e44643..de611462c052 100644
--- a/deskutils/xfce4-xkb-plugin/Makefile
+++ b/deskutils/xfce4-xkb-plugin/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xfce4-xkb-plugin
PORTVERSION= 0.8.2
+PORTREVISION= 1
CATEGORIES= deskutils xfce
MASTER_SITES= XFCE/panel-plugins
diff --git a/devel/xfce4-dev-tools/Makefile b/devel/xfce4-dev-tools/Makefile
index f85bc3b15b1c..c914799b5623 100644
--- a/devel/xfce4-dev-tools/Makefile
+++ b/devel/xfce4-dev-tools/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-dev-tools
-PORTVERSION= 4.14.0
+PORTVERSION= 4.16.0
CATEGORIES= devel xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
@@ -18,8 +18,10 @@ RUN_DEPENDS= autoconf>=2.69:devel/autoconf \
libtoolize:devel/libtool \
bash:shells/bash
-USES= gnome pkgconfig tar:bzip2 xfce
+USES= gnome pkgconfig shebangfix tar:bzip2 xfce
USE_GNOME= glib20
+SHEBANG_FILES= helpers/xfce-build helpers/xfce-do-release \
+ helpers/xfce-get-translations
GNU_CONFIGURE= yes
diff --git a/devel/xfce4-dev-tools/distinfo b/devel/xfce4-dev-tools/distinfo
index f5a93d727f91..34156e8dc7fd 100644
--- a/devel/xfce4-dev-tools/distinfo
+++ b/devel/xfce4-dev-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565543023
-SHA256 (xfce4/xfce4-dev-tools-4.14.0.tar.bz2) = 2c9eb8e0fe23e47dc31411a93b683fd1b7a49140e9163f0aab9e94a3d8a0b5fd
-SIZE (xfce4/xfce4-dev-tools-4.14.0.tar.bz2) = 292275
+TIMESTAMP = 1608682203
+SHA256 (xfce4/xfce4-dev-tools-4.16.0.tar.bz2) = f50b3070e66f3ebdf331744dd1ec5e1af5de333965d491e15ce05545e8eb4f04
+SIZE (xfce4/xfce4-dev-tools-4.16.0.tar.bz2) = 340107
diff --git a/devel/xfce4-dev-tools/pkg-plist b/devel/xfce4-dev-tools/pkg-plist
index 43ce95d8c1ee..ac73a94d3155 100644
--- a/devel/xfce4-dev-tools/pkg-plist
+++ b/devel/xfce4-dev-tools/pkg-plist
@@ -1,5 +1,12 @@
bin/xdt-autogen
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
+bin/xfce-build
+bin/xfce-do-release
+bin/xfce-get-release-notes
+bin/xfce-get-translations
+bin/xfce-update-news
+man/man1/xdt-csource.1.gz
+share/aclocal/xdt-depends.m4
+share/aclocal/xdt-features.m4
+share/aclocal/xdt-i18n.m4
+share/aclocal/xdt-version.m4
diff --git a/editors/mousepad/Makefile b/editors/mousepad/Makefile
index ee8d59aa0ecf..b8a378bcc910 100644
--- a/editors/mousepad/Makefile
+++ b/editors/mousepad/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mousepad
PORTVERSION= 0.5.1
+PORTREVISION= 1
CATEGORIES= editors xfce
MASTER_SITES= XFCE/apps
DIST_SUBDIR= xfce4
diff --git a/graphics/ristretto/Makefile b/graphics/ristretto/Makefile
index 1ddf50732028..7d57ed5264bd 100644
--- a/graphics/ristretto/Makefile
+++ b/graphics/ristretto/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ristretto
PORTVERSION= 0.10.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics xfce
MASTER_SITES= XFCE/apps
DIST_SUBDIR= xfce4
diff --git a/mail/xfce4-mailwatch-plugin/Makefile b/mail/xfce4-mailwatch-plugin/Makefile
index dc668352a1ed..650551f38ff9 100644
--- a/mail/xfce4-mailwatch-plugin/Makefile
+++ b/mail/xfce4-mailwatch-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-mailwatch-plugin
PORTVERSION= 1.3.0
+PORTREVISION= 1
CATEGORIES= mail xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
diff --git a/math/xfce4-calculator-plugin/Makefile b/math/xfce4-calculator-plugin/Makefile
index c621afc07a27..b422b8c4614f 100644
--- a/math/xfce4-calculator-plugin/Makefile
+++ b/math/xfce4-calculator-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-calculator-plugin
PORTVERSION= 0.7.1
+PORTREVISION= 1
CATEGORIES= math xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
diff --git a/misc/xfce4-appfinder/Makefile b/misc/xfce4-appfinder/Makefile
index 76fc0e0eacc5..930c1dd0ccca 100644
--- a/misc/xfce4-appfinder/Makefile
+++ b/misc/xfce4-appfinder/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-appfinder
-PORTVERSION= 4.14.0
+PORTVERSION= 4.16.0
CATEGORIES= misc xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
diff --git a/misc/xfce4-appfinder/distinfo b/misc/xfce4-appfinder/distinfo
index dfbf452adafd..1de0d02e032e 100644
--- a/misc/xfce4-appfinder/distinfo
+++ b/misc/xfce4-appfinder/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565586025
-SHA256 (xfce4/xfce4-appfinder-4.14.0.tar.bz2) = 7ec175d4954fceb2e76cbfbca76ac4a4f53fe799d097a14117e7de68e88a4d98
-SIZE (xfce4/xfce4-appfinder-4.14.0.tar.bz2) = 519705
+TIMESTAMP = 1608683020
+SHA256 (xfce4/xfce4-appfinder-4.16.0.tar.bz2) = 37b92aaaeeec8220ed23163cf89321168d3b49e0c48b4c10f12dc4a21fdf0954
+SIZE (xfce4/xfce4-appfinder-4.16.0.tar.bz2) = 569271
diff --git a/misc/xfce4-appfinder/pkg-plist b/misc/xfce4-appfinder/pkg-plist
index 8a3fc657e8e2..ec7ef8aa24c6 100644
--- a/misc/xfce4-appfinder/pkg-plist
+++ b/misc/xfce4-appfinder/pkg-plist
@@ -2,6 +2,12 @@ bin/xfce4-appfinder
bin/xfrun4
share/applications/xfce4-appfinder.desktop
share/applications/xfce4-run.desktop
+share/icons/hicolor/128x128/apps/org.xfce.appfinder.png
+share/icons/hicolor/16x16/apps/org.xfce.appfinder.png
+share/icons/hicolor/24x24/apps/org.xfce.appfinder.png
+share/icons/hicolor/32x32/apps/org.xfce.appfinder.png
+share/icons/hicolor/48x48/apps/org.xfce.appfinder.png
+share/icons/hicolor/scalable/apps/org.xfce.appfinder.svg
%%NLS%%share/locale/am/LC_MESSAGES/xfce4-appfinder.mo
%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-appfinder.mo
%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-appfinder.mo
@@ -14,6 +20,7 @@ share/applications/xfce4-run.desktop
%%NLS%%share/locale/de/LC_MESSAGES/xfce4-appfinder.mo
%%NLS%%share/locale/el/LC_MESSAGES/xfce4-appfinder.mo
%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/en_CA/LC_MESSAGES/xfce4-appfinder.mo
%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-appfinder.mo
%%NLS%%share/locale/eo/LC_MESSAGES/xfce4-appfinder.mo
%%NLS%%share/locale/es/LC_MESSAGES/xfce4-appfinder.mo
@@ -23,9 +30,11 @@ share/applications/xfce4-run.desktop
%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-appfinder.mo
%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-appfinder.mo
%%NLS%%share/locale/he/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/hi/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/hye/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
diff --git a/misc/xfce4-weather-plugin/Makefile b/misc/xfce4-weather-plugin/Makefile
index c4a0cb7f820b..2a553a3e5afc 100644
--- a/misc/xfce4-weather-plugin/Makefile
+++ b/misc/xfce4-weather-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-weather-plugin
PORTVERSION= 0.10.2
+PORTREVISION= 1
CATEGORIES= misc xfce geography
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
diff --git a/misc/xfce4-wm-themes/Makefile b/misc/xfce4-wm-themes/Makefile
index ad7b7e4e0a5a..008e6481327a 100644
--- a/misc/xfce4-wm-themes/Makefile
+++ b/misc/xfce4-wm-themes/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xfce4-wm-themes
PORTVERSION= 4.10.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= misc xfce
MASTER_SITES= XFCE/art
DISTNAME= xfwm4-themes-${DISTVERSIONFULL}
diff --git a/multimedia/xfce4-parole/Makefile b/multimedia/xfce4-parole/Makefile
index 8b6022878163..e7d43d0a9a81 100644
--- a/multimedia/xfce4-parole/Makefile
+++ b/multimedia/xfce4-parole/Makefile
@@ -3,6 +3,7 @@
PORTNAME= parole
PORTVERSION= 1.0.5
+PORTREVISION= 1
CATEGORIES= multimedia xfce
MASTER_SITES= XFCE/apps
DIST_SUBDIR= xfce4
diff --git a/print/Makefile b/print/Makefile
index 801ef75616f5..4c0d62ff7a07 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -255,7 +255,6 @@
SUBDIR += txtbdf2ps
SUBDIR += typetools
SUBDIR += utopia
- SUBDIR += xfce4-print
SUBDIR += xmbibtex
SUBDIR += xpdfopen
SUBDIR += xreader
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
deleted file mode 100644
index a165d8dd2265..000000000000
--- a/print/xfce4-print/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-# Created by: James Earl <jdearl@telus.net>
-# $FreeBSD$
-
-PORTNAME= xfce4-print
-PORTVERSION= 4.6.1
-PORTREVISION= 17
-CATEGORIES= print xfce
-MASTER_SITES= XFCE/archive
-DISTNAME= xfprint-${DISTVERSIONFULL}
-DIST_SUBDIR= xfce4
-
-MAINTAINER= xfce@FreeBSD.org
-COMMENT= Print system support for the Xfce Desktop
-
-LICENSE= GPLv2
-
-DEPRECATED= Unsupported upstream since 2009.
-
-BUILD_DEPENDS= a2ps:print/a2ps
-RUN_DEPENDS= a2ps:print/a2ps
-LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2
-
-USES= compiler:c11 gettext-tools gmake gnome libtool pathfix \
- pkgconfig tar:bzip2 xfce:gtk2 xorg
-USE_GNOME= cairo glib20 gtk20 intltool
-USE_LDCONFIG= yes
-USE_XFCE= libgui xfconf
-USE_XORG= x11
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-cups
-INSTALLS_ICONS= yes
-INSTALL_TARGET= install-strip
-
-OPTIONS_DEFINE= LETTER NLS
-OPTIONS_SINGLE= PRINTMETHOD
-OPTIONS_SINGLE_PRINTMETHOD= LPR
-OPTIONS_DEFAULT= LPR
-OPTIONS_SUB= yes
-
-LETTER_DESC= Use letter paper format instead of A4
-LPR_DESC= LPR printing system support
-
-LETTER_CONFIGURE_ENABLE=letter
-LPR_CONFIGURE_ENABLE= bsdlpr
-LPR_CONFIGURE_WITH= printcap=/etc/printcap
-
-NLS_CONFIGURE_ENABLE= nls
-NLS_USES= gettext-runtime
-
-post-patch:
- @${REINPLACE_CMD} '/_LDADD =/s/=/= -lX11/' \
- ${WRKSRC}/xfprint/Makefile.in \
- ${WRKSRC}/xfprint-manager/Makefile.in
-
-.include <bsd.port.mk>
diff --git a/print/xfce4-print/distinfo b/print/xfce4-print/distinfo
deleted file mode 100644
index 48032f47a0e1..000000000000
--- a/print/xfce4-print/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xfce4/xfprint-4.6.1.tar.bz2) = be0cc5d149234c22dee69db5f8cbddebc46bc21a4f96fefdec21df36b2a15f17
-SIZE (xfce4/xfprint-4.6.1.tar.bz2) = 842675
diff --git a/print/xfce4-print/pkg-descr b/print/xfce4-print/pkg-descr
deleted file mode 100644
index 3480755e4f7a..000000000000
--- a/print/xfce4-print/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Xfprint contains a print dialog and a printer manager for the Xfce Desktop
-Environment. It supports CUPS, BSD-LPR and file as printing destination.
-
-WWW: https://www.xfce.org/
diff --git a/print/xfce4-print/pkg-plist b/print/xfce4-print/pkg-plist
deleted file mode 100644
index 62cf69014383..000000000000
--- a/print/xfce4-print/pkg-plist
+++ /dev/null
@@ -1,110 +0,0 @@
-bin/xfprint4-manager
-bin/xfprint4
-bin/xfprint-settings
-include/xfce4/libxfprint/common.h
-include/xfce4/libxfprint/job.h
-include/xfce4/libxfprint/libxfprint.h
-include/xfce4/libxfprint/printer.h
-include/xfce4/libxfprint/printer-list-window.h
-include/xfce4/libxfprint/printer-queue-window.h
-include/xfce4/libxfprint/printing-system.h
-lib/libxfprint.a
-lib/libxfprint.so
-lib/libxfprint.so.0
-lib/libxfprint.so.0.0.1
-%%LPR%%lib/xfce4/xfprint-plugins/bsdlpr_plugin.a
-%%LPR%%lib/xfce4/xfprint-plugins/bsdlpr_plugin.so
-libdata/pkgconfig/xfprint-1.0.pc
-share/applications/xfprint.desktop
-share/applications/xfprint-manager.desktop
-share/applications/xfprint-settings.desktop
-share/gtk-doc/html/libxfprint/PrinterListWindow.html
-share/gtk-doc/html/libxfprint/PrinterQueueWindow.html
-share/gtk-doc/html/libxfprint/PrintingSystem.html
-share/gtk-doc/html/libxfprint/ch01.html
-share/gtk-doc/html/libxfprint/home.png
-share/gtk-doc/html/libxfprint/index.html
-share/gtk-doc/html/libxfprint/index.sgml
-share/gtk-doc/html/libxfprint/left.png
-share/gtk-doc/html/libxfprint/libxfprint-Job.html
-share/gtk-doc/html/libxfprint/libxfprint-Printer.html
-share/gtk-doc/html/libxfprint/libxfprint.devhelp
-share/gtk-doc/html/libxfprint/libxfprint.devhelp2
-share/gtk-doc/html/libxfprint/right.png
-share/gtk-doc/html/libxfprint/style.css
-share/gtk-doc/html/libxfprint/up.png
-share/icons/hicolor/24x24/devices/printer.png
-share/icons/hicolor/48x48/devices/printer.png
-share/icons/hicolor/scalable/devices/printer.svg
-%%NLS%%share/locale/am/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/ar/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/az/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/be/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/bg/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/bn_IN/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/da/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/de/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/dz/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/el/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/es/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/es_MX/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/et/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/fa/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/gu/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/he/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/hi/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/id/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/it/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/ka/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/lv/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/mk/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/mr/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/ms/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/pa/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/si/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/sq/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/ta/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/ur/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfprint.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfprint.mo
-share/xfce4/doc/C/images/xfprint_headings.png
-share/xfce4/doc/C/images/xfprint_input.png
-share/xfce4/doc/C/images/xfprint-manager.png
-share/xfce4/doc/C/images/xfprint-manager-queue.png
-share/xfce4/doc/C/images/xfprint_mcs_plugin.png
-share/xfce4/doc/C/images/xfprint_prettyprinting.png
-share/xfce4/doc/C/images/xfprint_sheets.png
-share/xfce4/doc/C/images/xfprint_virtualpages.png
-share/xfce4/doc/C/xfprint.html
-share/xfce4/doc/fr/images/xfprint_headings.png
-share/xfce4/doc/fr/images/xfprint_input.png
-share/xfce4/doc/fr/images/xfprint-manager.png
-share/xfce4/doc/fr/images/xfprint-manager-queue.png
-share/xfce4/doc/fr/images/xfprint_mcs_plugin.png
-share/xfce4/doc/fr/images/xfprint_prettyprinting.png
-share/xfce4/doc/fr/images/xfprint_sheets.png
-share/xfce4/doc/fr/images/xfprint_virtualpages.png
-share/xfce4/doc/fr/xfprint.html
diff --git a/science/xfce4-equake-plugin/Makefile b/science/xfce4-equake-plugin/Makefile
index 4b54cbbe12e8..a00e51386f7d 100644
--- a/science/xfce4-equake-plugin/Makefile
+++ b/science/xfce4-equake-plugin/Makefile
@@ -14,6 +14,10 @@ COMMENT= Earthquake monitor plugin for the Xfce panel
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
+BROKEN= Depends on removed gtk2 panel library
+DEPRECATED= Unsupported upstream, cannot work with XFCE 4.16
+EXPIRATION_DATE= 2021-01-31
+
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libcurl.so:ftp/curl
diff --git a/sysutils/catfish/Makefile b/sysutils/catfish/Makefile
index a3ac1747498b..2d4c41dac39b 100644
--- a/sysutils/catfish/Makefile
+++ b/sysutils/catfish/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= catfish
-PORTVERSION= 1.4.13
+PORTVERSION= 4.15.0
CATEGORIES= sysutils
MASTER_SITES= XFCE/apps
DIST_SUBDIR= xfce4
@@ -27,6 +27,8 @@ USE_GNOME= gtk30 intltool pygobject3
NO_ARCH= yes
INSTALLS_ICONS= yes
+PORTSCOUT= limitw:1,even
+
OPTIONS_DEFINE= DOCS ZEITGEIST
OPTIONS_DEFAULT=POLKIT
OPTIONS_MULTI= PRIVILEGES
diff --git a/sysutils/catfish/distinfo b/sysutils/catfish/distinfo
index 70b33fa90d17..f123afdf10d5 100644
--- a/sysutils/catfish/distinfo
+++ b/sysutils/catfish/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1579077633
-SHA256 (xfce4/catfish-1.4.13.tar.bz2) = 58c0ea06e5f286019295545fbfd1dbca23aea74c625762bbb4c89a6f484ae839
-SIZE (xfce4/catfish-1.4.13.tar.bz2) = 221999
+TIMESTAMP = 1603632719
+SHA256 (xfce4/catfish-4.15.0.tar.bz2) = cefc43d091c719690d0c4ad259a757c89038ccdf290626674f54b1b1ea9cefbe
+SIZE (xfce4/catfish-4.15.0.tar.bz2) = 256897
diff --git a/sysutils/catfish/pkg-plist b/sysutils/catfish/pkg-plist
index a5d47b86ec0f..8a0284027706 100644
--- a/sysutils/catfish/pkg-plist
+++ b/sysutils/catfish/pkg-plist
@@ -46,8 +46,13 @@ share/applications/org.xfce.Catfish.desktop
%%DATADIR%%/ui/catfish-wl-titlebar.png
%%DATADIR%%/ui/catfish_preferences.xml
%%DATADIR%%/ui/catfish_window.xml
-%%PORTDOCS%%%%DOCSDIR%%/README
-share/icons/hicolor/scalable/apps/catfish.svg
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+share/icons/hicolor/128x128/apps/org.xfce.catfish.png
+share/icons/hicolor/16x16/apps/org.xfce.catfish.svg
+share/icons/hicolor/48x48/apps/org.xfce.catfish.png
+share/icons/hicolor/48x48/apps/org.xfce.catfish.svg
+share/icons/hicolor/scalable/apps/org.xfce.catfish.svg
share/locale/af/LC_MESSAGES/catfish.mo
share/locale/ar/LC_MESSAGES/catfish.mo
share/locale/be/LC_MESSAGES/catfish.mo
@@ -60,6 +65,7 @@ share/locale/el/LC_MESSAGES/catfish.mo
share/locale/en_AU/LC_MESSAGES/catfish.mo
share/locale/eo/LC_MESSAGES/catfish.mo
share/locale/es/LC_MESSAGES/catfish.mo
+share/locale/et/LC_MESSAGES/catfish.mo
share/locale/eu/LC_MESSAGES/catfish.mo
share/locale/fi/LC_MESSAGES/catfish.mo
share/locale/fr/LC_MESSAGES/catfish.mo
@@ -68,6 +74,7 @@ share/locale/he/LC_MESSAGES/catfish.mo
share/locale/hr/LC_MESSAGES/catfish.mo
share/locale/hu/LC_MESSAGES/catfish.mo
share/locale/hy_AM/LC_MESSAGES/catfish.mo
+share/locale/hye/LC_MESSAGES/catfish.mo
share/locale/id/LC_MESSAGES/catfish.mo
share/locale/ie/LC_MESSAGES/catfish.mo
share/locale/is/LC_MESSAGES/catfish.mo
diff --git a/sysutils/garcon/Makefile b/sysutils/garcon/Makefile
index 88ddab26eb28..037c2e0d1397 100644
--- a/sysutils/garcon/Makefile
+++ b/sysutils/garcon/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= garcon
-PORTVERSION= 0.6.4
-PORTREVISION= 2
+PORTVERSION= 0.8.0
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
@@ -30,13 +29,9 @@ CONFIGURE_ARGS= --without-html-dir
PORTSCOUT= limitw:1,even
-OPTIONS_DEFINE= GTK2 NLS
-OPTIONS_DEFAULT= GTK2
+OPTIONS_DEFINE= NLS
OPTIONS_SUB= yes
-GTK2_USE= gnome=gtk20
-GTK2_CONFIGURE_ENABLE= gtk2
-
NLS_CONFIGURE_ENABLE= nls
NLS_USES= gettext-runtime
diff --git a/sysutils/garcon/distinfo b/sysutils/garcon/distinfo
index 98441302db58..683db8f6ee06 100644
--- a/sysutils/garcon/distinfo
+++ b/sysutils/garcon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564305293
-SHA256 (xfce4/garcon-0.6.4.tar.bz2) = d75e4753037a74733c07b71b8db7a656d869869f0f107f6411a306bbc87a762d
-SIZE (xfce4/garcon-0.6.4.tar.bz2) = 519744
+TIMESTAMP = 1608682795
+SHA256 (xfce4/garcon-0.8.0.tar.bz2) = 4811d89ee5bc48dbdeffd69fc3eec6c112bbf01fde98a9e848335b374a4aa1bb
+SIZE (xfce4/garcon-0.8.0.tar.bz2) = 539061
diff --git a/sysutils/garcon/pkg-plist b/sysutils/garcon/pkg-plist
index 4fba1087e319..55fa28cbd0f1 100644
--- a/sysutils/garcon/pkg-plist
+++ b/sysutils/garcon/pkg-plist
@@ -15,21 +15,15 @@ include/garcon-1/garcon/garcon-menu-separator.h
include/garcon-1/garcon/garcon-menu-tree-provider.h
include/garcon-1/garcon/garcon-menu.h
include/garcon-1/garcon/garcon.h
-%%GTK2%%include/garcon-gtk2-1/garcon-gtk/garcon-gtk-menu.h
-%%GTK2%%include/garcon-gtk2-1/garcon-gtk/garcon-gtk.h
include/garcon-gtk3-1/garcon-gtk/garcon-gtk-menu.h
include/garcon-gtk3-1/garcon-gtk/garcon-gtk.h
lib/libgarcon-1.so
lib/libgarcon-1.so.0
lib/libgarcon-1.so.0.0.0
-%%GTK2%%lib/libgarcon-gtk2-1.so
-%%GTK2%%lib/libgarcon-gtk2-1.so.0
-%%GTK2%%lib/libgarcon-gtk2-1.so.0.0.0
lib/libgarcon-gtk3-1.so
lib/libgarcon-gtk3-1.so.0
lib/libgarcon-gtk3-1.so.0.0.0
libdata/pkgconfig/garcon-1.pc
-%%GTK2%%libdata/pkgconfig/garcon-gtk2-1.pc
libdata/pkgconfig/garcon-gtk3-1.pc
share/desktop-directories/xfce-accessories.directory
share/desktop-directories/xfce-development.directory
@@ -45,6 +39,7 @@ share/desktop-directories/xfce-personal.directory
share/desktop-directories/xfce-screensavers.directory
share/desktop-directories/xfce-settings.directory
share/desktop-directories/xfce-system.directory
+share/icons/hicolor/32x32/apps/org.xfce.garcon.png
%%NLS%%share/locale/am/LC_MESSAGES/garcon.mo
%%NLS%%share/locale/ar/LC_MESSAGES/garcon.mo
%%NLS%%share/locale/ast/LC_MESSAGES/garcon.mo
@@ -72,11 +67,13 @@ share/desktop-directories/xfce-system.directory
%%NLS%%share/locale/hu/LC_MESSAGES/garcon.mo
%%NLS%%share/locale/hy/LC_MESSAGES/garcon.mo
%%NLS%%share/locale/hy_AM/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/hye/LC_MESSAGES/garcon.mo
%%NLS%%share/locale/id/LC_MESSAGES/garcon.mo
%%NLS%%share/locale/ie/LC_MESSAGES/garcon.mo
%%NLS%%share/locale/is/LC_MESSAGES/garcon.mo
%%NLS%%share/locale/it/LC_MESSAGES/garcon.mo
%%NLS%%share/locale/ja/LC_MESSAGES/garcon.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/garcon.mo
%%NLS%%share/locale/kk/LC_MESSAGES/garcon.mo
%%NLS%%share/locale/ko/LC_MESSAGES/garcon.mo
%%NLS%%share/locale/lt/LC_MESSAGES/garcon.mo
diff --git a/sysutils/xfburn/Makefile b/sysutils/xfburn/Makefile
index 1db3dd6ea004..ab715c302baf 100644
--- a/sysutils/xfburn/Makefile
+++ b/sysutils/xfburn/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfburn
PORTVERSION= 0.6.2
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= XFCE/apps
DIST_SUBDIR= xfce4
diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile
index 061470434e1f..4ffa824633e2 100644
--- a/sysutils/xfce4-battery-plugin/Makefile
+++ b/sysutils/xfce4-battery-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-battery-plugin
PORTVERSION= 1.1.3
+PORTREVISION= 1
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
diff --git a/sysutils/xfce4-bsdcpufreq-plugin/Makefile b/sysutils/xfce4-bsdcpufreq-plugin/Makefile
index 22bb1f2610d5..e8ba05e35b69 100644
--- a/sysutils/xfce4-bsdcpufreq-plugin/Makefile
+++ b/sysutils/xfce4-bsdcpufreq-plugin/Makefile
@@ -4,6 +4,7 @@
PORTNAME= xfce4-bsdcpufreq-plugin
PORTVERSION= 0.3.1
+PORTREVISION= 1
CATEGORIES= sysutils xfce
MAINTAINER= riggs@FreeBSD.org
diff --git a/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile
index f3ff4d67e680..d630f3051deb 100644
--- a/sysutils/xfce4-cpugraph-plugin/Makefile
+++ b/sysutils/xfce4-cpugraph-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-cpugraph-plugin
PORTVERSION= 1.2.0
+PORTREVISION= 1
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
diff --git a/sysutils/xfce4-diskperf-plugin/Makefile b/sysutils/xfce4-diskperf-plugin/Makefile
index 050b20ead511..89b5a836e51e 100644
--- a/sysutils/xfce4-diskperf-plugin/Makefile
+++ b/sysutils/xfce4-diskperf-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-diskperf-plugin
PORTVERSION= 2.6.3
+PORTREVISION= 1
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index 2692da187745..8dfd91cb27a8 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-fsguard-plugin
PORTVERSION= 1.1.2
+PORTREVISION= 1
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
diff --git a/sysutils/xfce4-genmon-plugin/Makefile b/sysutils/xfce4-genmon-plugin/Makefile
index 660d1b6f2c4b..bf81822fed41 100644
--- a/sysutils/xfce4-genmon-plugin/Makefile
+++ b/sysutils/xfce4-genmon-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-genmon-plugin
PORTVERSION= 4.1.0
+PORTREVISION= 1
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
diff --git a/sysutils/xfce4-mount-plugin/Makefile b/sysutils/xfce4-mount-plugin/Makefile
index 7b6e5b3915f5..14e91ff40315 100644
--- a/sysutils/xfce4-mount-plugin/Makefile
+++ b/sysutils/xfce4-mount-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-mount-plugin
PORTVERSION= 1.1.5
+PORTREVISION= 1
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile
index 60737f4efe04..9ec2232b49e5 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-netload-plugin
PORTVERSION= 1.3.2
+PORTREVISION= 1
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
diff --git a/sysutils/xfce4-places-plugin/Makefile b/sysutils/xfce4-places-plugin/Makefile
index 947ee88c4d94..22cce349f77a 100644
--- a/sysutils/xfce4-places-plugin/Makefile
+++ b/sysutils/xfce4-places-plugin/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xfce4-places-plugin
PORTVERSION= 1.8.1
+PORTREVISION= 1
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
diff --git a/sysutils/xfce4-power-manager/Makefile b/sysutils/xfce4-power-manager/Makefile
index 5fd90acaf6c7..b91e3901a8a1 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.6
+PORTVERSION= 4.16.0
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
@@ -28,6 +28,8 @@ CONFIGURE_ARGS= --disable-network-manager \
--enable-xfce4panel
INSTALL_TARGET= install-strip
+PORTSCOUT= limitw:1,even
+
OPTIONS_DEFINE= NLS
OPTIONS_SUB= yes
diff --git a/sysutils/xfce4-power-manager/distinfo b/sysutils/xfce4-power-manager/distinfo
index f7b9fc75c7dc..a994126e5352 100644
--- a/sysutils/xfce4-power-manager/distinfo
+++ b/sysutils/xfce4-power-manager/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1583705180
-SHA256 (xfce4/xfce4-power-manager-1.6.6.tar.bz2) = 1b7bf0d3e8af69b10f7b6a518451e01fc7888e0d9d360bc33f6c89179bb6080b
-SIZE (xfce4/xfce4-power-manager-1.6.6.tar.bz2) = 1227814
+TIMESTAMP = 1608682877
+SHA256 (xfce4/xfce4-power-manager-4.16.0.tar.bz2) = eb9c587c01b502fa45a32e7fc2aba98fa6d8391475133883654f77e562c43bf3
+SIZE (xfce4/xfce4-power-manager-4.16.0.tar.bz2) = 1234968
diff --git a/sysutils/xfce4-power-manager/files/patch-src_xfpm-backlight-helper.c b/sysutils/xfce4-power-manager/files/patch-src_xfpm-backlight-helper.c
index 087f2ed85bc1..690e60d19477 100644
--- a/sysutils/xfce4-power-manager/files/patch-src_xfpm-backlight-helper.c
+++ b/sysutils/xfce4-power-manager/files/patch-src_xfpm-backlight-helper.c
@@ -1,42 +1,42 @@
---- src/xfpm-backlight-helper.c.orig 2017-11-23 23:52:06 UTC
+--- src/xfpm-backlight-helper.c.orig 2020-01-26 23:15:39 UTC
+++ src/xfpm-backlight-helper.c
@@ -49,6 +49,8 @@
- #define EXIT_CODE_INVALID_USER 4
- #define EXIT_CODE_NO_BRIGHTNESS_SWITCH 5
+ #define EXIT_CODE_INVALID_USER 4
+ #define EXIT_CODE_NO_BRIGHTNESS_SWITCH 5
-+#define MAX_DEVICE_NUM 8
++#define MAX_DEVICE_NUM 8
+
#if !defined(BACKEND_TYPE_FREEBSD)
- #define BACKLIGHT_SYSFS_LOCATION "/sys/class/backlight"
- #define BRIGHTNESS_SWITCH_LOCATION "/sys/module/video/parameters/brightness_switch_enabled"
+ #define BACKLIGHT_SYSFS_LOCATION "/sys/class/backlight"
+ #define BRIGHTNESS_SWITCH_LOCATION "/sys/module/video/parameters/brightness_switch_enabled"
@@ -204,19 +206,23 @@ backlight_helper_get_device (void)
- /* devices in priority order */
- gchar *types[] = { "lcd", "crt", "out", "ext", "tv", NULL };
- gchar *device = NULL;
-- gint i;
-+ gint i, j;
+ /* devices in priority order */
+ gchar *types[] = { "lcd", "crt", "out", "ext", "tv", NULL };
+ gchar *device = NULL;
+- gint i;
++ gint i, j;
-- device = (gchar *) g_malloc (sizeof (gchar));
-+ device = (gchar *) g_malloc (sizeof (gchar) * 8);
+- device = (gchar *) g_malloc (sizeof (gchar));
++ device = (gchar *) g_malloc (sizeof (gchar) * 8);
- for (i = 0; types[i] != NULL; i++) {
-- g_snprintf (device, (gulong) strlen (types[i]), "%s0", types[i]);
-+ for (j = 0; j < MAX_DEVICE_NUM; j++) {
-+ g_snprintf (device, 8, "%s%i", types[i], j);
+ for (i = 0; types[i] != NULL; i++) {
+- g_snprintf (device, (gulong) strlen (types[i]), "%s0", types[i]);
++ for (j = 0; j < MAX_DEVICE_NUM; j++) {
++ g_snprintf (device, 8, "%s%i", types[i], j);
-- /* stop, when first device is found */
-- if (acpi_video_is_enabled (device))
-- break;
-+ /* stop, when first device is found */
-+ if (acpi_video_is_enabled (device))
-+ return (device);
-+ }
- }
+- /* stop, when first device is found */
+- if (acpi_video_is_enabled (device))
+- break;
++ /* stop, when first device is found */
++ if (acpi_video_is_enabled (device))
++ return (device);
++ }
+ }
-- return device;
-+ g_free (device);
+- return device;
++ g_free (device);
+
-+ return (NULL);
++ return (NULL);
}
/*
diff --git a/sysutils/xfce4-power-manager/files/patch-src_xfpm-dpms.c b/sysutils/xfce4-power-manager/files/patch-src_xfpm-dpms.c
index 50d9af42f798..7c959e986df6 100644
--- a/sysutils/xfce4-power-manager/files/patch-src_xfpm-dpms.c
+++ b/sysutils/xfce4-power-manager/files/patch-src_xfpm-dpms.c
@@ -1,18 +1,18 @@
---- src/xfpm-dpms.c.orig 2019-05-17 13:43:56 UTC
+--- src/xfpm-dpms.c.orig 2020-01-26 23:15:39 UTC
+++ src/xfpm-dpms.c
@@ -119,13 +119,13 @@ xfpm_dpms_get_enabled (XfpmDpms *dpms, gboolean *dpms_
static void
xfpm_dpms_get_sleep_mode (XfpmDpms *dpms, gboolean *ret_standby_mode)
{
-- gchar *sleep_mode;
-+ gchar *sleep_mode = NULL;
+- gchar *sleep_mode;
++ gchar *sleep_mode = NULL;
- g_object_get (G_OBJECT (dpms->priv->conf),
- DPMS_SLEEP_MODE, &sleep_mode,
- NULL);
+ g_object_get (G_OBJECT (dpms->priv->conf),
+ DPMS_SLEEP_MODE, &sleep_mode,
+ NULL);
-- if ( !g_strcmp0 (sleep_mode, "Standby"))
-+ if ( sleep_mode != NULL && !g_strcmp0 (sleep_mode, "Standby"))
- *ret_standby_mode = TRUE;
- else
- *ret_standby_mode = FALSE;
+- if ( !g_strcmp0 (sleep_mode, "Standby"))
++ if ( sleep_mode != NULL && !g_strcmp0 (sleep_mode, "Standby"))
+ *ret_standby_mode = TRUE;
+ else
+ *ret_standby_mode = FALSE;
diff --git a/sysutils/xfce4-power-manager/pkg-plist b/sysutils/xfce4-power-manager/pkg-plist
index 26fab3bb7022..8e5be137e301 100644
--- a/sysutils/xfce4-power-manager/pkg-plist
+++ b/sysutils/xfce4-power-manager/pkg-plist
@@ -7,28 +7,10 @@ man/man1/xfce4-power-manager.1.gz
sbin/xfce4-pm-helper
sbin/xfpm-power-backlight-helper
share/applications/xfce4-power-manager-settings.desktop
-share/icons/hicolor/32x32/status/ac-adapter.png
-share/icons/hicolor/32x32/status/battery-caution-charging.png
-share/icons/hicolor/32x32/status/battery-caution.png
-share/icons/hicolor/32x32/status/battery-empty-charging.png
-share/icons/hicolor/32x32/status/battery-empty.png
-share/icons/hicolor/32x32/status/battery-full-charged.png
-share/icons/hicolor/32x32/status/battery-full-charging.png
-share/icons/hicolor/32x32/status/battery-full.png
-share/icons/hicolor/32x32/status/battery-good-charging.png
-share/icons/hicolor/32x32/status/battery-good.png
-share/icons/hicolor/32x32/status/battery-low-charging.png
-share/icons/hicolor/32x32/status/battery-low.png
-share/icons/hicolor/32x32/status/battery-missing.png
-share/icons/hicolor/32x32/status/computer.png
-share/icons/hicolor/32x32/status/input-keyboard.png
-share/icons/hicolor/32x32/status/input-mouse.png
-share/icons/hicolor/32x32/status/multimedia-player.png
-share/icons/hicolor/32x32/status/pda.png
-share/icons/hicolor/32x32/status/phone.png
-share/icons/hicolor/32x32/status/tablet.png
-share/icons/hicolor/32x32/status/uninterruptible-power-supply.png
-share/icons/hicolor/32x32/status/video-display.png
+share/icons/hicolor/128x128/apps/org.xfce.powermanager.png
+share/icons/hicolor/16x16/apps/org.xfce.powermanager.png
+share/icons/hicolor/24x24/apps/org.xfce.powermanager.png
+share/icons/hicolor/48x48/apps/org.xfce.powermanager.png
share/icons/hicolor/48x48/status/ac-adapter.png
share/icons/hicolor/48x48/status/battery-caution-charging.png
share/icons/hicolor/48x48/status/battery-caution.png
@@ -53,6 +35,7 @@ share/icons/hicolor/48x48/status/phone.png
share/icons/hicolor/48x48/status/tablet.png
share/icons/hicolor/48x48/status/uninterruptible-power-supply.png
share/icons/hicolor/48x48/status/video-display.png
+share/icons/hicolor/scalable/apps/org.xfce.powermanager.svg
share/icons/hicolor/scalable/status/ac-adapter-symbolic.svg
share/icons/hicolor/scalable/status/ac-adapter.svg
share/icons/hicolor/scalable/status/battery-caution-charging-symbolic.svg
@@ -92,7 +75,6 @@ share/icons/hicolor/scalable/status/phone.svg
share/icons/hicolor/scalable/status/tablet.svg
share/icons/hicolor/scalable/status/uninterruptible-power-supply.svg
share/icons/hicolor/scalable/status/video-display.svg
-share/icons/hicolor/scalable/status/xfce4-power-manager-settings.svg
%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-power-manager.mo
%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-power-manager.mo
%%NLS%%share/locale/be/LC_MESSAGES/xfce4-power-manager.mo
@@ -103,6 +85,7 @@ share/icons/hicolor/scalable/status/xfce4-power-manager-settings.svg
%%NLS%%share/locale/de/LC_MESSAGES/xfce4-power-manager.mo
%%NLS%%share/locale/el/LC_MESSAGES/xfce4-power-manager.mo
%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/en_CA/LC_MESSAGES/xfce4-power-manager.mo
%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-power-manager.mo
%%NLS%%share/locale/es/LC_MESSAGES/xfce4-power-manager.mo
%%NLS%%share/locale/et/LC_MESSAGES/xfce4-power-manager.mo
@@ -114,6 +97,7 @@ share/icons/hicolor/scalable/status/xfce4-power-manager-settings.svg
%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-power-manager.mo
%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-power-manager.mo
%%NLS%%share/locale/hy_AM/LC_MESSAGES/xfce4-power-manager.mo
+%%NLS%%share/locale/hye/LC_MESSAGES/xfce4-power-manager.mo
%%NLS%%share/locale/id/LC_MESSAGES/xfce4-power-manager.mo
%%NLS%%share/locale/ie/LC_MESSAGES/xfce4-power-manager.mo
%%NLS%%share/locale/is/LC_MESSAGES/xfce4-power-manager.mo
diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile
index 7e53317e4a14..8f5f59dc3ea5 100644
--- a/sysutils/xfce4-settings/Makefile
+++ b/sysutils/xfce4-settings/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-settings
-PORTVERSION= 4.14.3
-PORTREVISION= 1
+PORTVERSION= 4.16.0
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
@@ -18,8 +17,8 @@ LIB_DEPENDS= libcolord.so:graphics/colord \
libfontconfig.so:x11-fonts/fontconfig \
libxklavier.so:x11/libxklavier
-USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \
- tar:bzip2 xfce xorg
+USES= compiler:c11 desktop-file-utils gettext-tools gmake gnome \
+ libtool python pkgconfig shebangfix tar:bzip2 xfce xorg
USE_GNOME= cairo glib20 gtk30 intltool
USE_XFCE= garcon libexo xfconf
USE_XORG= xorgproto x11 xcursor xi xrandr
@@ -27,6 +26,7 @@ USE_XORG= xorgproto x11 xcursor xi xrandr
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-pluggable-dialogs
INSTALLS_ICONS= yes
+SHEBANG_FILES= dialogs/mime-settings/helpers/xfce4-compose-mail
PORTSCOUT= limitw:1,even
diff --git a/sysutils/xfce4-settings/distinfo b/sysutils/xfce4-settings/distinfo
index b606d6b8b2a3..d35c3bf9848a 100644
--- a/sysutils/xfce4-settings/distinfo
+++ b/sysutils/xfce4-settings/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1586715148
-SHA256 (xfce4/xfce4-settings-4.14.3.tar.bz2) = cab1a4d5351f9871533700523570f86f92bbe6e4055f44e5df950eb4b4f48bb3
-SIZE (xfce4/xfce4-settings-4.14.3.tar.bz2) = 1201308
+TIMESTAMP = 1608682830
+SHA256 (xfce4/xfce4-settings-4.16.0.tar.bz2) = 67a1404fc754c675c6431e22a8fe0e5d79644fdfadbfe25a4523d68e1442ddc2
+SIZE (xfce4/xfce4-settings-4.16.0.tar.bz2) = 1492754
diff --git a/sysutils/xfce4-settings/pkg-plist b/sysutils/xfce4-settings/pkg-plist
index d7142af28be6..eb84cd186b1a 100644
--- a/sysutils/xfce4-settings/pkg-plist
+++ b/sysutils/xfce4-settings/pkg-plist
@@ -4,6 +4,7 @@ bin/xfce4-color-settings
bin/xfce4-display-settings
bin/xfce4-find-cursor
bin/xfce4-keyboard-settings
+bin/xfce4-mime-helper
bin/xfce4-mime-settings
bin/xfce4-mouse-settings
bin/xfce4-settings-editor
@@ -11,8 +12,10 @@ bin/xfce4-settings-manager
bin/xfsettingsd
etc/xdg/autostart/xfsettingsd.desktop
etc/xdg/menus/xfce-settings-manager.menu
+etc/xdg/xfce4/helpers.rc
etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
lib/xfce4/settings/appearance-install-theme
+lib/xfce4/xfce4-compose-mail
share/applications/xfce-display-settings.desktop
share/applications/xfce-keyboard-settings.desktop
share/applications/xfce-mouse-settings.desktop
@@ -20,22 +23,156 @@ 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-file-manager.desktop
+share/applications/xfce4-mail-reader.desktop
share/applications/xfce4-mime-settings.desktop
share/applications/xfce4-settings-editor.desktop
+share/applications/xfce4-terminal-emulator.desktop
+share/applications/xfce4-web-browser.desktop
+share/icons/hicolor/128x128/apps/org.xfce.filemanager.png
+share/icons/hicolor/128x128/apps/org.xfce.mailreader.png
+share/icons/hicolor/128x128/apps/org.xfce.settings.accessibility.png
+share/icons/hicolor/128x128/apps/org.xfce.settings.appearance.png
+share/icons/hicolor/128x128/apps/org.xfce.settings.color.png
+share/icons/hicolor/128x128/apps/org.xfce.settings.default-applications.png
+share/icons/hicolor/128x128/apps/org.xfce.settings.display.png
+share/icons/hicolor/128x128/apps/org.xfce.settings.editor.png
+share/icons/hicolor/128x128/apps/org.xfce.settings.keyboard.png
+share/icons/hicolor/128x128/apps/org.xfce.settings.manager.png
+share/icons/hicolor/128x128/apps/org.xfce.settings.mouse.png
+share/icons/hicolor/128x128/apps/org.xfce.terminalemulator.png
+share/icons/hicolor/128x128/apps/org.xfce.webbrowser.png
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
+share/icons/hicolor/16x16/apps/org.xfce.filemanager.png
+share/icons/hicolor/16x16/apps/org.xfce.mailreader.png
+share/icons/hicolor/16x16/apps/org.xfce.settings.accessibility.png
+share/icons/hicolor/16x16/apps/org.xfce.settings.appearance.png
+share/icons/hicolor/16x16/apps/org.xfce.settings.color.png
+share/icons/hicolor/16x16/apps/org.xfce.settings.default-applications.png
+share/icons/hicolor/16x16/apps/org.xfce.settings.display.png
+share/icons/hicolor/16x16/apps/org.xfce.settings.editor.png
+share/icons/hicolor/16x16/apps/org.xfce.settings.keyboard.png
+share/icons/hicolor/16x16/apps/org.xfce.settings.manager.png
+share/icons/hicolor/16x16/apps/org.xfce.settings.mouse.png
+share/icons/hicolor/16x16/apps/org.xfce.terminalemulator.png
+share/icons/hicolor/16x16/apps/org.xfce.webbrowser.png
+share/icons/hicolor/24x24/apps/org.xfce.filemanager.png
+share/icons/hicolor/24x24/apps/org.xfce.mailreader.png
+share/icons/hicolor/24x24/apps/org.xfce.settings.accessibility.png
+share/icons/hicolor/24x24/apps/org.xfce.settings.appearance.png
+share/icons/hicolor/24x24/apps/org.xfce.settings.color.png
+share/icons/hicolor/24x24/apps/org.xfce.settings.default-applications.png
+share/icons/hicolor/24x24/apps/org.xfce.settings.display.png
+share/icons/hicolor/24x24/apps/org.xfce.settings.editor.png
+share/icons/hicolor/24x24/apps/org.xfce.settings.keyboard.png
+share/icons/hicolor/24x24/apps/org.xfce.settings.manager.png
+share/icons/hicolor/24x24/apps/org.xfce.settings.mouse.png
+share/icons/hicolor/24x24/apps/org.xfce.terminalemulator.png
+share/icons/hicolor/24x24/apps/org.xfce.webbrowser.png
+share/icons/hicolor/32x32/apps/org.xfce.filemanager.png
+share/icons/hicolor/32x32/apps/org.xfce.mailreader.png
+share/icons/hicolor/32x32/apps/org.xfce.settings.accessibility.png
+share/icons/hicolor/32x32/apps/org.xfce.settings.appearance.png
+share/icons/hicolor/32x32/apps/org.xfce.settings.color.png
+share/icons/hicolor/32x32/apps/org.xfce.settings.default-applications.png
+share/icons/hicolor/32x32/apps/org.xfce.settings.display.png
+share/icons/hicolor/32x32/apps/org.xfce.settings.editor.png
+share/icons/hicolor/32x32/apps/org.xfce.settings.keyboard.png
+share/icons/hicolor/32x32/apps/org.xfce.settings.manager.png
+share/icons/hicolor/32x32/apps/org.xfce.settings.mouse.png
+share/icons/hicolor/32x32/apps/org.xfce.terminalemulator.png
+share/icons/hicolor/32x32/apps/org.xfce.webbrowser.png
+share/icons/hicolor/48x48/apps/org.xfce.filemanager.png
+share/icons/hicolor/48x48/apps/org.xfce.mailreader.png
+share/icons/hicolor/48x48/apps/org.xfce.settings.accessibility.png
+share/icons/hicolor/48x48/apps/org.xfce.settings.appearance.png
+share/icons/hicolor/48x48/apps/org.xfce.settings.color.png
+share/icons/hicolor/48x48/apps/org.xfce.settings.default-applications.png
+share/icons/hicolor/48x48/apps/org.xfce.settings.display.png
+share/icons/hicolor/48x48/apps/org.xfce.settings.editor.png
+share/icons/hicolor/48x48/apps/org.xfce.settings.keyboard.png
+share/icons/hicolor/48x48/apps/org.xfce.settings.manager.png
+share/icons/hicolor/48x48/apps/org.xfce.settings.mouse.png
+share/icons/hicolor/48x48/apps/org.xfce.terminalemulator.png
+share/icons/hicolor/48x48/apps/org.xfce.webbrowser.png
+share/icons/hicolor/scalable/apps/org.xfce.filemanager.svg
+share/icons/hicolor/scalable/apps/org.xfce.mailreader.svg
+share/icons/hicolor/scalable/apps/org.xfce.settings.accessibility.svg
+share/icons/hicolor/scalable/apps/org.xfce.settings.appearance.svg
+share/icons/hicolor/scalable/apps/org.xfce.settings.color.svg
+share/icons/hicolor/scalable/apps/org.xfce.settings.default-applications.svg
+share/icons/hicolor/scalable/apps/org.xfce.settings.display.svg
+share/icons/hicolor/scalable/apps/org.xfce.settings.editor.svg
+share/icons/hicolor/scalable/apps/org.xfce.settings.keyboard.svg
+share/icons/hicolor/scalable/apps/org.xfce.settings.manager.svg
+share/icons/hicolor/scalable/apps/org.xfce.settings.mouse.svg
+share/icons/hicolor/scalable/apps/org.xfce.terminalemulator.svg
+share/icons/hicolor/scalable/apps/org.xfce.webbrowser.svg
+
+share/locale/be@tarask/LC_MESSAGES/xfce4-settings.mo
+share/locale/et/LC_MESSAGES/xfce4-settings.mo
+share/locale/hye/LC_MESSAGES/xfce4-settings.mo
+share/xfce4/helpers/thunar.desktop
+share/xfce4/helpers/aterm.desktop
+share/xfce4/helpers/balsa.desktop
+share/xfce4/helpers/brave.desktop
+share/xfce4/helpers/caja.desktop
+share/xfce4/helpers/chromium.desktop
+share/xfce4/helpers/debian-sensible-browser.desktop
+share/xfce4/helpers/debian-x-terminal-emulator.desktop
+share/xfce4/helpers/dillo.desktop
+share/xfce4/helpers/encompass.desktop
+share/xfce4/helpers/epiphany.desktop
+share/xfce4/helpers/eterm.desktop
+share/xfce4/helpers/evolution.desktop
+share/xfce4/helpers/firefox.desktop
+share/xfce4/helpers/galeon.desktop
+share/xfce4/helpers/geary.desktop
+share/xfce4/helpers/gnome-terminal.desktop
+share/xfce4/helpers/google-chrome.desktop
+share/xfce4/helpers/icecat.desktop
+share/xfce4/helpers/icedove.desktop
+share/xfce4/helpers/iceweasel.desktop
+share/xfce4/helpers/jumanji.desktop
+share/xfce4/helpers/kmail.desktop
+share/xfce4/helpers/konqueror.desktop
+share/xfce4/helpers/links.desktop
+share/xfce4/helpers/lynx.desktop
+share/xfce4/helpers/midori.desktop
+share/xfce4/helpers/mozilla-browser.desktop
+share/xfce4/helpers/mozilla-mailer.desktop
+share/xfce4/helpers/mutt.desktop
+share/xfce4/helpers/nautilus.desktop
+share/xfce4/helpers/netscape-navigator.desktop
+share/xfce4/helpers/nxterm.desktop
+share/xfce4/helpers/opera-browser.desktop
+share/xfce4/helpers/pcmanfm-qt.desktop
+share/xfce4/helpers/pcmanfm.desktop
+share/xfce4/helpers/qterminal.desktop
+share/xfce4/helpers/qtfm.desktop
+share/xfce4/helpers/qupzilla.desktop
+share/xfce4/helpers/rodent.desktop
+share/xfce4/helpers/rox-filer.desktop
+share/xfce4/helpers/sakura.desktop
+share/xfce4/helpers/surf.desktop
+share/xfce4/helpers/sylpheed-claws.desktop
+share/xfce4/helpers/sylpheed.desktop
+share/xfce4/helpers/terminator.desktop
+share/xfce4/helpers/thunderbird.desktop
+share/xfce4/helpers/urxvt.desktop
+share/xfce4/helpers/vimprobable2.desktop
+share/xfce4/helpers/w3m.desktop
+share/xfce4/helpers/xfce4-terminal.desktop
+share/xfce4/helpers/xfe.desktop
+share/xfce4/helpers/xterm.desktop
%%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
-%%NLS%%share/locale/be@tarask/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/bn/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-settings.mo
diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index d16046a8d669..279183956f8e 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-systemload-plugin
PORTVERSION= 1.2.4
+PORTREVISION= 1
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
diff --git a/sysutils/xfce4-wavelan-plugin/Makefile b/sysutils/xfce4-wavelan-plugin/Makefile
index 430a60ad099b..40da38c1d471 100644
--- a/sysutils/xfce4-wavelan-plugin/Makefile
+++ b/sysutils/xfce4-wavelan-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-wavelan-plugin
PORTVERSION= 0.6.2
+PORTREVISION= 1
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
diff --git a/textproc/xfce4-dict-plugin/Makefile b/textproc/xfce4-dict-plugin/Makefile
index 975f930063e0..c464ed82b458 100644
--- a/textproc/xfce4-dict-plugin/Makefile
+++ b/textproc/xfce4-dict-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-dict
PORTVERSION= 0.8.4
+PORTREVISION= 1
CATEGORIES= textproc xfce
MASTER_SITES= XFCE/apps
PKGNAMESUFFIX= -plugin
diff --git a/www/xfce4-smartbookmark-plugin/Makefile b/www/xfce4-smartbookmark-plugin/Makefile
index 2d0d7813faf8..363af218cd8f 100644
--- a/www/xfce4-smartbookmark-plugin/Makefile
+++ b/www/xfce4-smartbookmark-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-smartbookmark-plugin
PORTVERSION= 0.5.2
+PORTREVISION= 1
CATEGORIES= www xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
diff --git a/x11-clocks/xfce4-datetime-plugin/Makefile b/x11-clocks/xfce4-datetime-plugin/Makefile
index 49a4e5af9122..bb918ccdd5dc 100644
--- a/x11-clocks/xfce4-datetime-plugin/Makefile
+++ b/x11-clocks/xfce4-datetime-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-datetime-plugin
PORTVERSION= 0.8.1
+PORTREVISION= 1
CATEGORIES= x11-clocks xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
diff --git a/x11-clocks/xfce4-stopwatch-plugin/Makefile b/x11-clocks/xfce4-stopwatch-plugin/Makefile
index 1345d3bbc213..28cbc1ce3ead 100644
--- a/x11-clocks/xfce4-stopwatch-plugin/Makefile
+++ b/x11-clocks/xfce4-stopwatch-plugin/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xfce4-stopwatch-plugin
PORTVERSION= 0.4.0
+PORTREVISION= 1
CATEGORIES= x11-clocks xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
diff --git a/x11-clocks/xfce4-stopwatch-plugin/files/patch-panel416fix b/x11-clocks/xfce4-stopwatch-plugin/files/patch-panel416fix
new file mode 100644
index 000000000000..88900bd60cba
--- /dev/null
+++ b/x11-clocks/xfce4-stopwatch-plugin/files/patch-panel416fix
@@ -0,0 +1,13 @@
+diff --git a/panel-plugin/stopwatch.c b/panel-plugin/stopwatch.c
+index 4fd7f68b94671cefed0c46d00b3cf49839d7571f..3bcfdec1222dc77dad28f40feacb3c5e8b948bd8 100644
+--- panel-plugin/stopwatch.c
++++ panel-plugin/stopwatch.c
+@@ -6,7 +6,7 @@
+ #include <config.h>
+ #endif
+
+-#include <libxfce4panel/xfce-panel-plugin.h>
++#include <libxfce4panel/libxfce4panel.h>
+ #include <libxfce4util/libxfce4util.h>
+
+ #include "stopwatchtimer.h"
diff --git a/x11-clocks/xfce4-time-out-plugin/Makefile b/x11-clocks/xfce4-time-out-plugin/Makefile
index b39326bd510a..fcaafadc26c4 100644
--- a/x11-clocks/xfce4-time-out-plugin/Makefile
+++ b/x11-clocks/xfce4-time-out-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-time-out-plugin
PORTVERSION= 1.1.1
+PORTREVISION= 1
CATEGORIES= x11-clocks xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
diff --git a/x11-clocks/xfce4-timer-plugin/Makefile b/x11-clocks/xfce4-timer-plugin/Makefile
index 00f10a3e11d0..7d464a8424f0 100644
--- a/x11-clocks/xfce4-timer-plugin/Makefile
+++ b/x11-clocks/xfce4-timer-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-timer-plugin
PORTVERSION= 1.7.1
+PORTREVISION= 1
CATEGORIES= x11-clocks xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile
index 5d76eebb5dbe..29a56c3deb45 100644
--- a/x11-fm/thunar/Makefile
+++ b/x11-fm/thunar/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= thunar
-DISTVERSION= 1.8.16
+DISTVERSION= 4.16.1
CATEGORIES= x11-fm xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
@@ -31,6 +31,8 @@ CONFIGURE_ARGS= --enable-gio-unix \
INSTALLS_ICONS= yes
INSTALL_TARGET= install-strip
+PORTSCOUT= limitw:1,even
+
OPTIONS_DEFINE= GIR NLS NOTIFY
OPTIONS_GROUP= PLUGINS
OPTIONS_GROUP_PLUGINS= PLUG_APR PLUG_SBR PLUG_TPA PLUG_UCA PLUG_WALL
diff --git a/x11-fm/thunar/distinfo b/x11-fm/thunar/distinfo
index 98d4f47457e9..70d2810a3862 100644
--- a/x11-fm/thunar/distinfo
+++ b/x11-fm/thunar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1604219231
-SHA256 (xfce4/thunar-1.8.16.tar.bz2) = 221338b1cbf14cbee2b9091f9b4e4f47cf6bc9513bbb113762da7ca4f8173c4c
-SIZE (xfce4/thunar-1.8.16.tar.bz2) = 2479718
+TIMESTAMP = 1609348619
+SHA256 (xfce4/thunar-4.16.1.tar.bz2) = da2d17d2cb69eb33768690b714cc232ed367cbd71eb9543aaa2a805d05dc3ce1
+SIZE (xfce4/thunar-4.16.1.tar.bz2) = 2447673
diff --git a/x11-fm/thunar/files/patch-thunar_thunar-list-model.c b/x11-fm/thunar/files/patch-thunar_thunar-list-model.c
deleted file mode 100644
index 723de73686b0..000000000000
--- a/x11-fm/thunar/files/patch-thunar_thunar-list-model.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- thunar/thunar-list-model.c.orig 2020-05-24 12:27:08 UTC
-+++ thunar/thunar-list-model.c
-@@ -705,7 +705,7 @@ thunar_list_model_get_value (GtkTreeModel *model,
- _thunar_return_if_fail (iter->stamp == (THUNAR_LIST_MODEL (model))->stamp);
-
- file = g_sequence_get (iter->user_data);
-- _thunar_assert (THUNAR_IS_FILE (file));
-+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
-
- switch (column)
- {
diff --git a/x11-fm/thunar/pkg-plist b/x11-fm/thunar/pkg-plist
index a5d68fb28a30..0e3453547ec4 100644
--- a/x11-fm/thunar/pkg-plist
+++ b/x11-fm/thunar/pkg-plist
@@ -16,7 +16,6 @@ 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
%%GIR%%lib/girepository-1.0/Thunarx-3.0.typelib
lib/libthunarx-3.so
@@ -73,16 +72,14 @@ 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/128x128/apps/org.xfce.thunar.png
+share/icons/hicolor/16x16/apps/org.xfce.thunar.png
share/icons/hicolor/16x16/stock/navigation/stock_folder-copy.png
share/icons/hicolor/16x16/stock/navigation/stock_folder-move.png
-share/icons/hicolor/24x24/apps/Thunar.png
share/icons/hicolor/24x24/stock/navigation/stock_folder-copy.png
share/icons/hicolor/24x24/stock/navigation/stock_folder-move.png
-share/icons/hicolor/48x48/apps/Thunar.png
-share/icons/hicolor/64x64/apps/Thunar.png
-share/icons/hicolor/128x128/apps/Thunar.png
-share/icons/hicolor/scalable/apps/Thunar.svg
+share/icons/hicolor/48x48/apps/org.xfce.thunar.png
+share/icons/hicolor/scalable/apps/org.xfce.thunar.svg
%%NLS%%share/locale/am/LC_MESSAGES/thunar.mo
%%NLS%%share/locale/en_AU/LC_MESSAGES/thunar.mo
%%NLS%%share/locale/ar/LC_MESSAGES/thunar.mo
@@ -148,6 +145,5 @@ share/icons/hicolor/scalable/apps/Thunar.svg
%%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/Makefile b/x11-toolkits/Makefile
index 933e47d38cce..42b8bf45cce2 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -84,7 +84,6 @@
SUBDIR += libwnck
SUBDIR += libwnck3
SUBDIR += libxaw3dxft
- SUBDIR += libxfce4gui
SUBDIR += linux-c7-gtk2
SUBDIR += linux-c7-gtk3
SUBDIR += linux-c7-openmotif
diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
deleted file mode 100644
index ae6af621c5de..000000000000
--- a/x11-toolkits/libxfce4gui/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# Created by: James Earl <jdearl@telus.net>
-# $FreeBSD$
-
-PORTNAME= libxfce4gui
-PORTVERSION= 4.10.0
-PORTREVISION= 7
-CATEGORIES= x11-toolkits xfce
-MASTER_SITES= XFCE/archive
-DISTNAME= libxfcegui4-${DISTVERSIONFULL}
-DIST_SUBDIR= xfce4
-
-MAINTAINER= xfce@FreeBSD.org
-COMMENT= Various Gtk widgets for the Xfce Desktop
-
-LICENSE= GPLv2
-
-LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2
-
-USES= compiler:c11 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
-
-GNU_CONFIGURE= yes
-INSTALLS_ICONS= yes
-CONFIGURE_ARGS= --disable-gladeui --disable-static \
- --without-html-dir
-INSTALL_TARGET= install-strip
-
-OPTIONS_DEFINE= NLS STARTUP
-OPTIONS_DEFAULT= STARTUP
-OPTIONS_SUB= yes
-
-STARTUP_DESC= Startup notification
-
-NLS_USES= gettext-runtime
-NLS_CONFIGURE_ENABLE= nls
-
-STARTUP_LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification
-STARTUP_CONFIGURE_ENABLE= startup-notification
-
-.include <bsd.port.mk>
diff --git a/x11-toolkits/libxfce4gui/distinfo b/x11-toolkits/libxfce4gui/distinfo
deleted file mode 100644
index c0e081006883..000000000000
--- a/x11-toolkits/libxfce4gui/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xfce4/libxfcegui4-4.10.0.tar.bz2) = 2b82f9979175d8856880c8f349e6eede491ca92fe6940c69c8958115418d4533
-SIZE (xfce4/libxfcegui4-4.10.0.tar.bz2) = 691012
diff --git a/x11-toolkits/libxfce4gui/files/patch-libxfcegui4_xfce-exec.c b/x11-toolkits/libxfce4gui/files/patch-libxfcegui4_xfce-exec.c
deleted file mode 100644
index 4cade1299fb6..000000000000
--- a/x11-toolkits/libxfce4gui/files/patch-libxfcegui4_xfce-exec.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libxfcegui4/xfce-exec.c.orig 2012-04-28 20:10:43 UTC
-+++ libxfcegui4/xfce-exec.c
-@@ -79,7 +79,7 @@ child_setup_sync(gpointer user_data)
- #ifndef G_OS_WIN32
- gchar *dpyname = user_data;
-
-- xfce_setenv ("DISPLAY", dpyname, TRUE);
-+ g_setenv ("DISPLAY", dpyname, TRUE);
- #endif
- }
-
diff --git a/x11-toolkits/libxfce4gui/pkg-descr b/x11-toolkits/libxfce4gui/pkg-descr
deleted file mode 100644
index 4ef2ce3d0213..000000000000
--- a/x11-toolkits/libxfce4gui/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-GUI-related extension widgets and libraries for the Xfce Desktop.
-
-WWW: https://www.xfce.org/
diff --git a/x11-toolkits/libxfce4gui/pkg-plist b/x11-toolkits/libxfce4gui/pkg-plist
deleted file mode 100644
index cab628afbfed..000000000000
--- a/x11-toolkits/libxfce4gui/pkg-plist
+++ /dev/null
@@ -1,125 +0,0 @@
-include/xfce4/libxfcegui4/dialogs.h
-include/xfce4/libxfcegui4/gtk_style.h
-include/xfce4/libxfcegui4/gtktoxevent.h
-include/xfce4/libxfcegui4/gui-enum-types.h
-include/xfce4/libxfcegui4/icons.h
-include/xfce4/libxfcegui4/libnetk.h
-include/xfce4/libxfcegui4/libxfcegui4-config.h
-include/xfce4/libxfcegui4/libxfcegui4.h
-include/xfce4/libxfcegui4/netk-application.h
-include/xfce4/libxfcegui4/netk-class-group.h
-include/xfce4/libxfcegui4/netk-enum-types.h
-include/xfce4/libxfcegui4/netk-pager.h
-include/xfce4/libxfcegui4/netk-screen.h
-include/xfce4/libxfcegui4/netk-tasklist.h
-include/xfce4/libxfcegui4/netk-trayicon.h
-include/xfce4/libxfcegui4/netk-util.h
-include/xfce4/libxfcegui4/netk-window-action-menu.h
-include/xfce4/libxfcegui4/netk-window-menu.h
-include/xfce4/libxfcegui4/netk-window.h
-include/xfce4/libxfcegui4/netk-workspace.h
-include/xfce4/libxfcegui4/preview_filesel.h
-include/xfce4/libxfcegui4/session-client.h
-include/xfce4/libxfcegui4/xfce-appmenuitem.h
-include/xfce4/libxfcegui4/xfce-colorbutton.h
-include/xfce4/libxfcegui4/xfce-exec.h
-include/xfce4/libxfcegui4/xfce-filechooser.h
-include/xfce4/libxfcegui4/xfce-gdk-extensions.h
-include/xfce4/libxfcegui4/xfce-gtk-extensions.h
-include/xfce4/libxfcegui4/xfce-heading.h
-include/xfce4/libxfcegui4/xfce-icontheme.h
-include/xfce4/libxfcegui4/xfce-startup-notification.h
-include/xfce4/libxfcegui4/xfce-titled-dialog.h
-include/xfce4/libxfcegui4/xfce-widget-helpers.h
-include/xfce4/libxfcegui4/xfce_aboutdialog.h
-include/xfce4/libxfcegui4/xfce_clock.h
-include/xfce4/libxfcegui4/xfce_decorbutton.h
-include/xfce4/libxfcegui4/xfce_decortoggle.h
-include/xfce4/libxfcegui4/xfce_framebox.h
-include/xfce4/libxfcegui4/xfce_iconbutton.h
-include/xfce4/libxfcegui4/xfce_menubutton.h
-include/xfce4/libxfcegui4/xfce_movehandler.h
-include/xfce4/libxfcegui4/xfce_scaled_image.h
-include/xfce4/libxfcegui4/xfce_systemtray.h
-include/xfce4/libxfcegui4/xfce_togglebutton.h
-include/xfce4/libxfcegui4/xinerama.h
-lib/libxfcegui4.so
-lib/libxfcegui4.so.4
-lib/libxfcegui4.so.4.3.0
-lib/libglade/2.0/libxfce4.so
-libdata/pkgconfig/libxfcegui4-1.0.pc
-share/icons/hicolor/48x48/apps/xfce-edit.png
-share/icons/hicolor/48x48/apps/xfce-filemanager.png
-share/icons/hicolor/48x48/apps/xfce-games.png
-share/icons/hicolor/48x48/apps/xfce-graphics.png
-share/icons/hicolor/48x48/apps/xfce-internet.png
-share/icons/hicolor/48x48/apps/xfce-man.png
-share/icons/hicolor/48x48/apps/xfce-multimedia.png
-share/icons/hicolor/48x48/apps/xfce-printer.png
-share/icons/hicolor/48x48/apps/xfce-schedule.png
-share/icons/hicolor/48x48/apps/xfce-sound.png
-share/icons/hicolor/48x48/apps/xfce-terminal.png
-share/icons/hicolor/48x48/apps/xfce-unknown.png
-share/icons/hicolor/48x48/apps/xfce-utils.png
-share/icons/hicolor/scalable/apps/xfce-filemanager.svg
-%%NLS%%share/locale/am/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/ar/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/ast/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/be/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/bn_IN/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/cy/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/da/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/de/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/dz/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/el/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/es/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/et/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/fa/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/gu/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/he/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/hr/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/hy/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/id/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/is/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/it/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/ka/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/kk/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/ku/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/lv/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/mk/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/mr/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/nn/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/pa/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/si/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/sq/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/ta/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/te/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/tl_PH/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/ug/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/ur/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/ur_PK/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/libxfcegui4.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/libxfcegui4.mo
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index b1d2fe7150a8..452cef9c36aa 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-desktop
-PORTVERSION= 4.14.3
+PORTVERSION= 4.16.0
CATEGORIES= x11-wm xfce
MASTER_SITES= XFCE
DISTNAME= xfdesktop-${DISTVERSIONFULL}
diff --git a/x11-wm/xfce4-desktop/distinfo b/x11-wm/xfce4-desktop/distinfo
index ed668267d299..2567aea0a098 100644
--- a/x11-wm/xfce4-desktop/distinfo
+++ b/x11-wm/xfce4-desktop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1604366823
-SHA256 (xfce4/xfdesktop-4.14.3.tar.bz2) = 06d7d08f41a847f539e9aeb52ed715f960255dc1b2162a60e5f90661892a5793
-SIZE (xfce4/xfdesktop-4.14.3.tar.bz2) = 1549953
+TIMESTAMP = 1608683086
+SHA256 (xfce4/xfdesktop-4.16.0.tar.bz2) = 934ba5affecff21e62d9fac1dd50c50cd94b3a807fefa5f5bff59f3d6f155bae
+SIZE (xfce4/xfdesktop-4.16.0.tar.bz2) = 2041114
diff --git a/x11-wm/xfce4-desktop/pkg-plist b/x11-wm/xfce4-desktop/pkg-plist
index 685620d2c515..280f640689c0 100644
--- a/x11-wm/xfce4-desktop/pkg-plist
+++ b/x11-wm/xfce4-desktop/pkg-plist
@@ -5,12 +5,13 @@ 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
-share/icons/hicolor/48x48/apps/xfce4-backdrop.png
-share/icons/hicolor/48x48/apps/xfce4-menueditor.png
-share/icons/hicolor/scalable/apps/xfce4-backdrop.svg
-share/icons/hicolor/scalable/apps/xfce4-menueditor.svg
+share/backgrounds/xfce/xfce-verticals.png
+share/icons/hicolor/128x128/apps/org.xfce.xfdesktop.png
+share/icons/hicolor/16x16/apps/org.xfce.xfdesktop.png
+share/icons/hicolor/24x24/apps/org.xfce.xfdesktop.png
+share/icons/hicolor/32x32/apps/org.xfce.xfdesktop.png
+share/icons/hicolor/48x48/apps/org.xfce.xfdesktop.png
+share/icons/hicolor/scalable/apps/org.xfce.xfdesktop.svg
%%NLS%%share/locale/am/LC_MESSAGES/xfdesktop.mo
%%NLS%%share/locale/ar/LC_MESSAGES/xfdesktop.mo
%%NLS%%share/locale/ast/LC_MESSAGES/xfdesktop.mo
@@ -37,8 +38,8 @@ 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/hye/LC_MESSAGES/xfdesktop.mo
%%NLS%%share/locale/hy_AM/LC_MESSAGES/xfdesktop.mo
+%%NLS%%share/locale/hye/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
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index dd4f036e4a48..1824a36e2596 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-panel
-PORTVERSION= 4.14.4
+PORTVERSION= 4.16.0
CATEGORIES= x11-wm xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
@@ -16,7 +16,8 @@ LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING
LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LIB
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2
+ libfreetype.so:print/freetype2 \
+ libdbusmenu-gtk3.so:devel/libdbusmenu
USES= compiler:c11 desktop-file-utils gettext-tools gmake gnome \
libtool pathfix perl5 pkgconfig tar:bzip2 xfce xorg
@@ -32,8 +33,8 @@ CONFIGURE_ARGS= --enable-gio-unix --without-html-dir
PORTSCOUT= limitw:1,even
-OPTIONS_DEFINE= GIR GTK2 NLS VAPI
-OPTIONS_DEFAULT= GIR GTK2 VAPI
+OPTIONS_DEFINE= GIR NLS VAPI
+OPTIONS_DEFAULT= GIR VAPI
OPTIONS_SUB= yes
GIR_DESC= Use Gobject Introspection
@@ -42,9 +43,6 @@ 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
diff --git a/x11-wm/xfce4-panel/distinfo b/x11-wm/xfce4-panel/distinfo
index 14a52461519b..b1887efdb61c 100644
--- a/x11-wm/xfce4-panel/distinfo
+++ b/x11-wm/xfce4-panel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1588078825
-SHA256 (xfce4/xfce4-panel-4.14.4.tar.bz2) = 8e5ea79412ba84cfada897ff309cbe2cd4aca16b9bd4f93df060229528576fd5
-SIZE (xfce4/xfce4-panel-4.14.4.tar.bz2) = 1307938
+TIMESTAMP = 1608682746
+SHA256 (xfce4/xfce4-panel-4.16.0.tar.bz2) = 5e979aeeb37d306d72858b1bc67448222ea7a68de01409055b846cd31f3cc53d
+SIZE (xfce4/xfce4-panel-4.16.0.tar.bz2) = 1382354
diff --git a/x11-wm/xfce4-panel/files/patch-plugins_pager_pager.c b/x11-wm/xfce4-panel/files/patch-plugins_pager_pager.c
index 64a605c24887..60998ddca727 100644
--- a/x11-wm/xfce4-panel/files/patch-plugins_pager_pager.c
+++ b/x11-wm/xfce4-panel/files/patch-plugins_pager_pager.c
@@ -3,15 +3,9 @@ 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.orig 2020-12-10 23:14:07 UTC
+++ plugins/pager/pager.c
-@@ -445,6 +445,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS
+@@ -482,6 +482,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);
@@ -20,6 +14,3 @@ index 5637bea6..3a64496e 100644
}
else
{
---
-2.23.0
-
diff --git a/x11-wm/xfce4-panel/pkg-plist b/x11-wm/xfce4-panel/pkg-plist
index 34a06bcacf45..cae1ea4a06ae 100644
--- a/x11-wm/xfce4-panel/pkg-plist
+++ b/x11-wm/xfce4-panel/pkg-plist
@@ -3,18 +3,6 @@ bin/xfce4-popup-applicationsmenu
bin/xfce4-popup-directorymenu
bin/xfce4-popup-windowmenu
etc/xdg/xfce4/panel/default.xml
-%%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
@@ -22,14 +10,10 @@ 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
+%%GIR%%lib/girepository-1.0/Libxfce4panel-2.0.typelib
lib/libxfce4panel-2.0.so
lib/libxfce4panel-2.0.so.4
lib/libxfce4panel-2.0.so.4.0.0
@@ -45,24 +29,31 @@ lib/xfce4/panel/plugins/libshowdesktop.so
lib/xfce4/panel/plugins/libsystray.so
lib/xfce4/panel/plugins/libtasklist.so
lib/xfce4/panel/plugins/libwindowmenu.so
-%%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
-share/icons/hicolor/22x22/apps/xfce4-panel.png
-share/icons/hicolor/24x24/apps/xfce4-panel-menu.png
-share/icons/hicolor/24x24/apps/xfce4-panel.png
-share/icons/hicolor/32x32/apps/xfce4-panel-menu.png
-share/icons/hicolor/32x32/apps/xfce4-panel.png
-share/icons/hicolor/48x48/apps/xfce4-panel-menu.png
-share/icons/hicolor/48x48/apps/xfce4-panel.png
-share/icons/hicolor/scalable/apps/xfce4-panel.svg
+%%GIR%%share/gir-1.0/Libxfce4panel-2.0.gir
+share/icons/hicolor/128x128/apps/org.xfce.panel.png
+share/icons/hicolor/16x16/apps/org.xfce.panel.applicationsmenu.png
+share/icons/hicolor/16x16/apps/org.xfce.panel.png
+share/icons/hicolor/24x24/apps/org.xfce.panel.applicationsmenu.png
+share/icons/hicolor/24x24/apps/org.xfce.panel.png
+share/icons/hicolor/32x32/apps/org.xfce.panel.actions.png
+share/icons/hicolor/32x32/apps/org.xfce.panel.applicationsmenu.png
+share/icons/hicolor/32x32/apps/org.xfce.panel.clock.png
+share/icons/hicolor/32x32/apps/org.xfce.panel.directorymenu.png
+share/icons/hicolor/32x32/apps/org.xfce.panel.launcher.png
+share/icons/hicolor/32x32/apps/org.xfce.panel.pager.png
+share/icons/hicolor/32x32/apps/org.xfce.panel.png
+share/icons/hicolor/32x32/apps/org.xfce.panel.separator.png
+share/icons/hicolor/32x32/apps/org.xfce.panel.showdesktop.png
+share/icons/hicolor/32x32/apps/org.xfce.panel.statustray.png
+share/icons/hicolor/32x32/apps/org.xfce.panel.tasklist.png
+share/icons/hicolor/32x32/apps/org.xfce.panel.windowmenu.png
+share/icons/hicolor/48x48/apps/org.xfce.panel.applicationsmenu.png
+share/icons/hicolor/48x48/apps/org.xfce.panel.png
+share/icons/hicolor/scalable/apps/org.xfce.panel.svg
%%NLS%%share/locale/am/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-panel.mo
@@ -80,7 +71,6 @@ share/icons/hicolor/scalable/apps/xfce4-panel.svg
%%NLS%%share/locale/es/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/et/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-panel.mo
-%%NLS%%share/locale/fa_IR/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-panel.mo
@@ -88,6 +78,7 @@ share/icons/hicolor/scalable/apps/xfce4-panel.svg
%%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/hye/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
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index 3084d5d12f0c..2e040f52dcb4 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-session
-PORTVERSION= 4.14.2
+PORTVERSION= 4.16.0
CATEGORIES= x11-wm xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
diff --git a/x11-wm/xfce4-session/distinfo b/x11-wm/xfce4-session/distinfo
index e15d234a5fdf..dbb9487151d3 100644
--- a/x11-wm/xfce4-session/distinfo
+++ b/x11-wm/xfce4-session/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1585440692
-SHA256 (xfce4/xfce4-session-4.14.2.tar.bz2) = fbe3a4a60c91589a2024ce12b2d2667625a8fedcbc90ef031831f56319f597af
-SIZE (xfce4/xfce4-session-4.14.2.tar.bz2) = 841878
+TIMESTAMP = 1608682710
+SHA256 (xfce4/xfce4-session-4.16.0.tar.bz2) = 22f273f212481d71e0b5618c62710cd85f69aea74f5ea5c0093f7918b07d17b7
+SIZE (xfce4/xfce4-session-4.16.0.tar.bz2) = 875504
diff --git a/x11-wm/xfce4-session/pkg-plist b/x11-wm/xfce4-session/pkg-plist
index a3f230563287..a9507749271f 100644
--- a/x11-wm/xfce4-session/pkg-plist
+++ b/x11-wm/xfce4-session/pkg-plist
@@ -12,14 +12,26 @@ 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/128x128/apps/org.xfce.session.png
+share/icons/hicolor/16x16/apps/org.xfce.session.png
+share/icons/hicolor/24x24/actions/xfsm-hibernate.png
+share/icons/hicolor/24x24/actions/xfsm-lock.png
+share/icons/hicolor/24x24/actions/xfsm-logout.png
+share/icons/hicolor/24x24/actions/xfsm-reboot.png
+share/icons/hicolor/24x24/actions/xfsm-shutdown.png
+share/icons/hicolor/24x24/actions/xfsm-suspend.png
+share/icons/hicolor/24x24/actions/xfsm-switch-user.png
+share/icons/hicolor/24x24/apps/org.xfce.session.png
+share/icons/hicolor/32x32/apps/org.xfce.session.png
share/icons/hicolor/48x48/actions/xfsm-hibernate.png
+share/icons/hicolor/48x48/actions/xfsm-lock.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/scalable/apps/xfce4-session.svg
+share/icons/hicolor/48x48/actions/xfsm-switch-user.png
+share/icons/hicolor/48x48/apps/org.xfce.session.png
+share/icons/hicolor/scalable/apps/org.xfce.session.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
@@ -33,6 +45,7 @@ share/icons/hicolor/scalable/apps/xfce4-session.svg
%%NLS%%share/locale/de/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/el/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/en_CA/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/eo/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/es/LC_MESSAGES/xfce4-session.mo
@@ -42,9 +55,11 @@ share/icons/hicolor/scalable/apps/xfce4-session.svg
%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/he/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/hi/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/hye/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
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index 7437922a6a45..32ba195c6119 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-wm
-PORTVERSION= 4.14.6
-PORTREVISION= 2
+PORTVERSION= 4.16.0
CATEGORIES= x11-wm xfce
MASTER_SITES= XFCE
DISTNAME= xfwm4-${DISTVERSIONFULL}
diff --git a/x11-wm/xfce4-wm/distinfo b/x11-wm/xfce4-wm/distinfo
index 22965cbf8b01..eea7e1280bc2 100644
--- a/x11-wm/xfce4-wm/distinfo
+++ b/x11-wm/xfce4-wm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1604253744
-SHA256 (xfce4/xfwm4-4.14.6.tar.bz2) = ac6fa8b09d34090fb9ad81d8b7fb0455a10eccf500396b644afa2b9c2444142f
-SIZE (xfce4/xfwm4-4.14.6.tar.bz2) = 1167818
+TIMESTAMP = 1608682605
+SHA256 (xfce4/xfwm4-4.16.0.tar.bz2) = 1e22eae1bbb66cebfd1753b0a5606e76ecbf6b09ce4cdfd732d093c936f1feb3
+SIZE (xfce4/xfwm4-4.16.0.tar.bz2) = 1200929
diff --git a/x11-wm/xfce4-wm/files/patch-XFixes-XError b/x11-wm/xfce4-wm/files/patch-XFixes-XError
deleted file mode 100644
index 7583e5c63462..000000000000
--- a/x11-wm/xfce4-wm/files/patch-XFixes-XError
+++ /dev/null
@@ -1,44 +0,0 @@
-From c255a406bd353a24a9143b152f91e5eb39f69f1f Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <fourdan@xfce.org>
-Date: Sat, 28 Nov 2020 21:16:20 +0100
-Subject: [PATCH] compositor: Handle XFixes XError
-
-XFixesSetPictureClipRegion() with the region from the client window can
-cause a RenderBadPicture error.
-
-Make sure to include it within the XError trap.
-
-Signed-off-by: Olivier Fourdan <fourdan@xfce.org>
-https://gitlab.xfce.org/xfce/xfwm4/-/issues/460
----
- src/compositor.c | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/src/compositor.c b/src/compositor.c
-index 5110f29c2..25baaabe5 100644
---- src/compositor.c
-+++ src/compositor.c
-@@ -781,15 +781,16 @@ border_size (CWindow *cw)
- myDisplayErrorTrapPush (display_info);
- border = XFixesCreateRegionFromWindow (display_info->dpy,
- cw->id, WindowRegionBounding);
-- if ((myDisplayErrorTrapPop (display_info) != Success) || (border == None))
-- {
-- return None;
-- }
- XFixesSetPictureClipRegion (display_info->dpy, cw->picture, 0, 0, border);
- XFixesTranslateRegion (display_info->dpy, border,
- cw->attr.x + cw->attr.border_width,
- cw->attr.y + cw->attr.border_width);
-
-+ if (myDisplayErrorTrapPop (display_info) != Success)
-+ {
-+ return None;
-+ }
-+
- return border;
- }
-
---
-GitLab
-
diff --git a/x11-wm/xfce4-wm/files/patch-XKillClient-XError b/x11-wm/xfce4-wm/files/patch-XKillClient-XError
deleted file mode 100644
index 2316463c484f..000000000000
--- a/x11-wm/xfce4-wm/files/patch-XKillClient-XError
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/client.c b/src/client.c
-index c90c7ada710b482a847e80a1e835adf54fe97f34..13acc44f75455b1c9de70255a73cf4457dfb7531 100644
---- src/client.c
-+++ src/client.c
-@@ -2705,10 +2705,18 @@ clientClose (Client *c)
- void
- clientKill (Client *c)
- {
-+ ScreenInfo *screen_info;
-+ DisplayInfo *display_info;
-+
- g_return_if_fail (c != NULL);
- TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
-
-- XKillClient (clientGetXDisplay (c), c->window);
-+ screen_info = c->screen_info;
-+ display_info = screen_info->display_info;
-+
-+ myDisplayErrorTrapPush (display_info);
-+ XKillClient (display_info->dpy, c->window);
-+ myDisplayErrorTrapPopIgnored (display_info);
- }
-
- void
diff --git a/x11-wm/xfce4-wm/files/patch-Xsync-XError b/x11-wm/xfce4-wm/files/patch-Xsync-XError
deleted file mode 100644
index 61b5aa5c6d2c..000000000000
--- a/x11-wm/xfce4-wm/files/patch-Xsync-XError
+++ /dev/null
@@ -1,30 +0,0 @@
-From 6b3c1ef155a01b61443b832b1922b560ef42ce24 Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <fourdan@xfce.org>
-Date: Sat, 21 Nov 2020 14:05:04 +0100
-Subject: [PATCH] xsync: Handle XError
-
-XSync can fail, handle the XError gracefully.
-
-Signed-off-by: Olivier Fourdan <fourdan@xfce.org>
-Closes: https://gitlab.xfce.org/xfce/xfwm4/-/issues/448
----
- src/xsync.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/xsync.c b/src/xsync.c
-index 920dfdc17..e1c379f9d 100644
---- src/xsync.c
-+++ src/xsync.c
-@@ -113,7 +113,9 @@ clientDestroyXSyncAlarm (Client *c)
- screen_info = c->screen_info;
- display_info = screen_info->display_info;
-
-+ myDisplayErrorTrapPush (display_info);
- XSyncDestroyAlarm (display_info->dpy, c->xsync_alarm);
-+ myDisplayErrorTrapPopIgnored (display_info);
- c->xsync_alarm = None;
- }
- }
---
-GitLab
-
diff --git a/x11-wm/xfce4-wm/pkg-plist b/x11-wm/xfce4-wm/pkg-plist
index 45e40680480c..0e63e3f40700 100644
--- a/x11-wm/xfce4-wm/pkg-plist
+++ b/x11-wm/xfce4-wm/pkg-plist
@@ -6,6 +6,12 @@ lib/xfce4/xfwm4/helper-dialog
share/applications/xfce-wm-settings.desktop
share/applications/xfce-wmtweaks-settings.desktop
share/applications/xfce-workspaces-settings.desktop
+share/icons/hicolor/128x128/apps/org.xfce.workspaces.png
+share/icons/hicolor/128x128/apps/org.xfce.xfwm4-tweaks.png
+share/icons/hicolor/128x128/apps/org.xfce.xfwm4.png
+share/icons/hicolor/16x16/apps/org.xfce.workspaces.png
+share/icons/hicolor/16x16/apps/org.xfce.xfwm4-tweaks.png
+share/icons/hicolor/16x16/apps/org.xfce.xfwm4.png
share/icons/hicolor/22x22/actions/xfce-wm-close.png
share/icons/hicolor/22x22/actions/xfce-wm-maximize.png
share/icons/hicolor/22x22/actions/xfce-wm-menu.png
@@ -15,10 +21,10 @@ share/icons/hicolor/22x22/actions/xfce-wm-stick.png
share/icons/hicolor/22x22/actions/xfce-wm-unmaximize.png
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/org.xfce.workspaces.png
+share/icons/hicolor/48x48/apps/org.xfce.xfwm4-tweaks.png
+share/icons/hicolor/48x48/apps/org.xfce.xfwm4.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
share/icons/hicolor/scalable/actions/xfce-wm-menu.svg
@@ -28,10 +34,10 @@ share/icons/hicolor/scalable/actions/xfce-wm-stick.svg
share/icons/hicolor/scalable/actions/xfce-wm-unmaximize.svg
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/org.xfce.workspaces.svg
+share/icons/hicolor/scalable/apps/org.xfce.xfwm4-tweaks.svg
+share/icons/hicolor/scalable/apps/org.xfce.xfwm4.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
%%NLS%%share/locale/ast/LC_MESSAGES/xfwm4.mo
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index 1997d15105dd..863f1671bfb2 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -1,44 +1,137 @@
-# Created by: James Earl <jdearl@telus.net>
+# Created by: Ben Woods <woodsb02@FreeBSD.org>
# $FreeBSD$
-PORTNAME= xfce
-PORTVERSION= 4.14
-CATEGORIES= x11-wm xfce
+PORTNAME= xfce4-goodies
+PORTVERSION= 4.16
+CATEGORIES= x11
MAINTAINER= xfce@FreeBSD.org
-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
-
-USES= metaport
-
-OPTIONS_DEFINE= APPFINDER GREYBIRD GTK2ENGINE ICONS LIGHTDM MOUSEPAD NOTIFY ORAGE PRINT \
- TERMINAL XPM
-OPTIONS_DEFAULT= APPFINDER GREYBIRD ICONS MOUSEPAD NOTIFY TERMINAL
-APPFINDER_RUN_DEPENDS= xfce4-appfinder:misc/xfce4-appfinder
-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
-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
-NOTIFY_RUN_DEPENDS= xfce4-notifyd-config:deskutils/xfce4-notifyd
-ORAGE_RUN_DEPENDS= orage:deskutils/orage
-ORAGE_DESC= Calendar
-PRINT_RUN_DEPENDS= xfprint4:print/xfce4-print
-TERMINAL_RUN_DEPENDS= xfce4-terminal:x11/xfce4-terminal
-TERMINAL_DESC= Terminal emulator
-XPM_RUN_DEPENDS= xfce4-power-manager:sysutils/xfce4-power-manager
-XPM_DESC= Power manager
-
-do-install: # empty
+COMMENT= Meta-port for software and artwork from the Xfce4 Goodies Project
+
+USES= metaport
+
+OPTIONS_DEFAULT= ARCHIVE BATTERY CALCULATOR CLIPMAN CPUGRAPH DASHBOARD \
+ DATETIME DICTIONARY DISKPERF FSGUARD GENMON GIGOLO \
+ MAILWATCH MEDIATAGS MENULIBRE MOUNT NETLOAD PAROLE \
+ POWERMANAGER RISTRETTO SCREENSAVER SCREENSHOOTER SMARTBOOKMARK \
+ SYSTEMLOAD TASKMANAGER TERMINAL THEMES TIMEOUT TIMER VCS VERVE \
+ WAVELAN WEATHER WHISKERMENU XFBURN XKB
+# Removed from defaults due to ports being broken.
+# NOTES BSDCPUFREQ
+
+OPTIONS_EXCLUDE_powerpc= BATTERY
+OPTIONS_EXCLUDE_powerpc64= BATTERY
+OPTIONS_EXCLUDE_powerpc64le= BATTERY
+OPTIONS_EXCLUDE_powerpcspe= BATTERY
+
+OPTIONS_GROUP= APPLICATIONS PANELPLUGINS THUNARPLUGINS UNOFFICIAL
+
+OPTIONS_GROUP_APPLICATIONS= DASHBOARD DICTIONARY GIGOLO MIDORI PAROLE \
+ POWERMANAGER RISTRETTO SCREENSHOOTER \
+ TASKMANAGER TERMINAL VOLUMEDPULSE XFBURN \
+ 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
+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
+VOLUMEDPULSE_DESC= Volume management daemon for Xfce using PulseAudio
+XFBURN_DESC= CD/DVD burning tool for Xfce
+XFMPC_DESC= Graphical MPD client focusing on low footprint
+
+DASHBOARD_RUN_DEPENDS= xfce4-dashboard>=0:x11/xfce4-dashboard
+DICTIONARY_RUN_DEPENDS= xfce4-dict-plugin>=0:textproc/xfce4-dict-plugin
+GIGOLO_RUN_DEPENDS= gigolo>=0:sysutils/gigolo
+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
+VOLUMEDPULSE_RUN_DEPENDS= xfce4-volumed-pulse>=0:deskutils/xfce4-volumed-pulse
+XFBURN_RUN_DEPENDS= xfburn>=0:sysutils/xfburn
+XFMPC_RUN_DEPENDS= xfmpc>=0:audio/xfmpc
+
+OPTIONS_GROUP_PANELPLUGINS= BATTERY CALCULATOR CLIPMAN CPUGRAPH DATETIME \
+ DISKPERF FSGUARD GENERICSLIDER GENMON \
+ MAILWATCH MOUNT MPC NETLOAD NOTES PULSEAUDIO \
+ SMARTBOOKMARK SYSTEMLOAD TIMER \
+ TIMEOUT VERVE WAVELAN WEATHER WHISKERMENU \
+ XKB
+BATTERY_DESC= Battery monitor panel plugin for Xfce4
+CALCULATOR_DESC= Simple calculator for the Xfce panel
+CLIPMAN_DESC= Clipboard manager for the Xfce panel
+CPUGRAPH_DESC= Graphical representation of the CPU load
+DATETIME_DESC= Datetime panel plugin for the Xfce desktop
+DISKPERF_DESC= Graphical representation of the disk IO
+FSGUARD_DESC= Displays free space of mountpoint
+GENERICSLIDER_DESC= Slider to adjust / monitor any numeric variable
+GENMON_DESC= Generic Monitor Xfce4 panel plugin
+MAILWATCH_DESC= Mail notification applet for the Xfce panel
+MOUNT_DESC= Mount and umount utility for the Xfce4 panel
+MPC_DESC= Musicpd client plugin for the Xfce panel
+NETLOAD_DESC= Network Load plugin for Xfce4
+NOTES_DESC= Notes plugin for the Xfce panel
+PULSEAUDIO_DESC= Panel plugin for controlling PulseAudio mixer
+SMARTBOOKMARK_DESC= Query search engines from the Xfce panel
+SYSTEMLOAD_DESC= System Load plugin for Xfce4 panel
+TIMEOUT_DESC= Prompts the user to take a break every X minutes
+TIMER_DESC= Set alarm at specific time or after time period
+VERVE_DESC= Command line plugin for the Xfce Desktop
+WAVELAN_DESC= Displays information about a WaveLAN device
+WEATHER_DESC= Weather plugin for the Xfce panel
+WHISKERMENU_DESC= Alternate menu for the Xfce Desktop
+XKB_DESC= Keyboard layout switching plugin for Xfce panel
+
+BATTERY_RUN_DEPENDS= xfce4-battery-plugin>=0:sysutils/xfce4-battery-plugin
+CALCULATOR_RUN_DEPENDS= xfce4-calculator-plugin>=0:math/xfce4-calculator-plugin
+CLIPMAN_RUN_DEPENDS= xfce4-clipman-plugin>=0:x11/xfce4-clipman-plugin
+CPUGRAPH_RUN_DEPENDS= xfce4-cpugraph-plugin>=0:sysutils/xfce4-cpugraph-plugin
+DATETIME_RUN_DEPENDS= xfce4-datetime-plugin>=0:x11-clocks/xfce4-datetime-plugin
+DISKPERF_RUN_DEPENDS= xfce4-diskperf-plugin>=0:sysutils/xfce4-diskperf-plugin
+FSGUARD_RUN_DEPENDS= xfce4-fsguard-plugin>=0:sysutils/xfce4-fsguard-plugin
+GENERICSLIDER_RUN_DEPENDS= xfce4-generic-slider>=0:deskutils/xfce4-generic-slider
+GENMON_RUN_DEPENDS= xfce4-genmon-plugin>=0:sysutils/xfce4-genmon-plugin
+MAILWATCH_RUN_DEPENDS= xfce4-mailwatch-plugin>=0:mail/xfce4-mailwatch-plugin
+MOUNT_RUN_DEPENDS= xfce4-mount-plugin>=0:sysutils/xfce4-mount-plugin
+MPC_RUN_DEPENDS= xfce4-mpc-plugin>=0:audio/xfce4-mpc-plugin
+NETLOAD_RUN_DEPENDS= xfce4-netload-plugin>=0:sysutils/xfce4-netload-plugin
+NOTES_RUN_DEPENDS= xfce4-notes-plugin>=0:deskutils/xfce4-notes-plugin
+PULSEAUDIO_RUN_DEPENDS= xfce4-pulseaudio-plugin>=0:audio/xfce4-pulseaudio-plugin
+SMARTBOOKMARK_RUN_DEPENDS= xfce4-smartbookmark-plugin>=0:www/xfce4-smartbookmark-plugin
+SYSTEMLOAD_RUN_DEPENDS= xfce4-systemload-plugin>=0:sysutils/xfce4-systemload-plugin
+TIMEOUT_RUN_DEPENDS= xfce4-time-out-plugin>=0:x11-clocks/xfce4-time-out-plugin
+TIMER_RUN_DEPENDS= xfce4-timer-plugin>=0:x11-clocks/xfce4-timer-plugin
+VERVE_RUN_DEPENDS= xfce4-verve-plugin>=0:x11/xfce4-verve-plugin
+WAVELAN_RUN_DEPENDS= xfce4-wavelan-plugin>=0:sysutils/xfce4-wavelan-plugin
+WEATHER_RUN_DEPENDS= xfce4-weather-plugin>=0:misc/xfce4-weather-plugin
+WHISKERMENU_RUN_DEPENDS= xfce4-whiskermenu-plugin>=0:x11/xfce4-whiskermenu-plugin
+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
+VCS_DESC= SVN+GIT Version Control System integration
+
+ARCHIVE_RUN_DEPENDS= thunar-archive-plugin>=0:archivers/thunar-archive-plugin
+MEDIATAGS_RUN_DEPENDS= thunar-media-tags-plugin>=0:audio/thunar-media-tags-plugin
+VCS_RUN_DEPENDS= thunar-vcs-plugin>=0:devel/thunar-vcs-plugin
+
+OPTIONS_GROUP_UNOFFICIAL= BSDCPUFREQ MENULIBRE THEMES
+BSDCPUFREQ_DESC= Display the CPU clock frequency in Xfce panel
+MENULIBRE_DESC= Advanced compliant menu editor
+THEMES_DESC= Additional themes for xfwm4
+
+BSDCPUFREQ_RUN_DEPENDS= xfce4-bsdcpufreq-plugin>=0:sysutils/xfce4-bsdcpufreq-plugin
+MENULIBRE_RUN_DEPENDS= py${PYTHON3_DEFAULT:S/.//}-menulibre>=0:x11/menulibre
+THEMES_RUN_DEPENDS= xfce4-wm-themes>=0:misc/xfce4-wm-themes
.include <bsd.port.mk>
diff --git a/x11/Makefile b/x11/Makefile
index 67502e0c0b91..dd2523c3d19b 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -435,14 +435,12 @@
SUBDIR += xfce4-dashboard
SUBDIR += xfce4-embed-plugin
SUBDIR += xfce4-goodies
- SUBDIR += xfce4-quicklauncher-plugin
SUBDIR += xfce4-screensaver
SUBDIR += xfce4-screenshooter-plugin
SUBDIR += xfce4-taskmanager
SUBDIR += xfce4-terminal
SUBDIR += xfce4-verve-plugin
SUBDIR += xfce4-whiskermenu-plugin
- SUBDIR += xfce4-wmdock-plugin
SUBDIR += xfd
SUBDIR += xfishtank
SUBDIR += xforward
diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index 1e04ae061d8e..d3d35081d48b 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= libexo
-PORTVERSION= 0.12.11
+PORTVERSION= 4.16.0
CATEGORIES= x11 xfce
MASTER_SITES= XFCE
DISTNAME= exo-${DISTVERSIONFULL}
@@ -34,15 +34,11 @@ INSTALLS_ICONS= yes
INSTALL_TARGET= install-strip
CONFIGURE_ARGS= --without-html-dir --disable-silent-rules
-PORTSCOUT= limit:^0\.12\.
+PORTSCOUT= limitw:1,even
-OPTIONS_DEFINE= GTK2 NLS
-OPTIONS_DEFAULT= GTK2
+OPTIONS_DEFINE= NLS
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 ac2385dd1714..c1acc4463d5c 100644
--- a/x11/libexo/distinfo
+++ b/x11/libexo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1576756210
-SHA256 (xfce4/exo-0.12.11.tar.bz2) = ec892519c08a67f3e0a1f0f8d43446e26871183e5aa6be7f82e214f388d1e5b6
-SIZE (xfce4/exo-0.12.11.tar.bz2) = 1333227
+TIMESTAMP = 1608682983
+SHA256 (xfce4/exo-4.16.0.tar.bz2) = 1975b00eed9a8aa1f899eab2efaea593731c19138b83fdff2f13bdca5275bacc
+SIZE (xfce4/exo-4.16.0.tar.bz2) = 966143
diff --git a/x11/libexo/pkg-message b/x11/libexo/pkg-message
new file mode 100644
index 000000000000..36d3f90087ea
--- /dev/null
+++ b/x11/libexo/pkg-message
@@ -0,0 +1,15 @@
+[
+{
+ type: install
+ message: <<EOM
+If you are upgrading your packages, due to a problem with the pkg
+package management tool libexo requires to be upgraded by itself
+before the rest of packages, to ensure correct installation, as
+described in UPDATING entry 20210102.
+
+If you skipped the manual step and XFCE parts are failing due to
+missing libraries, please run "pkg upgrade -f libexo" to force
+reinstalling the missing parts.
+EOM
+}
+]
diff --git a/x11/libexo/pkg-plist b/x11/libexo/pkg-plist
index a314eae1eda4..885a5032e0e2 100644
--- a/x11/libexo/pkg-plist
+++ b/x11/libexo/pkg-plist
@@ -1,32 +1,5 @@
-bin/exo-csource
bin/exo-desktop-item-edit
bin/exo-open
-bin/exo-preferred-applications
-etc/xdg/xfce4/helpers.rc
-%%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
@@ -43,142 +16,79 @@ include/exo-2/exo/exo-simple-job.h
include/exo-2/exo/exo-string.h
include/exo-2/exo/exo-thumbnail-preview.h
include/exo-2/exo/exo-thumbnail.h
-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
-%%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
-%%GTK2%%libdata/pkgconfig/exo-1.pc
libdata/pkgconfig/exo-2.pc
-man/man1/exo-csource.1.gz
man/man1/exo-open.1.gz
-share/applications/exo-file-manager.desktop
-share/applications/exo-mail-reader.desktop
-share/applications/exo-preferred-applications.desktop
-share/applications/exo-terminal-emulator.desktop
-share/applications/exo-web-browser.desktop
share/icons/hicolor/24x24/apps/preferences-desktop-default-applications.png
share/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png
-%%NLS%%share/locale/am/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/ar/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/ast/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/be/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/bg/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/bn/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/da/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/de/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/el/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/en_AU/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/es/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/et/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/he/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/hr/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/hy/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/hy_AM/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/id/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/ie/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/is/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/it/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/kk/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/kn/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/lv/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/ms/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/nn/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/oc/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/pa/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/si/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/sl/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/sq/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/sr/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/te/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/th/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/ug/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/ur/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/ur_PK/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/zh_HK/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/exo-1.mo
+%%NLS%%share/locale/am/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/be/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/bn/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/da/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/de/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/el/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/es/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/et/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/fa_IR/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/he/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/hy/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/hy_AM/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/hye/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/id/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/ie/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/is/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/it/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/kab/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/kn/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/si/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/te/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/th/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/zh_HK/LC_MESSAGES/exo-2.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/exo-2.mo
share/pixmaps/exo/exo-thumbnail-frame.png
-share/xfce4/helpers/Thunar.desktop
-share/xfce4/helpers/aterm.desktop
-share/xfce4/helpers/balsa.desktop
-share/xfce4/helpers/brave.desktop
-share/xfce4/helpers/caja.desktop
-share/xfce4/helpers/chromium.desktop
-share/xfce4/helpers/debian-sensible-browser.desktop
-share/xfce4/helpers/debian-x-terminal-emulator.desktop
-share/xfce4/helpers/dillo.desktop
-share/xfce4/helpers/encompass.desktop
-share/xfce4/helpers/epiphany.desktop
-share/xfce4/helpers/eterm.desktop
-share/xfce4/helpers/evolution.desktop
-share/xfce4/helpers/firefox.desktop
-share/xfce4/helpers/galeon.desktop
-share/xfce4/helpers/geary.desktop
-share/xfce4/helpers/gnome-terminal.desktop
-share/xfce4/helpers/google-chrome.desktop
-share/xfce4/helpers/icecat.desktop
-share/xfce4/helpers/icedove.desktop
-share/xfce4/helpers/iceweasel.desktop
-share/xfce4/helpers/jumanji.desktop
-share/xfce4/helpers/kmail.desktop
-share/xfce4/helpers/konqueror.desktop
-share/xfce4/helpers/links.desktop
-share/xfce4/helpers/lynx.desktop
-share/xfce4/helpers/midori.desktop
-share/xfce4/helpers/mozilla-browser.desktop
-share/xfce4/helpers/mozilla-mailer.desktop
-share/xfce4/helpers/mutt.desktop
-share/xfce4/helpers/nautilus.desktop
-share/xfce4/helpers/netscape-navigator.desktop
-share/xfce4/helpers/nxterm.desktop
-share/xfce4/helpers/opera-browser.desktop
-share/xfce4/helpers/pcmanfm-qt.desktop
-share/xfce4/helpers/pcmanfm.desktop
-share/xfce4/helpers/qterminal.desktop
-share/xfce4/helpers/qtfm.desktop
-share/xfce4/helpers/qupzilla.desktop
-share/xfce4/helpers/rodent.desktop
-share/xfce4/helpers/rox-filer.desktop
-share/xfce4/helpers/sakura.desktop
-share/xfce4/helpers/surf.desktop
-share/xfce4/helpers/sylpheed-claws.desktop
-share/xfce4/helpers/sylpheed.desktop
-share/xfce4/helpers/terminator.desktop
-share/xfce4/helpers/thunderbird.desktop
-share/xfce4/helpers/urxvt.desktop
-share/xfce4/helpers/vimprobable2.desktop
-share/xfce4/helpers/w3m.desktop
-share/xfce4/helpers/xfce4-terminal.desktop
-share/xfce4/helpers/xfe.desktop
-share/xfce4/helpers/xterm.desktop
diff --git a/x11/libxfce4menu/Makefile b/x11/libxfce4menu/Makefile
index 1e8924e56264..abffde3effa6 100644
--- a/x11/libxfce4menu/Makefile
+++ b/x11/libxfce4menu/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= libxfce4menu
-PORTVERSION= 4.14.1
-PORTREVISION= 2
+PORTVERSION= 4.16.0
CATEGORIES= x11 xfce
MASTER_SITES= XFCE
DISTNAME= libxfce4ui-${DISTVERSIONFULL}
@@ -15,7 +14,9 @@ COMMENT= Widgets library for the Xfce desktop environment
LICENSE= GPLv2
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2
+ libfreetype.so:print/freetype2 \
+ libepoxy.so:graphics/libepoxy \
+ libgtop-2.0.so:devel/libgtop
USES= compiler:c11 gettext-tools gmake gnome libtool pathfix \
pkgconfig tar:bzip2 xfce xorg
@@ -26,13 +27,15 @@ USE_XORG= ice sm x11
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-CONFIGURE_ARGS= --with-vendor-info=${OPSYS} --without-html-dir
+CONFIGURE_ARGS= --with-vendor-info=${OPSYS} --without-html-dir \
+ --enable-glibtop --enable-epoxy \
+ --disable-gudev
INSTALL_TARGET= install-strip
PORTSCOUT= limitw:1,even
-OPTIONS_DEFINE= GIR GLADE GTK2 NLS STARTUP VAPI
-OPTIONS_DEFAULT= GIR GTK2 STARTUP VAPI
+OPTIONS_DEFINE= GIR GLADE NLS STARTUP VAPI
+OPTIONS_DEFAULT= GIR STARTUP VAPI
OPTIONS_SUB= yes
GIR_DESC= Use Gobject Introspection
@@ -45,9 +48,6 @@ 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
diff --git a/x11/libxfce4menu/distinfo b/x11/libxfce4menu/distinfo
index 9ecdc286a28d..e3d8270252d2 100644
--- a/x11/libxfce4menu/distinfo
+++ b/x11/libxfce4menu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565558955
-SHA256 (xfce4/libxfce4ui-4.14.1.tar.bz2) = c449075eaeae4d1138d22eeed3d2ad7032b87fb8878eada9b770325bed87f2da
-SIZE (xfce4/libxfce4ui-4.14.1.tar.bz2) = 756175
+TIMESTAMP = 1608682562
+SHA256 (xfce4/libxfce4ui-4.16.0.tar.bz2) = 8b06c9e94f4be88a9d87c47592411b6cbc32073e7af9cbd64c7b2924ec90ceaa
+SIZE (xfce4/libxfce4ui-4.16.0.tar.bz2) = 837838
diff --git a/x11/libxfce4menu/files/patch-libxfce4kbd-private_xfce-shortcuts-grabber.c b/x11/libxfce4menu/files/patch-libxfce4kbd-private_xfce-shortcuts-grabber.c
deleted file mode 100644
index cc012aa82466..000000000000
--- a/x11/libxfce4menu/files/patch-libxfce4kbd-private_xfce-shortcuts-grabber.c
+++ /dev/null
@@ -1,74 +0,0 @@
---- libxfce4kbd-private/xfce-shortcuts-grabber.c.orig 2019-08-11 16:02:06 UTC
-+++ libxfce4kbd-private/xfce-shortcuts-grabber.c
-@@ -72,8 +72,9 @@ struct _XfceShortcutsGrabberPrivate
-
- struct _XfceKey
- {
-- guint keyval;
-- guint modifiers;
-+ guint keyval;
-+ guint modifiers;
-+ GArray *keycodes;
- };
-
-
-@@ -339,10 +340,14 @@ xfce_shortcuts_grabber_grab (XfceShortcutsGrabber *gra
- GrabModeAsync,
- GrabModeAsync);
- else
-- XUngrabKey (GDK_DISPLAY_XDISPLAY (display),
-- keys[i].keycode,
-- modifiers | mod_masks [k],
-- root_window);
-+ {
-+ if (i >= key->keycodes->len)
-+ break;
-+ XUngrabKey (GDK_DISPLAY_XDISPLAY (display),
-+ g_array_index (key->keycodes, guint, i),
-+ modifiers | mod_masks [k],
-+ root_window);
-+ }
- }
-
- gdk_flush ();
-@@ -355,8 +360,20 @@ xfce_shortcuts_grabber_grab (XfceShortcutsGrabber *gra
- TRACE ("Failed to ungrab");
- }
- }
-+ /* Remember the old keycode, as we need it to ungrab. */
-+ if (grab)
-+ g_array_append_val (key->keycodes, keys[i].keycode);
-+ else
-+ g_array_index(key->keycodes, guint, i) = UINT_MAX;
- }
-
-+ /* Cleanup elements containing UINT_MAX from the key->keycodes array */
-+ for (i = key->keycodes->len - 1; i >= 0; i --)
-+ {
-+ if (g_array_index(key->keycodes, guint, i) == UINT_MAX)
-+ g_array_remove_index_fast(key->keycodes, i);
-+ }
-+
- g_free (keys);
- }
-
-@@ -514,6 +531,7 @@ xfce_shortcuts_grabber_add (XfceShortcutsGrabber *grab
- g_return_if_fail (shortcut != NULL);
-
- key = g_new0 (XfceKey, 1);
-+ key->keycodes = g_array_new (FALSE, TRUE, sizeof (guint));
-
- gtk_accelerator_parse (shortcut, &key->keyval, &key->modifiers);
-
-@@ -523,7 +541,10 @@ xfce_shortcuts_grabber_add (XfceShortcutsGrabber *grab
- g_hash_table_insert (grabber->priv->keys, g_strdup (shortcut), key);
- }
- else
-- g_free (key);
-+ {
-+ g_array_free (key->keycodes, TRUE);
-+ g_free (key);
-+ }
- }
-
-
diff --git a/x11/libxfce4menu/pkg-plist b/x11/libxfce4menu/pkg-plist
index a0b8c72a24f0..a28920ed01f5 100644
--- a/x11/libxfce4menu/pkg-plist
+++ b/x11/libxfce4menu/pkg-plist
@@ -1,57 +1,43 @@
bin/xfce4-about
etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
-%%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-filename-input.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
+%%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
-%%GIR%%share/gir-1.0/libxfce4ui-2.0.gir
+%%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
+share/icons/hicolor/128x128/apps/org.xfce.about.png
+share/icons/hicolor/128x128/apps/xfce4-logo.png
+share/icons/hicolor/16x16/apps/org.xfce.about.png
+share/icons/hicolor/16x16/apps/xfce4-logo.png
+share/icons/hicolor/48x48/apps/org.xfce.about.png
+share/icons/hicolor/scalable/apps/org.xfce.about.svg
+share/icons/hicolor/scalable/apps/xfce4-logo.svg
%%NLS%%share/locale/am/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/ar/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/ast/LC_MESSAGES/libxfce4ui.mo
@@ -67,6 +53,7 @@ share/icons/hicolor/48x48/apps/xfce4-logo.png
%%NLS%%share/locale/en_AU/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/en_GB/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/es/LC_MESSAGES/libxfce4ui.mo
+%%NLS%%share/locale/et/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/eu/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/fi/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/fr/LC_MESSAGES/libxfce4ui.mo
@@ -76,11 +63,13 @@ share/icons/hicolor/48x48/apps/xfce4-logo.png
%%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/hye/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
+%%NLS%%share/locale/ka/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/kk/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/ko/LC_MESSAGES/libxfce4ui.mo
%%NLS%%share/locale/lt/LC_MESSAGES/libxfce4ui.mo
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index 553a3ab73a9c..8dfb161bf191 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= libxfce4util
-PORTVERSION= 4.14.0
+PORTVERSION= 4.16.0
CATEGORIES= x11 xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
diff --git a/x11/libxfce4util/distinfo b/x11/libxfce4util/distinfo
index e67e4a42a6db..53ac743f6d7f 100644
--- a/x11/libxfce4util/distinfo
+++ b/x11/libxfce4util/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565543253
-SHA256 (xfce4/libxfce4util-4.14.0.tar.bz2) = 32ad79b7992ec3fd863e8ff2f03eebda8740363ef9d7d910a35963ac1c1a6324
-SIZE (xfce4/libxfce4util-4.14.0.tar.bz2) = 516358
+TIMESTAMP = 1608682260
+SHA256 (xfce4/libxfce4util-4.16.0.tar.bz2) = 60598d745d1fc81ff5ad3cecc3a8d1b85990dd22023e7743f55abd87d8b55b83
+SIZE (xfce4/libxfce4util-4.16.0.tar.bz2) = 508328
diff --git a/x11/libxfce4util/pkg-plist b/x11/libxfce4util/pkg-plist
index 70b63e386cb4..e21e7933bd3f 100644
--- a/x11/libxfce4util/pkg-plist
+++ b/x11/libxfce4util/pkg-plist
@@ -11,13 +11,13 @@ 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
+%%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
+%%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
@@ -39,10 +39,12 @@ sbin/xfce4-kiosk-query
%%NLS%%share/locale/fr/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/gl/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/he/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/hi/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/hye/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
@@ -65,6 +67,7 @@ sbin/xfce4-kiosk-query
%%NLS%%share/locale/ru/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/si/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/sk/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/sq/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/sr/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/sv/LC_MESSAGES/libxfce4util.mo
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index 9637377a791c..b91131de7178 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-clipman-plugin
PORTVERSION= 1.6.1
+PORTREVISION= 1
CATEGORIES= x11 xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
diff --git a/x11/xfce4-conf/Makefile b/x11/xfce4-conf/Makefile
index 03721a9368eb..bd0818d76b39 100644
--- a/x11/xfce4-conf/Makefile
+++ b/x11/xfce4-conf/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-conf
-PORTVERSION= 4.14.4
+PORTVERSION= 4.16.0
CATEGORIES= x11 xfce
MASTER_SITES= XFCE
DISTNAME= xfconf-${DISTVERSIONFULL}
@@ -25,16 +25,16 @@ USE_XORG= x11
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
-CONFIGURE_ARGS= --without-html-dir
+CONFIGURE_ARGS= --without-html-dir \
+ --without-bash-completion-dir
PORTSCOUT= limitw:1,even
-OPTIONS_DEFINE= GIR NLS PERL VAPI
+OPTIONS_DEFINE= GIR NLS 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
@@ -43,13 +43,6 @@ GIR_CONFIGURE_OFF= --enable-introspection=no
NLS_CONFIGURE_ENABLE= nls
NLS_USES= gettext-runtime
-PERL_BUILD_DEPENDS= p5-ExtUtils-Depends>=0.405:devel/p5-ExtUtils-Depends \
- p5-ExtUtils-PkgConfig>=1.15:devel/p5-ExtUtils-PkgConfig \
- p5-Glib>=1.321:devel/p5-Glib
-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
VAPI_IMPLIES= GIR
diff --git a/x11/xfce4-conf/distinfo b/x11/xfce4-conf/distinfo
index 38cc1576558c..092fcdf08a05 100644
--- a/x11/xfce4-conf/distinfo
+++ b/x11/xfce4-conf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1604914760
-SHA256 (xfce4/xfconf-4.14.4.tar.bz2) = cc37622eece51ed8905dfaad6f77b3c24662f41881545eb0142110f347ba5f73
-SIZE (xfce4/xfconf-4.14.4.tar.bz2) = 592024
+TIMESTAMP = 1608682404
+SHA256 (xfce4/xfconf-4.16.0.tar.bz2) = 652a119007c67d9ba6c0bc7a740c923d33f32d03dc76dfc7ba682584e72a5425
+SIZE (xfce4/xfconf-4.16.0.tar.bz2) = 634858
diff --git a/x11/xfce4-conf/pkg-plist b/x11/xfce4-conf/pkg-plist
index 4551aacf0fc1..ec744d9de765 100644
--- a/x11/xfce4-conf/pkg-plist
+++ b/x11/xfce4-conf/pkg-plist
@@ -4,6 +4,7 @@ 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
+lib/gio/modules/libxfconfgsettingsbackend.so
%%GIR%%lib/girepository-1.0/Xfconf-0.typelib
lib/libxfconf-0.so
lib/libxfconf-0.so.3
@@ -34,6 +35,7 @@ share/dbus-1/services/org.xfce.Xfconf.service
%%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/hye/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,12 +71,5 @@ share/dbus-1/services/org.xfce.Xfconf.service
%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/zh_HK/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfconf.mo
-%%PERL%%%%PERL5_MAN3%%/Xfce4::Xfconf.3.gz
-%%PERL%%%%SITE_ARCH%%/auto/Xfce4/Xfconf/Xfconf.so
-%%PERL%%%%SITE_ARCH%%/Xfce4/Xfconf/Install/Files.pm
-%%PERL%%%%SITE_ARCH%%/Xfce4/Xfconf/Install/xfconfperl.h
-%%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 44697ca867e9..be1361bd959a 100644
--- a/x11/xfce4-dashboard/Makefile
+++ b/x11/xfce4-dashboard/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= dashboard
-PORTVERSION= 0.7.7
+PORTVERSION= 0.8.0
CATEGORIES= x11 xfce
MASTER_SITES= XFCE/apps
PKGNAMEPREFIX= xfce4-
diff --git a/x11/xfce4-dashboard/distinfo b/x11/xfce4-dashboard/distinfo
index a2518a7400f6..b8c2f2bffcd8 100644
--- a/x11/xfce4-dashboard/distinfo
+++ b/x11/xfce4-dashboard/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575397514
-SHA256 (xfce4/xfdashboard-0.7.7.tar.bz2) = ef45b7b879cf042a3cb1c727f108db2da991aa07aba4513692a74224d67422a4
-SIZE (xfce4/xfdashboard-0.7.7.tar.bz2) = 3445508
+TIMESTAMP = 1608753869
+SHA256 (xfce4/xfdashboard-0.8.0.tar.bz2) = 5834d6cb2e3f623224ac886c47a07069bab770484026d069e634ce7b6cc43ad8
+SIZE (xfce4/xfdashboard-0.8.0.tar.bz2) = 3341109
diff --git a/x11/xfce4-dashboard/pkg-plist b/x11/xfce4-dashboard/pkg-plist
index 53f05d63ad41..bf4178babd6c 100644
--- a/x11/xfce4-dashboard/pkg-plist
+++ b/x11/xfce4-dashboard/pkg-plist
@@ -86,8 +86,9 @@ include/xfdashboard/libxfdashboard/windows-view.h
include/xfdashboard/libxfdashboard/workspace-selector.h
lib/libxfdashboard.so
lib/libxfdashboard.so.0
-lib/libxfdashboard.so.0.700.7
+lib/libxfdashboard.so.0.800.0
lib/xfdashboard/plugins/clock-view.so
+lib/xfdashboard/plugins/example-search-provider.so
lib/xfdashboard/plugins/gnome-shell-search-provider.so
lib/xfdashboard/plugins/hot-corner.so
lib/xfdashboard/plugins/middle-click-window-close.so
@@ -95,15 +96,13 @@ libdata/pkgconfig/libxfdashboard.pc
share/appdata/xfdashboard.appdata.xml
share/applications/xfdashboard-settings.desktop
share/applications/xfdashboard.desktop
-share/icons/hicolor/128x128/apps/xfdashboard.png
-share/icons/hicolor/16x16/apps/xfdashboard.png
-share/icons/hicolor/22x22/apps/xfdashboard.png
-share/icons/hicolor/24x24/apps/xfdashboard.png
-share/icons/hicolor/256x256/apps/xfdashboard.png
-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
+share/icons/hicolor/128x128/apps/org.xfce.xfdashboard.png
+share/icons/hicolor/16x16/apps/org.xfce.xfdashboard.png
+share/icons/hicolor/24x24/apps/org.xfce.xfdashboard.png
+share/icons/hicolor/32x32/apps/org.xfce.xfdashboard.png
+share/icons/hicolor/48x48/apps/org.xfce.xfdashboard.png
+share/icons/hicolor/scalable/apps/org.xfce.xfdashboard.svg
+%%NLS%%share/locale/bg/LC_MESSAGES/xfdashboard.mo
%%NLS%%share/locale/ca/LC_MESSAGES/xfdashboard.mo
%%NLS%%share/locale/da/LC_MESSAGES/xfdashboard.mo
%%NLS%%share/locale/de/LC_MESSAGES/xfdashboard.mo
@@ -112,15 +111,26 @@ share/icons/hicolor/96x96/apps/xfdashboard.png
%%NLS%%share/locale/fr/LC_MESSAGES/xfdashboard.mo
%%NLS%%share/locale/gl/LC_MESSAGES/xfdashboard.mo
%%NLS%%share/locale/he/LC_MESSAGES/xfdashboard.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfdashboard.mo
+%%NLS%%share/locale/ie/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/nb/LC_MESSAGES/xfdashboard.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfdashboard.mo
%%NLS%%share/locale/pl/LC_MESSAGES/xfdashboard.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfdashboard.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfdashboard.mo
%%NLS%%share/locale/ru/LC_MESSAGES/xfdashboard.mo
%%NLS%%share/locale/ru_RU/LC_MESSAGES/xfdashboard.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/xfdashboard.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/xfdashboard.mo
%%NLS%%share/locale/sr/LC_MESSAGES/xfdashboard.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfdashboard.mo
+%%NLS%%share/locale/sv_SE/LC_MESSAGES/xfdashboard.mo
%%NLS%%share/locale/tr/LC_MESSAGES/xfdashboard.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfdashboard.mo
share/themes/xfdashboard-auber/xfdashboard-1.0/animations.xml
share/themes/xfdashboard-auber/xfdashboard-1.0/effects.xml
share/themes/xfdashboard-auber/xfdashboard-1.0/screenshot-xfdashboard-auber.png
diff --git a/x11/xfce4-embed-plugin/Makefile b/x11/xfce4-embed-plugin/Makefile
index 5c06cc6d73b3..7298daf7522e 100644
--- a/x11/xfce4-embed-plugin/Makefile
+++ b/x11/xfce4-embed-plugin/Makefile
@@ -13,6 +13,10 @@ COMMENT= Embed arbitrary windows into the Xfce panel
LICENSE= GPLv2
+BROKEN= Depends on removed XFCE GTK2 support
+DEPRECATED= Unsupported upstream, cannot work with XFCE 4.16
+EXPIRATION_DATE= 2021-01-31
+
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
diff --git a/x11/xfce4-goodies/Makefile b/x11/xfce4-goodies/Makefile
index 2ea98470fd93..295c24badb50 100644
--- a/x11/xfce4-goodies/Makefile
+++ b/x11/xfce4-goodies/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-goodies
-PORTVERSION= 4.14
-PORTREVISION= 1
+PORTVERSION= 4.16
CATEGORIES= x11
MAINTAINER= xfce@FreeBSD.org
@@ -11,15 +10,15 @@ COMMENT= Meta-port for software and artwork from the Xfce4 Goodies Project
USES= metaport
-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 THEMES VOLUMED
+OPTIONS_DEFAULT= ARCHIVE BATTERY CALCULATOR CLIPMAN CPUGRAPH DASHBOARD \
+ DATETIME DICTIONARY DISKPERF FSGUARD GENMON GIGOLO \
+ MAILWATCH MEDIATAGS MENULIBRE MOUNT NETLOAD PAROLE \
+ POWERMANAGER RISTRETTO SCREENSAVER SCREENSHOOTER \
+ SMARTBOOKMARK STOPWATCH SYSTEMLOAD TASKMANAGER TERMINAL \
+ THEMES TIMEOUT TIMER VCS VERVE WAVELAN WEATHER WHISKERMENU \
+ XFBURN XKB
+# Removed from defaults due to ports being broken.
+# NOTES BSDCPUFREQ
OPTIONS_EXCLUDE_powerpc= BATTERY
OPTIONS_EXCLUDE_powerpc64= BATTERY
@@ -63,18 +62,17 @@ XFBURN_RUN_DEPENDS= xfburn>=0:sysutils/xfburn
XFMPC_RUN_DEPENDS= xfmpc>=0:audio/xfmpc
OPTIONS_GROUP_PANELPLUGINS= BATTERY CALCULATOR CLIPMAN CPUGRAPH DATETIME \
- DISKPERF EMBED FSGUARD GENERICSLIDER GENMON \
+ DISKPERF FSGUARD GENERICSLIDER GENMON \
MAILWATCH MOUNT MPC NETLOAD NOTES PULSEAUDIO \
- QUICKLAUNCHER SMARTBOOKMARK SYSTEMLOAD TIMER \
+ SMARTBOOKMARK STOPWATCH SYSTEMLOAD TIMER \
TIMEOUT VERVE WAVELAN WEATHER WHISKERMENU \
- WMDOCK XKB
+ XKB
BATTERY_DESC= Battery monitor panel plugin for Xfce4
CALCULATOR_DESC= Simple calculator for the Xfce panel
CLIPMAN_DESC= Clipboard manager for the Xfce panel
CPUGRAPH_DESC= Graphical representation of the CPU load
DATETIME_DESC= Datetime panel plugin for the Xfce desktop
DISKPERF_DESC= Graphical representation of the disk IO
-EMBED_DESC= Embed arbitrary windows into the Xfce panel
FSGUARD_DESC= Displays free space of mountpoint
GENERICSLIDER_DESC= Slider to adjust / monitor any numeric variable
GENMON_DESC= Generic Monitor Xfce4 panel plugin
@@ -84,8 +82,8 @@ MPC_DESC= Musicpd client plugin for the Xfce panel
NETLOAD_DESC= Network Load plugin for Xfce4
NOTES_DESC= Notes plugin for the Xfce panel
PULSEAUDIO_DESC= Panel plugin for controlling PulseAudio mixer
-QUICKLAUNCHER_DESC= Quicklauncher plugin for Xfce
SMARTBOOKMARK_DESC= Query search engines from the Xfce panel
+STOPWATCH_DESC= Stopwatch plugin for the Xfce4 panel
SYSTEMLOAD_DESC= System Load plugin for Xfce4 panel
TIMEOUT_DESC= Prompts the user to take a break every X minutes
TIMER_DESC= Set alarm at specific time or after time period
@@ -93,7 +91,6 @@ VERVE_DESC= Command line plugin for the Xfce Desktop
WAVELAN_DESC= Displays information about a WaveLAN device
WEATHER_DESC= Weather plugin for the Xfce panel
WHISKERMENU_DESC= Alternate menu for the Xfce Desktop
-WMDOCK_DESC= WMdock plugin for Xfce
XKB_DESC= Keyboard layout switching plugin for Xfce panel
BATTERY_RUN_DEPENDS= xfce4-battery-plugin>=0:sysutils/xfce4-battery-plugin
@@ -102,7 +99,6 @@ CLIPMAN_RUN_DEPENDS= xfce4-clipman-plugin>=0:x11/xfce4-clipman-plugin
CPUGRAPH_RUN_DEPENDS= xfce4-cpugraph-plugin>=0:sysutils/xfce4-cpugraph-plugin
DATETIME_RUN_DEPENDS= xfce4-datetime-plugin>=0:x11-clocks/xfce4-datetime-plugin
DISKPERF_RUN_DEPENDS= xfce4-diskperf-plugin>=0:sysutils/xfce4-diskperf-plugin
-EMBED_RUN_DEPENDS= xfce4-embed-plugin>=0:x11/xfce4-embed-plugin
FSGUARD_RUN_DEPENDS= xfce4-fsguard-plugin>=0:sysutils/xfce4-fsguard-plugin
GENERICSLIDER_RUN_DEPENDS= xfce4-generic-slider>=0:deskutils/xfce4-generic-slider
GENMON_RUN_DEPENDS= xfce4-genmon-plugin>=0:sysutils/xfce4-genmon-plugin
@@ -112,8 +108,8 @@ MPC_RUN_DEPENDS= xfce4-mpc-plugin>=0:audio/xfce4-mpc-plugin
NETLOAD_RUN_DEPENDS= xfce4-netload-plugin>=0:sysutils/xfce4-netload-plugin
NOTES_RUN_DEPENDS= xfce4-notes-plugin>=0:deskutils/xfce4-notes-plugin
PULSEAUDIO_RUN_DEPENDS= xfce4-pulseaudio-plugin>=0:audio/xfce4-pulseaudio-plugin
-QUICKLAUNCHER_RUN_DEPENDS= xfce4-quicklauncher-plugin>=0:x11/xfce4-quicklauncher-plugin
SMARTBOOKMARK_RUN_DEPENDS= xfce4-smartbookmark-plugin>=0:www/xfce4-smartbookmark-plugin
+STOPWATCH_RUN_DEPENDS= xfce4-stopwatch-plugin>=0:x11-clocks/xfce4-stopwatch-plugin
SYSTEMLOAD_RUN_DEPENDS= xfce4-systemload-plugin>=0:sysutils/xfce4-systemload-plugin
TIMEOUT_RUN_DEPENDS= xfce4-time-out-plugin>=0:x11-clocks/xfce4-time-out-plugin
TIMER_RUN_DEPENDS= xfce4-timer-plugin>=0:x11-clocks/xfce4-timer-plugin
@@ -121,7 +117,6 @@ VERVE_RUN_DEPENDS= xfce4-verve-plugin>=0:x11/xfce4-verve-plugin
WAVELAN_RUN_DEPENDS= xfce4-wavelan-plugin>=0:sysutils/xfce4-wavelan-plugin
WEATHER_RUN_DEPENDS= xfce4-weather-plugin>=0:misc/xfce4-weather-plugin
WHISKERMENU_RUN_DEPENDS= xfce4-whiskermenu-plugin>=0:x11/xfce4-whiskermenu-plugin
-WMDOCK_RUN_DEPENDS= xfce4-wmdock-plugin>=0:x11/xfce4-wmdock-plugin
XKB_RUN_DEPENDS= xfce4-xkb-plugin>=0:deskutils/xfce4-xkb-plugin
OPTIONS_GROUP_THUNARPLUGINS= ARCHIVE MEDIATAGS VCS
@@ -133,20 +128,13 @@ ARCHIVE_RUN_DEPENDS= thunar-archive-plugin>=0:archivers/thunar-archive-plugin
MEDIATAGS_RUN_DEPENDS= thunar-media-tags-plugin>=0:audio/thunar-media-tags-plugin
VCS_RUN_DEPENDS= thunar-vcs-plugin>=0:devel/thunar-vcs-plugin
-OPTIONS_GROUP_UNOFFICIAL= BSDCPUFREQ EQUAKE MENULIBRE PRINT THEMES \
- VOLUMED
+OPTIONS_GROUP_UNOFFICIAL= BSDCPUFREQ MENULIBRE THEMES
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
-PRINT_DESC= Print system support for the Xfce Desktop
THEMES_DESC= Additional themes for xfwm4
-VOLUMED_DESC= Volume management daemon for the Xfce desktop
BSDCPUFREQ_RUN_DEPENDS= xfce4-bsdcpufreq-plugin>=0:sysutils/xfce4-bsdcpufreq-plugin
-EQUAKE_RUN_DEPENDS= xfce4-equake-plugin>=0:science/xfce4-equake-plugin
MENULIBRE_RUN_DEPENDS= py${PYTHON3_DEFAULT:S/.//}-menulibre>=0:x11/menulibre
-PRINT_RUN_DEPENDS= xfce4-print>=0:print/xfce4-print
THEMES_RUN_DEPENDS= xfce4-wm-themes>=0:misc/xfce4-wm-themes
-VOLUMED_RUN_DEPENDS= xfce4-volumed>=0:deskutils/xfce4-volumed
.include <bsd.port.mk>
diff --git a/x11/xfce4-quicklauncher-plugin/Makefile b/x11/xfce4-quicklauncher-plugin/Makefile
deleted file mode 100644
index db64b5e00ba6..000000000000
--- a/x11/xfce4-quicklauncher-plugin/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# Created by: Martin Wilke (miwi@FreeBSD.org)
-# $FreeBSD$
-
-PORTNAME= xfce4-quicklauncher-plugin
-PORTVERSION= 1.9.4
-PORTREVISION= 19
-CATEGORIES= x11 xfce
-MASTER_SITES= XFCE/panel-plugins
-DIST_SUBDIR= xfce4
-
-MAINTAINER= xfce@FreeBSD.org
-COMMENT= Quicklauncher plugin for Xfce
-
-LICENSE= GPLv2
-
-DEPRECATED= Unsupported upstream since 2009, no active source repository.
-
-LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2
-
-USES= compiler:c11 gettext gmake gnome libtool pkgconfig tar:bzip2 \
- xfce:gtk2
-USE_GNOME= cairo gdkpixbuf2 gtk20 intltool
-USE_XFCE= libgui panel
-
-SSP_UNSAFE= yes
-GNU_CONFIGURE= yes
-INSTALL_TARGET= install-strip
-
-.include <bsd.port.mk>
diff --git a/x11/xfce4-quicklauncher-plugin/distinfo b/x11/xfce4-quicklauncher-plugin/distinfo
deleted file mode 100644
index c1eaafeeb0fc..000000000000
--- a/x11/xfce4-quicklauncher-plugin/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xfce4/xfce4-quicklauncher-plugin-1.9.4.tar.bz2) = 0b253d96e3b3fb02508e1100cbf39bfb8b40e9c75da75053e6432d83dedfffdf
-SIZE (xfce4/xfce4-quicklauncher-plugin-1.9.4.tar.bz2) = 282545
diff --git a/x11/xfce4-quicklauncher-plugin/pkg-descr b/x11/xfce4-quicklauncher-plugin/pkg-descr
deleted file mode 100644
index 8a2c1e23650e..000000000000
--- a/x11/xfce4-quicklauncher-plugin/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-The goal of the xfce4-quicklauncher-plugin is double.
-First, it is intented to offer you a fast and easy way to configure the
-plugins which are on your panel.
-Secondly, it is able to display these launchers on one or more lines, and
-they are displayed so that they don't waste space. They also feature
-a little zoom effect when you pass the mouse over them.
-
-
-WWW: https://goodies.xfce.org/projects/panel-plugins/xfce4-quicklauncher-plugin
diff --git a/x11/xfce4-quicklauncher-plugin/pkg-plist b/x11/xfce4-quicklauncher-plugin/pkg-plist
deleted file mode 100644
index e33b012e959f..000000000000
--- a/x11/xfce4-quicklauncher-plugin/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-lib/xfce4/panel-plugins/libquicklauncher.so
-share/locale/cs/LC_MESSAGES/xfce4-quicklauncher-plugin.mo
-share/locale/el/LC_MESSAGES/xfce4-quicklauncher-plugin.mo
-share/locale/eu/LC_MESSAGES/xfce4-quicklauncher-plugin.mo
-share/locale/fr/LC_MESSAGES/xfce4-quicklauncher-plugin.mo
-share/locale/gl/LC_MESSAGES/xfce4-quicklauncher-plugin.mo
-share/locale/hu/LC_MESSAGES/xfce4-quicklauncher-plugin.mo
-share/locale/ja/LC_MESSAGES/xfce4-quicklauncher-plugin.mo
-share/locale/pl/LC_MESSAGES/xfce4-quicklauncher-plugin.mo
-share/locale/ru/LC_MESSAGES/xfce4-quicklauncher-plugin.mo
-share/locale/vi/LC_MESSAGES/xfce4-quicklauncher-plugin.mo
-share/xfce4/panel-plugins/quicklauncher.desktop
diff --git a/x11/xfce4-screensaver/Makefile b/x11/xfce4-screensaver/Makefile
index 6923e6c4b4e8..1c56fee7096f 100644
--- a/x11/xfce4-screensaver/Makefile
+++ b/x11/xfce4-screensaver/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xfce4-screensaver
PORTVERSION= 0.1.11
+PORTREVISION= 1
CATEGORIES= x11 xfce
MASTER_SITES= XFCE/apps
DIST_SUBDIR= xfce4
diff --git a/x11/xfce4-taskmanager/Makefile b/x11/xfce4-taskmanager/Makefile
index b84bf354fc53..bd62304b2ac0 100644
--- a/x11/xfce4-taskmanager/Makefile
+++ b/x11/xfce4-taskmanager/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-taskmanager
PORTVERSION= 1.4.0
+PORTREVISION= 1
CATEGORIES= x11 xfce
MASTER_SITES= XFCE/apps
DIST_SUBDIR= xfce4
diff --git a/x11/xfce4-terminal/Makefile b/x11/xfce4-terminal/Makefile
index 83ef002f0b87..b74681e33d33 100644
--- a/x11/xfce4-terminal/Makefile
+++ b/x11/xfce4-terminal/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-terminal
PORTVERSION= 0.8.10
+PORTREVISION= 1
CATEGORIES= x11 xfce
MASTER_SITES= XFCE/apps
DIST_SUBDIR= xfce4
diff --git a/x11/xfce4-verve-plugin/Makefile b/x11/xfce4-verve-plugin/Makefile
index c9328cc40e25..cce271510057 100644
--- a/x11/xfce4-verve-plugin/Makefile
+++ b/x11/xfce4-verve-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= verve-plugin
PORTVERSION= 2.0.1
+PORTREVISION= 1
CATEGORIES= x11 xfce
MASTER_SITES= XFCE/panel-plugins
PKGNAMEPREFIX= xfce4-
diff --git a/x11/xfce4-whiskermenu-plugin/Makefile b/x11/xfce4-whiskermenu-plugin/Makefile
index 85230defefc5..75447c305814 100644
--- a/x11/xfce4-whiskermenu-plugin/Makefile
+++ b/x11/xfce4-whiskermenu-plugin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xfce4-whiskermenu-plugin
PORTVERSION= 2.5.0
+PORTREVISION= 1
CATEGORIES= x11 xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
diff --git a/x11/xfce4-wmdock-plugin/Makefile b/x11/xfce4-wmdock-plugin/Makefile
deleted file mode 100644
index 19be987dc3d7..000000000000
--- a/x11/xfce4-wmdock-plugin/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# Created by: Martin Wilke <miwi@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= xfce4-wmdock-plugin
-PORTVERSION= 0.6.0
-PORTREVISION= 4
-CATEGORIES= x11 xfce
-MASTER_SITES= XFCE/panel-plugins
-DIST_SUBDIR= xfce4
-
-MAINTAINER= xfce@FreeBSD.org
-COMMENT= WMdock plugin for Xfce
-
-LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2
-
-DEPRECATED= Unsupported upstream since 2013, no active source repository.
-
-USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \
- tar:bzip2 xfce:gtk2 xorg
-USE_GNOME= cairo gtk20 intltool libwnck
-USE_XFCE= libgui panel
-USE_XORG= x11
-
-GNU_CONFIGURE= yes
-INSTALLS_ICONS= yes
-
-OPTIONS_DEFINE= NLS
-OPTIONS_SUB= yes
-
-NLS_CONFIGURE_ENABLE= nls
-NLS_USES= gettext-runtime
-
-.include <bsd.port.mk>
diff --git a/x11/xfce4-wmdock-plugin/distinfo b/x11/xfce4-wmdock-plugin/distinfo
deleted file mode 100644
index 68daa9069bc4..000000000000
--- a/x11/xfce4-wmdock-plugin/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xfce4/xfce4-wmdock-plugin-0.6.0.tar.bz2) = 922bffc31ad0da8ecc5281751e500576ce79a85176212c7ddf80f9af316acfad
-SIZE (xfce4/xfce4-wmdock-plugin-0.6.0.tar.bz2) = 344743
diff --git a/x11/xfce4-wmdock-plugin/pkg-descr b/x11/xfce4-wmdock-plugin/pkg-descr
deleted file mode 100644
index 71eede1337bf..000000000000
--- a/x11/xfce4-wmdock-plugin/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-The WMdock plugin is a compatibility layer for running WindowMaker dockapps
-on the Xfce desktop. It integrates the dockapps into a panel, closely
-resembling the look and feel of the WindowMaker dock or clip, respectively.
-
-WWW: https://goodies.xfce.org/projects/panel-plugins/xfce4-wmdock-plugin
diff --git a/x11/xfce4-wmdock-plugin/pkg-plist b/x11/xfce4-wmdock-plugin/pkg-plist
deleted file mode 100644
index 6a1e6f9cee9f..000000000000
--- a/x11/xfce4-wmdock-plugin/pkg-plist
+++ /dev/null
@@ -1,28 +0,0 @@
-libexec/xfce4/panel-plugins/xfce4-wmdock-plugin
-share/icons/hicolor/48x48/apps/xfce4-wmdock.png
-%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-wmdock-plugin.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-wmdock-plugin.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-wmdock-plugin.mo
-%%NLS%%share/locale/da/LC_MESSAGES/xfce4-wmdock-plugin.mo
-%%NLS%%share/locale/de/LC_MESSAGES/xfce4-wmdock-plugin.mo
-%%NLS%%share/locale/el/LC_MESSAGES/xfce4-wmdock-plugin.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-wmdock-plugin.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-wmdock-plugin.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-wmdock-plugin.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-wmdock-plugin.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-wmdock-plugin.mo
-%%NLS%%share/locale/id/LC_MESSAGES/xfce4-wmdock-plugin.mo
-%%NLS%%share/locale/it/LC_MESSAGES/xfce4-wmdock-plugin.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-wmdock-plugin.mo
-%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-wmdock-plugin.mo
-%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-wmdock-plugin.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-wmdock-plugin.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-wmdock-plugin.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-wmdock-plugin.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-wmdock-plugin.mo
-%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-wmdock-plugin.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-wmdock-plugin.mo
-%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-wmdock-plugin.mo
-%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-wmdock-plugin.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-wmdock-plugin.mo
-share/xfce4/panel-plugins/wmdock.desktop