4 files changed, 95 insertions, 120 deletions

diff --git a/sysutils/xfce4-power-manager/Makefile b/sysutils/xfce4-power-manager/Makefile
index 285a2abd384e..d7a0d9c314e0 100644
--- a/sysutils/xfce4-power-manager/Makefile
+++ b/sysutils/xfce4-power-manager/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xfce4-power-manager
-PORTVERSION=	1.4.4
+PORTVERSION=	1.5.0
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R}/
 DIST_SUBDIR=	xfce4
@@ -18,14 +18,14 @@ LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify \
 	libupower-glib.so:${PORTSDIR}/sysutils/upower
 
 GNU_CONFIGURE=	yes
-USES=		gettext pkgconfig gmake libtool xfce tar:bzip2
-USE_GNOME=	glib20 gtk20 intltool intlhack
+USES=		gettext pkgconfig gmake libtool xfce:gtk3 tar:bzip2
+USE_GNOME=	glib20 gtk30 intltool intlhack
 USE_XFCE=	panel
 INSTALLS_ICONS=	yes
 USE_XORG=	xrandr x11 xext xtst xscrnsaver
 CONFIGURE_ARGS=	--disable-network-manager \
 		--enable-polkit \
-		--enable-xfce4panel \
-		--disable-lxdepanel
+		--enable-xfce4panel
+INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/sysutils/xfce4-power-manager/distinfo b/sysutils/xfce4-power-manager/distinfo
index f4939315955c..b6f8fc21c8bd 100644
--- a/sysutils/xfce4-power-manager/distinfo
+++ b/sysutils/xfce4-power-manager/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfce4-power-manager-1.4.4.tar.bz2) = c50ec8aa7e7848c57c0f856dceb8132eb5f37585f0ac1627459ab8c882c73b07
-SIZE (xfce4/xfce4-power-manager-1.4.4.tar.bz2) = 1144421
+SHA256 (xfce4/xfce4-power-manager-1.5.0.tar.bz2) = 62bc832d9474094fd7481c4658c0dd67e1b41fe89fdaa75b2803d3d2096f9fb7
+SIZE (xfce4/xfce4-power-manager-1.5.0.tar.bz2) = 1108153
diff --git a/sysutils/xfce4-power-manager/files/patch-panel-plugins_power-manager-plugin_power-manager-button.c b/sysutils/xfce4-power-manager/files/patch-panel-plugins_power-manager-plugin_power-manager-button.c
new file mode 100644
index 000000000000..5498fd9a68a6
--- /dev/null
+++ b/sysutils/xfce4-power-manager/files/patch-panel-plugins_power-manager-plugin_power-manager-button.c
@@ -0,0 +1,26 @@
+--- panel-plugins/power-manager-plugin/power-manager-button.c.orig	2015-05-25 16:10:37 UTC
++++ panel-plugins/power-manager-plugin/power-manager-button.c
+@@ -382,7 +382,7 @@ power_manager_button_update_device_icon_
+     details = get_device_description (button->priv->upower, device);
+ 
+     /* If UPower doesn't give us an icon, just use the default */
+-    if (icon_name == NULL)
++    if (icon_name == NULL || g_strcmp0 (icon_name, "") == 0)
+         icon_name = g_strdup (PANEL_DEFAULT_ICON);
+ 
+     pix = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
+@@ -407,7 +407,13 @@ power_manager_button_update_device_icon_
+         DBG("this is the display device, updating");
+         /* it is! update the panel button */
+         g_free (button->priv->panel_icon_name);
+-
++#ifdef XFCE_PLUGIN
++        g_object_get (device,
++                      "icon-name", &icon_name,
++                      NULL);
++        if (icon_name == NULL || g_strcmp0 (icon_name, "") == 0)
++            icon_name = g_strdup (PANEL_DEFAULT_ICON);
++#endif
+         button->priv->panel_icon_name = g_strdup (icon_name);
+         power_manager_button_set_icon (button);
+         /* update tooltip */
diff --git a/sysutils/xfce4-power-manager/pkg-plist b/sysutils/xfce4-power-manager/pkg-plist
index 3f942d4f06e0..56b152c3e139 100644
--- a/sysutils/xfce4-power-manager/pkg-plist
+++ b/sysutils/xfce4-power-manager/pkg-plist
@@ -8,51 +8,19 @@ sbin/xfce4-pm-helper
 sbin/xfpm-power-backlight-helper
 share/appdata/xfce4-power-manager.appdata.xml
 share/applications/xfce4-power-manager-settings.desktop
