4 files changed, 77 insertions, 27 deletions

diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile
index 98ae77579280..3f927f7181fc 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	xfce4-netload-plugin
-PORTVERSION=	0.4.0
-PORTREVISION=	13
+PORTVERSION=	1.0.0
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
+MASTER_SITES=	${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	demon@FreeBSD.org
@@ -17,9 +17,28 @@ COMMENT=	Network Load plugin for XFce4
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnometarget gtk20 intltool intlhack pkgconfig
-USE_XFCE=	configenv panel
+USE_GNOME=	gnomehack intltool intlhack pkgconfig
+USE_XFCE=	configenv libgui panel
+INSTALLS_ICONS=	yes
 
-.include <bsd.port.mk>
+CONFIGURE_ARGS=	--disable-debug
+
+OPTIONS=	NLS "Enable Native Language Support" on
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=  yes
+CONFIGURE_ARGS+=--enable-nls
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+do-patch:
+	@${REINPLACE_CMD} -e 's|#  include <net/if_ppp.h>||' \
+		${WRKSRC}/panel-plugin/os.h
+
+.include <bsd.port.post.mk>
diff --git a/sysutils/xfce4-netload-plugin/distinfo b/sysutils/xfce4-netload-plugin/distinfo
index 219050ae0c51..09dad8747bc5 100644
--- a/sysutils/xfce4-netload-plugin/distinfo
+++ b/sysutils/xfce4-netload-plugin/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfce4/xfce4-netload-plugin-0.4.0.tar.bz2) = a15ee479089ba7703c5dde33ff439573
-SHA256 (xfce4/xfce4-netload-plugin-0.4.0.tar.bz2) = debcc2793b3f42556fc0a58e69bb46925880791eff60f3231f27ec5a5359a191
-SIZE (xfce4/xfce4-netload-plugin-0.4.0.tar.bz2) = 125046
+SHA256 (xfce4/xfce4-netload-plugin-1.0.0.tar.bz2) = f312d19fc6bfae525886a1f6e84e7d839f19a9f672be4e01f3df1c813f6a6032
+SIZE (xfce4/xfce4-netload-plugin-1.0.0.tar.bz2) = 153298
diff --git a/sysutils/xfce4-netload-plugin/files/patch-panel-plugin-os.h b/sysutils/xfce4-netload-plugin/files/patch-panel-plugin-os.h
deleted file mode 100644
index 2f64f67c9946..000000000000
--- a/sysutils/xfce4-netload-plugin/files/patch-panel-plugin-os.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- panel-plugin/os.h.orig	2010-04-08 12:52:28.000000000 +0400
-+++ panel-plugin/os.h	2010-04-08 12:52:47.000000000 +0400
-@@ -95,7 +95,6 @@
- #include <net/if_mib.h>
- #include <arpa/inet.h>
- #include <net/ppp_defs.h>
--#include <net/if_ppp.h>
- #elif __NetBSD__            /* N E T B S D */
- #include <stdio.h>
- #include <sys/param.h>
diff --git a/sysutils/xfce4-netload-plugin/pkg-plist b/sysutils/xfce4-netload-plugin/pkg-plist
index cfbba3912d8b..1f565e08d4ee 100644
--- a/sysutils/xfce4-netload-plugin/pkg-plist
+++ b/sysutils/xfce4-netload-plugin/pkg-plist
@@ -1,13 +1,55 @@
 libexec/xfce4/panel-plugins/xfce4-netload-plugin
-share/locale/de/LC_MESSAGES/xfce4-netload-plugin.mo
-share/locale/fr/LC_MESSAGES/xfce4-netload-plugin.mo
-share/locale/lt/LC_MESSAGES/xfce4-netload-plugin.mo
-share/locale/ca/LC_MESSAGES/xfce4-netload-plugin.mo
-share/locale/ko/LC_MESSAGES/xfce4-netload-plugin.mo
-share/locale/pl/LC_MESSAGES/xfce4-netload-plugin.mo
-share/locale/uk/LC_MESSAGES/xfce4-netload-plugin.mo
+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/ast/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_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
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-netload-plugin.mo
+%%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/hu/LC_MESSAGES/xfce4-netload-plugin.mo
+%%NLS%%share/locale/id/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/nb/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
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-netload-plugin.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-netload-plugin.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/xfce4-netload-plugin.mo
+%%NLS%%share/locale/sv/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
+%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-netload-plugin.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-netload-plugin.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/xfce4-netload-plugin.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-netload-plugin.mo
 share/xfce4/panel-plugins/netload.desktop
 @dirrmtry share/xfce4/panel-plugins
 @dirrmtry share/xfce4
+%%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ur_PK
+%%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ur
+%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ug
+%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/kk
+%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ast
 @dirrmtry libexec/xfce4/panel-plugins
 @dirrmtry libexec/xfce4