1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-20 00:21:35 +00:00

Update gnome-nettool to 3.8.1.

This commit is contained in:
Koop Mast 2015-09-04 10:43:19 +00:00
parent 53aeda8cf6
commit 68184f247f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=396075
6 changed files with 145 additions and 89 deletions

View File

@ -1,33 +1,33 @@
# Created by: Adam Weinberger <adamw@FreeBSD.org>
# $FreeBSD$
# $MCom: ports/net/gnome-nettool/Makefile,v 1.58 2010/09/28 09:03:44 kwm Exp $
PORTNAME= gnome-nettool
PORTVERSION= 2.32.0
PORTREVISION= 1
PORTVERSION= 3.8.1
PORTEPOCH= 1
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME utility that provides network information statistics
BUILD_DEPENDS= itstool:${PORTSDIR}/textproc/itstool
LIB_DEPENDS= libgtop-2.0.so:${PORTSDIR}/devel/libgtop
USE_GNOME= intlhack gnomeprefix libglade2 gconf2 gnomedocutils
GNOME_DESKTOP_VERSION=2
USES= gettext gmake libtool pathfix pkgconfig tar:bzip2
INSTALLS_OMF= yes
USE_GNOME= gtk30 intlhack libxml2:build
USES= gettext gmake libtool pathfix pkgconfig tar:xz
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -DHAVE_SOCKADDR_SA_LEN
INSTALL_TARGET= install-strip
post-install:
${LN} -sf ${PREFIX}/share/gnome-nettool/pixmaps/gnome-nettool.png \
${STAGEDIR}${PREFIX}/share/pixmaps/gnome-nettool.png
GLIB_SCHEMAS= org.gnome.gnome-nettool.gschema.xml
.include <bsd.port.options.mk>
.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} > 1000000)
RUN_DEPENDS+= ${LOCALBASE}/bin/dig:${PORTSDIR}/dns/bind-tools
.endif
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (gnome2/gnome-nettool-2.32.0.tar.bz2) = 8c70f85952760170114b2fa4be3ccaa3fc6298f802bacda2503ed482b8a0539c
SIZE (gnome2/gnome-nettool-2.32.0.tar.bz2) = 647036
SHA256 (gnome3/gnome-nettool-3.8.1.tar.xz) = f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1
SIZE (gnome3/gnome-nettool-3.8.1.tar.xz) = 589024

View File

@ -1,10 +0,0 @@
--- 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"

View File

