Update to 1.99.5, and finish the port to FreeBSD. Yay!

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1405 df743ca5-7f9a-e211-a948-0013205c9059

11 files changed, 225 insertions, 51 deletions

diff --git a/net/gnomenetwork/Makefile b/net/gnomenetwork/Makefile
index c6ff749b7..eb963cd70 100644
--- a/net/gnomenetwork/Makefile
+++ b/net/gnomenetwork/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomenetwork
-PORTVERSION=	1.99.1
+PORTVERSION=	1.99.5
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-network/1.99
@@ -16,8 +16,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A library for writing networked servers & clients
 
-IGNORE=		"This port is in bad need of a good de-Linuxing"
-
+USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
 USE_GMAKE=	yes
diff --git a/net/gnomenetwork/distinfo b/net/gnomenetwork/distinfo
index 0a74386a1..5a96d35bb 100644
--- a/net/gnomenetwork/distinfo
+++ b/net/gnomenetwork/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-network-1.99.1.tar.bz2) = e5e4bbff44b972ea782bd764c4e07151
+MD5 (gnome2/gnome-network-1.99.5.tar.bz2) = 77532442a106d06ed2fe015f87d9b522
diff --git a/net/gnomenetwork/files/patch-gnome-netinfo::info.c b/net/gnomenetwork/files/patch-gnome-netinfo::info.c
index c32f9e4b1..258d2fbe0 100644
--- a/net/gnomenetwork/files/patch-gnome-netinfo::info.c
+++ b/net/gnomenetwork/files/patch-gnome-netinfo::info.c
@@ -1,6 +1,6 @@
---- gnome-netinfo/info.c.orig	Thu Jul 24 18:10:39 2003
-+++ gnome-netinfo/info.c	Mon Sep  1 00:36:32 2003
-@@ -26,6 +26,7 @@
+--- gnome-netinfo/info.c.orig	Mon Nov 24 18:29:43 2003
++++ gnome-netinfo/info.c	Sat Dec  6 23:37:03 2003
+@@ -27,6 +27,7 @@
  #endif
  
  
@@ -8,8 +8,8 @@
  #include <sys/socket.h>	/* basic socket definitions */
  #include <arpa/inet.h>	/* inet(3) functions */
  #include <sys/un.h>	/* for Unix domain sockets */
-@@ -180,7 +181,7 @@
- 	gboolean loopback;
+@@ -164,7 +165,7 @@
+ 	gint flags;
  	mii_data_result data;
  		
 -	sockfd = socket (AF_INET, SOCK_DGRAM, 0);
@@ -17,7 +17,7 @@
  
  	ifc.ifc_len = sizeof (buf);
  	ifc.ifc_req = (struct ifreq *) buf;
-@@ -189,7 +190,7 @@
+@@ -173,7 +174,7 @@
  	for (ptr = buf; ptr < buf + ifc.ifc_len;) {
  		ifr = (struct ifreq *) ptr;
  		len = sizeof (struct sockaddr);
@@ -26,15 +26,28 @@
  		if (ifr->ifr_addr.sa_len > len)
  			len = ifr->ifr_addr.sa_len;	/* length > 16 */
  #endif
-@@ -322,7 +323,6 @@
+@@ -182,8 +183,12 @@
+ 		if (strcmp (ifr->ifr_name, nic) != 0) {
+ 			continue;
+ 		}
++
++		bzero (&data, sizeof(data));
+ 		
++#ifdef __linux__
+ 		data = mii_get_basic (nic);
++#endif
+ 		
+ 		switch (ifr->ifr_addr.sa_family) {
+ 		case AF_INET:
+@@ -306,7 +311,6 @@
  			break;
  		}
  	}
 -	g_free (ifr);
  }
  
- GList *
-@@ -336,8 +336,10 @@
+ static GList *
+@@ -319,8 +323,10 @@
  	struct ifreq *ifr;
  	int sockfd, len;
  
@@ -46,7 +59,7 @@
  	ifc.ifc_len = sizeof (buf);
  	ifc.ifc_req = (struct ifreq *) buf;
  
-@@ -348,9 +350,11 @@
+@@ -331,9 +337,11 @@
  		len = sizeof (struct sockaddr);
  
  		iface = g_strdup (ifr->ifr_name);
