Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 2 Jan 2021 16:36:33 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r559953 - in head: . Mk/Uses archivers/thunar-archive-plugin audio/thunar-media-tags-plugin audio/xfce4-pulseaudio-plugin deskutils/orage deskutils/xfce4-generic-slider deskutils/xfce4-...
Message-ID:  <202101021636.102GaXch058834@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Sat Jan  2 16:36:33 2021
New Revision: 559953
URL: https://svnweb.freebsd.org/changeset/ports/559953

Log:
  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

Added:
  head/x11-clocks/xfce4-stopwatch-plugin/files/
  head/x11-clocks/xfce4-stopwatch-plugin/files/patch-panel416fix   (contents, props changed)
  head/x11/libexo/pkg-message   (contents, props changed)
Deleted:
  head/print/xfce4-print/
  head/x11-fm/thunar/files/
  head/x11-toolkits/libxfce4gui/
  head/x11-wm/xfce4-wm/files/
  head/x11/libxfce4menu/files/
  head/x11/xfce4-quicklauncher-plugin/
  head/x11/xfce4-wmdock-plugin/
Modified:
  head/MOVED
  head/Mk/Uses/xfce.mk
  head/UPDATING
  head/archivers/thunar-archive-plugin/Makefile
  head/audio/thunar-media-tags-plugin/Makefile
  head/audio/xfce4-pulseaudio-plugin/Makefile
  head/deskutils/orage/Makefile
  head/deskutils/orage/pkg-descr
  head/deskutils/orage/pkg-plist
  head/deskutils/xfce4-generic-slider/Makefile
  head/deskutils/xfce4-notes-plugin/Makefile
  head/deskutils/xfce4-notifyd/Makefile
  head/deskutils/xfce4-tumbler/Makefile
  head/deskutils/xfce4-tumbler/distinfo
  head/deskutils/xfce4-tumbler/pkg-plist
  head/deskutils/xfce4-volumed-pulse/Makefile
  head/deskutils/xfce4-volumed/Makefile
  head/deskutils/xfce4-xkb-plugin/Makefile
  head/devel/xfce4-dev-tools/Makefile
  head/devel/xfce4-dev-tools/distinfo
  head/devel/xfce4-dev-tools/pkg-plist
  head/editors/mousepad/Makefile
  head/graphics/ristretto/Makefile
  head/mail/xfce4-mailwatch-plugin/Makefile
  head/math/xfce4-calculator-plugin/Makefile
  head/misc/xfce4-appfinder/Makefile
  head/misc/xfce4-appfinder/distinfo
  head/misc/xfce4-appfinder/pkg-plist
  head/misc/xfce4-weather-plugin/Makefile
  head/misc/xfce4-wm-themes/Makefile
  head/multimedia/xfce4-parole/Makefile
  head/print/Makefile
  head/science/xfce4-equake-plugin/Makefile
  head/sysutils/catfish/Makefile
  head/sysutils/catfish/distinfo
  head/sysutils/catfish/pkg-plist
  head/sysutils/garcon/Makefile
  head/sysutils/garcon/distinfo
  head/sysutils/garcon/pkg-plist
  head/sysutils/xfburn/Makefile
  head/sysutils/xfce4-battery-plugin/Makefile
  head/sysutils/xfce4-bsdcpufreq-plugin/Makefile
  head/sysutils/xfce4-cpugraph-plugin/Makefile
  head/sysutils/xfce4-diskperf-plugin/Makefile
  head/sysutils/xfce4-fsguard-plugin/Makefile
  head/sysutils/xfce4-genmon-plugin/Makefile
  head/sysutils/xfce4-mount-plugin/Makefile
  head/sysutils/xfce4-netload-plugin/Makefile
  head/sysutils/xfce4-places-plugin/Makefile
  head/sysutils/xfce4-power-manager/Makefile
  head/sysutils/xfce4-power-manager/distinfo
  head/sysutils/xfce4-power-manager/files/patch-src_xfpm-backlight-helper.c
  head/sysutils/xfce4-power-manager/files/patch-src_xfpm-dpms.c
  head/sysutils/xfce4-power-manager/pkg-plist
  head/sysutils/xfce4-settings/Makefile
  head/sysutils/xfce4-settings/distinfo
  head/sysutils/xfce4-settings/pkg-plist
  head/sysutils/xfce4-systemload-plugin/Makefile
  head/sysutils/xfce4-wavelan-plugin/Makefile
  head/textproc/xfce4-dict-plugin/Makefile
  head/www/xfce4-smartbookmark-plugin/Makefile
  head/x11-clocks/xfce4-datetime-plugin/Makefile
  head/x11-clocks/xfce4-stopwatch-plugin/Makefile
  head/x11-clocks/xfce4-time-out-plugin/Makefile
  head/x11-clocks/xfce4-timer-plugin/Makefile
  head/x11-fm/thunar/Makefile
  head/x11-fm/thunar/distinfo
  head/x11-fm/thunar/pkg-plist
  head/x11-toolkits/Makefile
  head/x11-wm/xfce4-desktop/Makefile
  head/x11-wm/xfce4-desktop/distinfo
  head/x11-wm/xfce4-desktop/pkg-plist
  head/x11-wm/xfce4-panel/Makefile
  head/x11-wm/xfce4-panel/distinfo
  head/x11-wm/xfce4-panel/files/patch-plugins_pager_pager.c
  head/x11-wm/xfce4-panel/pkg-plist
  head/x11-wm/xfce4-session/Makefile
  head/x11-wm/xfce4-session/distinfo
  head/x11-wm/xfce4-session/pkg-plist
  head/x11-wm/xfce4-wm/Makefile
  head/x11-wm/xfce4-wm/distinfo
  head/x11-wm/xfce4-wm/pkg-plist
  head/x11-wm/xfce4/Makefile
  head/x11/Makefile
  head/x11/libexo/Makefile
  head/x11/libexo/distinfo
  head/x11/libexo/pkg-plist
  head/x11/libxfce4menu/Makefile
  head/x11/libxfce4menu/distinfo
  head/x11/libxfce4menu/pkg-plist
  head/x11/libxfce4util/Makefile
  head/x11/libxfce4util/distinfo
  head/x11/libxfce4util/pkg-plist
  head/x11/xfce4-clipman-plugin/Makefile
  head/x11/xfce4-conf/Makefile
  head/x11/xfce4-conf/distinfo
  head/x11/xfce4-conf/pkg-plist
  head/x11/xfce4-dashboard/Makefile
  head/x11/xfce4-dashboard/distinfo
  head/x11/xfce4-dashboard/pkg-plist
  head/x11/xfce4-embed-plugin/Makefile
  head/x11/xfce4-goodies/Makefile
  head/x11/xfce4-screensaver/Makefile
  head/x11/xfce4-taskmanager/Makefile
  head/x11/xfce4-terminal/Makefile
  head/x11/xfce4-verve-plugin/Makefile
  head/x11/xfce4-whiskermenu-plugin/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/MOVED	Sat Jan  2 16:36:33 2021	(r559953)