-share/icons/hicolor/16x16/status/xfpm-ac-adapter.png
-share/icons/hicolor/16x16/status/xfpm-primary-000-charging.png
-share/icons/hicolor/16x16/status/xfpm-primary-000.png
-share/icons/hicolor/16x16/status/xfpm-primary-020-charging.png
-share/icons/hicolor/16x16/status/xfpm-primary-020.png
-share/icons/hicolor/16x16/status/xfpm-primary-040-charging.png
-share/icons/hicolor/16x16/status/xfpm-primary-040.png
-share/icons/hicolor/16x16/status/xfpm-primary-060-charging.png
-share/icons/hicolor/16x16/status/xfpm-primary-060.png
-share/icons/hicolor/16x16/status/xfpm-primary-080-charging.png
-share/icons/hicolor/16x16/status/xfpm-primary-080.png
-share/icons/hicolor/16x16/status/xfpm-primary-100-charging.png
-share/icons/hicolor/16x16/status/xfpm-primary-100.png
-share/icons/hicolor/16x16/status/xfpm-primary-charged.png
-share/icons/hicolor/16x16/status/xfpm-primary-missing.png
-share/icons/hicolor/22x22/status/xfpm-ac-adapter.png
-share/icons/hicolor/22x22/status/xfpm-primary-000-charging.png
-share/icons/hicolor/22x22/status/xfpm-primary-000.png
-share/icons/hicolor/22x22/status/xfpm-primary-020-charging.png
-share/icons/hicolor/22x22/status/xfpm-primary-020.png
-share/icons/hicolor/22x22/status/xfpm-primary-040-charging.png
-share/icons/hicolor/22x22/status/xfpm-primary-040.png
-share/icons/hicolor/22x22/status/xfpm-primary-060-charging.png
-share/icons/hicolor/22x22/status/xfpm-primary-060.png
-share/icons/hicolor/22x22/status/xfpm-primary-080-charging.png
-share/icons/hicolor/22x22/status/xfpm-primary-080.png
-share/icons/hicolor/22x22/status/xfpm-primary-100-charging.png
-share/icons/hicolor/22x22/status/xfpm-primary-100.png
-share/icons/hicolor/22x22/status/xfpm-primary-charged.png
-share/icons/hicolor/22x22/status/xfpm-primary-missing.png
-share/icons/hicolor/24x24/status/xfpm-ac-adapter.png
-share/icons/hicolor/24x24/status/xfpm-primary-000-charging.png
-share/icons/hicolor/24x24/status/xfpm-primary-000.png
-share/icons/hicolor/24x24/status/xfpm-primary-020-charging.png
-share/icons/hicolor/24x24/status/xfpm-primary-020.png
-share/icons/hicolor/24x24/status/xfpm-primary-040-charging.png
-share/icons/hicolor/24x24/status/xfpm-primary-040.png
-share/icons/hicolor/24x24/status/xfpm-primary-060-charging.png
-share/icons/hicolor/24x24/status/xfpm-primary-060.png
-share/icons/hicolor/24x24/status/xfpm-primary-080-charging.png
-share/icons/hicolor/24x24/status/xfpm-primary-080.png
-share/icons/hicolor/24x24/status/xfpm-primary-100-charging.png
-share/icons/hicolor/24x24/status/xfpm-primary-100.png
-share/icons/hicolor/24x24/status/xfpm-primary-charged.png
-share/icons/hicolor/24x24/status/xfpm-primary-missing.png
+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
@@ -60,91 +28,72 @@ 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/32x32/status/xfpm-ac-adapter.png
-share/icons/hicolor/32x32/status/xfpm-brightness-lcd.png
-share/icons/hicolor/32x32/status/xfpm-primary-000-charging.png
-share/icons/hicolor/32x32/status/xfpm-primary-000.png
-share/icons/hicolor/32x32/status/xfpm-primary-020-charging.png
-share/icons/hicolor/32x32/status/xfpm-primary-020.png
-share/icons/hicolor/32x32/status/xfpm-primary-040-charging.png
-share/icons/hicolor/32x32/status/xfpm-primary-040.png
-share/icons/hicolor/32x32/status/xfpm-primary-060-charging.png
-share/icons/hicolor/32x32/status/xfpm-primary-060.png
-share/icons/hicolor/32x32/status/xfpm-primary-080-charging.png
-share/icons/hicolor/32x32/status/xfpm-primary-080.png
-share/icons/hicolor/32x32/status/xfpm-primary-100-charging.png
-share/icons/hicolor/32x32/status/xfpm-primary-100.png
-share/icons/hicolor/32x32/status/xfpm-primary-charged.png
-share/icons/hicolor/32x32/status/xfpm-primary-missing.png
-share/icons/hicolor/32x32/status/xfpm-ups-000.png
-share/icons/hicolor/32x32/status/xfpm-ups-020.png
-share/icons/hicolor/32x32/status/xfpm-ups-040.png
-share/icons/hicolor/32x32/status/xfpm-ups-060.png
-share/icons/hicolor/32x32/status/xfpm-ups-080.png
-share/icons/hicolor/32x32/status/xfpm-ups-100.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
+share/icons/hicolor/48x48/status/battery-empty-charging.png
+share/icons/hicolor/48x48/status/battery-empty.png
+share/icons/hicolor/48x48/status/battery-full-charged.png
+share/icons/hicolor/48x48/status/battery-full-charging.png
+share/icons/hicolor/48x48/status/battery-full.png
+share/icons/hicolor/48x48/status/battery-good-charging.png
+share/icons/hicolor/48x48/status/battery-good.png
+share/icons/hicolor/48x48/status/battery-low-charging.png
+share/icons/hicolor/48x48/status/battery-low.png
+share/icons/hicolor/48x48/status/battery-missing.png
 share/icons/hicolor/48x48/status/computer.png
