Add CONFLICTS with 3.

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

8 files changed, 392 insertions, 0 deletions

diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
new file mode 100644
index 000000000..7813e0597
--- /dev/null
+++ b/net/gnome-nettool/Makefile
@@ -0,0 +1,39 @@
+# New ports collection makefile for:   gnomenetwork
+# Date Created:			03 June 2003
+# Whom:				Adam Weinberger <adamw@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom$
+#
+
+PORTNAME=	gnome-nettool
+PORTVERSION=	2.32.0
+PORTEPOCH=	1
+CATEGORIES=	net gnome
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A GNOME utility that provides network information statistics
+
+LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop
+
+CONFLICTS=	gnome-nettool-3.[0-9]*
+
+USE_BZIP2=	yes
+USE_GNOME=	gnomehack intlhack gnomeprefix libglade2 gconf2 gnomedocutils
+USE_GMAKE=	yes
+USE_GETTEXT=	yes
+INSTALLS_OMF=	yes
+INSTALLS_ICONS=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+CFLAGS+=	-DHAVE_SOCKADDR_SA_LEN
+
+post-install:
+	${MKDIR} ${PREFIX}/share/pixmaps
+	${LN} -sf ${PREFIX}/share/gnome-nettool/pixmaps/gnome-nettool.png \
+		${PREFIX}/share/pixmaps/gnome-nettool.png
+
+.include <bsd.port.mk>
diff --git a/net/gnome-nettool/distinfo b/net/gnome-nettool/distinfo
new file mode 100644
index 000000000..ea6b8c3a8
--- /dev/null
+++ b/net/gnome-nettool/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gnome2/gnome-nettool-2.32.0.tar.bz2) = 8c70f85952760170114b2fa4be3ccaa3fc6298f802bacda2503ed482b8a0539c
+SIZE (gnome2/gnome-nettool-2.32.0.tar.bz2) = 647036
diff --git a/net/gnome-nettool/files/patch-src_info.c b/net/gnome-nettool/files/patch-src_info.c
new file mode 100644
index 000000000..88a107e6f
--- /dev/null
+++ b/net/gnome-nettool/files/patch-src_info.c
@@ -0,0 +1,76 @@
+--- src/info.c.orig	2008-12-08 23:29:39.000000000 -0500
++++ src/info.c	2009-02-27 16:33:49.000000000 -0500
+@@ -20,6 +20,10 @@
+ #include <gtk/gtk.h>
+ #include <glib/gi18n.h>
+ #include <glib/gprintf.h>
++#include <sys/types.h>
++#include <string.h>
++#include <errno.h>
++#include <unistd.h>
+ 
+ #ifdef HAVE_CONFIG_H
+ #  include <config.h>
+@@ -37,6 +41,9 @@
+ #include <sys/ioctl.h>
+ #include <stdlib.h>
+ #include <net/if.h>
++#ifdef __FreeBSD__
++#include <net/if_media.h>
++#endif
+ 
+ #include <glibtop.h>
+ #include <glibtop/netlist.h>
+@@ -61,6 +68,7 @@ static InfoInterfaceDescription info_ifa
+ 	{ N_("Ethernet Interface"),      INFO_INTERFACE_ETH,     "16_ethernet.xpm", "eth",        NULL },
+ 	{ N_("Wireless Interface"),      INFO_INTERFACE_WLAN,    "wavelan-16.png",  "wlan",       NULL },
+ 	{ N_("Modem Interface"),         INFO_INTERFACE_PPP,     "16_ppp.xpm",      "ppp",        NULL },
++	{ N_("Modem Interface"),         INFO_INTERFACE_PPP,     "16_ppp.xpm",      "tun",        NULL },
+ 	{ N_("Parallel Line Interface"), INFO_INTERFACE_PLIP,    "16_plip.xpm",     "plip",       NULL },
+ 	{ N_("Infrared Interface"),      INFO_INTERFACE_IRLAN,   "irda-16.png",     "irlan",      NULL },
+ 	{ N_("Loopback Interface"),      INFO_INTERFACE_LO,      "16_loopback.xpm", "lo",         NULL },
+@@ -131,9 +139,42 @@ info_get_interface_from_dev_name (const 
+ {
+ 	gint i;
+ 	gchar *path;
+-	
++	gchar *dev_type = NULL;
++#if defined(__FreeBSD__)
++	int s;
++	struct ifmediareq ifmr;
++
++	if ((s = socket (AF_INET, SOCK_DGRAM, 0)) > -1) {
++
++		(void) memset (&ifmr, 0, sizeof (ifmr));
++		(void) strncpy (ifmr.ifm_name, dev_name, sizeof (ifmr.ifm_name));
++
++		if (ioctl (s, SIOCGIFMEDIA, (caddr_t) &ifmr) > -1) {
++			switch (IFM_TYPE (ifmr.ifm_active)) {
++				case IFM_ETHER:
++					dev_type = "eth";
++					break;
++				case IFM_FDDI:
++				case IFM_TOKEN:
++#ifdef IFM_ATM
++				case IFM_ATM:
++#endif
++					dev_type = "other_type";
++					break;
++				case IFM_IEEE80211:
++					dev_type = "wlan";
++					break;
++			}
++		}
++		close (s);
++	}
++#endif /* defined(__FreeBSD__) */
++
++	if (!dev_type)
++		dev_type = (gchar *) dev_name;
++
+ 	for (i = 0; info_iface_desc[i].name; i++)
+-		if (strstr (dev_name, info_iface_desc[i].prefix) == dev_name) {
++		if (strstr (dev_type, info_iface_desc[i].prefix) == dev_type) {
+ 			(*iface) = g_strdup_printf ("%s (%s)", _(info_iface_desc[i].name), dev_name);
+ 			if (info_iface_desc[i].pixbuf == NULL) {
+ 				path = g_build_filename (PIXMAPS_DIR, info_iface_desc[i].icon, NULL);
diff --git a/net/gnome-nettool/files/patch-src_lookup.c b/net/gnome-nettool/files/patch-src_lookup.c
new file mode 100644
index 000000000..9744c1397
--- /dev/null
+++ b/net/gnome-nettool/files/patch-src_lookup.c
@@ -0,0 +1,10 @@
+--- src/lookup.c.orig	Sun Jul  3 17:47:02 2005
++++ src/lookup.c	Sun Jul  3 17:47:20 2005
+@@ -21,6 +21,7 @@
+ #include <gtk/gtk.h>
+ #include <glib/gi18n.h>
+ #include <glib/gprintf.h>
++#include <sys/types.h>
+ 
+ #include "lookup.h"
+ #include "utils.h"
diff --git a/net/gnome-nettool/files/patch-src_netstat.c b/net/gnome-nettool/files/patch-src_netstat.c
new file mode 100644
index 000000000..1eec84927
--- /dev/null
+++ b/net/gnome-nettool/files/patch-src_netstat.c
@@ -0,0 +1,20 @@
+--- src/netstat.c.orig	Tue Jul  6 13:55:25 2004
++++ src/netstat.c	Fri Aug 20 15:55:40 2004
+@@ -108,12 +108,17 @@
+ 	g_return_val_if_fail (netinfo != NULL, NULL);
+ 	
+ 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (netinfo->routing))) {
++#ifdef __FreeBSD__
++		/* XXX We only support ipv4 now */
++		option = g_strdup ("-rn -f inet");
++#else
+ 		/* Works for Solaris and Linux */
+ 		if (netinfo_is_ipv6_enable ()) {
+ 			option = g_strdup ("-rn -A inet -A inet6");
+ 		} else {
+ 			option = g_strdup ("-rn -A inet");
+ 		}
++#endif
+ 
+ 		if (netinfo->stbar_text)
+ 			g_free (netinfo->stbar_text);
diff --git a/net/gnome-nettool/files/patch-src_nettool.c b/net/gnome-nettool/files/patch-src_nettool.c
new file mode 100644
index 000000000..40e454467
--- /dev/null
+++ b/net/gnome-nettool/files/patch-src_nettool.c
@@ -0,0 +1,49 @@
+--- src/nettool.c.orig	2009-06-18 13:51:14.000000000 -0400
++++ src/nettool.c	2009-07-19 16:05:59.000000000 -0400
+@@ -24,6 +24,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <signal.h>
+ #include <errno.h>
+ #include <sys/wait.h>
+@@ -374,6 +375,10 @@ netinfo_io_text_buffer_dialog (GIOChanne
+ 						 	len, NULL);
+ 			}
+ 
++			g_free (text);
++
++			return TRUE;
++
+ 		} else if (status == G_IO_STATUS_AGAIN) {
+ 			char buf[1];
+ 
+@@ -385,6 +390,8 @@ netinfo_io_text_buffer_dialog (GIOChanne
+ 				}
+ 				g_string_append_c (netinfo->command_output, buf[0]);
+ 			}
++			g_free (text);
++			return TRUE;
+ 		} else if (status == G_IO_STATUS_EOF) {
+ 			
+ 		} else if (status == G_IO_STATUS_ERROR) {
+@@ -402,15 +409,15 @@ netinfo_io_text_buffer_dialog (GIOChanne
+ 
+ 			} else {
+ 				g_warning ("Error: %s\n", err->message);
+-				g_free (text);
+ 				g_free (err);
+ 			}
+ 
++			g_free (text);
++			return TRUE;
++
+ 		}
+ 
+ 		g_free (text);
+-
+-		return TRUE;
+ 	}
+ 
+ 	/* The condition is not G_IO_HUP | G_IO_ERR | G_IO_NVAL, so
diff --git a/net/gnome-nettool/pkg-descr b/net/gnome-nettool/pkg-descr
new file mode 100644
index 000000000..5619126fe
--- /dev/null
+++ b/net/gnome-nettool/pkg-descr
@@ -0,0 +1,3 @@
+Gnome-nettool is a utility for getting network information such as interface
+statistics, and for front-ending commands like ping and traceroute.  It
+is very similar to the MacOS X Network Utility.
diff --git a/net/gnome-nettool/pkg-plist b/net/gnome-nettool/pkg-plist
new file mode 100644
index 000000000..f358bc3f8
--- /dev/null
+++ b/net/gnome-nettool/pkg-plist
@@ -0,0 +1,193 @@
+bin/gnome-nettool
+share/applications/gnome-nettool.desktop
+%%DATADIR%%/pixmaps/16_ethernet.xpm
+%%DATADIR%%/pixmaps/16_loopback.xpm
+%%DATADIR%%/pixmaps/16_plip.xpm
+%%DATADIR%%/pixmaps/16_ppp.xpm
+%%DATADIR%%/pixmaps/gnome-nettool.png
+%%DATADIR%%/pixmaps/irda-16.png
+%%DATADIR%%/pixmaps/network.png
+%%DATADIR%%/pixmaps/wavelan-16.png
+%%DATADIR%%/ui/gnome-nettool.ui
+share/gnome/help/gnome-nettool/C/gnome-nettool.xml
+share/gnome/help/gnome-nettool/C/legal.xml
+share/gnome/help/gnome-nettool/ca/gnome-nettool.xml
+share/gnome/help/gnome-nettool/cs/gnome-nettool.xml
+share/gnome/help/gnome-nettool/da/gnome-nettool.xml
+share/gnome/help/gnome-nettool/de/gnome-nettool.xml
+share/gnome/help/gnome-nettool/el/gnome-nettool.xml
+share/gnome/help/gnome-nettool/en_GB/gnome-nettool.xml
+share/gnome/help/gnome-nettool/es/gnome-nettool.xml
+share/gnome/help/gnome-nettool/fr/gnome-nettool.xml
+share/gnome/help/gnome-nettool/oc/gnome-nettool.xml
+share/gnome/help/gnome-nettool/pa/gnome-nettool.xml
+share/gnome/help/gnome-nettool/pt_BR/gnome-nettool.xml
+share/gnome/help/gnome-nettool/ru/gnome-nettool.xml
+share/gnome/help/gnome-nettool/sv/gnome-nettool.xml
+share/gnome/help/gnome-nettool/uk/gnome-nettool.xml
+share/gnome/help/gnome-nettool/vi/gnome-nettool.xml
+share/gnome/help/gnome-nettool/zh_CN/gnome-nettool.xml
+share/icons/hicolor/16x16/apps/gnome-nettool.png
+share/icons/hicolor/22x22/apps/gnome-nettool.png
+share/icons/hicolor/24x24/apps/gnome-nettool.png
+share/icons/hicolor/32x32/apps/gnome-nettool.png
+share/icons/hicolor/scalable/apps/gnome-nettool.svg
+share/locale/af/LC_MESSAGES/gnome-nettool.mo
+share/locale/ar/LC_MESSAGES/gnome-nettool.mo
+share/locale/as/LC_MESSAGES/gnome-nettool.mo
+share/locale/ast/LC_MESSAGES/gnome-nettool.mo
+share/locale/az/LC_MESSAGES/gnome-nettool.mo
+share/locale/bg/LC_MESSAGES/gnome-nettool.mo
+share/locale/bn/LC_MESSAGES/gnome-nettool.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-nettool.mo
+share/locale/br/LC_MESSAGES/gnome-nettool.mo
+share/locale/bs/LC_MESSAGES/gnome-nettool.mo
+share/locale/ca/LC_MESSAGES/gnome-nettool.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-nettool.mo
+share/locale/cs/LC_MESSAGES/gnome-nettool.mo
+share/locale/cy/LC_MESSAGES/gnome-nettool.mo
+share/locale/da/LC_MESSAGES/gnome-nettool.mo
+share/locale/de/LC_MESSAGES/gnome-nettool.mo
+share/locale/dz/LC_MESSAGES/gnome-nettool.mo
+share/locale/el/LC_MESSAGES/gnome-nettool.mo
+share/locale/en@shaw/LC_MESSAGES/gnome-nettool.mo
+share/locale/en_CA/LC_MESSAGES/gnome-nettool.mo
+share/locale/en_GB/LC_MESSAGES/gnome-nettool.mo
+share/locale/es/LC_MESSAGES/gnome-nettool.mo
+share/locale/et/LC_MESSAGES/gnome-nettool.mo
+share/locale/eu/LC_MESSAGES/gnome-nettool.mo
+share/locale/fa/LC_MESSAGES/gnome-nettool.mo
+share/locale/fi/LC_MESSAGES/gnome-nettool.mo
+share/locale/fr/LC_MESSAGES/gnome-nettool.mo
+share/locale/ga/LC_MESSAGES/gnome-nettool.mo
+share/locale/gl/LC_MESSAGES/gnome-nettool.mo
+share/locale/gu/LC_MESSAGES/gnome-nettool.mo
+share/locale/he/LC_MESSAGES/gnome-nettool.mo
+share/locale/hi/LC_MESSAGES/gnome-nettool.mo
+share/locale/hr/LC_MESSAGES/gnome-nettool.mo
+share/locale/hu/LC_MESSAGES/gnome-nettool.mo
+share/locale/id/LC_MESSAGES/gnome-nettool.mo
+share/locale/it/LC_MESSAGES/gnome-nettool.mo
+share/locale/ja/LC_MESSAGES/gnome-nettool.mo
+share/locale/ka/LC_MESSAGES/gnome-nettool.mo
+share/locale/kn/LC_MESSAGES/gnome-nettool.mo
+share/locale/ko/LC_MESSAGES/gnome-nettool.mo
+share/locale/ku/LC_MESSAGES/gnome-nettool.mo
+share/locale/lt/LC_MESSAGES/gnome-nettool.mo
+share/locale/lv/LC_MESSAGES/gnome-nettool.mo
+share/locale/mai/LC_MESSAGES/gnome-nettool.mo
+share/locale/mg/LC_MESSAGES/gnome-nettool.mo
+share/locale/mk/LC_MESSAGES/gnome-nettool.mo
+share/locale/ml/LC_MESSAGES/gnome-nettool.mo
+share/locale/mn/LC_MESSAGES/gnome-nettool.mo
+share/locale/mr/LC_MESSAGES/gnome-nettool.mo
+share/locale/ms/LC_MESSAGES/gnome-nettool.mo
+share/locale/nb/LC_MESSAGES/gnome-nettool.mo
+share/locale/ne/LC_MESSAGES/gnome-nettool.mo
+share/locale/nl/LC_MESSAGES/gnome-nettool.mo
+share/locale/nn/LC_MESSAGES/gnome-nettool.mo
+share/locale/oc/LC_MESSAGES/gnome-nettool.mo
+share/locale/or/LC_MESSAGES/gnome-nettool.mo
+share/locale/pa/LC_MESSAGES/gnome-nettool.mo
+share/locale/pl/LC_MESSAGES/gnome-nettool.mo
+share/locale/ps/LC_MESSAGES/gnome-nettool.mo
+share/locale/pt/LC_MESSAGES/gnome-nettool.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-nettool.mo
+share/locale/ro/LC_MESSAGES/gnome-nettool.mo
+share/locale/ru/LC_MESSAGES/gnome-nettool.mo
+share/locale/rw/LC_MESSAGES/gnome-nettool.mo
+share/locale/si/LC_MESSAGES/gnome-nettool.mo
+share/locale/sk/LC_MESSAGES/gnome-nettool.mo
+share/locale/sl/LC_MESSAGES/gnome-nettool.mo
+share/locale/sq/LC_MESSAGES/gnome-nettool.mo
+share/locale/sr/LC_MESSAGES/gnome-nettool.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-nettool.mo
+share/locale/sv/LC_MESSAGES/gnome-nettool.mo
+share/locale/ta/LC_MESSAGES/gnome-nettool.mo
+share/locale/te/LC_MESSAGES/gnome-nettool.mo
+share/locale/th/LC_MESSAGES/gnome-nettool.mo
+share/locale/tr/LC_MESSAGES/gnome-nettool.mo
+share/locale/uk/LC_MESSAGES/gnome-nettool.mo
+share/locale/uz/LC_MESSAGES/gnome-nettool.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gnome-nettool.mo
+share/locale/vi/LC_MESSAGES/gnome-nettool.mo
+share/locale/wa/LC_MESSAGES/gnome-nettool.mo
+share/locale/xh/LC_MESSAGES/gnome-nettool.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-nettool.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-nettool.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-nettool.mo
+share/omf/gnome-nettool/gnome-nettool-C.omf
+share/omf/gnome-nettool/gnome-nettool-ca.omf
+share/omf/gnome-nettool/gnome-nettool-cs.omf
+share/omf/gnome-nettool/gnome-nettool-da.omf
+share/omf/gnome-nettool/gnome-nettool-de.omf
+share/omf/gnome-nettool/gnome-nettool-el.omf
+share/omf/gnome-nettool/gnome-nettool-en_GB.omf
+share/omf/gnome-nettool/gnome-nettool-es.omf
+share/omf/gnome-nettool/gnome-nettool-fr.omf
+share/omf/gnome-nettool/gnome-nettool-oc.omf
+share/omf/gnome-nettool/gnome-nettool-pa.omf
+share/omf/gnome-nettool/gnome-nettool-pt_BR.omf
+share/omf/gnome-nettool/gnome-nettool-ru.omf
+share/omf/gnome-nettool/gnome-nettool-sv.omf
+share/omf/gnome-nettool/gnome-nettool-uk.omf
+share/omf/gnome-nettool/gnome-nettool-vi.omf
+share/omf/gnome-nettool/gnome-nettool-zh_CN.omf
+share/pixmaps/gnome-nettool.png
+@dirrm share/omf/gnome-nettool
+@dirrm share/gnome/help/gnome-nettool/zh_CN
+@dirrm share/gnome/help/gnome-nettool/vi
+@dirrm share/gnome/help/gnome-nettool/uk
+@dirrm share/gnome/help/gnome-nettool/sv
+@dirrm share/gnome/help/gnome-nettool/ru
+@dirrm share/gnome/help/gnome-nettool/pt_BR
+@dirrm share/gnome/help/gnome-nettool/pa
+@dirrm share/gnome/help/gnome-nettool/oc
+@dirrm share/gnome/help/gnome-nettool/fr
+@dirrm share/gnome/help/gnome-nettool/es
+@dirrm share/gnome/help/gnome-nettool/en_GB
+@dirrm share/gnome/help/gnome-nettool/el
+@dirrm share/gnome/help/gnome-nettool/de
+@dirrm share/gnome/help/gnome-nettool/da
+@dirrm share/gnome/help/gnome-nettool/cs
+@dirrm share/gnome/help/gnome-nettool/ca
+@dirrm share/gnome/help/gnome-nettool/C
+@dirrm share/gnome/help/gnome-nettool
+@dirrm %%DATADIR%%/ui
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%
+@dirrmtry share/applications
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as