@@ -16003,3 +16003,7 @@ sysutils/osquery||2021-01-02|Has expired: Uses Python 
 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

Modified: head/Mk/Uses/xfce.mk
==============================================================================
--- head/Mk/Uses/xfce.mk	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/Mk/Uses/xfce.mk	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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,11 +35,7 @@ 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
 
 thunar_LIB_DEPENDS=	libthunarx-3.so:x11-fm/thunar
@@ -96,10 +77,6 @@ LIB_DEPENDS+=	${${comp}_LIB_DEPENDS}
 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)
 

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/UPDATING	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

Modified: head/archivers/thunar-archive-plugin/Makefile
==============================================================================
--- head/archivers/thunar-archive-plugin/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/archivers/thunar-archive-plugin/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

Modified: head/audio/thunar-media-tags-plugin/Makefile
==============================================================================
--- head/audio/thunar-media-tags-plugin/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/audio/thunar-media-tags-plugin/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

Modified: head/audio/xfce4-pulseaudio-plugin/Makefile
==============================================================================
--- head/audio/xfce4-pulseaudio-plugin/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/audio/xfce4-pulseaudio-plugin/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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 \

Modified: head/deskutils/orage/Makefile
==============================================================================
--- head/deskutils/orage/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/deskutils/orage/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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 \

