Remove gnome-nettool. It's pretty much dead upstream and it provides

nothing more than gnome-terminal does...

"ENOTCARE" jasper@
This commit is contained in:
ajacoutot 2013-03-28 14:53:31 +00:00
parent 480e2acd60
commit d4b0002097
8 changed files with 0 additions and 356 deletions

View File

@ -1,36 +0,0 @@
# $OpenBSD: Makefile,v 1.26 2013/03/11 11:46:11 espie Exp $
COMMENT= GNOME interface for various networking tools
GNOME_PROJECT= gnome-nettool
GNOME_VERSION= 3.2.0
REVISION= 1
CATEGORIES= net
# GPLv3
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 c cairo
WANTLIB += cairo-gobject drm expat fontconfig freetype gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
WANTLIB += gtk-3 gtop-2.0 kvm m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 png pthread pthread-stubs xcb xcb-render
WANTLIB += xcb-shm z ffi stdc++
MODULES= devel/dconf \
devel/gettext \
x11/gnome
LIB_DEPENDS= devel/libgtop2 \
x11/gtk+3
BUILD_DEPENDS= devel/gsettings-desktop-schemas
RUN_DEPENDS= devel/gsettings-desktop-schemas \
net/nmap
MODGNOME_TOOLS= yelp
MODGNOME_DESKTOP_FILE= Yes
MODGNOME_ICON_CACHE= Yes
.include <bsd.port.mk>

View File

@ -1,2 +0,0 @@
SHA256 (gnome/gnome-nettool-3.2.0.tar.xz) = mIggLxwT+Y/Sa0F0aObyNF+IVVfzqY+zZe7qUteSv3k=
SIZE (gnome/gnome-nettool-3.2.0.tar.xz) = 585556

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_callbacks_c,v 1.3 2011/09/12 07:28:53 jasper Exp $
--- src/callbacks.c.orig Thu Dec 2 10:26:14 2010
+++ src/callbacks.c Tue May 17 18:06:38 2011
@@ -293,12 +293,11 @@ gn_quit_app (GtkWidget * widget, gpointer data)
{
gint status, pid;
- pid = getpid () + 1;
- while (waitpid (-1, &status, WNOHANG) == 0) {
- if (waitpid (pid, &status, WNOHANG) == 0)
- kill (pid, SIGKILL);
- pid ++;
- }
+ pid = getpid ();
+ if (childpid > 0)
+ kill (childpid, SIGKILL);
+ if (waitpid (pid, &status, WNOHANG) == 0)
+ kill (pid, SIGKILL);
netinfo_progress_indicator_stop (NULL);

View File

@ -1,70 +0,0 @@
$OpenBSD: patch-src_info_c,v 1.4 2012/04/03 15:10:40 jasper Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=652713
--- src/info.c.orig Tue Jan 3 10:10:16 2012
+++ src/info.c Tue Jan 3 10:50:22 2012
@@ -20,6 +20,12 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <glib/gprintf.h>
+#if defined (__FreeBSD__) || defined (__OpenBSD__)
+#include <sys/types.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#endif
#ifdef HAVE_CONFIG_H
# include <config.h>
@@ -37,6 +43,9 @@
#include <sys/ioctl.h>
#include <stdlib.h>
#include <net/if.h>
+#if defined (__FreeBSD__) || defined (__OpenBSD__)
+#include <net/if_media.h>
+#endif
#include <glibtop.h>
#include <glibtop/netlist.h>
@@ -131,9 +140,39 @@ info_get_interface_from_dev_name (const gchar *dev_nam
{
gint i;
gchar *path;
+ gchar *dev_type = NULL;
+#if defined (__FreeBSD__) || defined (__OpenBSD__)
+ 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_IEEE80211:
+ dev_type = "wlan";
+ break;
+ default:
+ dev_type = "other_type";
+ break;
+ }
+ }
+ close (s);
+ }
+#endif /* defined (__FreeBSD__) || defined (__OpenBSD__) */
+
+ 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);

View File

