Update to 1.99.1...sort of. It doesn't build as there are a lot of

Linux-specific bits still in there.


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

6 files changed, 115 insertions, 39 deletions

diff --git a/net/gnomenetwork/Makefile b/net/gnomenetwork/Makefile
index b13072960..c6ff749b7 100644
--- a/net/gnomenetwork/Makefile
+++ b/net/gnomenetwork/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomenetwork
-PORTVERSION=	1.99.0
-PORTREVISION=	2
+PORTVERSION=	1.99.1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-network/1.99
@@ -17,6 +16,8 @@ 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_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
 USE_GMAKE=	yes
diff --git a/net/gnomenetwork/distinfo b/net/gnomenetwork/distinfo
index 19ca1e24f..0a74386a1 100644
--- a/net/gnomenetwork/distinfo
+++ b/net/gnomenetwork/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-network-1.99.0.tar.bz2) = 3c8bb27a941b7132a27880e6ebb1e771
+MD5 (gnome2/gnome-network-1.99.1.tar.bz2) = e5e4bbff44b972ea782bd764c4e07151
diff --git a/net/gnomenetwork/files/patch-gnome-netinfo::info.c b/net/gnomenetwork/files/patch-gnome-netinfo::info.c
index bc9e4209b..c32f9e4b1 100644
--- a/net/gnomenetwork/files/patch-gnome-netinfo::info.c
+++ b/net/gnomenetwork/files/patch-gnome-netinfo::info.c
@@ -1,64 +1,40 @@
---- gnome-netinfo/info.c.orig	Thu Mar 20 15:04:48 2003
-+++ gnome-netinfo/info.c	Sat Jun 28 20:45:20 2003
-@@ -26,6 +26,10 @@
+--- 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 @@
  #endif
  
  
-+#ifdef __FreeBSD__
-+#  include <netinet/in.h>
-+#endif
-+
++#include <netinet/in.h>
  #include <sys/socket.h>	/* basic socket definitions */
  #include <arpa/inet.h>	/* inet(3) functions */
  #include <sys/un.h>	/* for Unix domain sockets */
-@@ -124,7 +128,7 @@
- 	gint flags;
+@@ -180,7 +181,7 @@
  	gboolean loopback;
- 
+ 	mii_data_result data;
+ 		
 -	sockfd = socket (AF_INET, SOCK_DGRAM, 0);
 +	sockfd = socket (AF_INET, SOCK_STREAM, 0);
  
  	ifc.ifc_len = sizeof (buf);
  	ifc.ifc_req = (struct ifreq *) buf;
-@@ -133,13 +137,13 @@
+@@ -189,7 +190,7 @@
  	for (ptr = buf; ptr < buf + ifc.ifc_len;) {
  		ifr = (struct ifreq *) ptr;
  		len = sizeof (struct sockaddr);
 -#ifdef	HAVE_SOCKADDR_SA_LEN
-+#if defined(HAVE_SOCKADDR_SA_LEN) || defined(__FreeBSD__)
++#if	defined(HAVE_SOCKADDR_SA_LEN) || defined(__FreeBSD__)
  		if (ifr->ifr_addr.sa_len > len)
  			len = ifr->ifr_addr.sa_len;	/* length > 16 */
  #endif
- 		ptr += sizeof (ifr->ifr_name) + len;	/* for next one in buffer */
- 
--		if (strcmp (ifr->ifr_name, nic) != 0) {
-+		if (strcmp (ifr->ifr_name, nic) != 0 || ifr->ifr_addr.sa_family != AF_INET) {
- 			continue;
- 		}
- 		
-@@ -149,10 +153,10 @@
- 			/* Get the IPv4 address */
- 			sinptr = (struct sockaddr_in *) &ifr->ifr_addr;
- 			inet_ntop (AF_INET, &sinptr->sin_addr, dst, INFO_ADDRSTRLEN);
--			
-+		
- 			gtk_label_set_text (GTK_LABEL (info->ip_address), dst);
- 			bzero (dst, INFO_ADDRSTRLEN);
--			
-+		
- 			ifrcopy = *ifr;
- 			flags = ifrcopy.ifr_flags;
- 
-@@ -255,7 +259,7 @@
+@@ -322,7 +323,6 @@
  			break;
  		}
  	}
 -	g_free (ifr);