+share/icons/hicolor/48x48/status/display-brightness.png
 share/icons/hicolor/48x48/status/input-keyboard.png
 share/icons/hicolor/48x48/status/input-mouse.png
+share/icons/hicolor/48x48/status/keyboard-brightness.png
 share/icons/hicolor/48x48/status/multimedia-player.png
 share/icons/hicolor/48x48/status/pda.png
 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/48x48/status/xfpm-ac-adapter.png
-share/icons/hicolor/48x48/status/xfpm-brightness-keyboard.png
-share/icons/hicolor/48x48/status/xfpm-brightness-lcd.png
-share/icons/hicolor/48x48/status/xfpm-primary-000-charging.png
-share/icons/hicolor/48x48/status/xfpm-primary-000.png
-share/icons/hicolor/48x48/status/xfpm-primary-020-charging.png
-share/icons/hicolor/48x48/status/xfpm-primary-020.png
-share/icons/hicolor/48x48/status/xfpm-primary-040-charging.png
-share/icons/hicolor/48x48/status/xfpm-primary-040.png
-share/icons/hicolor/48x48/status/xfpm-primary-060-charging.png
-share/icons/hicolor/48x48/status/xfpm-primary-060.png
-share/icons/hicolor/48x48/status/xfpm-primary-080-charging.png
-share/icons/hicolor/48x48/status/xfpm-primary-080.png
-share/icons/hicolor/48x48/status/xfpm-primary-100-charging.png
-share/icons/hicolor/48x48/status/xfpm-primary-100.png
-share/icons/hicolor/48x48/status/xfpm-primary-charged.png
-share/icons/hicolor/48x48/status/xfpm-primary-missing.png
-share/icons/hicolor/48x48/status/xfpm-ups-000.png
-share/icons/hicolor/48x48/status/xfpm-ups-020.png
-share/icons/hicolor/48x48/status/xfpm-ups-040.png
-share/icons/hicolor/48x48/status/xfpm-ups-060.png
-share/icons/hicolor/48x48/status/xfpm-ups-080.png
-share/icons/hicolor/48x48/status/xfpm-ups-100.png
+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
+share/icons/hicolor/scalable/status/battery-caution-charging.svg
+share/icons/hicolor/scalable/status/battery-caution-symbolic.svg
+share/icons/hicolor/scalable/status/battery-caution.svg
+share/icons/hicolor/scalable/status/battery-empty-charging-symbolic.svg
+share/icons/hicolor/scalable/status/battery-empty-charging.svg
+share/icons/hicolor/scalable/status/battery-empty-symbolic.svg
+share/icons/hicolor/scalable/status/battery-empty.svg
+share/icons/hicolor/scalable/status/battery-full-charged-symbolic.svg
+share/icons/hicolor/scalable/status/battery-full-charged.svg
+share/icons/hicolor/scalable/status/battery-full-charging-symbolic.svg
+share/icons/hicolor/scalable/status/battery-full-charging.svg
+share/icons/hicolor/scalable/status/battery-full-symbolic.svg
+share/icons/hicolor/scalable/status/battery-full.svg
+share/icons/hicolor/scalable/status/battery-good-charging-symbolic.svg
+share/icons/hicolor/scalable/status/battery-good-charging.svg
+share/icons/hicolor/scalable/status/battery-good-symbolic.svg
+share/icons/hicolor/scalable/status/battery-good.svg
+share/icons/hicolor/scalable/status/battery-low-charging-symbolic.svg
+share/icons/hicolor/scalable/status/battery-low-charging.svg
+share/icons/hicolor/scalable/status/battery-low-symbolic.svg
+share/icons/hicolor/scalable/status/battery-low.svg
+share/icons/hicolor/scalable/status/battery-missing-symbolic.svg
+share/icons/hicolor/scalable/status/battery-missing.svg
 share/icons/hicolor/scalable/status/computer.svg
