Update to version 1.2.2.

PR:		194765
Submitted by:	olivierd@FreeBSD.org

4 files changed, 24 insertions, 16 deletions

diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile
index 72b5632ad040..a080015291a3 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xfce4-netload-plugin
-PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTVERSION=	1.2.2
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
@@ -13,24 +12,21 @@ MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Network Load plugin for Xfce4
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	intltool intlhack
 USE_XFCE=	configenv libmenu panel
-USES=		gmake pkgconfig tar:bzip2
+USES=		gmake pkgconfig libtool tar:bzip2
 INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=	gettext
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS+=--enable-nls
-.else
-CONFIGURE_ARGS+=--disable-nls
-.endif
+.include <bsd.port.options.mk>
 
 do-patch:
 	@${REINPLACE_CMD} -e 's, || __FreeBSD_kernel__,,' \
@@ -38,8 +34,12 @@ do-patch:
 		${WRKSRC}/panel-plugin/net.h \
 		${WRKSRC}/panel-plugin/os.h
 
-.if empty(PORT_OPTIONS:MNLS)
-	@${REINPLACE_CMD} -e 's|po ||' ${WRKSRC}/Makefile.in
+.if ${PORT_OPTIONS:MNLS}
+	${REINPLACE_CMD} -e \
+		's|$$(prefix)/$$(DATADIRNAME)/locale|$$(datarootdir)/locale|' \
+		${WRKSRC}/po/Makefile.in.in
+.else
+	${REINPLACE_CMD} -e 's|po ||' ${WRKSRC}/Makefile.in
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/xfce4-netload-plugin/distinfo b/sysutils/xfce4-netload-plugin/distinfo
index f678081f52cb..4a227218e694 100644
--- a/sysutils/xfce4-netload-plugin/distinfo
+++ b/sysutils/xfce4-netload-plugin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfce4-netload-plugin-1.2.0.tar.bz2) = c824f09e2d3860011b44d8272d661c458237786828027f3d9ad6a1d4f0096845
-SIZE (xfce4/xfce4-netload-plugin-1.2.0.tar.bz2) = 169721
+SHA256 (xfce4/xfce4-netload-plugin-1.2.2.tar.bz2) = 53954d89277d4d18732ecfc927034a6c3c88d4acf926fe9c5f1913b36807bfb6
+SIZE (xfce4/xfce4-netload-plugin-1.2.2.tar.bz2) = 361307
diff --git a/sysutils/xfce4-netload-plugin/pkg-descr b/sysutils/xfce4-netload-plugin/pkg-descr
index d959da53f932..385eb892a734 100644
--- a/sysutils/xfce4-netload-plugin/pkg-descr
+++ b/sysutils/xfce4-netload-plugin/pkg-descr
@@ -1,3 +1,3 @@
-Network Load plugin for Xfce4.
+Network Load plugin for the Xfce Desktop.
 
 WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin
diff --git a/sysutils/xfce4-netload-plugin/pkg-plist b/sysutils/xfce4-netload-plugin/pkg-plist
index 49e26d06609f..3c662393c731 100644
--- a/sysutils/xfce4-netload-plugin/pkg-plist
+++ b/sysutils/xfce4-netload-plugin/pkg-plist
@@ -1,14 +1,16 @@
-libexec/xfce4/panel-plugins/xfce4-netload-plugin
+lib/xfce4/panel/plugins/libnetload.so
 share/icons/hicolor/24x24/apps/xfce4-netload-plugin.png
 share/icons/hicolor/48x48/apps/xfce4-netload-plugin.png
 share/icons/hicolor/scalable/apps/xfce4-netload-plugin.svg
 %%NLS%%share/locale/ar/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/xfce4-netload-plugin.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/da/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/de/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/el/LC_MESSAGES/xfce4-netload-plugin.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/es/LC_MESSAGES/xfce4-netload-plugin.mo
@@ -16,17 +18,21 @@ share/icons/hicolor/scalable/apps/xfce4-netload-plugin.svg
 %%NLS%%share/locale/fi/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/xfce4-netload-plugin.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/id/LC_MESSAGES/xfce4-netload-plugin.mo
+%%NLS%%share/locale/is/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/it/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/xfce4-netload-plugin.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/xfce4-netload-plugin.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/pa/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/xfce4-netload-plugin.mo
@@ -34,7 +40,9 @@ share/icons/hicolor/scalable/apps/xfce4-netload-plugin.svg
 %%NLS%%share/locale/ru/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/xfce4-netload-plugin.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/xfce4-netload-plugin.mo
+%%NLS%%share/locale/th/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/ug/LC_MESSAGES/xfce4-netload-plugin.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/xfce4-netload-plugin.mo