diff --git a/net/gnomenetwork/files/patch-gnome-netinfo_callbacks.c b/net/gnomenetwork/files/patch-gnome-netinfo_callbacks.c
new file mode 100644
index 000000000..32d818c6f
--- /dev/null
+++ b/net/gnomenetwork/files/patch-gnome-netinfo_callbacks.c
@@ -0,0 +1,10 @@
+--- gnome-netinfo/callbacks.c.orig	Sat Dec  6 23:20:05 2003
++++ gnome-netinfo/callbacks.c	Sat Dec  6 23:20:14 2003
+@@ -27,6 +27,7 @@
+ #include <sys/wait.h>
+ #include <unistd.h>
+ #include <sys/types.h>
++#include <signal.h>
+ 
+ #include "callbacks.h"
+ #include "traceroute.h"
diff --git a/net/gnomenetwork/files/patch-gnome-netinfo_netinfo.c b/net/gnomenetwork/files/patch-gnome-netinfo_netinfo.c
new file mode 100644
index 000000000..4048c43b4
--- /dev/null
+++ b/net/gnomenetwork/files/patch-gnome-netinfo_netinfo.c
@@ -0,0 +1,41 @@
+--- gnome-netinfo/netinfo.c.orig	Mon Nov 24 18:29:43 2003
++++ gnome-netinfo/netinfo.c	Sun Dec  7 01:00:52 2003
+@@ -20,6 +20,7 @@
+ 
+ #include <gnome.h>
+ #include <sys/types.h>
++#include <sys/socket.h>
+ #include <signal.h>
+ #include <errno.h>
+ #include <sys/wait.h>
+@@ -253,14 +254,16 @@
+ 	if (condition & G_IO_IN) {
+ 		g_io_channel_read_line (channel, &text, &len, NULL, NULL);
+ 
+-		if (netinfo->process_line != NULL) {
+-			(netinfo->process_line) ((gpointer) netinfo, text,
+-						 len, NULL);
+-		}
++		if (text != NULL) {
++			if (netinfo->process_line != NULL) {
++				(netinfo->process_line) ((gpointer) netinfo, text,
++						 	len, NULL);
++			}
+ 
+-		g_free (text);
++			g_free (text);
+ 
+-		return TRUE;
++			return TRUE;
++		}
+ 	}
+ 
+ 	/* The condition is not G_IO_HUP | G_IO_ERR | G_IO_NVAL, so
+@@ -285,6 +288,7 @@
+ 	}
+ 	return FALSE;
+ }
++
+ 
+ void
+ netinfo_stop_process_command (Netinfo * netinfo)
diff --git a/net/gnomenetwork/files/patch-gnome-netinfo_netstat.c b/net/gnomenetwork/files/patch-gnome-netinfo_netstat.c
index c89520c47..011cc667a 100644
--- a/net/gnomenetwork/files/patch-gnome-netinfo_netstat.c
+++ b/net/gnomenetwork/files/patch-gnome-netinfo_netstat.c
@@ -1,6 +1,6 @@
---- gnome-netinfo/netstat.c.orig	Mon Sep  1 02:05:22 2003
-+++ gnome-netinfo/netstat.c	Mon Sep  1 02:31:00 2003
-@@ -109,7 +109,11 @@
+--- gnome-netinfo/netstat.c.orig	Mon Nov 24 18:29:43 2003
++++ gnome-netinfo/netstat.c	Sun Dec  7 01:34:51 2003
+@@ -113,7 +113,11 @@
  	}
  	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (netinfo->protocol))) {
  		/* Only works for Solaris */