+share/icons/hicolor/scalable/status/display-brightness-symbolic.svg
+share/icons/hicolor/scalable/status/display-brightness.svg
+share/icons/hicolor/scalable/status/keyboard-brightness-symbolic.svg
+share/icons/hicolor/scalable/status/keyboard-brightness.svg
 share/icons/hicolor/scalable/status/keyboard.svg
 share/icons/hicolor/scalable/status/mouse.svg
 share/icons/hicolor/scalable/status/multimedia-player.svg
 share/icons/hicolor/scalable/status/pda.svg
 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/xfpm-ac-adapter.svg
-share/icons/hicolor/scalable/status/xfpm-brightness-keyboard.svg
-share/icons/hicolor/scalable/status/xfpm-brightness-lcd.svg
-share/icons/hicolor/scalable/status/xfpm-primary-000-charging.svg
-share/icons/hicolor/scalable/status/xfpm-primary-000.svg
-share/icons/hicolor/scalable/status/xfpm-primary-020-charging.svg
-share/icons/hicolor/scalable/status/xfpm-primary-020.svg
-share/icons/hicolor/scalable/status/xfpm-primary-040-charging.svg
-share/icons/hicolor/scalable/status/xfpm-primary-040.svg
-share/icons/hicolor/scalable/status/xfpm-primary-060-charging.svg
-share/icons/hicolor/scalable/status/xfpm-primary-060.svg
-share/icons/hicolor/scalable/status/xfpm-primary-080-charging.svg
-share/icons/hicolor/scalable/status/xfpm-primary-080.svg
-share/icons/hicolor/scalable/status/xfpm-primary-100-charging.svg
-share/icons/hicolor/scalable/status/xfpm-primary-100.svg
-share/icons/hicolor/scalable/status/xfpm-primary-charged.svg
-share/icons/hicolor/scalable/status/xfpm-primary-missing.svg
-share/icons/hicolor/scalable/status/xfpm-ups-000.svg
-share/icons/hicolor/scalable/status/xfpm-ups-020.svg
-share/icons/hicolor/scalable/status/xfpm-ups-040.svg
-share/icons/hicolor/scalable/status/xfpm-ups-060.svg
-share/icons/hicolor/scalable/status/xfpm-ups-080.svg
-share/icons/hicolor/scalable/status/xfpm-ups-100.svg
+share/icons/hicolor/scalable/status/xfce4-power-manager-settings.svg
 share/locale/ar/LC_MESSAGES/xfce4-power-manager.mo
 share/locale/ast/LC_MESSAGES/xfce4-power-manager.mo
 share/locale/bg/LC_MESSAGES/xfce4-power-manager.mo