diff options
author | nia <nia@pkgsrc.org> | 2020-01-16 15:33:29 +0000 |
---|---|---|
committer | nia <nia@pkgsrc.org> | 2020-01-16 15:33:29 +0000 |
commit | 4dd6901436852f35e061c377bcf5387646b9f244 (patch) | |
tree | d44daaefad52d9965a9d0c6a40cdfef6cbf3d6c2 /net/gnome-nettool | |
parent | 41d5fe66e20260619692e8764ac1dcadea255123 (diff) | |
download | pkgsrc-4dd6901436852f35e061c377bcf5387646b9f244.tar.gz |
gnome-nettool: Update to 3.8.1
Updated to GNOME 3/gtk3 version.
Diffstat (limited to 'net/gnome-nettool')
-rw-r--r-- | net/gnome-nettool/Makefile | 35 | ||||
-rw-r--r-- | net/gnome-nettool/PLIST | 151 | ||||
-rw-r--r-- | net/gnome-nettool/distinfo | 13 | ||||
-rw-r--r-- | net/gnome-nettool/patches/patch-src_netstat.c | 52 | ||||
-rw-r--r-- | net/gnome-nettool/patches/patch-src_netstat.h | 19 | ||||
-rw-r--r-- | net/gnome-nettool/patches/patch-src_utils.h | 18 |
6 files changed, 136 insertions, 152 deletions
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile index a6e3b2d1be0..2a63f497364 100644 --- a/net/gnome-nettool/Makefile +++ b/net/gnome-nettool/Makefile @@ -1,29 +1,28 @@ -# $NetBSD: Makefile,v 1.41 2019/07/21 22:25:31 wiz Exp $ -# +# $NetBSD: Makefile,v 1.42 2020/01/16 15:33:29 nia Exp $ -DISTNAME= gnome-nettool-2.26.2 -PKGREVISION= 31 +DISTNAME= gnome-nettool-3.8.1 CATEGORIES= net gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-nettool/2.26/} -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-nettool/3.8/} +EXTRACT_SUFX= .tar.xz MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= https://www.gnome.org/ +HOMEPAGE= https://gitlab.gnome.org/GNOME/gnome-nettool COMMENT= GNOME interface for various network tools LICENSE= gnu-gpl-v2 -GNU_CONFIGURE= yes -USE_TOOLS+= gmake intltool msgfmt pkg-config -USE_LIBTOOL= yes -USE_PKGLOCALEDIR= yes +TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool +TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2 +TOOL_DEPENDS+= p5-XML-LibXML>=1.58:../../textproc/p5-XML-LibXML -.include "../../devel/GConf/buildlink3.mk" -.include "../../devel/libglade/buildlink3.mk" +GNU_CONFIGURE= yes + +USE_TOOLS+= pkg-config perl gmake +USE_TOOLS+= intltool msgfmt msgmerge xgettext + +.include "../../devel/glib2/schemas.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../sysutils/libgtop/buildlink3.mk" -.include "../../textproc/gnome-doc-utils/buildlink3.mk" -.include "../../mk/omf-scrollkeeper.mk" -BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0 -.include "../../x11/gtk2/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk" +.include "../../sysutils/libgtop/buildlink3.mk" +.include "../../x11/gtk3/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/gnome-nettool/PLIST b/net/gnome-nettool/PLIST index 1383d537312..874b30b2f2b 100644 --- a/net/gnome-nettool/PLIST +++ b/net/gnome-nettool/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:09:28 joerg Exp $ +@comment $NetBSD: PLIST,v 1.5 2020/01/16 15:33:29 nia Exp $ bin/gnome-nettool share/applications/gnome-nettool.desktop -share/gnome-nettool/dialogs/gnome-nettool.glade +share/glib-2.0/schemas/org.gnome.gnome-nettool.gschema.xml share/gnome-nettool/pixmaps/16_ethernet.xpm share/gnome-nettool/pixmaps/16_loopback.xpm share/gnome-nettool/pixmaps/16_plip.xpm @@ -10,24 +10,109 @@ 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/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/gnome-nettool/ui/gnome-nettool.ui +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 @@ -38,19 +123,24 @@ 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 @@ -68,11 +158,13 @@ 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 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 @@ -102,8 +194,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 @@ -113,20 +207,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 diff --git a/net/gnome-nettool/distinfo b/net/gnome-nettool/distinfo index 277e590c7de..754cfd64afd 100644 --- a/net/gnome-nettool/distinfo +++ b/net/gnome-nettool/distinfo @@ -1,9 +1,6 @@ -$NetBSD: distinfo,v 1.8 2016/04/18 12:14:29 jperkin Exp $ +$NetBSD: distinfo,v 1.9 2020/01/16 15:33:29 nia Exp $ -SHA1 (gnome-nettool-2.26.2.tar.bz2) = dcb026f358a5797793391e5a90ae74c8401a8fec -RMD160 (gnome-nettool-2.26.2.tar.bz2) = 20b2145d8d616fbbac0c6081a0d508439a9b31f7 -SHA512 (gnome-nettool-2.26.2.tar.bz2) = ec3165a4c4365feaff84d937474528135dc10fce5272214c3aa6508bfc53df04fb79ac30308983ff65533f52057167baaf02042c5595c39245bac5c73f57c9d1 -Size (gnome-nettool-2.26.2.tar.bz2) = 631631 bytes -SHA1 (patch-src_netstat.c) = c71285c56b565e40ed28681d62e24470eede49f0 -SHA1 (patch-src_netstat.h) = e087a0ad253031889b6e29f9ab692bf532414657 -SHA1 (patch-src_utils.h) = 29ec268988ada403627fe4f1f3c89572b0c3f22e +SHA1 (gnome-nettool-3.8.1.tar.xz) = e40bc85ff71b64fcca11db444392c93d04d0094c +RMD160 (gnome-nettool-3.8.1.tar.xz) = e9bf8fdbcbdc39609853376ecc4e6721fe8e661f +SHA512 (gnome-nettool-3.8.1.tar.xz) = c1c90fa727ebbf21442c4d0f5f4e98acf91fdd68a476f5f378167f92c3d7938ef33598525b62b838dc9b485abeb40171bdffb0fe3cb060fd3982db013a30bbed +Size (gnome-nettool-3.8.1.tar.xz) = 589024 bytes diff --git a/net/gnome-nettool/patches/patch-src_netstat.c b/net/gnome-nettool/patches/patch-src_netstat.c deleted file mode 100644 index d3d673f7624..00000000000 --- a/net/gnome-nettool/patches/patch-src_netstat.c +++ /dev/null @@ -1,52 +0,0 @@ -$NetBSD: patch-src_netstat.c,v 1.1 2016/04/18 12:14:29 jperkin Exp $ - -Fix SunOS build, from OpenIndiana. - ---- src/netstat.c.orig 2009-05-20 00:56:41.000000000 +0000 -+++ src/netstat.c -@@ -112,9 +112,15 @@ netstat_get_active_option (Netinfo * net - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (netinfo->routing))) { - /* Works for Solaris and Linux */ - if (netinfo_is_ipv6_enable ()) { -+#ifdef __sun -+ option = g_strdup ("-rn -f inet -f inet6"); -+ } else { -+ option = g_strdup ("-rn -f inet"); -+#else - option = g_strdup ("-rn -A inet -A inet6"); - } else { - option = g_strdup ("-rn -A inet"); -+#endif - } - - if (netinfo->stbar_text) -@@ -125,7 +131,7 @@ netstat_get_active_option (Netinfo * net - /* Only works for Solaris */ - #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - option = g_strdup ("-a -f inet -ln"); --#else -+#elif defined(__linux) - if (netinfo_is_ipv6_enable ()) { - option = g_strdup ("-A inet -A inet6 -ln"); - } else { -@@ -541,7 +547,11 @@ netstat_route_tree_insert (GtkTreeView * - gtk_list_store_set (GTK_LIST_STORE (model), &iter, - 0, data.destination, - 1, data.gateway, -+#ifdef __sun -+ 2, NULL, -+#else - 2, data.netmask, -+#endif - 3, data.iface, -1); - - gtk_tree_view_set_model (widget, model); -@@ -562,7 +572,7 @@ strip_route_line (gchar * line, netstat_ - gchar **items; - #endif - --#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) -+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__sun) - count = sscanf (line, NETSTAT_ROUTE_FORMAT, - data->destination, - data->gateway, flags, diff --git a/net/gnome-nettool/patches/patch-src_netstat.h b/net/gnome-nettool/patches/patch-src_netstat.h deleted file mode 100644 index e8e2ae7a996..00000000000 --- a/net/gnome-nettool/patches/patch-src_netstat.h +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-src_netstat.h,v 1.1 2016/04/18 12:14:29 jperkin Exp $ - -Fix SunOS build, from OpenIndiana. - ---- src/netstat.h.orig 2009-05-20 00:56:41.000000000 +0000 -+++ src/netstat.h -@@ -36,6 +36,12 @@ - # define NETSTAT_ROUTE_FORMAT "%s %s %s %d %d %s" - # define NETSTAT_MULTICAST_FORMAT "%s %d %s" - -+#elif defined(__sun) -+# define NETSTAT_PROTOCOL_FORMAT "%s %d %d %s %s %s" -+# define NETSTAT_ROUTE_FORMAT "%s %s %s %d %d %s" -+# define NETSTAT_ROUTE6_FORMAT "%s %s %s %d %d %d %s" -+# define NETSTAT_MULTICAST_FORMAT "%s %s %d" -+ - #endif - - typedef enum { diff --git a/net/gnome-nettool/patches/patch-src_utils.h b/net/gnome-nettool/patches/patch-src_utils.h deleted file mode 100644 index 77007000b8d..00000000000 --- a/net/gnome-nettool/patches/patch-src_utils.h +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-src_utils.h,v 1.1 2016/04/18 12:14:29 jperkin Exp $ - -Fix SunOS build, from OpenIndiana. - ---- src/utils.h.orig 2009-04-18 14:59:27.000000000 +0000 -+++ src/utils.h -@@ -29,6 +29,11 @@ - # include <config.h> - #endif - -+#ifdef __sun -+#define gethostbyname2(name, domain) getipnodebyname((name), (domain), 0, &g_n_err_macro) -+int g_n_err_macro; -+#endif -+ - #if (GLIB_MINOR_VERSION < 2) - - # define _g_vsprintf vsprintf |