Modified: head/deskutils/orage/pkg-descr
==============================================================================
--- head/deskutils/orage/pkg-descr	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/deskutils/orage/pkg-descr	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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.
 

Modified: head/deskutils/orage/pkg-plist
==============================================================================
--- head/deskutils/orage/pkg-plist	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/deskutils/orage/pkg-plist	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

Modified: head/deskutils/xfce4-generic-slider/Makefile
==============================================================================
--- head/deskutils/xfce4-generic-slider/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/deskutils/xfce4-generic-slider/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -11,6 +11,8 @@ COMMENT=	Slider plugin to adjust and/or monitor any nu
 
 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

Modified: head/deskutils/xfce4-notes-plugin/Makefile
==============================================================================
--- head/deskutils/xfce4-notes-plugin/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/deskutils/xfce4-notes-plugin/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

Modified: head/deskutils/xfce4-notifyd/Makefile
==============================================================================
--- head/deskutils/xfce4-notifyd/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/deskutils/xfce4-notifyd/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

Modified: head/deskutils/xfce4-tumbler/Makefile
==============================================================================
--- head/deskutils/xfce4-tumbler/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/deskutils/xfce4-tumbler/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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,17 +30,23 @@ 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

Modified: head/deskutils/xfce4-tumbler/distinfo
==============================================================================
--- head/deskutils/xfce4-tumbler/distinfo	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/deskutils/xfce4-tumbler/distinfo	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

Modified: head/deskutils/xfce4-tumbler/pkg-plist
==============================================================================
--- head/deskutils/xfce4-tumbler/pkg-plist	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/deskutils/xfce4-tumbler/pkg-plist	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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.se
 %%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

Modified: head/deskutils/xfce4-volumed-pulse/Makefile
==============================================================================
--- head/deskutils/xfce4-volumed-pulse/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/deskutils/xfce4-volumed-pulse/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

Modified: head/deskutils/xfce4-volumed/Makefile
==============================================================================
--- head/deskutils/xfce4-volumed/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/deskutils/xfce4-volumed/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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 \

Modified: head/deskutils/xfce4-xkb-plugin/Makefile
==============================================================================
--- head/deskutils/xfce4-xkb-plugin/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/deskutils/xfce4-xkb-plugin/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xfce4-xkb-plugin
 PORTVERSION=	0.8.2
+PORTREVISION=	1
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	XFCE/panel-plugins
 

Modified: head/devel/xfce4-dev-tools/Makefile
==============================================================================
--- head/devel/xfce4-dev-tools/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/devel/xfce4-dev-tools/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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
 

Modified: head/devel/xfce4-dev-tools/distinfo
==============================================================================
--- head/devel/xfce4-dev-tools/distinfo	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/devel/xfce4-dev-tools/distinfo	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

Modified: head/devel/xfce4-dev-tools/pkg-plist
==============================================================================
--- head/devel/xfce4-dev-tools/pkg-plist	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/devel/xfce4-dev-tools/pkg-plist	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

Modified: head/editors/mousepad/Makefile
==============================================================================
--- head/editors/mousepad/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/editors/mousepad/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -3,6 +3,7 @@
 
 PORTNAME=	mousepad
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	editors xfce
 MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4

Modified: head/graphics/ristretto/Makefile
==============================================================================
--- head/graphics/ristretto/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/graphics/ristretto/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ristretto
 PORTVERSION=	0.10.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics xfce
 MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4