@ -1,42 +0,0 @@
$OpenBSD: patch-src_nettool_c,v 1.5 2012/03/29 06:58:10 ajacoutot Exp $
--- src/nettool.c.orig Tue Jan 3 10:38:09 2012
+++ src/nettool.c Wed Mar 28 09:44:06 2012
@@ -410,6 +410,10 @@ netinfo_io_text_buffer_dialog (GIOChannel * channel,
len, NULL);
}
+ g_free (text);
+
+ return TRUE;
+
} else if (status == G_IO_STATUS_AGAIN) {
char buf[1];
@@ -421,6 +425,8 @@ netinfo_io_text_buffer_dialog (GIOChannel * channel,
}
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) {
@@ -438,15 +444,15 @@ netinfo_io_text_buffer_dialog (GIOChannel * channel,
} 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

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_utils_h,v 1.3 2012/01/03 12:11:53 ajacoutot Exp $
--- src/utils.h.orig Sun Jan 1 00:54:24 2012
+++ src/utils.h Tue Jan 3 10:50:22 2012
@@ -26,6 +26,8 @@
#include <glib.h>
#include <gtk/gtk.h>
+gint childpid;
+
#if (GLIB_MINOR_VERSION < 2)
# define _g_vsprintf vsprintf

View File

@ -1,2 +0,0 @@
GNOME Nettool is a set of front-ends to various networking command-line
tools, like ping, netstat, ifconfig, whois, traceroute, finger.

View File

@ -1,171 +0,0 @@
@comment $OpenBSD: PLIST,v 1.7 2012/06/15 08:30:20 ajacoutot Exp $
@bin bin/gnome-nettool
share/applications/gnome-nettool.desktop
share/glib-2.0/schemas/org.gnome.gnome-nettool.gschema.xml
share/gnome/
share/gnome-nettool/
share/gnome-nettool/pixmaps/
share/gnome-nettool/pixmaps/16_ethernet.xpm
share/gnome-nettool/pixmaps/16_loopback.xpm
share/gnome-nettool/pixmaps/16_plip.xpm
share/gnome-nettool/pixmaps/16_ppp.xpm
share/gnome-nettool/pixmaps/gnome-nettool.png
share/gnome-nettool/pixmaps/irda-16.png
share/gnome-nettool/pixmaps/network.png
share/gnome-nettool/pixmaps/wavelan-16.png
share/gnome-nettool/ui/
share/gnome-nettool/ui/gnome-nettool.ui
share/gnome/help/
share/gnome/help/gnome-nettool/
share/gnome/help/gnome-nettool/C/
share/gnome/help/gnome-nettool/C/gnome-nettool.xml
share/gnome/help/gnome-nettool/C/legal.xml
share/gnome/help/gnome-nettool/ca/
share/gnome/help/gnome-nettool/ca/gnome-nettool.xml
share/gnome/help/gnome-nettool/cs/
share/gnome/help/gnome-nettool/cs/gnome-nettool.xml
share/gnome/help/gnome-nettool/da/
share/gnome/help/gnome-nettool/da/gnome-nettool.xml
share/gnome/help/gnome-nettool/de/
share/gnome/help/gnome-nettool/de/gnome-nettool.xml
share/gnome/help/gnome-nettool/el/
share/gnome/help/gnome-nettool/el/gnome-nettool.xml
share/gnome/help/gnome-nettool/en_GB/
share/gnome/help/gnome-nettool/en_GB/gnome-nettool.xml
share/gnome/help/gnome-nettool/es/
share/gnome/help/gnome-nettool/es/gnome-nettool.xml
share/gnome/help/gnome-nettool/fr/
share/gnome/help/gnome-nettool/fr/gnome-nettool.xml
share/gnome/help/gnome-nettool/oc/
share/gnome/help/gnome-nettool/oc/gnome-nettool.xml
share/gnome/help/gnome-nettool/pa/
share/gnome/help/gnome-nettool/pa/gnome-nettool.xml
share/gnome/help/gnome-nettool/pt_BR/
share/gnome/help/gnome-nettool/pt_BR/gnome-nettool.xml
share/gnome/help/gnome-nettool/ru/
share/gnome/help/gnome-nettool/ru/gnome-nettool.xml
share/gnome/help/gnome-nettool/sv/
share/gnome/help/gnome-nettool/sv/gnome-nettool.xml
share/gnome/help/gnome-nettool/uk/
share/gnome/help/gnome-nettool/uk/gnome-nettool.xml
share/gnome/help/gnome-nettool/vi/
share/gnome/help/gnome-nettool/vi/gnome-nettool.xml
share/gnome/help/gnome-nettool/zh_CN/
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/be/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/eo/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/ug/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/
share/omf/gnome-nettool/
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
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
@exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
@unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null