@@ -12,7 +12,19 @@
  	}
  	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (netinfo->multicast))) {
  		/* It works for Solaris and Linux */
-@@ -335,11 +339,27 @@
+@@ -266,7 +270,11 @@
+ 	g_return_if_fail (line != NULL);
+ 
+ 	count = strip_protocol_line (line, &data);
++#ifdef __FreeBSD__
++	if (count == 5 || count == 6 || count == 9 || count == 10) {
++#else
+ 	if (count == 7 || count == 8) {
++#endif
+ #ifdef DEBUG
+ 		g_print ("%s\t%s:%s\t%s\n", data.protocol,
+ 			data.ip_src, data.port_src, data.state);
+@@ -331,11 +339,42 @@
  strip_protocol_line (gchar * line, netstat_protocol_data *data)
  {
  	gint count = 0;
@@ -28,19 +40,34 @@
  
 +#ifdef __FreeBSD__
 +	count = sscanf (line, NETSTAT_PROTOCOL_FORMAT,
-+			&(data)->protocol, &n2, &n3,
-+			&a1, &a2, &a3, &a4, &(data)->port_src,
-+			s9, &(data)->state);
-+	snprintf (&(data)->ip_src, 30, "%d.%d.%d.%d", a1, a2, a3, a4);
++			data->protocol, &n2, &n3,
++			&a1, &a2, &a3, &a4, data->port_src,
++			s9, data->state);
++	g_snprintf (data->ip_src, 30, "%d.%d.%d.%d", a1, a2, a3, a4);
 +
 +	if (count == 9) {
 +	    bzero (&(data)->state, 30);
 +	}
++
++	if (count == 3) {
++	    /* Handle the *.* entries. */
++	    gchar s5[30];
++	    count = sscanf (line, ALT_NETSTAT_PROTOCOL_FORMAT,
++		    	    data->protocol, &n2, &n3,
++			    data->port_src, s5,
++			    data->state);
++	    g_snprintf (data->ip_src, 30, "*");
++
++	    if (count == 5) {
++		bzero (&(data)->state, 30);
++	    }
++	}
++
 +#else
  	count = sscanf (line, NETSTAT_PROTOCOL_FORMAT,
- 			&(data)->protocol, &n2, &n3,
- 			&(data)->ip_src, &(data)->port_src, 
-@@ -348,6 +368,7 @@
+ 			data->protocol, &n2, &n3,
+ 			data->ip_src, data->port_src, 
+@@ -344,6 +383,7 @@
  	if (count == 7) {
  		bzero (&(data)->state, 30);
  	}
@@ -48,27 +75,62 @@
  	
  	return count;
  }
-@@ -477,12 +498,23 @@
- 	gint count = 0;
- 	gchar flags[30];
- 	gint ref, use;
+@@ -405,7 +445,11 @@
+ 	g_return_if_fail (line != NULL);
+ 
+ 	count = strip_route_line (line, &data);
 +#ifdef __FreeBSD__
-+	gint expire;
++	if (count == 6) {
++#else
+ 	if (count == 8) {
 +#endif
+ #ifdef DEBUG
+ 		g_print ("%s\t%s:%s\t%d\t%s\n", data.destination,
+ 			data.gateway, data.netmask, data.metric,
+@@ -474,11 +518,19 @@
+ 	gchar flags[30];
+ 	gint ref, use;
  
 +#ifdef __FreeBSD__
 +	count = sscanf (line, NETSTAT_ROUTE_FORMAT,
-+			&(data)->destination,
-+			&(data)->gateway, flags,
-+			&ref, &use, &(data)->iface,
-+			&expire);
++			data->destination,
++			data->gateway, flags,
++			&ref, &use, data->iface);
 +#else
++
  	count = sscanf (line, NETSTAT_ROUTE_FORMAT,
- 			&(data)->destination,
- 			&(data)->gateway, &(data)->netmask, 
+ 			data->destination,
+ 			data->gateway, data->netmask, 
  			flags, &(data)->metric, &ref, &use, 
- 			&(data)->iface);
+ 			data->iface);
 +#endif
  	
  	return count;
  }
+@@ -493,7 +545,11 @@
+ 	renderer = gtk_cell_renderer_text_new ();
+ 	column =
+ 	    gtk_tree_view_column_new_with_attributes
++#ifdef __FreeBSD__
++	    ("Destination/Prefix", renderer, "text", 0, NULL);
++#else
+ 	    (_("Destination"), renderer, "text", 0, NULL);
++#endif
+ 	gtk_tree_view_append_column (widget, column);
+ 
+ 	renderer = gtk_cell_renderer_text_new ();
+@@ -503,12 +559,14 @@
+ 	gtk_tree_view_column_set_alignment (column, 0.5);
+ 	gtk_tree_view_append_column (widget, column);
+ 
++#ifndef __FreeBSD__
+ 	renderer = gtk_cell_renderer_text_new ();
+ 	column =
+ 	    gtk_tree_view_column_new_with_attributes
+ 	    (_("Netmask"), renderer, "text", 2, NULL);
+ 		
+ 	gtk_tree_view_append_column (widget, column);
++#endif
+ 
+ 	renderer = gtk_cell_renderer_text_new ();
+ 	column =
diff --git a/net/gnomenetwork/files/patch-gnome-netinfo_netstat.h b/net/gnomenetwork/files/patch-gnome-netinfo_netstat.h
index aa324e951..6e00ba018 100644
--- a/net/gnomenetwork/files/patch-gnome-netinfo_netstat.h
+++ b/net/gnomenetwork/files/patch-gnome-netinfo_netstat.h
@@ -1,12 +1,13 @@
---- gnome-netinfo/netstat.h.orig	Mon Sep  1 02:24:37 2003
-+++ gnome-netinfo/netstat.h	Mon Sep  1 02:27:08 2003
-@@ -28,6 +28,10 @@
+--- gnome-netinfo/netstat.h.orig	Sun Jul 20 22:31:57 2003
++++ gnome-netinfo/netstat.h	Sun Dec  7 01:32:10 2003
+@@ -28,6 +28,11 @@
  #   define NETSTAT_PROTOCOL_FORMAT "%s %d %d %s %s %s %s %s" 
  #   define NETSTAT_ROUTE_FORMAT "%s %s %s %s %d %d %d %s" 
  #   define NETSTAT_MULTICAST_FORMAT "%s %d %s" 
 +#elif defined(__FreeBSD__)
-+#   define NETSTAT_PROTOCOL_FORMAT "%s %d %d %d.%d.%d.%d.%d %s %s"
-+#   define NETSTAT_ROUTE_FORMAT "%s %s %s %d %d %s %d"
++#   define NETSTAT_PROTOCOL_FORMAT "%s %d %d %d.%d.%d.%d.%s %s %s"
++#   define ALT_NETSTAT_PROTOCOL_FORMAT "%s %d %d *.%s %s %s"
++#   define NETSTAT_ROUTE_FORMAT "%s %s %s %d %d %s"
 +#   define NETSTAT_MULTICAST_FORMAT "%s %d %s"
  
  #endif
diff --git a/net/gnomenetwork/files/patch-gnome-netinfo_ping.c b/net/gnomenetwork/files/patch-gnome-netinfo_ping.c
new file mode 100644
index 000000000..40f2b83fa
--- /dev/null
+++ b/net/gnomenetwork/files/patch-gnome-netinfo_ping.c
@@ -0,0 +1,11 @@
+--- gnome-netinfo/ping.c.orig	Sat Dec  6 23:08:52 2003
++++ gnome-netinfo/ping.c	Sat Dec  6 23:17:35 2003
+@@ -330,6 +330,8 @@
+ 
+ 	if (netinfo_get_ip_version (netinfo) == IPV4)
+ 		line = g_strdelimit (line, ":", ' ');
++	else
++	    	line = g_strdelimit (line, ",", ' ');
+ 
+ #ifdef PING_PARAMS_5
+ 	count = sscanf (line, PING_FORMAT,
diff --git a/net/gnomenetwork/files/patch-gnome-netinfo_ping.h b/net/gnomenetwork/files/patch-gnome-netinfo_ping.h
new file mode 100644
index 000000000..debf4603d
--- /dev/null
+++ b/net/gnomenetwork/files/patch-gnome-netinfo_ping.h
@@ -0,0 +1,11 @@
+--- gnome-netinfo/ping.h.orig	Sat Dec  6 23:11:01 2003
++++ gnome-netinfo/ping.h	Sat Dec  6 23:17:53 2003
+@@ -25,7 +25,7 @@
+ 
+ /* The ping usage and output is different between Unix flavours */
+ /* FIXME: Add BSD support */
+-#if defined(__linux__) || defined(__OSF__)
++#if defined(__linux__) || defined(__OSF__) || defined(__FreeBSD__)
+ #   define PING_PROGRAM_FORMAT "%s ping -c %d -n %s"
+ #   define PING_PROGRAM_FORMAT_6 "%s ping6 -c %d -n %s"
+ #   define PING_FORMAT "%d bytes from %s icmp_seq=%d ttl=%d time=%s %s"
diff --git a/net/gnomenetwork/files/patch-gnome-netinfo_util-mii.c b/net/gnomenetwork/files/patch-gnome-netinfo_util-mii.c
new file mode 100644
index 000000000..9d38a3d3d
--- /dev/null
+++ b/net/gnomenetwork/files/patch-gnome-netinfo_util-mii.c
@@ -0,0 +1,15 @@
+--- gnome-netinfo/util-mii.c.orig	Sat Dec  6 23:30:50 2003
++++ gnome-netinfo/util-mii.c	Sat Dec  6 23:38:14 2003
+@@ -39,6 +39,7 @@
+  * http://www.national.com/pf/DP/DP83840.html
+  */
+ 
++#ifdef __linux__
+ #include <glib.h>
+ 
+ #include <errno.h>
+@@ -237,3 +238,4 @@
+ 	close (sock);
+ 	return data;
+ }
++#endif
diff --git a/net/gnomenetwork/pkg-plist b/net/gnomenetwork/pkg-plist
index 8fc16e3b4..5c7e7394d 100644
--- a/net/gnomenetwork/pkg-plist
+++ b/net/gnomenetwork/pkg-plist
@@ -1,18 +1,31 @@
 bin/gnome-remote-shell
-bin/gnome-backup
 bin/gnome-remote-desktop
 bin/gnome-netinfo
+share/gnome/application-registry/gnome-remote-desktop.applications
 share/gnome/applications/gnome-network-utilities.desktop
-share/gnome/applications/gnome-backup.desktop
-share/gnome/applications/gnome-remote-desktop.desktop
 share/gnome/applications/gnome-netinfo.desktop
-share/gnome/gnome-backup/glade/gnome-backup.glade
-share/gnome/gnome-remote-desktop/glade/gnome-remote-desktop.glade
+share/gnome/apps/Internet/gnome-remote-desktop.desktop
 share/gnome/gnome-network/dialogs/gnome-netinfo.glade
+share/gnome/gnome-network/dialogs/gnome-remote-shell.glade
+share/gnome/mime-info/gnome-remote-desktop.keys
+share/gnome/mime-info/gnome-remote-desktop.mime
+share/gnome/pixmaps/gnome-netinfo.png
+share/gnome/pixmaps/gnome-network/colors.png
+share/gnome/pixmaps/gnome-network/computer.png
+share/gnome/pixmaps/gnome-network/gnome-remote-desktop.png
+share/gnome/pixmaps/gnome-network/keyboard.png
+share/gnome/pixmaps/gnome-network/perform.png
+share/gnome/pixmaps/gnome-network/program.png
+share/gnome/pixmaps/gnome-network/size.png
+share/gnome/pixmaps/gnome-network/sound.png
+share/gnome/pixmaps/gnome-remote-desktop.png
+share/gnome/pixmaps/gnome-remote-shell.png
+share/locale/az/LC_MESSAGES/gnome-network.mo
 share/locale/ca/LC_MESSAGES/gnome-network.mo
 share/locale/cs/LC_MESSAGES/gnome-network.mo
 share/locale/da/LC_MESSAGES/gnome-network.mo
 share/locale/de/LC_MESSAGES/gnome-network.mo
+share/locale/el/LC_MESSAGES/gnome-network.mo
 share/locale/es/LC_MESSAGES/gnome-network.mo
 share/locale/fr/LC_MESSAGES/gnome-network.mo
 share/locale/ga/LC_MESSAGES/gnome-network.mo
@@ -22,6 +35,7 @@ share/locale/hu/LC_MESSAGES/gnome-network.mo
 share/locale/it/LC_MESSAGES/gnome-network.mo
 share/locale/ja/LC_MESSAGES/gnome-network.mo
 share/locale/ko/LC_MESSAGES/gnome-network.mo
+share/locale/ms/LC_MESSAGES/gnome-network.mo
 share/locale/nl/LC_MESSAGES/gnome-network.mo
 share/locale/no/LC_MESSAGES/gnome-network.mo
 share/locale/pl/LC_MESSAGES/gnome-network.mo
@@ -37,9 +51,6 @@ share/locale/vi/LC_MESSAGES/gnome-network.mo
 share/locale/wa/LC_MESSAGES/gnome-network.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-network.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-network.mo
-@dirrm share/gnome/gnome-remote-desktop/glade
-@dirrm share/gnome/gnome-remote-desktop
+@dirrm share/gnome/pixmaps/gnome-network
 @dirrm share/gnome/gnome-network/dialogs
 @dirrm share/gnome/gnome-network
-@dirrm share/gnome/gnome-backup/glade
-@dirrm share/gnome/gnome-backup