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

4 files changed, 25 insertions, 110 deletions

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