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

5 files changed, 52 insertions, 66 deletions

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