-+/*	g_free (ifr);*/
  }
  
  GList *
-@@ -269,8 +273,10 @@
+@@ -336,8 +336,10 @@
  	struct ifreq *ifr;
  	int sockfd, len;
  
@@ -70,7 +46,7 @@
  	ifc.ifc_len = sizeof (buf);
  	ifc.ifc_req = (struct ifreq *) buf;
  
-@@ -281,9 +287,11 @@
+@@ -348,9 +350,11 @@
  		len = sizeof (struct sockaddr);
  
  		iface = g_strdup (ifr->ifr_name);
diff --git a/net/gnomenetwork/files/patch-gnome-netinfo_netstat.c b/net/gnomenetwork/files/patch-gnome-netinfo_netstat.c
new file mode 100644
index 000000000..c89520c47
--- /dev/null
+++ b/net/gnomenetwork/files/patch-gnome-netinfo_netstat.c
@@ -0,0 +1,74 @@
+--- 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 @@
+ 	}
+ 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (netinfo->protocol))) {
+ 		/* Only works for Solaris */
++#ifdef __FreeBSD__
++	    	option = g_strdup ("-a -f inet -ln");
++#else
+ 		option = g_strdup ("-A inet -ln");
++#endif
+ 	}
+ 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (netinfo->multicast))) {
+ 		/* It works for Solaris and Linux */
+@@ -335,11 +339,27 @@
+ strip_protocol_line (gchar * line, netstat_protocol_data *data)
+ {
+ 	gint count = 0;
++#ifdef __FreeBSD__
++	gint a1, a2, a3, a4;
++	gchar s9[30];
++#else
+ 	gchar s6[30], s7[30];
++#endif
+ 	gint n2, n3;
+ 
+ 	line = g_strdelimit (line, ":", ' ');
+ 
++#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);
++
++	if (count == 9) {
++	    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 @@
+ 	if (count == 7) {
+ 		bzero (&(data)->state, 30);
+ 	}
++#endif
+ 	
+ 	return count;
+ }
+@@ -477,12 +498,23 @@
+ 	gint count = 0;
+ 	gchar flags[30];
+ 	gint ref, use;
++#ifdef __FreeBSD__
++	gint expire;
++#endif
+ 
++#ifdef __FreeBSD__
++	count = sscanf (line, NETSTAT_ROUTE_FORMAT,
++			&(data)->destination,
++			&(data)->gateway, flags,
++			&ref, &use, &(data)->iface,
++			&expire);
++#else
+ 	count = sscanf (line, NETSTAT_ROUTE_FORMAT,
+ 			&(data)->destination,
+ 			&(data)->gateway, &(data)->netmask, 
+ 			flags, &(data)->metric, &ref, &use, 
+ 			&(data)->iface);
++#endif
+ 	
+ 	return count;
+ }
diff --git a/net/gnomenetwork/files/patch-gnome-netinfo_netstat.h b/net/gnomenetwork/files/patch-gnome-netinfo_netstat.h
new file mode 100644
index 000000000..aa324e951
--- /dev/null
+++ b/net/gnomenetwork/files/patch-gnome-netinfo_netstat.h
@@ -0,0 +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 @@
+ #   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_MULTICAST_FORMAT "%s %d %s"
+ 
+ #endif
+ 
diff --git a/net/gnomenetwork/files/patch-network-utilities_gnome-remote-shell.c b/net/gnomenetwork/files/patch-network-utilities_gnome-remote-shell.c
new file mode 100644
index 000000000..0ac22218e
--- /dev/null
+++ b/net/gnomenetwork/files/patch-network-utilities_gnome-remote-shell.c
@@ -0,0 +1,12 @@
+--- network-utilities/gnome-remote-shell.c.orig	Mon Sep  1 01:56:21 2003
++++ network-utilities/gnome-remote-shell.c	Mon Sep  1 01:58:11 2003
+@@ -23,6 +23,9 @@
+ #endif
+ 
+ #include <netdb.h>
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
+ #include <gconf/gconf-client.h>
+ #include <gtk/gtkdialog.h>
+ #include <gtk/gtkentry.h>