Modified: head/mail/xfce4-mailwatch-plugin/Makefile
==============================================================================
--- head/mail/xfce4-mailwatch-plugin/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/mail/xfce4-mailwatch-plugin/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

Modified: head/math/xfce4-calculator-plugin/Makefile
==============================================================================
--- head/math/xfce4-calculator-plugin/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/math/xfce4-calculator-plugin/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

Modified: head/misc/xfce4-appfinder/Makefile
==============================================================================
--- head/misc/xfce4-appfinder/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/misc/xfce4-appfinder/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

Modified: head/misc/xfce4-appfinder/distinfo
==============================================================================
--- head/misc/xfce4-appfinder/distinfo	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/misc/xfce4-appfinder/distinfo	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

Modified: head/misc/xfce4-appfinder/pkg-plist
==============================================================================
--- head/misc/xfce4-appfinder/pkg-plist	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/misc/xfce4-appfinder/pkg-plist	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

Modified: head/misc/xfce4-weather-plugin/Makefile
==============================================================================
--- head/misc/xfce4-weather-plugin/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/misc/xfce4-weather-plugin/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

Modified: head/misc/xfce4-wm-themes/Makefile
==============================================================================
--- head/misc/xfce4-wm-themes/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/misc/xfce4-wm-themes/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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}

Modified: head/multimedia/xfce4-parole/Makefile
==============================================================================
--- head/multimedia/xfce4-parole/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/multimedia/xfce4-parole/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -3,6 +3,7 @@
 
 PORTNAME=	parole
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	multimedia xfce
 MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4

Modified: head/print/Makefile
==============================================================================
--- head/print/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/print/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -255,7 +255,6 @@
     SUBDIR += txtbdf2ps
     SUBDIR += typetools
     SUBDIR += utopia
-    SUBDIR += xfce4-print
     SUBDIR += xmbibtex
     SUBDIR += xpdfopen
     SUBDIR += xreader

Modified: head/science/xfce4-equake-plugin/Makefile
==============================================================================
--- head/science/xfce4-equake-plugin/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/science/xfce4-equake-plugin/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

Modified: head/sysutils/catfish/Makefile
==============================================================================
--- head/sysutils/catfish/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/sysutils/catfish/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	catfish
-PORTVERSION=	1.4.13
+PORTVERSION=	4.15.0
 CATEGORIES=	sysutils
 MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
@@ -26,6 +26,8 @@ USE_GNOME=	gtk30 intltool pygobject3
 
 NO_ARCH=	yes
 INSTALLS_ICONS=	yes
+
+PORTSCOUT=	limitw:1,even
 
 OPTIONS_DEFINE=	DOCS ZEITGEIST
 OPTIONS_DEFAULT=POLKIT

Modified: head/sysutils/catfish/distinfo
==============================================================================
--- head/sysutils/catfish/distinfo	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/sysutils/catfish/distinfo	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

Modified: head/sysutils/catfish/pkg-plist
==============================================================================
--- head/sysutils/catfish/pkg-plist	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/sysutils/catfish/pkg-plist	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

Modified: head/sysutils/garcon/Makefile
==============================================================================
--- head/sysutils/garcon/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/sysutils/garcon/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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,12 +29,8 @@ 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

Modified: head/sysutils/garcon/distinfo
==============================================================================
--- head/sysutils/garcon/distinfo	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/sysutils/garcon/distinfo	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

Modified: head/sysutils/garcon/pkg-plist
==============================================================================
--- head/sysutils/garcon/pkg-plist	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/sysutils/garcon/pkg-plist	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

Modified: head/sysutils/xfburn/Makefile
==============================================================================
--- head/sysutils/xfburn/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/sysutils/xfburn/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -3,6 +3,7 @@
 
 PORTNAME=	xfburn
 PORTVERSION=	0.6.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4

Modified: head/sysutils/xfce4-battery-plugin/Makefile
==============================================================================
--- head/sysutils/xfce4-battery-plugin/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/sysutils/xfce4-battery-plugin/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

