5 files changed, 38 insertions, 143 deletions

diff --git a/net/netspeed_applet/Makefile b/net/netspeed_applet/Makefile
index 2f18fc1beedb..6f0fa2e15432 100644
--- a/net/netspeed_applet/Makefile
+++ b/net/netspeed_applet/Makefile
@@ -6,8 +6,7 @@
 #    $MCom: ports/net/netspeed_applet/Makefile,v 1.2 2007/05/19 21:36:17 marcus Exp $
 
 PORTNAME=	netspeed_applet
-PORTVERSION=	0.13
-PORTREVISION=	2
+PORTVERSION=	0.14
 CATEGORIES=	net gnome
 MASTER_SITES=	http://www.wh-hms.uni-ulm.de/~mfcn/shared/netspeed/
 
diff --git a/net/netspeed_applet/distinfo b/net/netspeed_applet/distinfo
index 57877ac1cef3..fc7994b84b2f 100644
--- a/net/netspeed_applet/distinfo
+++ b/net/netspeed_applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (netspeed_applet-0.13.tar.gz) = b5c5332993ed779c3653433c6f3b6a9a
-SHA256 (netspeed_applet-0.13.tar.gz) = 86041c571b0cd3113c3a428ba8d01498ed8fb81613b3e6ccf6c7c8e722530853
-SIZE (netspeed_applet-0.13.tar.gz) = 647081
+MD5 (netspeed_applet-0.14.tar.gz) = e542f9b4a42f13833b9972520dfe0ac9
+SHA256 (netspeed_applet-0.14.tar.gz) = a20bc9129d62a49484d6910a15555a10c765969bf5ce6fa7d73ed889542a559b
+SIZE (netspeed_applet-0.14.tar.gz) = 547197
diff --git a/net/netspeed_applet/files/patch-src_backend.c b/net/netspeed_applet/files/patch-src_backend.c
deleted file mode 100644
index 041a6d941efd..000000000000
--- a/net/netspeed_applet/files/patch-src_backend.c
+++ /dev/null
@@ -1,56 +0,0 @@
---- src/backend.c.orig	Wed May  3 02:41:00 2006
-+++ src/backend.c	Wed May  3 03:03:09 2006
-@@ -20,6 +20,7 @@
- #include <config.h>
- #include <glibtop/netlist.h>
- #include <glibtop/netload.h>
-+#include <net/if_media.h>
- #include "backend.h"
- 
- /* Check for all available devices. This really should be
-@@ -131,7 +132,7 @@
- 
- 	g_strlcpy(request.ifr_name, devinfo->name, sizeof request.ifr_name);
- 
--	if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-+	if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
- 		goto out;
- 
- 	if (ioctl(fd, SIOCGIFFLAGS, &request) == -1)
-@@ -148,16 +149,20 @@
- 		}
- 	}
- 
-+	if (devinfo->type == DEV_UNKNOWN) {
-+		struct ifmediareq ifmr;  
- 
--	if (ioctl(fd, SIOCGIWNAME, &request) >= 0) {
--		devinfo->type = DEV_WIRELESS;
--	}
-+		memset(&ifmr, 0, sizeof(ifmr));
-+		g_strlcpy(ifmr.ifm_name, devinfo->name, sizeof(ifmr.ifm_name));
- 
--	if (ioctl(fd, SIOCGIWENCODE, &request) >= 0) {
--		g_assert_not_reached();
-+		if (ioctl(fd, SIOCGIFMEDIA, &ifmr) >= 0) {
-+			switch (IFM_TYPE(ifmr.ifm_current)) {
-+			case IFM_ETHER:		devinfo->type = DEV_ETHERNET; break;
-+			case IFM_IEEE80211:	devinfo->type = DEV_WIRELESS; break;
-+			}
-+		}
- 	}
-     
--    
-  out:
- 	if(fd != -1)
- 		close(fd);
-@@ -210,9 +215,6 @@
- 		else {
- 			devinfo.type = DEV_PPP;
- 		}
--	}
--	else if (g_str_has_prefix(device, "eth")) {
--		devinfo.type = DEV_ETHERNET;
- 	}
- 
- 	get_additional_info(&devinfo);
diff --git a/net/netspeed_applet/files/patch-src_netspeed.c b/net/netspeed_applet/files/patch-src_netspeed.c
index 580d2bdd79f9..11baff12d0d0 100644
--- a/net/netspeed_applet/files/patch-src_netspeed.c
+++ b/net/netspeed_applet/files/patch-src_netspeed.c
@@ -1,5 +1,5 @@
---- src/netspeed.c.orig	Mon May  1 19:36:46 2006
-+++ src/netspeed.c	Mon May  1 19:42:28 2006
+--- src/netspeed.c.orig	2006-09-28 05:54:52.000000000 -0400
++++ src/netspeed.c	2008-02-25 14:24:13.000000000 -0500
 @@ -23,6 +23,7 @@
  #include <panel-applet.h>
  #include <panel-applet-gconf.h>
@@ -8,45 +8,21 @@
  #include "backend.h"
  #include "netspeed.h"
  
-@@ -391,7 +392,7 @@
- 
- 	devices = get_available_devices();
- 	for (tmp = devices; tmp; tmp = g_list_next(tmp)) {
--		if (strcmp(tmp->data, "lo") == 0) continue;
-+		if (strcmp(tmp->data, "lo0") == 0) continue;
- 		if (strncmp(tmp->data, "dummy", strlen("dummy")) == 0) continue;
- 		info = get_device_info(tmp->data);
- 		if (info.running) {
-@@ -1344,6 +1345,16 @@
- 	if (strcmp (iid, "OAFIID:GNOME_NetspeedApplet"))
- 		return FALSE;
- 
-+    /*
-+     * Work around a design flaw in libgtop: force an initialisation
-+     * of the server, otherwise glibtop_get_netlist() will find that
-+     * the server is not needed and glibtop_get_netload() (which needs
-+     * the server) will fail.
-+     *
-+     * Jean-Yves Lefort <jylefort@FreeBSD.org> 20060501
-+     */
-+    glibtop_init();
-+
-     icon_theme = gtk_icon_theme_get_default();
-     gtk_icon_theme_append_search_path(icon_theme, DATADIR"/pixmaps/"PACKAGE);
- 	
-@@ -1432,13 +1443,13 @@
+@@ -1493,7 +1494,7 @@ netspeed_applet_factory(PanelApplet *app
  		GList *ptr, *devices = get_available_devices();
  		ptr = devices;
  		while (ptr) { 
--			if (!g_str_equal(ptr->data, "lo"))
-+			if (!g_str_equal(ptr->data, "lo0"))
- 				applet->devinfo = get_device_info(ptr->data);
- 			ptr = g_list_next(ptr);
- 		}
+-			if (!g_str_equal(ptr->data, "lo")) {
++			if (!g_str_equal(ptr->data, "lo0")) {
+ 				get_device_info(ptr->data, &applet->devinfo);
+ 				break;
+ 			}
+@@ -1502,7 +1503,7 @@ netspeed_applet_factory(PanelApplet *app
  		free_devices_list(devices);		
  	}
--	if (!applet->devinfo.name) applet->devinfo = get_device_info("lo");	
-+	if (!applet->devinfo.name) applet->devinfo = get_device_info("lo0");	
+ 	if (!applet->devinfo.name)
+-		get_device_info("lo", &applet->devinfo);	
++		get_device_info("lo0", &applet->devinfo);	
  	applet->device_has_changed = TRUE;	
  	
  	applet->tooltips = gtk_tooltips_new();
diff --git a/net/netspeed_applet/pkg-plist b/net/netspeed_applet/pkg-plist
index f4e872288ebb..00cc99d6ed4b 100644
--- a/net/netspeed_applet/pkg-plist
+++ b/net/netspeed_applet/pkg-plist
@@ -11,52 +11,29 @@ share/gnome/help/netspeed_applet/C/figures/settings.png
 share/gnome/help/netspeed_applet/C/figures/wavelan.png
 share/gnome/help/netspeed_applet/C/legal.xml
 share/gnome/help/netspeed_applet/C/netspeed_applet.xml
-share/gnome/help/netspeed_applet/cs/figures/details.png
-share/gnome/help/netspeed_applet/cs/figures/eth_48.png
-share/gnome/help/netspeed_applet/cs/figures/eth_sum_48.png
-share/gnome/help/netspeed_applet/cs/figures/netspeed_applet_24.png
-share/gnome/help/netspeed_applet/cs/figures/netspeed_applet_48.png
-share/gnome/help/netspeed_applet/cs/figures/netspeed_applet_48_sum.png
-share/gnome/help/netspeed_applet/cs/figures/phone_24.png
-share/gnome/help/netspeed_applet/cs/figures/settings.png
-share/gnome/help/netspeed_applet/cs/legal.xml
-share/gnome/help/netspeed_applet/cs/netspeed_applet.xml
 share/gnome/help/netspeed_applet/de/figures/details.png
-share/gnome/help/netspeed_applet/de/figures/eth_48.png
 share/gnome/help/netspeed_applet/de/figures/eth_sum_48.png
-share/gnome/help/netspeed_applet/de/figures/netspeed_applet_24.png
-share/gnome/help/netspeed_applet/de/figures/netspeed_applet_48.png
-share/gnome/help/netspeed_applet/de/figures/netspeed_applet_48_sum.png
-share/gnome/help/netspeed_applet/de/figures/phone_24.png
+share/gnome/help/netspeed_applet/de/figures/ethernet.png
+share/gnome/help/netspeed_applet/de/figures/loopback.png
+share/gnome/help/netspeed_applet/de/figures/netspeed_applet.png
+share/gnome/help/netspeed_applet/de/figures/plip.png
+share/gnome/help/netspeed_applet/de/figures/ppp.png
 share/gnome/help/netspeed_applet/de/figures/settings.png
-share/gnome/help/netspeed_applet/de/legal.xml
+share/gnome/help/netspeed_applet/de/figures/wavelan.png
 share/gnome/help/netspeed_applet/de/netspeed_applet.xml
-share/gnome/help/netspeed_applet/es/figures/details.png
-share/gnome/help/netspeed_applet/es/figures/eth_sum_48.png
-share/gnome/help/netspeed_applet/es/figures/ethernet.png
-share/gnome/help/netspeed_applet/es/figures/loopback.png
-share/gnome/help/netspeed_applet/es/figures/netspeed_applet.png
-share/gnome/help/netspeed_applet/es/figures/plip.png
-share/gnome/help/netspeed_applet/es/figures/ppp.png
-share/gnome/help/netspeed_applet/es/figures/settings.png
-share/gnome/help/netspeed_applet/es/figures/wavelan.png
-share/gnome/help/netspeed_applet/es/legal.xml
-share/gnome/help/netspeed_applet/es/netspeed_applet.xml
-share/gnome/help/netspeed_applet/ru/figures/details.png
-share/gnome/help/netspeed_applet/ru/figures/eth_48.png
-share/gnome/help/netspeed_applet/ru/figures/eth_sum_48.png
-share/gnome/help/netspeed_applet/ru/figures/netspeed_applet_24.png
-share/gnome/help/netspeed_applet/ru/figures/netspeed_applet_48.png
-share/gnome/help/netspeed_applet/ru/figures/netspeed_applet_48_sum.png
-share/gnome/help/netspeed_applet/ru/figures/phone_24.png
-share/gnome/help/netspeed_applet/ru/figures/settings.png
-share/gnome/help/netspeed_applet/ru/legal.xml
-share/gnome/help/netspeed_applet/ru/netspeed_applet.xml
+share/gnome/help/netspeed_applet/sv/figures/details.png
+share/gnome/help/netspeed_applet/sv/figures/eth_sum_48.png
+share/gnome/help/netspeed_applet/sv/figures/ethernet.png
+share/gnome/help/netspeed_applet/sv/figures/loopback.png
+share/gnome/help/netspeed_applet/sv/figures/netspeed_applet.png
+share/gnome/help/netspeed_applet/sv/figures/plip.png
+share/gnome/help/netspeed_applet/sv/figures/ppp.png
+share/gnome/help/netspeed_applet/sv/figures/settings.png
+share/gnome/help/netspeed_applet/sv/figures/wavelan.png
+share/gnome/help/netspeed_applet/sv/netspeed_applet.xml
 share/omf/netspeed_applet/netspeed_applet-C.omf
-share/omf/netspeed_applet/netspeed_applet-cs.omf
 share/omf/netspeed_applet/netspeed_applet-de.omf
-share/omf/netspeed_applet/netspeed_applet-es.omf
-share/omf/netspeed_applet/netspeed_applet-ru.omf
+share/omf/netspeed_applet/netspeed_applet-sv.omf
 share/pixmaps/netspeed_applet.png
 share/pixmaps/netspeed_applet/gnome-dev-loopback.png
 share/pixmaps/netspeed_applet/gnome-dev-plip.png
@@ -65,12 +42,15 @@ share/locale/cs/LC_MESSAGES/netspeed_applet.mo
 share/locale/de/LC_MESSAGES/netspeed_applet.mo
 share/locale/es/LC_MESSAGES/netspeed_applet.mo
 share/locale/et/LC_MESSAGES/netspeed_applet.mo
+share/locale/fi/LC_MESSAGES/netspeed_applet.mo
 share/locale/fr/LC_MESSAGES/netspeed_applet.mo
 share/locale/hu/LC_MESSAGES/netspeed_applet.mo
 share/locale/it/LC_MESSAGES/netspeed_applet.mo
 share/locale/ja/LC_MESSAGES/netspeed_applet.mo
 share/locale/ms/LC_MESSAGES/netspeed_applet.mo
 share/locale/nl/LC_MESSAGES/netspeed_applet.mo
+share/locale/pl/LC_MESSAGES/netspeed_applet.mo
+share/locale/pt_BR/LC_MESSAGES/netspeed_applet.mo
 share/locale/ro/LC_MESSAGES/netspeed_applet.mo
 share/locale/ru/LC_MESSAGES/netspeed_applet.mo
 share/locale/sv/LC_MESSAGES/netspeed_applet.mo
@@ -78,14 +58,10 @@ share/locale/tr/LC_MESSAGES/netspeed_applet.mo
 share/locale/zh_CN/LC_MESSAGES/netspeed_applet.mo
 @dirrm share/pixmaps/netspeed_applet
 @dirrm share/omf/netspeed_applet
-@dirrm share/gnome/help/netspeed_applet/ru/figures
-@dirrm share/gnome/help/netspeed_applet/ru
-@dirrm share/gnome/help/netspeed_applet/es/figures
-@dirrm share/gnome/help/netspeed_applet/es
+@dirrm share/gnome/help/netspeed_applet/sv/figures
+@dirrm share/gnome/help/netspeed_applet/sv
 @dirrm share/gnome/help/netspeed_applet/de/figures
 @dirrm share/gnome/help/netspeed_applet/de
-@dirrm share/gnome/help/netspeed_applet/cs/figures
-@dirrm share/gnome/help/netspeed_applet/cs
 @dirrm share/gnome/help/netspeed_applet/C/figures
 @dirrm share/gnome/help/netspeed_applet/C
 @dirrm share/gnome/help/netspeed_applet