@ -1,20 +1,11 @@
--- 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 @@
--- src/netstat.c.orig 2012-01-03 10:38:09.000000000 +0100
+++ src/netstat.c 2015-08-28 16:21:17.101757000 +0200
@@ -114,7 +114,7 @@ netstat_get_active_option (Netinfo * net
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 defined (__OpenBSD__)
+#if defined (__OpenBSD__) || defined (__FreeBSD__)
if (netinfo_is_ipv6_enable ()) {
option = g_strdup ("-rn -A inet -A inet6");
option = g_strdup ("-rn");
} else {
option = g_strdup ("-rn -A inet");
}
+#endif
if (netinfo->stbar_text)
g_free (netinfo->stbar_text);

View File

@ -1,14 +1,14 @@
--- 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 @@
--- src/nettool.c.orig 2012-01-03 10:38:09.000000000 +0100
+++ src/nettool.c 2015-08-28 16:28:52.904785000 +0200
@@ -28,7 +28,6 @@
#include <string.h>
#include <sys/types.h>
#include <sys/socket.h>
+#include <netinet/in.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
@@ -410,6 +409,10 @@ netinfo_io_text_buffer_dialog (GIOChanne
len, NULL);
}
@ -19,16 +19,19 @@
} else if (status == G_IO_STATUS_AGAIN) {
char buf[1];
@@ -385,6 +390,8 @@ netinfo_io_text_buffer_dialog (GIOChanne
@@ -421,6 +424,11 @@ 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
@@ -438,15 +446,16 @@ netinfo_io_text_buffer_dialog (GIOChanne
} else {
g_warning ("Error: %s\n", err->message);
@ -36,14 +39,15 @@
g_free (err);
}
+ g_free (text);
+ return TRUE;
+
}
g_free (text);
- }
-
- return TRUE;
g_free (text);
return TRUE;
+
+ }
+
+ g_free (text);
}
/* The condition is not G_IO_HUP | G_IO_ERR | G_IO_NVAL, so

View File

@ -9,24 +9,108 @@ share/applications/gnome-nettool.desktop
%%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/help/C/gnome-nettool/figures/gnome-nettool-trail.png
share/help/C/gnome-nettool/figures/gnome-nettool.png
share/help/C/gnome-nettool/index.page
share/help/C/gnome-nettool/introduction.page
share/help/C/gnome-nettool/ip-information.page
share/help/C/gnome-nettool/network-connectivity.page
share/help/ca/gnome-nettool/figures/gnome-nettool-trail.png
share/help/ca/gnome-nettool/figures/gnome-nettool.png
share/help/ca/gnome-nettool/index.page
share/help/ca/gnome-nettool/introduction.page
share/help/ca/gnome-nettool/ip-information.page
share/help/ca/gnome-nettool/network-connectivity.page
share/help/cs/gnome-nettool/figures/gnome-nettool-trail.png
share/help/cs/gnome-nettool/figures/gnome-nettool.png
share/help/cs/gnome-nettool/index.page
share/help/cs/gnome-nettool/introduction.page
share/help/cs/gnome-nettool/ip-information.page
share/help/cs/gnome-nettool/network-connectivity.page
share/help/da/gnome-nettool/figures/gnome-nettool-trail.png
share/help/da/gnome-nettool/figures/gnome-nettool.png
share/help/da/gnome-nettool/index.page
share/help/da/gnome-nettool/introduction.page
share/help/da/gnome-nettool/ip-information.page
share/help/da/gnome-nettool/network-connectivity.page
share/help/de/gnome-nettool/figures/gnome-nettool-trail.png
share/help/de/gnome-nettool/figures/gnome-nettool.png
share/help/de/gnome-nettool/index.page
share/help/de/gnome-nettool/introduction.page
share/help/de/gnome-nettool/ip-information.page
share/help/de/gnome-nettool/network-connectivity.page
share/help/el/gnome-nettool/figures/gnome-nettool-trail.png
share/help/el/gnome-nettool/figures/gnome-nettool.png
share/help/el/gnome-nettool/index.page
share/help/el/gnome-nettool/introduction.page
share/help/el/gnome-nettool/ip-information.page
share/help/el/gnome-nettool/network-connectivity.page
share/help/en_GB/gnome-nettool/figures/gnome-nettool-trail.png
share/help/en_GB/gnome-nettool/figures/gnome-nettool.png
share/help/en_GB/gnome-nettool/index.page
share/help/en_GB/gnome-nettool/introduction.page
share/help/en_GB/gnome-nettool/ip-information.page
share/help/en_GB/gnome-nettool/network-connectivity.page
share/help/es/gnome-nettool/figures/gnome-nettool-trail.png
share/help/es/gnome-nettool/figures/gnome-nettool.png
share/help/es/gnome-nettool/index.page
share/help/es/gnome-nettool/introduction.page
share/help/es/gnome-nettool/ip-information.page
share/help/es/gnome-nettool/network-connectivity.page
share/help/fr/gnome-nettool/figures/gnome-nettool-trail.png
share/help/fr/gnome-nettool/figures/gnome-nettool.png
share/help/fr/gnome-nettool/index.page
share/help/fr/gnome-nettool/introduction.page
share/help/fr/gnome-nettool/ip-information.page
share/help/fr/gnome-nettool/network-connectivity.page
share/help/oc/gnome-nettool/figures/gnome-nettool-trail.png
share/help/oc/gnome-nettool/figures/gnome-nettool.png
share/help/oc/gnome-nettool/index.page
share/help/oc/gnome-nettool/introduction.page
share/help/oc/gnome-nettool/ip-information.page
share/help/oc/gnome-nettool/network-connectivity.page
share/help/pa/gnome-nettool/figures/gnome-nettool-trail.png
share/help/pa/gnome-nettool/figures/gnome-nettool.png
share/help/pa/gnome-nettool/index.page
share/help/pa/gnome-nettool/introduction.page
share/help/pa/gnome-nettool/ip-information.page
share/help/pa/gnome-nettool/network-connectivity.page
share/help/pt_BR/gnome-nettool/figures/gnome-nettool-trail.png
share/help/pt_BR/gnome-nettool/figures/gnome-nettool.png
share/help/pt_BR/gnome-nettool/index.page
share/help/pt_BR/gnome-nettool/introduction.page
share/help/pt_BR/gnome-nettool/ip-information.page
share/help/pt_BR/gnome-nettool/network-connectivity.page
share/help/ru/gnome-nettool/figures/gnome-nettool-trail.png
share/help/ru/gnome-nettool/figures/gnome-nettool.png
share/help/ru/gnome-nettool/index.page
share/help/ru/gnome-nettool/introduction.page
share/help/ru/gnome-nettool/ip-information.page
share/help/ru/gnome-nettool/network-connectivity.page
share/help/sv/gnome-nettool/figures/gnome-nettool-trail.png
share/help/sv/gnome-nettool/figures/gnome-nettool.png
share/help/sv/gnome-nettool/index.page
share/help/sv/gnome-nettool/introduction.page
share/help/sv/gnome-nettool/ip-information.page
share/help/sv/gnome-nettool/network-connectivity.page
share/help/uk/gnome-nettool/figures/gnome-nettool-trail.png
share/help/uk/gnome-nettool/figures/gnome-nettool.png
share/help/uk/gnome-nettool/index.page
share/help/uk/gnome-nettool/introduction.page
share/help/uk/gnome-nettool/ip-information.page
share/help/uk/gnome-nettool/network-connectivity.page
share/help/vi/gnome-nettool/figures/gnome-nettool-trail.png
share/help/vi/gnome-nettool/figures/gnome-nettool.png
share/help/vi/gnome-nettool/index.page
share/help/vi/gnome-nettool/introduction.page
share/help/vi/gnome-nettool/ip-information.page
share/help/vi/gnome-nettool/network-connectivity.page
share/help/zh_CN/gnome-nettool/figures/gnome-nettool-trail.png
share/help/zh_CN/gnome-nettool/figures/gnome-nettool.png
share/help/zh_CN/gnome-nettool/index.page
share/help/zh_CN/gnome-nettool/introduction.page
share/help/zh_CN/gnome-nettool/ip-information.page
share/help/zh_CN/gnome-nettool/network-connectivity.page
share/icons/hicolor/16x16/apps/gnome-nettool.png
share/icons/hicolor/22x22/apps/gnome-nettool.png
share/icons/hicolor/24x24/apps/gnome-nettool.png
@ -37,6 +121,7 @@ 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
@ -53,6 +138,7 @@ 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
@ -70,6 +156,7 @@ 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/km/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
@ -105,8 +192,10 @@ 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/tg/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
@ -116,21 +205,3 @@ 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