Modified: head/sysutils/xfce4-bsdcpufreq-plugin/Makefile
==============================================================================
--- head/sysutils/xfce4-bsdcpufreq-plugin/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/sysutils/xfce4-bsdcpufreq-plugin/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -4,6 +4,7 @@
 
 PORTNAME=	xfce4-bsdcpufreq-plugin
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 
 MAINTAINER=	riggs@FreeBSD.org

Modified: head/sysutils/xfce4-cpugraph-plugin/Makefile
==============================================================================
--- head/sysutils/xfce4-cpugraph-plugin/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/sysutils/xfce4-cpugraph-plugin/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

Modified: head/sysutils/xfce4-diskperf-plugin/Makefile
==============================================================================
--- head/sysutils/xfce4-diskperf-plugin/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/sysutils/xfce4-diskperf-plugin/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

Modified: head/sysutils/xfce4-fsguard-plugin/Makefile
==============================================================================
--- head/sysutils/xfce4-fsguard-plugin/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/sysutils/xfce4-fsguard-plugin/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

Modified: head/sysutils/xfce4-genmon-plugin/Makefile
==============================================================================
--- head/sysutils/xfce4-genmon-plugin/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/sysutils/xfce4-genmon-plugin/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

Modified: head/sysutils/xfce4-mount-plugin/Makefile
==============================================================================
--- head/sysutils/xfce4-mount-plugin/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/sysutils/xfce4-mount-plugin/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

Modified: head/sysutils/xfce4-netload-plugin/Makefile
==============================================================================
--- head/sysutils/xfce4-netload-plugin/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/sysutils/xfce4-netload-plugin/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

Modified: head/sysutils/xfce4-places-plugin/Makefile
==============================================================================
--- head/sysutils/xfce4-places-plugin/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/sysutils/xfce4-places-plugin/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

Modified: head/sysutils/xfce4-power-manager/Makefile
==============================================================================
--- head/sysutils/xfce4-power-manager/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/sysutils/xfce4-power-manager/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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
@@ -27,6 +27,8 @@ CONFIGURE_ARGS=	--disable-network-manager \
 		--enable-polkit \
 		--enable-xfce4panel
 INSTALL_TARGET=	install-strip
+
+PORTSCOUT=	limitw:1,even
 
 OPTIONS_DEFINE=		NLS
 OPTIONS_SUB=		yes

Modified: head/sysutils/xfce4-power-manager/distinfo
==============================================================================
--- head/sysutils/xfce4-power-manager/distinfo	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/sysutils/xfce4-power-manager/distinfo	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

Modified: head/sysutils/xfce4-power-manager/files/patch-src_xfpm-backlight-helper.c
==============================================================================
--- head/sysutils/xfce4-power-manager/files/patch-src_xfpm-backlight-helper.c	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/sysutils/xfce4-power-manager/files/patch-src_xfpm-backlight-helper.c	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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);
  }
  
  /*

Modified: head/sysutils/xfce4-power-manager/files/patch-src_xfpm-dpms.c
==============================================================================
--- head/sysutils/xfce4-power-manager/files/patch-src_xfpm-dpms.c	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/sysutils/xfce4-power-manager/files/patch-src_xfpm-dpms.c	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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;

Modified: head/sysutils/xfce4-power-manager/pkg-plist
==============================================================================
--- head/sysutils/xfce4-power-manager/pkg-plist	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/sysutils/xfce4-power-manager/pkg-plist	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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-manage
 %%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-manage
 %%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

Modified: head/sysutils/xfce4-settings/Makefile
==============================================================================
--- head/sysutils/xfce4-settings/Makefile	Sat Jan  2 15:36:42 2021	(r559952)
+++ head/sysutils/xfce4-settings/Makefile	Sat Jan  2 16:36:33 2021	(r559953)
@@ -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

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101021636.102GaXch058834>