Remove this port now that it is part of the FreeBSD ports tree.

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

33 files changed, 0 insertions, 1222 deletions

diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
deleted file mode 100644
index 4c5494cb6..000000000
--- a/net/gnome-netstatus/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# New ports collection makefile for:   gnomenetstatus
-# Date Created:			05 December 2003
-# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnomenetstatus
-PORTVERSION=	0.12
-PORTREVISION=	1
-CATEGORIES=	net gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-netstatus/0.12
-DISTNAME=	gnome-netstatus-${PORTVERSION}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A GNOME applet that shows network status
-
-USE_X_PREFIX=	yes
-USE_BZIP2=	yes
-USE_GNOME=	gnomehack gnomeprefix libgnome
-USE_GMAKE=	yes
-USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-.include <bsd.port.mk>
diff --git a/net/gnome-netstatus/distinfo b/net/gnome-netstatus/distinfo
deleted file mode 100644
index f355b4b3f..000000000
--- a/net/gnome-netstatus/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (gnome2/gnome-netstatus-0.12.tar.bz2) = 9977c8fddaaa335c86772da56a591112
diff --git a/net/gnome-netstatus/files/patch-configure b/net/gnome-netstatus/files/patch-configure
deleted file mode 100644
index f195f07b4..000000000
--- a/net/gnome-netstatus/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Wed Dec 11 18:31:51 2002
-+++ configure	Thu Dec 12 12:07:17 2002
-@@ -7414,6 +7414,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/net/gnome-netstatus/files/patch-src_netstatus-iface.c b/net/gnome-netstatus/files/patch-src_netstatus-iface.c
deleted file mode 100644
index f33269915..000000000
--- a/net/gnome-netstatus/files/patch-src_netstatus-iface.c
+++ /dev/null
@@ -1,114 +0,0 @@
---- src/netstatus-iface.c.orig	Fri Oct 31 08:49:51 2003
-+++ src/netstatus-iface.c	Fri Jan  2 23:29:27 2004
-@@ -32,9 +32,12 @@
- 
- #include <libgnome/gnome-i18n.h>
- 
-+#include <sys/types.h>
-+#include <sys/socket.h>
- #include <sys/ioctl.h>
- #include <net/if.h>
- #include <net/if_arp.h>
-+#include <netinet/in.h>
- #include <arpa/inet.h>
- #include <errno.h>
- #include <unistd.h>
-@@ -577,6 +580,7 @@
- 					       iface);
- 
-       netstatus_iface_monitor_timeout (iface);
-+
-     }
- }
- 
-@@ -646,7 +650,11 @@
-   strncpy (if_req.ifr_name, iface->priv->name, IF_NAMESIZE - 1);
-   if_req.ifr_name [IF_NAMESIZE - 1] = '\0';
-   if (mask && ioctl (fd, SIOCGIFNETMASK, &if_req) == 0)
-+#if !defined(__FreeBSD__)
-     *mask = g_strdup (inet_ntoa (((struct sockaddr_in *) &if_req.ifr_netmask)->sin_addr));
-+#else
-+    *mask = g_strdup (inet_ntoa (((struct sockaddr_in *) &if_req.ifr_addr)->sin_addr));
-+#endif
- 
-   close (fd);
- 
-@@ -925,6 +933,7 @@
- 				char           **hw_addr)
- 				
- {
-+#ifdef SIOCGIFHWADDR
-   static struct HwType *hw_type = NULL;
-   struct ifreq          if_req;
-   int                   fd;
-@@ -973,6 +982,9 @@
-     *hw_addr = hw_type->print_hw_addr (if_req.ifr_hwaddr.sa_data);
- 
-   return hw_type;
-+#else
-+  return NULL;
-+#endif
- }
- 
- gboolean
-@@ -1083,8 +1095,11 @@
-   struct ifconf *if_conf;
-   GList         *interfaces;
-   GList         *loopbacks;
-+  gchar         *ptr;
-   int            fd;
--  int            i;
-+  struct ifreq  *if_req;
-+  int            len;
-+  gboolean       loopback;
-   
-   if ((fd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
-     {
-@@ -1105,12 +1120,25 @@
-   interfaces = NULL;
-   loopbacks  = NULL;
- 
--  for (i = 0; i < if_conf->ifc_len / sizeof (struct ifreq); i++)
-+  for (ptr = if_conf->ifc_buf; ptr < if_conf->ifc_buf + if_conf->ifc_len;)
-     {
--      struct ifreq if_req = if_conf->ifc_req [i];
--      gboolean     loopback = FALSE;
-+      if_req = (struct ifreq *) ptr;
-+      loopback = FALSE;
-+      len      = sizeof(struct sockaddr);
-+#if defined(HAVE_SOCKADDR_SA_LEN) || defined(__FreeBSD__)
-+      if (if_req->ifr_addr.sa_len > len)
-+	len = if_req->ifr_addr.sa_len;
-+#endif
-+
-+      ptr += sizeof(if_req->ifr_name) + len;
-+ 
-+      if (g_list_find_custom (interfaces, if_req->ifr_name, 
-+		  (GCompareFunc) g_ascii_strcasecmp) != NULL
-+	      || g_list_find_custom (loopbacks, if_req->ifr_name,
-+		  (GCompareFunc) g_ascii_strcasecmp) != NULL)
-+	continue;
- 
--      if (ioctl (fd, SIOCGIFFLAGS, &if_req) < 0)
-+      if (ioctl (fd, SIOCGIFFLAGS, if_req) < 0)
- 	{
- 	  if (error)
- 	    *error = g_error_new (NETSTATUS_ERROR,
-@@ -1120,13 +1148,14 @@
- 	}
-       else
- 	{
--	  loopback = (if_req.ifr_flags & IFF_LOOPBACK);
-+	  loopback = (if_req->ifr_flags & IFF_LOOPBACK);
- 	}
- 
-       if (!loopback)
--	interfaces = g_list_prepend (interfaces, g_strdup (if_req.ifr_name));
-+	interfaces = g_list_prepend (interfaces, g_strdup (if_req->ifr_name));
-       else
--	loopbacks  = g_list_prepend (loopbacks,  g_strdup (if_req.ifr_name));
-+	loopbacks  = g_list_prepend (loopbacks,  g_strdup (if_req->ifr_name));
-+
-     }
- 
-   interfaces = g_list_concat (interfaces, loopbacks);
diff --git a/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c b/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c
deleted file mode 100644
index 3598a24e6..000000000
--- a/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c
+++ /dev/null
@@ -1,160 +0,0 @@
---- src/netstatus-sysdeps.c.orig	Mon Jun  9 13:18:04 2003
-+++ src/netstatus-sysdeps.c	Fri Jan  2 23:29:16 2004
-@@ -27,10 +27,13 @@
- 
- #include <stdio.h>
- #include <string.h>
-+#include <unistd.h>
- #include <errno.h>
- #include <glib.h>
- #include <libgnome/gnome-i18n.h>
- 
-+#if !defined(__FreeBSD__)
-+
- static inline char *
- parse_iface_name (const char *buf)
- {
-@@ -90,6 +93,7 @@
- 	}
-     }
- }
-+#endif
- 
- static inline int
- parse_stats (char  *buf,
-@@ -124,6 +128,8 @@
-   return TRUE;
- }
- 
-+#if !defined(__FreeBSD__)
-+
- static inline FILE *
- get_proc_net_dev_fh (void)
- {
-@@ -206,3 +212,126 @@
- 
-   return error_message;
- }
-+
-+#else
-+
-+static inline void
-+parse_header (char *buf,
-+	      int  *prx_idx,
-+	      int  *ptx_idx,
-+	      int  *brx_idx,
-+	      int  *btx_idx)
-+{
-+   char *p;
-+   int   i;
-+
-+   *prx_idx = *ptx_idx = -1;
-+   *brx_idx = *btx_idx = -1;
-+
-+   p = strtok (buf, " \n\t");
-+   for (i = 0; p; i++, p = strtok (NULL, " \t\n"))
-+     {
-+        if (!strcmp (p, "Ipkts"))
-+	  {
-+	     *prx_idx = i;
-+	  }
-+	else if (!strcmp (p, "Ibytes"))
-+	  {
-+	     *brx_idx = i;
-+	  }
-+	else if (!strcmp (p, "Opkts"))
-+	  {
-+	     *ptx_idx = i;
-+	  }
-+	else if (!strcmp (p, "Obytes"))
-+	  {
-+	     *btx_idx = i;
-+	  }
-+     }
-+}
-+
-+char *
-+netstatus_sysdeps_read_iface_statistics (const char *iface,
-+					 long       *in_packets,
-+					 long       *out_packets,
-+					 long       *in_bytes,
-+					 long       *out_bytes)
-+{
-+   gchar *buf;
-+   gchar *cmd = NULL;
-+   gchar **command_line;
-+   int prx_idx, ptx_idx;
-+   int brx_idx, btx_idx;
-+   char *error_message = NULL;
-+   gchar *dir = g_get_current_dir ();
-+   gint pout;
-+   GIOChannel *channel;
-+   GError *err = NULL;
-+
-+   *in_packets = -1;
-+   *out_packets = -1;
-+   *in_bytes = -1;
-+   *out_bytes = -1;
-+
-+   cmd = g_strdup_printf ("/usr/bin/netstat netstat -n -I %s -b -f inet", iface);
-+   command_line = g_strsplit (cmd, " ", -1);
-+   g_free (cmd);
-+
-+   if (g_spawn_async_with_pipes (dir, command_line, NULL,
-+	       			 G_SPAWN_FILE_AND_ARGV_ZERO, NULL,
-+				 NULL, NULL, NULL, &pout,
-+				 NULL, &err)) {
-+       g_strfreev (command_line);
-+       channel = g_io_channel_unix_new (pout);
-+       g_io_channel_read_line (channel, &buf, NULL, NULL, NULL);
-+
-+       parse_header (buf, &prx_idx, &ptx_idx, &brx_idx, &btx_idx);
-+       if (prx_idx == -1 || ptx_idx == -1 ||
-+	   brx_idx == -1 || btx_idx == -1)
-+         {
-+	   if (buf)
-+	     g_free (buf);
-+	   g_io_channel_unref (channel);
-+	   g_io_channel_shutdown (channel, TRUE, NULL);
-+	   close (pout);
-+	   return g_strdup ("Could not parse netstat output.  Unknown format");
-+	 }
-+
-+       if (buf)
-+          g_free (buf);
-+       g_io_channel_read_line (channel, &buf, NULL, NULL, NULL);
-+
-+       if (!parse_stats (buf, prx_idx, ptx_idx, in_packets, out_packets,
-+	       	    brx_idx, btx_idx, in_bytes, out_bytes))
-+       {
-+	  if (error_message)
-+	     g_free (error_message);
-+	  error_message = g_strdup_printf (_("Could not parse interface statistics from '%s'. "
-+		      	     "prx_idx = %d; ptx_idx = %d; brx_idx = %d; btx_idx = %d;"),
-+		  	     buf, prx_idx, ptx_idx, brx_idx, btx_idx);
-+       }
-+
-+       if (buf)
-+	 g_free (buf);
-+
-+       if ((*in_packets == -1 || *out_packets == -1 || *in_bytes == -1 || *out_bytes == -1) && !error_message)
-+	   error_message = g_strdup_printf ("Could not obtain information on interface '%s' from netstat", iface);
-+
-+       g_io_channel_unref (channel);
-+       g_io_channel_shutdown (channel, TRUE, NULL);
-+       close (pout);
-+   }
-+   else {
-+      g_strfreev (command_line);
-+      if (error_message)
-+        g_free (error_message);
-+      error_message = g_strdup_printf ("Error running /usr/bin/netstat for '%s': %s", 
-+	iface, err->message);
-+      g_error_free (err);
-+   }
-+
-+   g_free (dir);
-+
-+   return error_message;
-+}
-+#endif
diff --git a/net/gnome-netstatus/pkg-descr b/net/gnome-netstatus/pkg-descr
deleted file mode 100644
index 85e70885c..000000000
--- a/net/gnome-netstatus/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-Gnome-netstatus is an applet which provides information about a network 
-interface on your panel.
diff --git a/net/gnome-netstatus/pkg-plist b/net/gnome-netstatus/pkg-plist
deleted file mode 100644
index e8b096d6e..000000000
--- a/net/gnome-netstatus/pkg-plist
+++ /dev/null
@@ -1,40 +0,0 @@
-etc/gconf/gconf.xml.defaults/apps/netstatus_applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/netstatus_applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/netstatus_applet/prefs/%gconf.xml
-etc/gconf/schemas/netstatus.schemas
-libdata/bonobo/servers/GNOME_NetstatusApplet_Factory.server
-libexec/gnome-netstatus-applet
-share/gnome/gnome-2.0/ui/GNOME_NetstatusApplet.xml
-share/gnome/gnome-netstatus/gnome-netstatus.glade
-share/gnome/icons/gnome-netstatus/gnome-netstatus-disconn.png
-share/gnome/icons/gnome-netstatus/gnome-netstatus-error.png
-share/gnome/icons/gnome-netstatus/gnome-netstatus-idle.png
-share/gnome/icons/gnome-netstatus/gnome-netstatus-rx.png
-share/gnome/icons/gnome-netstatus/gnome-netstatus-tx.png
-share/gnome/icons/gnome-netstatus/gnome-netstatus-txrx.png
-share/gnome/pixmaps/gnome-netstatus-tx.png
-share/locale/az/LC_MESSAGES/gnome-netstatus.mo
-share/locale/cs/LC_MESSAGES/gnome-netstatus.mo
-share/locale/de/LC_MESSAGES/gnome-netstatus.mo
-share/locale/el/LC_MESSAGES/gnome-netstatus.mo
-share/locale/es/LC_MESSAGES/gnome-netstatus.mo
-share/locale/fr/LC_MESSAGES/gnome-netstatus.mo
-share/locale/it/LC_MESSAGES/gnome-netstatus.mo
-share/locale/ja/LC_MESSAGES/gnome-netstatus.mo
-share/locale/ms/LC_MESSAGES/gnome-netstatus.mo
-share/locale/nl/LC_MESSAGES/gnome-netstatus.mo
-share/locale/pl/LC_MESSAGES/gnome-netstatus.mo
-share/locale/pt/LC_MESSAGES/gnome-netstatus.mo
-share/locale/ru/LC_MESSAGES/gnome-netstatus.mo
-share/locale/sr/LC_MESSAGES/gnome-netstatus.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-netstatus.mo
-share/locale/sv/LC_MESSAGES/gnome-netstatus.mo
-share/locale/tr/LC_MESSAGES/gnome-netstatus.mo
-share/locale/vi/LC_MESSAGES/gnome-netstatus.mo
-share/locale/wa/LC_MESSAGES/gnome-netstatus.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-netstatus.mo
-@dirrm share/gnome/icons/gnome-netstatus
-@dirrm share/gnome/gnome-netstatus
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/netstatus_applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/netstatus_applet
-@dirrm etc/gconf/gconf.xml.defaults/apps/netstatus_applet
diff --git a/net/gnomenetstatus/Makefile b/net/gnomenetstatus/Makefile
deleted file mode 100644
index 4c5494cb6..000000000
--- a/net/gnomenetstatus/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# New ports collection makefile for:   gnomenetstatus
-# Date Created:			05 December 2003
-# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnomenetstatus
-PORTVERSION=	0.12
-PORTREVISION=	1
-CATEGORIES=	net gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-netstatus/0.12
-DISTNAME=	gnome-netstatus-${PORTVERSION}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A GNOME applet that shows network status
-
-USE_X_PREFIX=	yes
-USE_BZIP2=	yes
-USE_GNOME=	gnomehack gnomeprefix libgnome
-USE_GMAKE=	yes
-USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-.include <bsd.port.mk>
diff --git a/net/gnomenetstatus/distinfo b/net/gnomenetstatus/distinfo
deleted file mode 100644
index f355b4b3f..000000000
--- a/net/gnomenetstatus/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (gnome2/gnome-netstatus-0.12.tar.bz2) = 9977c8fddaaa335c86772da56a591112
diff --git a/net/gnomenetstatus/files/patch-configure b/net/gnomenetstatus/files/patch-configure
deleted file mode 100644
index f195f07b4..000000000
--- a/net/gnomenetstatus/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Wed Dec 11 18:31:51 2002
-+++ configure	Thu Dec 12 12:07:17 2002
-@@ -7414,6 +7414,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/net/gnomenetstatus/files/patch-src_netstatus-iface.c b/net/gnomenetstatus/files/patch-src_netstatus-iface.c
deleted file mode 100644
index f33269915..000000000
--- a/net/gnomenetstatus/files/patch-src_netstatus-iface.c
+++ /dev/null
@@ -1,114 +0,0 @@
---- src/netstatus-iface.c.orig	Fri Oct 31 08:49:51 2003
-+++ src/netstatus-iface.c	Fri Jan  2 23:29:27 2004
-@@ -32,9 +32,12 @@
- 
- #include <libgnome/gnome-i18n.h>
- 
-+#include <sys/types.h>
-+#include <sys/socket.h>
- #include <sys/ioctl.h>
- #include <net/if.h>
- #include <net/if_arp.h>
-+#include <netinet/in.h>
- #include <arpa/inet.h>
- #include <errno.h>
- #include <unistd.h>
-@@ -577,6 +580,7 @@
- 					       iface);
- 
-       netstatus_iface_monitor_timeout (iface);
-+
-     }
- }
- 
-@@ -646,7 +650,11 @@
-   strncpy (if_req.ifr_name, iface->priv->name, IF_NAMESIZE - 1);
-   if_req.ifr_name [IF_NAMESIZE - 1] = '\0';
-   if (mask && ioctl (fd, SIOCGIFNETMASK, &if_req) == 0)
-+#if !defined(__FreeBSD__)
-     *mask = g_strdup (inet_ntoa (((struct sockaddr_in *) &if_req.ifr_netmask)->sin_addr));
-+#else
-+    *mask = g_strdup (inet_ntoa (((struct sockaddr_in *) &if_req.ifr_addr)->sin_addr));
-+#endif
- 
-   close (fd);
- 
-@@ -925,6 +933,7 @@
- 				char           **hw_addr)
- 				
- {
-+#ifdef SIOCGIFHWADDR
-   static struct HwType *hw_type = NULL;
-   struct ifreq          if_req;
-   int                   fd;
-@@ -973,6 +982,9 @@
-     *hw_addr = hw_type->print_hw_addr (if_req.ifr_hwaddr.sa_data);
- 
-   return hw_type;
-+#else
-+  return NULL;
-+#endif
- }
- 
- gboolean
-@@ -1083,8 +1095,11 @@
-   struct ifconf *if_conf;
-   GList         *interfaces;
-   GList         *loopbacks;
-+  gchar         *ptr;
-   int            fd;
--  int            i;
-+  struct ifreq  *if_req;
-+  int            len;
-+  gboolean       loopback;
-   
-   if ((fd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
-     {
-@@ -1105,12 +1120,25 @@
-   interfaces = NULL;
-   loopbacks  = NULL;
- 
--  for (i = 0; i < if_conf->ifc_len / sizeof (struct ifreq); i++)
-+  for (ptr = if_conf->ifc_buf; ptr < if_conf->ifc_buf + if_conf->ifc_len;)
-     {
--      struct ifreq if_req = if_conf->ifc_req [i];
--      gboolean     loopback = FALSE;
-+      if_req = (struct ifreq *) ptr;
-+      loopback = FALSE;
-+      len      = sizeof(struct sockaddr);
-+#if defined(HAVE_SOCKADDR_SA_LEN) || defined(__FreeBSD__)
-+      if (if_req->ifr_addr.sa_len > len)
-+	len = if_req->ifr_addr.sa_len;
-+#endif
-+
-+      ptr += sizeof(if_req->ifr_name) + len;
-+ 
-+      if (g_list_find_custom (interfaces, if_req->ifr_name, 
-+		  (GCompareFunc) g_ascii_strcasecmp) != NULL
-+	      || g_list_find_custom (loopbacks, if_req->ifr_name,
-+		  (GCompareFunc) g_ascii_strcasecmp) != NULL)
-+	continue;
- 
--      if (ioctl (fd, SIOCGIFFLAGS, &if_req) < 0)
-+      if (ioctl (fd, SIOCGIFFLAGS, if_req) < 0)
- 	{
- 	  if (error)
- 	    *error = g_error_new (NETSTATUS_ERROR,
-@@ -1120,13 +1148,14 @@
- 	}
-       else
- 	{
--	  loopback = (if_req.ifr_flags & IFF_LOOPBACK);
-+	  loopback = (if_req->ifr_flags & IFF_LOOPBACK);
- 	}
- 
-       if (!loopback)
--	interfaces = g_list_prepend (interfaces, g_strdup (if_req.ifr_name));
-+	interfaces = g_list_prepend (interfaces, g_strdup (if_req->ifr_name));
-       else
--	loopbacks  = g_list_prepend (loopbacks,  g_strdup (if_req.ifr_name));
-+	loopbacks  = g_list_prepend (loopbacks,  g_strdup (if_req->ifr_name));
-+
-     }
- 
-   interfaces = g_list_concat (interfaces, loopbacks);
diff --git a/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c b/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c
deleted file mode 100644
index 3598a24e6..000000000
--- a/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c
+++ /dev/null
@@ -1,160 +0,0 @@
---- src/netstatus-sysdeps.c.orig	Mon Jun  9 13:18:04 2003
-+++ src/netstatus-sysdeps.c	Fri Jan  2 23:29:16 2004
-@@ -27,10 +27,13 @@
- 
- #include <stdio.h>
- #include <string.h>
-+#include <unistd.h>
- #include <errno.h>
- #include <glib.h>
- #include <libgnome/gnome-i18n.h>
- 
-+#if !defined(__FreeBSD__)
-+
- static inline char *
- parse_iface_name (const char *buf)
- {
-@@ -90,6 +93,7 @@
- 	}
-     }
- }
-+#endif
- 
- static inline int
- parse_stats (char  *buf,
-@@ -124,6 +128,8 @@
-   return TRUE;
- }
- 
-+#if !defined(__FreeBSD__)
-+
- static inline FILE *
- get_proc_net_dev_fh (void)
- {
-@@ -206,3 +212,126 @@
- 
-   return error_message;
- }
-+
-+#else
-+
-+static inline void
-+parse_header (char *buf,
-+	      int  *prx_idx,
-+	      int  *ptx_idx,
-+	      int  *brx_idx,
-+	      int  *btx_idx)
-+{
-+   char *p;
-+   int   i;
-+
-+   *prx_idx = *ptx_idx = -1;
-+   *brx_idx = *btx_idx = -1;
-+
-+   p = strtok (buf, " \n\t");
-+   for (i = 0; p; i++, p = strtok (NULL, " \t\n"))
-+     {
-+        if (!strcmp (p, "Ipkts"))
-+	  {
-+	     *prx_idx = i;
-+	  }
-+	else if (!strcmp (p, "Ibytes"))
-+	  {
-+	     *brx_idx = i;
-+	  }
-+	else if (!strcmp (p, "Opkts"))
-+	  {
-+	     *ptx_idx = i;
-+	  }
-+	else if (!strcmp (p, "Obytes"))
-+	  {
-+	     *btx_idx = i;
-+	  }
-+     }
-+}
-+
-+char *
-+netstatus_sysdeps_read_iface_statistics (const char *iface,
-+					 long       *in_packets,
-+					 long       *out_packets,
-+					 long       *in_bytes,
-+					 long       *out_bytes)
-+{
-+   gchar *buf;
-+   gchar *cmd = NULL;
-+   gchar **command_line;
-+   int prx_idx, ptx_idx;
-+   int brx_idx, btx_idx;
-+   char *error_message = NULL;
-+   gchar *dir = g_get_current_dir ();
-+   gint pout;
-+   GIOChannel *channel;
-+   GError *err = NULL;
-+
-+   *in_packets = -1;
-+   *out_packets = -1;
-+   *in_bytes = -1;
-+   *out_bytes = -1;
-+
-+   cmd = g_strdup_printf ("/usr/bin/netstat netstat -n -I %s -b -f inet", iface);
-+   command_line = g_strsplit (cmd, " ", -1);
-+   g_free (cmd);
-+
-+   if (g_spawn_async_with_pipes (dir, command_line, NULL,
-+	       			 G_SPAWN_FILE_AND_ARGV_ZERO, NULL,
-+				 NULL, NULL, NULL, &pout,
-+				 NULL, &err)) {
-+       g_strfreev (command_line);
-+       channel = g_io_channel_unix_new (pout);
-+       g_io_channel_read_line (channel, &buf, NULL, NULL, NULL);
-+
-+       parse_header (buf, &prx_idx, &ptx_idx, &brx_idx, &btx_idx);
-+       if (prx_idx == -1 || ptx_idx == -1 ||
-+	   brx_idx == -1 || btx_idx == -1)
-+         {
-+	   if (buf)
-+	     g_free (buf);
-+	   g_io_channel_unref (channel);
-+	   g_io_channel_shutdown (channel, TRUE, NULL);
-+	   close (pout);
-+	   return g_strdup ("Could not parse netstat output.  Unknown format");
-+	 }
-+
-+       if (buf)
-+          g_free (buf);
-+       g_io_channel_read_line (channel, &buf, NULL, NULL, NULL);
-+
-+       if (!parse_stats (buf, prx_idx, ptx_idx, in_packets, out_packets,
-+	       	    brx_idx, btx_idx, in_bytes, out_bytes))
-+       {
-+	  if (error_message)
-+	     g_free (error_message);
-+	  error_message = g_strdup_printf (_("Could not parse interface statistics from '%s'. "
-+		      	     "prx_idx = %d; ptx_idx = %d; brx_idx = %d; btx_idx = %d;"),
-+		  	     buf, prx_idx, ptx_idx, brx_idx, btx_idx);
-+       }
-+
-+       if (buf)
-+	 g_free (buf);
-+
-+       if ((*in_packets == -1 || *out_packets == -1 || *in_bytes == -1 || *out_bytes == -1) && !error_message)
-+	   error_message = g_strdup_printf ("Could not obtain information on interface '%s' from netstat", iface);
-+
-+       g_io_channel_unref (channel);
-+       g_io_channel_shutdown (channel, TRUE, NULL);
-+       close (pout);
-+   }
-+   else {
-+      g_strfreev (command_line);
-+      if (error_message)
-+        g_free (error_message);
-+      error_message = g_strdup_printf ("Error running /usr/bin/netstat for '%s': %s", 
-+	iface, err->message);
-+      g_error_free (err);
-+   }
-+
-+   g_free (dir);
-+
-+   return error_message;
-+}
-+#endif
diff --git a/net/gnomenetstatus/pkg-descr b/net/gnomenetstatus/pkg-descr
deleted file mode 100644
index 85e70885c..000000000
--- a/net/gnomenetstatus/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-Gnome-netstatus is an applet which provides information about a network 
-interface on your panel.
diff --git a/net/gnomenetstatus/pkg-plist b/net/gnomenetstatus/pkg-plist
deleted file mode 100644
index e8b096d6e..000000000
--- a/net/gnomenetstatus/pkg-plist
+++ /dev/null
@@ -1,40 +0,0 @@
-etc/gconf/gconf.xml.defaults/apps/netstatus_applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/netstatus_applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/netstatus_applet/prefs/%gconf.xml
-etc/gconf/schemas/netstatus.schemas
-libdata/bonobo/servers/GNOME_NetstatusApplet_Factory.server
-libexec/gnome-netstatus-applet
-share/gnome/gnome-2.0/ui/GNOME_NetstatusApplet.xml
-share/gnome/gnome-netstatus/gnome-netstatus.glade
-share/gnome/icons/gnome-netstatus/gnome-netstatus-disconn.png
-share/gnome/icons/gnome-netstatus/gnome-netstatus-error.png
-share/gnome/icons/gnome-netstatus/gnome-netstatus-idle.png
-share/gnome/icons/gnome-netstatus/gnome-netstatus-rx.png
-share/gnome/icons/gnome-netstatus/gnome-netstatus-tx.png
-share/gnome/icons/gnome-netstatus/gnome-netstatus-txrx.png
-share/gnome/pixmaps/gnome-netstatus-tx.png
-share/locale/az/LC_MESSAGES/gnome-netstatus.mo
-share/locale/cs/LC_MESSAGES/gnome-netstatus.mo
-share/locale/de/LC_MESSAGES/gnome-netstatus.mo
-share/locale/el/LC_MESSAGES/gnome-netstatus.mo
-share/locale/es/LC_MESSAGES/gnome-netstatus.mo
-share/locale/fr/LC_MESSAGES/gnome-netstatus.mo
-share/locale/it/LC_MESSAGES/gnome-netstatus.mo
-share/locale/ja/LC_MESSAGES/gnome-netstatus.mo
-share/locale/ms/LC_MESSAGES/gnome-netstatus.mo
-share/locale/nl/LC_MESSAGES/gnome-netstatus.mo
-share/locale/pl/LC_MESSAGES/gnome-netstatus.mo
-share/locale/pt/LC_MESSAGES/gnome-netstatus.mo
-share/locale/ru/LC_MESSAGES/gnome-netstatus.mo
-share/locale/sr/LC_MESSAGES/gnome-netstatus.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-netstatus.mo
-share/locale/sv/LC_MESSAGES/gnome-netstatus.mo
-share/locale/tr/LC_MESSAGES/gnome-netstatus.mo
-share/locale/vi/LC_MESSAGES/gnome-netstatus.mo
-share/locale/wa/LC_MESSAGES/gnome-netstatus.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-netstatus.mo
-@dirrm share/gnome/icons/gnome-netstatus
-@dirrm share/gnome/gnome-netstatus
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/netstatus_applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/netstatus_applet
-@dirrm etc/gconf/gconf.xml.defaults/apps/netstatus_applet
diff --git a/net/gnomenetwork/Makefile b/net/gnomenetwork/Makefile
deleted file mode 100644
index 7cd02d804..000000000
--- a/net/gnomenetwork/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# New ports collection makefile for:   gnomenetwork
-# Date Created:			03 June 2003
-# Whom:				Adam Weinberger <adamw@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnomenetwork
-PORTVERSION=	1.99.5
-PORTREVISION=	1
-CATEGORIES=	net gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-network/1.99
-DISTNAME=	gnome-network-${PORTVERSION}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A library for writing networked servers & clients
-
-USE_X_PREFIX=	yes
-USE_BZIP2=	yes
-USE_GNOME=	gnomehack gnomeprefix intlhack lthack libgnomeui
-USE_GMAKE=	yes
-USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-.include <bsd.port.mk>
diff --git a/net/gnomenetwork/distinfo b/net/gnomenetwork/distinfo
deleted file mode 100644
index 5a96d35bb..000000000
--- a/net/gnomenetwork/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 54c795546..000000000
--- a/net/gnomenetwork/files/patch-gnome-netinfo::info.c
+++ /dev/null
@@ -1,63 +0,0 @@
---- gnome-netinfo/info.c.orig	Mon Nov 24 18:29:43 2003
-+++ gnome-netinfo/info.c	Wed Dec 17 22:27:46 2003
-@@ -27,6 +27,7 @@
- #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 */
-@@ -173,7 +174,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 (ifr->ifr_addr.sa_len > len)
- 			len = ifr->ifr_addr.sa_len;	/* length > 16 */
- #endif
-@@ -182,8 +183,12 @@
- 		if (strcmp (ifr->ifr_name, nic) != 0) {
- 			continue;
- 		}
-+
-+		memset (&data, 0, 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);
- }
- 
- static GList *
-@@ -321,6 +325,8 @@
- 
- 	sockfd = socket (AF_INET, SOCK_DGRAM, 0);
- 
-+	memset (&ifc, 0, sizeof (struct ifconf));
-+	memset (&buf, 0, sizeof (buf));
- 	ifc.ifc_len = sizeof (buf);
- 	ifc.ifc_req = (struct ifreq *) buf;
- 
-@@ -331,9 +337,11 @@
- 		len = sizeof (struct sockaddr);
- 
- 		iface = g_strdup (ifr->ifr_name);
--		items = g_list_append (items, iface);
-+		if (g_list_find_custom (items, iface, (GCompareFunc) g_ascii_strcasecmp) == NULL) {
-+			items = g_list_append (items, iface);
-+		}
- 
--#ifdef	HAVE_SOCKADDR_SA_LEN
-+#if defined(HAVE_SOCKADDR_SA_LEN) || defined(__FreeBSD__)
- 		if (ifr->ifr_addr.sa_len > len)
- 			len = ifr->ifr_addr.sa_len;	/* length > 16 */
- #endif
diff --git a/net/gnomenetwork/files/patch-gnome-netinfo_callbacks.c b/net/gnomenetwork/files/patch-gnome-netinfo_callbacks.c
deleted file mode 100644
index 32d818c6f..000000000
--- a/net/gnomenetwork/files/patch-gnome-netinfo_callbacks.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index 4048c43b4..000000000
--- a/net/gnomenetwork/files/patch-gnome-netinfo_netinfo.c
+++ /dev/null
@@ -1,41 +0,0 @@
---- 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
deleted file mode 100644
index 4f0a7240b..000000000
--- a/net/gnomenetwork/files/patch-gnome-netinfo_netstat.c
+++ /dev/null
@@ -1,136 +0,0 @@
---- 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 */
-+#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 */
-@@ -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;
-+#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);
-+	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, 
-@@ -344,6 +383,7 @@
- 	if (count == 7) {
- 		bzero (&(data)->state, 30);
- 	}
-+#endif
- 	
- 	return count;
- }
-@@ -405,7 +445,11 @@
- 	g_return_if_fail (line != NULL);
- 
- 	count = strip_route_line (line, &data);
-+#ifdef __FreeBSD__
-+	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);
-+#else
-+
- 	count = sscanf (line, NETSTAT_ROUTE_FORMAT,
- 			data->destination,
- 			data->gateway, data->netmask, 
- 			flags, &(data)->metric, &ref, &use, 
- 			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
deleted file mode 100644
index 6e00ba018..000000000
--- a/net/gnomenetwork/files/patch-gnome-netinfo_netstat.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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.%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
deleted file mode 100644
index 40f2b83fa..000000000
--- a/net/gnomenetwork/files/patch-gnome-netinfo_ping.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index debf4603d..000000000
--- a/net/gnomenetwork/files/patch-gnome-netinfo_ping.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 9d38a3d3d..000000000
--- a/net/gnomenetwork/files/patch-gnome-netinfo_util-mii.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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/files/patch-network-utilities_gnome-remote-shell.c b/net/gnomenetwork/files/patch-network-utilities_gnome-remote-shell.c
deleted file mode 100644
index 0ac22218e..000000000
--- a/net/gnomenetwork/files/patch-network-utilities_gnome-remote-shell.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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>
diff --git a/net/gnomenetwork/pkg-descr b/net/gnomenetwork/pkg-descr
deleted file mode 100644
index 1362640b6..000000000
--- a/net/gnomenetwork/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-gnome-network is a set of network oriented user tools. It includes the
-following tools:
-
-        * gnome-remote-shell: a remote shell (Telnet/SSH) client.
-        * gnome-remote-desktop: a remote desktop (X11/VNC) client.
-        * gnome-netinfo: a network information tool, for getting info on
-          network cards, DNS, etc.
-        * gnome-backup: a backup client tool.
-
-WWW: http://www.gnome.org/
diff --git a/net/gnomenetwork/pkg-plist b/net/gnomenetwork/pkg-plist
deleted file mode 100644
index 5c7e7394d..000000000
--- a/net/gnomenetwork/pkg-plist
+++ /dev/null
@@ -1,56 +0,0 @@
-bin/gnome-remote-shell
-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-netinfo.desktop
-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
-share/locale/gl/LC_MESSAGES/gnome-network.mo
-share/locale/he/LC_MESSAGES/gnome-network.mo
-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
-share/locale/pt/LC_MESSAGES/gnome-network.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-network.mo
-share/locale/ru/LC_MESSAGES/gnome-network.mo
-share/locale/sr/LC_MESSAGES/gnome-network.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-network.mo
-share/locale/sv/LC_MESSAGES/gnome-network.mo
-share/locale/tr/LC_MESSAGES/gnome-network.mo
-share/locale/uk/LC_MESSAGES/gnome-network.mo
-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/pixmaps/gnome-network
-@dirrm share/gnome/gnome-network/dialogs
-@dirrm share/gnome/gnome-network
diff --git a/net/libgnetwork/Makefile b/net/libgnetwork/Makefile
deleted file mode 100644
index 11d416c83..000000000
--- a/net/libgnetwork/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# New ports collection makefile for:	libgnetwork
-# Date created:				11 December 2003
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	libgnetwork
-PORTVERSION=	0.0.4
-CATEGORIES=	net gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.0
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A GLib-based networking wrapper
-
-USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack lthack gconf2
-INSTALLS_SHLIB=	yes
-USE_LIBTOOL=	yes
-USE_GMAKE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-.if !defined(WITHOUT_SSL)
-LIB_DEPENDS+=	gnutls.7:${PORTSDIR}/security/gnutls
-CONFIGURE_ARGS+=--enable-ssl=gnutls
-.else
-CONFIGURE_ARGS+=--enable-ssl=no
-.endif
-
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "libgnetwork has the following configurable option(s):"
-	@${ECHO_MSG} "	WITHOUT_SSL	Disable GnuTLS SSL support"
-	@${ECHO_MSG} ""
-
-.include <bsd.port.mk>
diff --git a/net/libgnetwork/distinfo b/net/libgnetwork/distinfo
deleted file mode 100644
index ebf5ee23b..000000000
--- a/net/libgnetwork/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (gnome2/libgnetwork-0.0.4.tar.bz2) = 8945ba82695613a09f1947b10d80a9e8
diff --git a/net/libgnetwork/files/patch-Makefile.in b/net/libgnetwork/files/patch-Makefile.in
deleted file mode 100644
index bfedc0255..000000000
--- a/net/libgnetwork/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Fri Dec 12 01:51:23 2003
-+++ Makefile.in	Fri Dec 12 01:51:29 2003
-@@ -197,7 +197,7 @@
- 
- AUTOMAKE_OPTIONS = 1.7
- 
--SUBDIRS = libgnetwork tests data doc po
-+SUBDIRS = libgnetwork data doc po
- 
- EXTRA_DIST = \
- 	intltool-merge.in \
diff --git a/net/libgnetwork/files/patch-data_Makefile.in b/net/libgnetwork/files/patch-data_Makefile.in
deleted file mode 100644
index 741e38dc9..000000000
--- a/net/libgnetwork/files/patch-data_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- data/Makefile.in.orig	Fri Dec 12 02:11:14 2003
-+++ data/Makefile.in	Fri Dec 12 02:11:34 2003
-@@ -419,7 +419,6 @@
- 	if test -z "$(DESTDIR)" ; then \
- 		for p in $(schema_DATA) ; do \
- 			if test -f $(srcdir)/$$p ; then \
--				GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
- 			fi \
- 		done \
- 	fi
diff --git a/net/libgnetwork/pkg-descr b/net/libgnetwork/pkg-descr
deleted file mode 100644
index 2a8487b69..000000000
--- a/net/libgnetwork/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-GNetwork is a networking wrapper written in pure C against the Glib/GObject
-object framework.
-
-The intention here is to provide a useful and easy-to-develop-against sockets
-wrapper for GNOME2 & GTK+ 2.0 programs which require TCP/IP connection
-capabilities. It can be used by programs which do not use GNOME or GTK+ 
-anyways,however. It is NOT recommended or intended for high-load server 
-situations, just user applications which need TCP/IP networking. Proxies are 
-supported completely transparently, using the same settings as gnome-vfs.
-
--- The libgnetwork README
diff --git a/net/libgnetwork/pkg-plist b/net/libgnetwork/pkg-plist
deleted file mode 100644
index 23ca76d29..000000000
--- a/net/libgnetwork/pkg-plist
+++ /dev/null
@@ -1,31 +0,0 @@
-etc/gconf/schemas/libgnetwork.schemas
-include/libgnetwork-1.0/libgnetwork/gnetwork-connection.h
-include/libgnetwork-1.0/libgnetwork/gnetwork-datagram.h
-include/libgnetwork-1.0/libgnetwork/gnetwork-dns.h
-include/libgnetwork-1.0/libgnetwork/gnetwork-errors.h
-include/libgnetwork-1.0/libgnetwork/gnetwork-interfaces.h
-include/libgnetwork-1.0/libgnetwork/gnetwork-ip-address.h
-include/libgnetwork-1.0/libgnetwork/gnetwork-ip-multicast.h
-include/libgnetwork-1.0/libgnetwork/gnetwork-macros.h
-include/libgnetwork-1.0/libgnetwork/gnetwork-server.h
-include/libgnetwork-1.0/libgnetwork/gnetwork-ssl.h
-include/libgnetwork-1.0/libgnetwork/gnetwork-tcp-connection.h
-include/libgnetwork-1.0/libgnetwork/gnetwork-tcp-proxy.h
-include/libgnetwork-1.0/libgnetwork/gnetwork-tcp-server.h
-include/libgnetwork-1.0/libgnetwork/gnetwork-threads.h
-include/libgnetwork-1.0/libgnetwork/gnetwork-type-builtins.h
-include/libgnetwork-1.0/libgnetwork/gnetwork-udp-datagram.h
-include/libgnetwork-1.0/libgnetwork/gnetwork-unix-connection.h
-include/libgnetwork-1.0/libgnetwork/gnetwork-unix-server.h
-include/libgnetwork-1.0/libgnetwork/gnetwork.h
-lib/libgnetwork-1.0.a
-lib/libgnetwork-1.0.so
-lib/libgnetwork-1.0.so.0
-libdata/pkgconfig/libgnetwork-1.0.pc
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/up.png
-@dirrm %%DOCSDIR%%
-@dirrm include/libgnetwork-1.0/libgnetwork
-@dirrm include/libgnetwork-1.0