- Update sysutils/xfce4-battery-plugin to 1.1.0

- Correctly sort and order variables
- Add dependencies reported by QA script
- Regenerate patch

PR:		222497
Submitted by:	Olivier Duchateau <duchateau.olivier@gmail.com>

4 files changed, 22 insertions, 12 deletions

diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile
index 842477ebe1a2..9e3f37545fc4 100644
--- a/sysutils/xfce4-battery-plugin/Makefile
+++ b/sysutils/xfce4-battery-plugin/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xfce4-battery-plugin
-PORTVERSION=	1.0.5
-PORTREVISION=	4
+PORTVERSION=	1.1.0
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
@@ -13,17 +12,18 @@ COMMENT=	Battery monitor panel plugin for Xfce4
 
 LICENSE=	GPLv2
 
-ONLY_FOR_ARCHS=	i386 amd64
+ONLY_FOR_ARCHS=	amd64 i386
 
 SSP_UNSAFE=	yes
+USES=		alias gettext-tools gmake libtool pkgconfig tar:bzip2 xfce:gtk3
 GNU_CONFIGURE=	yes
+USE_GNOME=	gtk30 glib20 intltool cairo
+USE_XFCE=	panel
 INSTALLS_ICONS=	yes
+USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
-USES=		alias gmake libtool pkgconfig gettext-tools xfce tar:bzip2
-USE_GNOME=	gtk20 glib20 intltool intlhack
-USE_XFCE=	panel
 
-OPTIONS_DEFINE= NLS
+OPTIONS_DEFINE=	NLS
 NLS_USES=	gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
 OPTIONS_SUB=	yes
diff --git a/sysutils/xfce4-battery-plugin/distinfo b/sysutils/xfce4-battery-plugin/distinfo
index 8e17b8a538d4..a595ffb846d3 100644
--- a/sysutils/xfce4-battery-plugin/distinfo
+++ b/sysutils/xfce4-battery-plugin/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xfce4/xfce4-battery-plugin-1.0.5.tar.bz2) = f659b1af40ab72c93448affaa693ab551827a5600ce9b97a799b7c2419bdeb11
-SIZE (xfce4/xfce4-battery-plugin-1.0.5.tar.bz2) = 403505
+TIMESTAMP = 1506013469
+SHA256 (xfce4/xfce4-battery-plugin-1.1.0.tar.bz2) = 8c9deec8d95da4cc39d6d9091433e5822b6bbe07d80117045dd4dd3480427ece
+SIZE (xfce4/xfce4-battery-plugin-1.1.0.tar.bz2) = 398621
diff --git a/sysutils/xfce4-battery-plugin/files/patch-configure b/sysutils/xfce4-battery-plugin/files/patch-configure
index e424a9c01a05..78813965a83a 100644
--- a/sysutils/xfce4-battery-plugin/files/patch-configure
+++ b/sysutils/xfce4-battery-plugin/files/patch-configure
@@ -1,6 +1,6 @@
---- ./configure.orig	2012-06-30 07:50:07.000000000 +0000
-+++ ./configure	2014-01-30 14:32:38.000000000 +0000
-@@ -13225,7 +13225,7 @@
+--- configure.orig	2016-10-31 17:27:48 UTC
++++ configure
+@@ -13269,7 +13269,7 @@ _ACEOF
  
      fi
    fi
diff --git a/sysutils/xfce4-battery-plugin/pkg-plist b/sysutils/xfce4-battery-plugin/pkg-plist
index 2dda38d39512..aa5084d70901 100644
--- a/sysutils/xfce4-battery-plugin/pkg-plist
+++ b/sysutils/xfce4-battery-plugin/pkg-plist
@@ -48,12 +48,14 @@ share/icons/hicolor/scalable/apps/xfce4-battery-plugin.svg
 %%NLS%%share/locale/da/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/de/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/el/LC_MESSAGES/xfce4-battery-plugin.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/es/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/xfce4-battery-plugin.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/id/LC_MESSAGES/xfce4-battery-plugin.mo
@@ -64,22 +66,29 @@ share/icons/hicolor/scalable/apps/xfce4-battery-plugin.svg
 %%NLS%%share/locale/ko/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/xfce4-battery-plugin.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/nn/LC_MESSAGES/xfce4-battery-plugin.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/pa/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/xfce4-battery-plugin.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/xfce4-battery-plugin.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/xfce4-battery-plugin.mo
+%%NLS%%share/locale/th/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/ug/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/ur/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-battery-plugin.mo
+%%NLS%%share/locale/uz/LC_MESSAGES/xfce4-battery-plugin.mo
+%%NLS%%share/locale/uz@Latn/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-battery-plugin.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-battery-plugin.mo