aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/gnome-netstatus/Makefile4
-rw-r--r--net/gnome-netstatus/distinfo6
-rw-r--r--net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c28
-rw-r--r--net/gnome-netstatus/pkg-plist34
-rw-r--r--net/gnome-nettool/Makefile7
-rw-r--r--net/gnome-nettool/distinfo6
-rw-r--r--net/gnome-nettool/files/patch-src_info.c197
-rw-r--r--net/gnome-nettool/files/patch-src_utils.c20
-rw-r--r--net/gnome-nettool/pkg-plist15
-rw-r--r--net/libgweather/Makefile4
-rw-r--r--net/libgweather/distinfo6
-rw-r--r--net/libgweather/pkg-plist19
-rw-r--r--net/tsclient/Makefile7
-rw-r--r--net/vinagre/Makefile5
-rw-r--r--net/vinagre/distinfo6
-rw-r--r--net/vinagre/pkg-plist25
-rw-r--r--net/vino/Makefile7
-rw-r--r--net/vino/distinfo6
-rw-r--r--net/vino/files/patch-configure28
-rw-r--r--net/vino/files/patch-server_libvncserver_sockets.c42
-rw-r--r--net/vino/files/patch-server_vino-dbus-listener.c12
-rw-r--r--net/vino/pkg-plist6
22 files changed, 217 insertions, 273 deletions
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index 0b7b3de5c126..7f14c35a3604 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net/gnome-netstatus/Makefile,v 1.50 2008/09/22 23:33:17 kwm Exp $
+# $MCom: ports/net/gnome-netstatus/Makefile,v 1.52 2009/03/08 19:32:04 marcus Exp $
#
PORTNAME= gnome-netstatus
-PORTVERSION= 2.12.2
+PORTVERSION= 2.26.0
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/net/gnome-netstatus/distinfo b/net/gnome-netstatus/distinfo
index 72f18f1c2715..818e6650a3e8 100644
--- a/net/gnome-netstatus/distinfo
+++ b/net/gnome-netstatus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-netstatus-2.12.2.tar.bz2) = f1f9e18b48d46adb32c9002e4325f80e
-SHA256 (gnome2/gnome-netstatus-2.12.2.tar.bz2) = 50c8b1abe1e5d813cf651bf12d1b39b00b22fadc0ee886135e5f9a08e3969943
-SIZE (gnome2/gnome-netstatus-2.12.2.tar.bz2) = 525222
+MD5 (gnome2/gnome-netstatus-2.26.0.tar.bz2) = f116157535ec185f0ea7503fafc5edd6
+SHA256 (gnome2/gnome-netstatus-2.26.0.tar.bz2) = 17169ef602037ac40e5d6b43a7add0593c9fe3f04da65aa06d70c59bc6bbccd8
+SIZE (gnome2/gnome-netstatus-2.26.0.tar.bz2) = 552061
diff --git a/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c b/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c
index dca19039a579..0c9c78b83b65 100644
--- a/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c
+++ b/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c
@@ -1,5 +1,5 @@
---- src/netstatus-sysdeps.c.orig 2007-02-13 04:39:19.000000000 -0500
-+++ src/netstatus-sysdeps.c 2008-04-23 13:07:24.000000000 -0400
+--- src/netstatus-sysdeps.c.orig 2009-03-08 00:25:52.000000000 -0500
++++ src/netstatus-sysdeps.c 2009-03-08 15:24:33.000000000 -0400
@@ -37,13 +37,26 @@
#ifdef __FreeBSD__
@@ -162,24 +162,24 @@
*signal_strength = 0;
+#if __FreeBSD_version < 800036
- if (g_strncasecmp (iface, "an", 2) &&
- g_strncasecmp (iface, "wi", 2) &&
- g_strncasecmp (iface, "ath", 3) &&
- g_strncasecmp (iface, "ndis", 4) &&
-+ g_strncasecmp (iface, "ural", 4) &&
-+ g_strncasecmp (iface, "ral", 3) &&
- g_strncasecmp (iface, "ipw", 3) &&
- g_strncasecmp (iface, "iwi", 3) &&
-+ g_strncasecmp (iface, "rum", 3) &&
-+ g_strncasecmp (iface, "ray", 3) &&
- g_strncasecmp (iface, "acx", 3))
+ if (g_ascii_strncasecmp (iface, "an", 2) &&
+ g_ascii_strncasecmp (iface, "wi", 2) &&
+ g_ascii_strncasecmp (iface, "ath", 3) &&
+ g_ascii_strncasecmp (iface, "ndis", 4) &&
++ g_ascii_strncasecmp (iface, "ural", 4) &&
++ g_ascii_strncasecmp (iface, "ral", 3) &&
+ g_ascii_strncasecmp (iface, "ipw", 3) &&
+ g_ascii_strncasecmp (iface, "iwi", 3) &&
++ g_ascii_strncasecmp (iface, "rum", 3) &&
++ g_ascii_strncasecmp (iface, "ray", 3) &&
+ g_ascii_strncasecmp (iface, "acx", 3))
+#else
+ if (g_strncasecmp (iface, "wlan", 4))
+#endif
return error_message;
+#if __FreeBSD_version < 700046
- if (g_strncasecmp (iface, "an", 2) == 0)
+ if (g_ascii_strncasecmp (iface, "an", 2) == 0)
{
error_message = get_an_data (iface, signal_strength);
*is_wireless = TRUE;
diff --git a/net/gnome-netstatus/pkg-plist b/net/gnome-netstatus/pkg-plist
index 9cb23623a744..b3c64e8bcbd5 100644
--- a/net/gnome-netstatus/pkg-plist
+++ b/net/gnome-netstatus/pkg-plist
@@ -32,6 +32,13 @@ share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-tx.png
share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-txrx.png
share/gnome/help/gnome-netstatus/de/gnome-netstatus.xml
share/gnome/help/gnome-netstatus/de/legal.xml
+share/gnome/help/gnome-netstatus/el/figures/gnome-netstatus-disconn.png
+share/gnome/help/gnome-netstatus/el/figures/gnome-netstatus-error.png
+share/gnome/help/gnome-netstatus/el/figures/gnome-netstatus-idle.png
+share/gnome/help/gnome-netstatus/el/figures/gnome-netstatus-rx.png
+share/gnome/help/gnome-netstatus/el/figures/gnome-netstatus-tx.png
+share/gnome/help/gnome-netstatus/el/figures/gnome-netstatus-txrx.png
+share/gnome/help/gnome-netstatus/el/gnome-netstatus.xml
share/gnome/help/gnome-netstatus/en_GB/figures/gnome-netstatus-disconn.png
share/gnome/help/gnome-netstatus/en_GB/figures/gnome-netstatus-error.png
share/gnome/help/gnome-netstatus/en_GB/figures/gnome-netstatus-idle.png
@@ -153,6 +160,7 @@ share/omf/gnome-netstatus/gnome-netstatus-C.omf
share/omf/gnome-netstatus/gnome-netstatus-ca.omf
share/omf/gnome-netstatus/gnome-netstatus-bg.omf
share/omf/gnome-netstatus/gnome-netstatus-de.omf
+share/omf/gnome-netstatus/gnome-netstatus-el.omf
share/omf/gnome-netstatus/gnome-netstatus-en_GB.omf
share/omf/gnome-netstatus/gnome-netstatus-es.omf
share/omf/gnome-netstatus/gnome-netstatus-fr.omf
@@ -182,11 +190,13 @@ share/icons/hicolor/48x48/apps/gnome-netstatus-txrx.png
share/locale/af/LC_MESSAGES/gnome-netstatus.mo
share/locale/ar/LC_MESSAGES/gnome-netstatus.mo
share/locale/az/LC_MESSAGES/gnome-netstatus.mo
+share/locale/be@latin/LC_MESSAGES/gnome-netstatus.mo
share/locale/bg/LC_MESSAGES/gnome-netstatus.mo
share/locale/bn/LC_MESSAGES/gnome-netstatus.mo
share/locale/bn_IN/LC_MESSAGES/gnome-netstatus.mo
share/locale/bs/LC_MESSAGES/gnome-netstatus.mo
share/locale/ca/LC_MESSAGES/gnome-netstatus.mo
+share/locale/crh/LC_MESSAGES/gnome-netstatus.mo
share/locale/cs/LC_MESSAGES/gnome-netstatus.mo
share/locale/cy/LC_MESSAGES/gnome-netstatus.mo
share/locale/da/LC_MESSAGES/gnome-netstatus.mo
@@ -215,9 +225,12 @@ share/locale/it/LC_MESSAGES/gnome-netstatus.mo
share/locale/ja/LC_MESSAGES/gnome-netstatus.mo
share/locale/ka/LC_MESSAGES/gnome-netstatus.mo
share/locale/kn/LC_MESSAGES/gnome-netstatus.mo
+share/locale/ku/LC_MESSAGES/gnome-netstatus.mo
share/locale/ko/LC_MESSAGES/gnome-netstatus.mo
share/locale/lt/LC_MESSAGES/gnome-netstatus.mo
share/locale/lv/LC_MESSAGES/gnome-netstatus.mo
+share/locale/mg/LC_MESSAGES/gnome-netstatus.mo
+share/locale/ml/LC_MESSAGES/gnome-netstatus.mo
share/locale/mn/LC_MESSAGES/gnome-netstatus.mo
share/locale/mr/LC_MESSAGES/gnome-netstatus.mo
share/locale/ms/LC_MESSAGES/gnome-netstatus.mo
@@ -226,19 +239,23 @@ share/locale/ne/LC_MESSAGES/gnome-netstatus.mo
share/locale/nl/LC_MESSAGES/gnome-netstatus.mo
share/locale/nn/LC_MESSAGES/gnome-netstatus.mo
share/locale/oc/LC_MESSAGES/gnome-netstatus.mo
+share/locale/or/LC_MESSAGES/gnome-netstatus.mo
share/locale/pa/LC_MESSAGES/gnome-netstatus.mo
share/locale/pl/LC_MESSAGES/gnome-netstatus.mo
+share/locale/ps/LC_MESSAGES/gnome-netstatus.mo
share/locale/pt/LC_MESSAGES/gnome-netstatus.mo
share/locale/pt_BR/LC_MESSAGES/gnome-netstatus.mo
share/locale/ro/LC_MESSAGES/gnome-netstatus.mo
share/locale/ru/LC_MESSAGES/gnome-netstatus.mo
share/locale/rw/LC_MESSAGES/gnome-netstatus.mo
share/locale/sk/LC_MESSAGES/gnome-netstatus.mo
+share/locale/sl/LC_MESSAGES/gnome-netstatus.mo
share/locale/sq/LC_MESSAGES/gnome-netstatus.mo
share/locale/sr/LC_MESSAGES/gnome-netstatus.mo
share/locale/sr@latin/LC_MESSAGES/gnome-netstatus.mo
share/locale/sv/LC_MESSAGES/gnome-netstatus.mo
share/locale/ta/LC_MESSAGES/gnome-netstatus.mo
+share/locale/te/LC_MESSAGES/gnome-netstatus.mo
share/locale/th/LC_MESSAGES/gnome-netstatus.mo
share/locale/tr/LC_MESSAGES/gnome-netstatus.mo
share/locale/uk/LC_MESSAGES/gnome-netstatus.mo
@@ -248,6 +265,7 @@ share/locale/vi/LC_MESSAGES/gnome-netstatus.mo
share/locale/wa/LC_MESSAGES/gnome-netstatus.mo
share/locale/xh/LC_MESSAGES/gnome-netstatus.mo
share/locale/zh_CN/LC_MESSAGES/gnome-netstatus.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-netstatus.mo
share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo
@dirrm share/omf/gnome-netstatus
@dirrm share/gnome/help/gnome-netstatus/zh_TW/figures
@@ -282,6 +300,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo
@dirrm share/gnome/help/gnome-netstatus/es
@dirrm share/gnome/help/gnome-netstatus/en_GB/figures
@dirrm share/gnome/help/gnome-netstatus/en_GB
+@dirrm share/gnome/help/gnome-netstatus/el/figures
+@dirrm share/gnome/help/gnome-netstatus/el
@dirrm share/gnome/help/gnome-netstatus/de/figures
@dirrm share/gnome/help/gnome-netstatus/de
@dirrm share/gnome/help/gnome-netstatus/ca/figures
@@ -292,21 +312,35 @@ share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo
@dirrm share/gnome/help/gnome-netstatus/C
@dirrm share/gnome/help/gnome-netstatus
@dirrm share/gnome-netstatus
+@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/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
@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/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
@dirrmtry share/locale/fur/LC_MESSAGES
@dirrmtry share/locale/fur
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/crh/LC_MESSAGES
+@dirrmtry share/locale/crh
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index 328b54c1acc1..26c071b3d45e 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -3,12 +3,11 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net/gnome-nettool/Makefile,v 1.44 2008/09/22 23:38:56 kwm Exp $
+# $MCom: ports/net/gnome-nettool/Makefile,v 1.50 2009/04/01 04:33:15 marcus Exp $
#
PORTNAME= gnome-nettool
-PORTVERSION= 2.22.1
-PORTEPOCH= 1
+PORTVERSION= 2.26.1
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,6 +15,8 @@ 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
+
USE_BZIP2= yes
USE_GNOME= gnomehack intlhack gnomeprefix libglade2 gconf2 gnomedocutils
USE_GMAKE= yes
diff --git a/net/gnome-nettool/distinfo b/net/gnome-nettool/distinfo
index dcc612d6ddbd..6f4d384b5012 100644
--- a/net/gnome-nettool/distinfo
+++ b/net/gnome-nettool/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-nettool-2.22.1.tar.bz2) = afcaff8ebc76b5f352902ed424dc2856
-SHA256 (gnome2/gnome-nettool-2.22.1.tar.bz2) = 90938c337575ce0f008a46a9f89f24bc6c04f5384337475fe3d5b960594c31b1
-SIZE (gnome2/gnome-nettool-2.22.1.tar.bz2) = 600085
+MD5 (gnome2/gnome-nettool-2.26.1.tar.bz2) = 476a0ffe807cfc374732d944efc83058
+SHA256 (gnome2/gnome-nettool-2.26.1.tar.bz2) = d8e71f2df9da5d5ba38c408f7646e92a89acc9a4a6af791cd1e9256c9b3af08f
+SIZE (gnome2/gnome-nettool-2.26.1.tar.bz2) = 611892
diff --git a/net/gnome-nettool/files/patch-src_info.c b/net/gnome-nettool/files/patch-src_info.c
index 74eb698a4665..88a107e6f825 100644
--- a/net/gnome-nettool/files/patch-src_info.c
+++ b/net/gnome-nettool/files/patch-src_info.c
@@ -1,5 +1,5 @@
---- src/info.c.orig Fri Dec 1 10:36:15 2006
-+++ src/info.c Mon Dec 18 17:32:19 2006
+--- 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>
@@ -11,19 +11,17 @@
#ifdef HAVE_CONFIG_H
# include <config.h>
-@@ -38,6 +42,11 @@
+@@ -37,6 +41,9 @@
#include <sys/ioctl.h>
#include <stdlib.h>
#include <net/if.h>
+#ifdef __FreeBSD__
-+#include <sys/sysctl.h>
-+#include <net/if_dl.h>
+#include <net/if_media.h>
+#endif
- #include "info.h"
- #include "utils.h"
-@@ -58,6 +67,7 @@ static InfoInterfaceDescription info_ifa
+ #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 },
@@ -31,7 +29,7 @@
{ 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 },
-@@ -128,9 +138,42 @@ info_get_interface_from_dev_name (const
+@@ -131,9 +139,42 @@ info_get_interface_from_dev_name (const
{
gint i;
gchar *path;
@@ -76,184 +74,3 @@
(*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);
-@@ -218,38 +261,87 @@ info_nic_update_stats (gpointer data)
- gchar tx[10], tx_error[10], tx_drop[10], tx_ovr[10];
- */
- gchar iface[30]; /*, flags[30]; */
-- gchar rx_bytes[16], rx_pkt[10], rx_error[10], rx_drop[10], rx_fifo[10];
-- gchar frame[10], compressed[10], multicast[10];
-- gchar tx_bytes[16], tx_pkt[10], tx_error[10], tx_drop[10], tx_fifo[10];
-+ gchar rx_bytes[16], rx_pkt[10], rx_error[10];
-+ gchar tx_bytes[16], tx_pkt[10], tx_error[10];
- gchar collissions[10];
-+#if defined(__linux__)
-+ gchar rx_drop[10], rx_fifo[10];
-+ gchar frame[10], compressed[10], multicast[10];
-+ gchar tx_drop[10], tx_fifo[10];
-+#elif defined(__FreeBSD__)
-+ char *p;
-+ gchar **tokens, **argv;
-+ int i;
-+ int pipe_out;
-+#endif
-
- GIOChannel *io = NULL;
- gchar *line;
- gboolean title = TRUE;
- const gchar *text;
- gchar *text_tx_bytes, *text_rx_bytes;
--
-+
- g_return_val_if_fail (info != NULL, FALSE);
-
- model = gtk_combo_box_get_model (GTK_COMBO_BOX (info->combo));
- text = info_get_nic (info);
- if (!text)
- return FALSE;
--
-+
- #if defined(__linux__)
- io = g_io_channel_new_file ("/proc/net/dev", "r", NULL);
--
-+#elif defined(__FreeBSD__)
-+ if (!g_shell_parse_argv ("/usr/bin/netstat -in -b -f link", NULL, &argv, NULL)) {
-+ return FALSE;
-+ }
-+ if (!g_spawn_async_with_pipes (NULL, argv, NULL, 0, NULL, NULL, NULL, NULL, &pipe_out, NULL, NULL)) {
-+ g_strfreev (argv);
-+ return FALSE;
-+ }
-+
-+ g_strfreev (argv);
-+
-+ io = g_io_channel_unix_new (pipe_out);
-+#endif /* defined(__linux__) */
-+
- while (g_io_channel_read_line (io, &line, NULL, NULL, NULL) == G_IO_STATUS_NORMAL) {
- if (title) {
- title = FALSE;
- g_free (line);
- continue;
- }
-+#if defined(__linux__)
- line = g_strdelimit (line, ":", ' ');
- sscanf (line, "%s %s %s %s %s %s %s %s %s %s %s %s %s %s %s", iface,
- rx_bytes, rx_pkt, rx_error, rx_drop, rx_fifo, frame,
- compressed, multicast,
- tx_bytes, tx_pkt, tx_error, tx_drop, tx_fifo, collissions);
-+#elif defined(__FreeBSD__)
-+ tokens = (gchar **) g_malloc0 (sizeof (gchar *) * 12);
-+ p = strtok (line, " \t\n");
-+ /* We only care about 11 fields for now */
-+ for (i = 0; i < 11 && p; i++, p = strtok (NULL, " \t\n")) {
-+ tokens[i] = g_strdup (p);
-+ }
-+
-+ if (i == 0 || i < 10) {
-+ g_free (line);
-+ g_strfreev (tokens);
-+ continue;
-+ }
-+
-+ g_strlcpy (iface, tokens[0], sizeof (iface));
-+
-+ g_strlcpy (collissions, tokens[--i], sizeof (collissions));
-+ g_strlcpy (tx_bytes, tokens[--i], sizeof (tx_bytes));
-+ g_strlcpy (tx_error, tokens[--i], sizeof (tx_error));
-+ g_strlcpy (tx_pkt, tokens[--i], sizeof (tx_pkt));
-+ g_strlcpy (rx_bytes, tokens[--i], sizeof (rx_bytes));
-+ g_strlcpy (rx_error, tokens[--i], sizeof (rx_error));
-+ g_strlcpy (rx_pkt, tokens[--i], sizeof (rx_pkt));
-+
-+ g_strfreev (tokens);
-+#endif /* defined(__linux__) */
-
- if (g_ascii_strcasecmp (iface, text) == 0) {
- /*
-@@ -277,7 +369,9 @@ info_nic_update_stats (gpointer data)
- }
-
- g_io_channel_unref (io);
--#endif /* defined(__linux__) */
-+#if defined(__FreeBSD__)
-+ close (pipe_out);
-+#endif /* defined(__FreeBSD__) */
-
- return TRUE;
- }
-@@ -425,8 +519,19 @@ info_get_nic_information (const gchar *n
- #ifdef __linux__
- mii_data_result data;
- #endif
-+#ifdef __FreeBSD__
-+ gint hwmib[6];
-+ size_t hwlen;
-+ gchar *hwbuf;
-+ guchar *hwptr;
-+ struct if_msghdr *hwifm;
-+ struct sockaddr_dl *hwsinptr;
-+#endif
-
-- getifaddrs (&ifa0);
-+ if (getifaddrs (&ifa0) != 0) {
-+ g_warning ("getifaddrs failed: %s", g_strerror (errno));
-+ goto fail;
-+ }
-
- for (ifr6 = ifa0; ifr6; ifr6 = ifr6->ifa_next) {
- if (strcmp (ifr6->ifa_name, nic) != 0) {
-@@ -510,6 +615,45 @@ info_get_nic_information (const gchar *n
- (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[3],
- (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[4],
- (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[5]);
-+#elif defined(__FreeBSD__)
-+ hwmib[0] = CTL_NET;
-+ hwmib[1] = AF_ROUTE;
-+ hwmib[2] = 0;
-+ hwmib[3] = AF_LINK;
-+ hwmib[4] = NET_RT_IFLIST;
-+ if ((hwmib[5] = if_nametoindex (nic)) == 0) {
-+ g_sprintf (dst, NOT_AVAILABLE);
-+ goto hwfail;
-+ }
-+ if (sysctl (hwmib, 6, NULL, &hwlen, NULL, 0) < 0) {
-+ g_sprintf (dst, NOT_AVAILABLE);
-+ goto hwfail;
-+ }
-+ if ((hwbuf = g_malloc (hwlen)) == NULL) {
-+ g_sprintf (dst, NOT_AVAILABLE);
-+ goto hwfail;
-+ }
-+ if (sysctl (hwmib, 6, hwbuf, &hwlen, NULL, 0) < 0) {
-+ g_sprintf (dst, NOT_AVAILABLE);
-+ goto hwfail;
-+ }
-+
-+ hwifm = (struct if_msghdr *) hwbuf;
-+ hwsinptr = (struct sockaddr_dl *) (hwifm + 1);
-+ hwptr = (guchar *) LLADDR (hwsinptr);
-+ if (*hwptr != 0 || *(hwptr + 1) != 0 ||
-+ *(hwptr + 2) != 0 || *(hwptr + 3) != 0 ||
-+ *(hwptr + 4) != 0 || *(hwptr + 5) != 0) {
-+ g_sprintf (dst, "%02x:%02x:%02x:%02x:%02x:%02x",
-+ *hwptr, *(hwptr + 1), *(hwptr + 2),
-+ *(hwptr + 3), *(hwptr + 4), *(hwptr + 5));
-+ }
-+ else {
-+ g_sprintf (dst, NOT_AVAILABLE);
-+ }
-+ g_free (hwbuf);
-+
-+hwfail:
- #else
- g_sprintf (dst, NOT_AVAILABLE);
- #endif /* SIOCGIFHWADDR */
-@@ -625,6 +769,8 @@ info_get_nic_information (const gchar *n
- }
-
- freeifaddrs (ifa0);
-+fail:
-+ ;
- }
-
- static gint *
diff --git a/net/gnome-nettool/files/patch-src_utils.c b/net/gnome-nettool/files/patch-src_utils.c
deleted file mode 100644
index 921c780498c1..000000000000
--- a/net/gnome-nettool/files/patch-src_utils.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/utils.c.orig Fri May 6 16:10:28 2005
-+++ src/utils.c Sun Jul 3 17:48:12 2005
-@@ -24,6 +24,8 @@
- on GNOME 2.0 */
-
- #include "utils.h"
-+#include <stdlib.h>
-+#include <limits.h>
- #include <string.h>
- #include <glib/gi18n.h>
-
-@@ -240,7 +242,7 @@ util_legible_bytes (gchar *bytes)
- const gchar *unit = "B";
- gchar *result;
-
-- sscanf (bytes, "%lld", &rx);
-+ rx = strtoull (bytes, (char **)NULL, 10);
- short_rx = rx * 10;
-
- if (rx > 1125899906842624ull) {
diff --git a/net/gnome-nettool/pkg-plist b/net/gnome-nettool/pkg-plist
index 9ba878e67375..39446f94d070 100644
--- a/net/gnome-nettool/pkg-plist
+++ b/net/gnome-nettool/pkg-plist
@@ -14,20 +14,26 @@ 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/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/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
@@ -78,6 +84,7 @@ 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
@@ -107,22 +114,30 @@ 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-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-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/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/de
@dirrm share/gnome/help/gnome-nettool/da
@dirrm share/gnome/help/gnome-nettool/cs
@dirrm share/gnome/help/gnome-nettool/ca
diff --git a/net/libgweather/Makefile b/net/libgweather/Makefile
index 02403b0f37b0..63fa56282dc2 100644
--- a/net/libgweather/Makefile
+++ b/net/libgweather/Makefile
@@ -3,11 +3,11 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net/libgweather/Makefile,v 1.21 2008/11/25 17:04:51 mezz Exp $
+# $MCom: ports/net/libgweather/Makefile,v 1.25 2009/03/17 23:07:29 kwm Exp $
#
PORTNAME= libgweather
-PORTVERSION= 2.24.3
+PORTVERSION= 2.26.0
CATEGORIES= net gnome
MASTER_SITES= GNOME
diff --git a/net/libgweather/distinfo b/net/libgweather/distinfo
index 636956b1061e..cfe463151c37 100644
--- a/net/libgweather/distinfo
+++ b/net/libgweather/distinfo
@@ -1,3 +1,3 @@
-MD5 (libgweather-2.24.3.tar.bz2) = ab29ea93a87339bb1571434fe2086789
-SHA256 (libgweather-2.24.3.tar.bz2) = fff7f1fa447156951ce6f01ed88f52b891c1ca6c65ff215f56a501e8aa917fcb
-SIZE (libgweather-2.24.3.tar.bz2) = 7094107
+MD5 (libgweather-2.26.0.tar.bz2) = b96016d7b35c66cf251189e9851ee252
+SHA256 (libgweather-2.26.0.tar.bz2) = c1efdeb59fe87145d13d99b7bb6f51b56505081fb2ebc2f7fe7dc3f7699da45e
+SIZE (libgweather-2.26.0.tar.bz2) = 6536099
diff --git a/net/libgweather/pkg-plist b/net/libgweather/pkg-plist
index eaa4b04adcb5..049dc64a0c0a 100644
--- a/net/libgweather/pkg-plist
+++ b/net/libgweather/pkg-plist
@@ -12,6 +12,24 @@ lib/libgweather.la
lib/libgweather.so
lib/libgweather.so.1
libdata/pkgconfig/gweather.pc
+%%DOCSDIR%%/GWeatherLocationEntry.html
+%%DOCSDIR%%/GWeatherTimezoneMenu.html
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/libgweather-gweather-gconf.html
+%%DOCSDIR%%/libgweather-gweather-location.html
+%%DOCSDIR%%/libgweather-gweather-prefs.html
+%%DOCSDIR%%/libgweather-gweather-timezone.html
+%%DOCSDIR%%/libgweather-gweather-xml.html
+%%DOCSDIR%%/libgweather-weather.html
+%%DOCSDIR%%/libgweather.devhelp
+%%DOCSDIR%%/libgweather.devhelp2
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
%%DATADIR%%/Locations.ang.xml
%%DATADIR%%/Locations.ar.xml
%%DATADIR%%/Locations.as.xml
@@ -191,6 +209,7 @@ share/locale/zh_CN/LC_MESSAGES/libgweather.mo
share/locale/zh_HK/LC_MESSAGES/libgweather.mo
share/locale/zh_TW/LC_MESSAGES/libgweather.mo
@dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%
@dirrm include/libgweather
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile
index c18274452e9c..013a84a64e15 100644
--- a/net/tsclient/Makefile
+++ b/net/tsclient/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tsclient
PORTVERSION= 0.150
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net gnome
MASTER_SITES= SF
@@ -25,8 +25,9 @@ USE_GNOME= gtk20
USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`" \
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ LIBS="`pkg-config --libs libgnomeui-2.0`"
MAN1= tsclient.1
PORTDOCS= COPYING NEWS README
diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index fe5e59d677cb..de6059a78ab2 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net/vinagre/Makefile,v 1.20 2008/12/31 21:16:54 mezz Exp $
+# $MCom: ports/net/vinagre/Makefile,v 1.24 2009/03/18 00:32:18 kwm Exp $
#
PORTNAME= vinagre
-PORTVERSION= 2.24.2
-PORTREVISION= 1
+PORTVERSION= 2.26.0
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/net/vinagre/distinfo b/net/vinagre/distinfo
index d08ef1d64156..8f873d515440 100644
--- a/net/vinagre/distinfo
+++ b/net/vinagre/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/vinagre-2.24.2.tar.bz2) = 330a65e0277a2c8fe746e2091c3198ce
-SHA256 (gnome2/vinagre-2.24.2.tar.bz2) = 57b4be4c8bfeeb1493e96b728ec6a4ac29b3e01217b03ce9b194e1932f538959
-SIZE (gnome2/vinagre-2.24.2.tar.bz2) = 1450774
+MD5 (gnome2/vinagre-2.26.0.tar.bz2) = 6930bec2968c96dfb3407d6492ae42d4
+SHA256 (gnome2/vinagre-2.26.0.tar.bz2) = 3308e8072335370aa88201cbac23896c3f6118669c2fc531b7f7e8b62fb89c3e
+SIZE (gnome2/vinagre-2.26.0.tar.bz2) = 1412103
diff --git a/net/vinagre/pkg-plist b/net/vinagre/pkg-plist
index 1b13279b6f25..b9943a89a7e4 100644
--- a/net/vinagre/pkg-plist
+++ b/net/vinagre/pkg-plist
@@ -18,6 +18,8 @@ share/gnome/help/vinagre/cs/figures/vinagre-screenshot.png
share/gnome/help/vinagre/cs/vinagre.xml
share/gnome/help/vinagre/de/figures/vinagre-screenshot.png
share/gnome/help/vinagre/de/vinagre.xml
+share/gnome/help/vinagre/en_GB/figures/vinagre-screenshot.png
+share/gnome/help/vinagre/en_GB/vinagre.xml
share/gnome/help/vinagre/es/figures/vinagre-screenshot.png
share/gnome/help/vinagre/es/vinagre.xml
share/gnome/help/vinagre/fr/figures/vinagre-screenshot.png
@@ -28,6 +30,8 @@ share/gnome/help/vinagre/oc/figures/vinagre-screenshot.png
share/gnome/help/vinagre/oc/vinagre.xml
share/gnome/help/vinagre/pt/figures/vinagre-screenshot.png
share/gnome/help/vinagre/pt/vinagre.xml
+share/gnome/help/vinagre/pt_BR/figures/vinagre-screenshot.png
+share/gnome/help/vinagre/pt_BR/vinagre.xml
share/gnome/help/vinagre/sq/figures/vinagre-screenshot.png
share/gnome/help/vinagre/sq/vinagre.xml
share/gnome/help/vinagre/sv/figures/vinagre-screenshot.png
@@ -37,22 +41,28 @@ share/gnome/help/vinagre/th/vinagre.xml
share/icons/hicolor/16x16/apps/vinagre.png
share/icons/hicolor/16x16/mimetypes/application-x-remote-connection.png
share/icons/hicolor/16x16/mimetypes/application-x-vnc.png
+share/icons/hicolor/16x16/status/view-minimize.png
share/icons/hicolor/22x22/apps/vinagre.png
share/icons/hicolor/22x22/mimetypes/application-x-remote-connection.png
share/icons/hicolor/22x22/mimetypes/application-x-vnc.png
+share/icons/hicolor/22x22/status/view-minimize.png
share/icons/hicolor/24x24/apps/vinagre.png
share/icons/hicolor/24x24/mimetypes/application-x-remote-connection.png
share/icons/hicolor/24x24/mimetypes/application-x-vnc.png
share/icons/hicolor/32x32/apps/vinagre.png
share/icons/hicolor/32x32/mimetypes/application-x-remote-connection.png
share/icons/hicolor/32x32/mimetypes/application-x-vnc.png
+share/icons/hicolor/32x32/status/view-minimize.png
share/icons/hicolor/48x48/apps/vinagre.png
share/icons/hicolor/48x48/mimetypes/application-x-remote-connection.png
share/icons/hicolor/48x48/mimetypes/application-x-vnc.png
+share/icons/hicolor/48x48/status/view-minimize.png
share/icons/hicolor/scalable/apps/vinagre.svg
share/icons/hicolor/scalable/mimetypes/application-x-remote-connection.svg
share/icons/hicolor/scalable/mimetypes/application-x-vnc.svg
share/locale/ar/LC_MESSAGES/vinagre.mo
+share/locale/as/LC_MESSAGES/vinagre.mo
+share/locale/ast/LC_MESSAGES/vinagre.mo
share/locale/be@latin/LC_MESSAGES/vinagre.mo
share/locale/bg/LC_MESSAGES/vinagre.mo
share/locale/bn_IN/LC_MESSAGES/vinagre.mo
@@ -78,6 +88,7 @@ share/locale/kn/LC_MESSAGES/vinagre.mo
share/locale/ko/LC_MESSAGES/vinagre.mo
share/locale/ku/LC_MESSAGES/vinagre.mo
share/locale/lt/LC_MESSAGES/vinagre.mo
+share/locale/lv/LC_MESSAGES/vinagre.mo
share/locale/mk/LC_MESSAGES/vinagre.mo
share/locale/ml/LC_MESSAGES/vinagre.mo
share/locale/mr/LC_MESSAGES/vinagre.mo
@@ -90,6 +101,7 @@ share/locale/pa/LC_MESSAGES/vinagre.mo
share/locale/pl/LC_MESSAGES/vinagre.mo
share/locale/pt/LC_MESSAGES/vinagre.mo
share/locale/pt_BR/LC_MESSAGES/vinagre.mo
+share/locale/ro/LC_MESSAGES/vinagre.mo
share/locale/ru/LC_MESSAGES/vinagre.mo
share/locale/si/LC_MESSAGES/vinagre.mo
share/locale/sl/LC_MESSAGES/vinagre.mo
@@ -98,6 +110,7 @@ share/locale/sr/LC_MESSAGES/vinagre.mo
share/locale/sr@latin/LC_MESSAGES/vinagre.mo
share/locale/sv/LC_MESSAGES/vinagre.mo
share/locale/ta/LC_MESSAGES/vinagre.mo
+share/locale/te/LC_MESSAGES/vinagre.mo
share/locale/th/LC_MESSAGES/vinagre.mo
share/locale/tr/LC_MESSAGES/vinagre.mo
share/locale/vi/LC_MESSAGES/vinagre.mo
@@ -112,11 +125,13 @@ share/omf/vinagre/vinagre-C.omf
share/omf/vinagre/vinagre-ca.omf
share/omf/vinagre/vinagre-cs.omf
share/omf/vinagre/vinagre-de.omf
+share/omf/vinagre/vinagre-en_GB.omf
share/omf/vinagre/vinagre-es.omf
share/omf/vinagre/vinagre-fr.omf
share/omf/vinagre/vinagre-it.omf
share/omf/vinagre/vinagre-oc.omf
share/omf/vinagre/vinagre-pt.omf
+share/omf/vinagre/vinagre-pt_BR.omf
share/omf/vinagre/vinagre-sq.omf
share/omf/vinagre/vinagre-sv.omf
share/omf/vinagre/vinagre-th.omf
@@ -131,6 +146,8 @@ share/omf/vinagre/vinagre-th.omf
@dirrm share/gnome/help/vinagre/sv
@dirrm share/gnome/help/vinagre/sq/figures
@dirrm share/gnome/help/vinagre/sq
+@dirrm share/gnome/help/vinagre/pt_BR/figures
+@dirrm share/gnome/help/vinagre/pt_BR
@dirrm share/gnome/help/vinagre/pt/figures
@dirrm share/gnome/help/vinagre/pt
@dirrm share/gnome/help/vinagre/oc/figures
@@ -141,6 +158,8 @@ share/omf/vinagre/vinagre-th.omf
@dirrm share/gnome/help/vinagre/fr
@dirrm share/gnome/help/vinagre/es/figures
@dirrm share/gnome/help/vinagre/es
+@dirrm share/gnome/help/vinagre/en_GB/figures
+@dirrm share/gnome/help/vinagre/en_GB
@dirrm share/gnome/help/vinagre/de/figures
@dirrm share/gnome/help/vinagre/de
@dirrm share/gnome/help/vinagre/cs/figures
@@ -158,6 +177,8 @@ share/omf/vinagre/vinagre-th.omf
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@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
@@ -172,3 +193,7 @@ share/omf/vinagre/vinagre-th.omf
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/net/vino/Makefile b/net/vino/Makefile
index 94df0bf63f40..0f1edaa04b55 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -3,11 +3,11 @@
# Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
#
# $FreeBSD$
-# $MCom: ports/net/vino/Makefile,v 1.63 2008/10/20 23:08:47 kwm Exp $
+# $MCom: ports/net/vino/Makefile,v 1.68 2009/03/18 00:27:09 kwm Exp $
#
PORTNAME= vino
-PORTVERSION= 2.24.1
+PORTVERSION= 2.26.0
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -15,7 +15,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= VNC server that allows for remote access to your GNOME desktop
-LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls
+LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls \
+ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
USE_BZIP2= yes
USE_GETTEXT= yes
diff --git a/net/vino/distinfo b/net/vino/distinfo
index 7abd78a63129..b2e2fc19385f 100644
--- a/net/vino/distinfo
+++ b/net/vino/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/vino-2.24.1.tar.bz2) = b373292a7a5443d7fad1cce5eb07f37f
-SHA256 (gnome2/vino-2.24.1.tar.bz2) = 4522c3969b64330b893de9a3257b4f7462975644b5e6cc57e9113d1f0c9c4a77
-SIZE (gnome2/vino-2.24.1.tar.bz2) = 674201
+MD5 (gnome2/vino-2.26.0.tar.bz2) = 7a10464824d8446411b90c162d34401e
+SHA256 (gnome2/vino-2.26.0.tar.bz2) = 1dfad6b20f99b3f8c79b265c2e71e19ad206317e38b1d167debb41fc9e6d94fb
+SIZE (gnome2/vino-2.26.0.tar.bz2) = 710542
diff --git a/net/vino/files/patch-configure b/net/vino/files/patch-configure
new file mode 100644
index 000000000000..c7da75af74e6
--- /dev/null
+++ b/net/vino/files/patch-configure
@@ -0,0 +1,28 @@
+--- configure.orig 2009-02-27 20:32:40.000000000 -0500
++++ configure 2009-02-27 20:34:44.000000000 -0500
+@@ -17882,6 +17882,8 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
++ #include <sys/types.h>
++ #include <sys/socket.h>
+ #include <ifaddrs.h>
+
+ int
+@@ -17896,6 +17898,7 @@ main ()
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
++have_getifaddrs=yes
+ if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+@@ -17921,7 +17924,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- if test $"$have_getifaddrs" = "yes"; then
++ if test x"$have_getifaddrs" = x"yes"; then
+ HAVE_GETIFADDRS_TRUE=
+ HAVE_GETIFADDRS_FALSE='#'
+ else
diff --git a/net/vino/files/patch-server_libvncserver_sockets.c b/net/vino/files/patch-server_libvncserver_sockets.c
index b182a2c4fc91..348ea91d3deb 100644
--- a/net/vino/files/patch-server_libvncserver_sockets.c
+++ b/net/vino/files/patch-server_libvncserver_sockets.c
@@ -1,22 +1,30 @@
-Index: server/libvncserver/sockets.c
-diff -u -p server/libvncserver/sockets.c.orig server/libvncserver/sockets.c
---- server/libvncserver/sockets.c.orig Tue Jan 2 22:34:50 2007
-+++ server/libvncserver/sockets.c Sun Mar 25 22:52:02 2007
-@@ -560,6 +560,7 @@ ListenOnTCPPort(port, localOnly)
-
- #ifdef ENABLE_IPV6
- struct sockaddr_in6 addr_in6;
+--- server/libvncserver/sockets.c.orig 2009-02-13 08:11:38.000000000 -0500
++++ server/libvncserver/sockets.c 2009-03-07 20:19:28.000000000 -0500
+@@ -668,6 +669,11 @@ NewSocketListenTCP(struct sockaddr *addr
+ {
+ int sock = -1;
+ int one = 1;
++#ifdef ENABLE_IPV6
++#ifdef IPV6_V6ONLY
+ int off = 0;
++#endif
++#endif
- memset(&addr_in6, 0, sizeof(addr_in6));
- addr_in6.sin6_family = AF_INET6;
-@@ -570,6 +571,9 @@ ListenOnTCPPort(port, localOnly)
- addrlen = sizeof(addr_in6);
+ if ((sock = socket(addr->sa_family, SOCK_STREAM, 0)) < 0)
+ return -1;
+@@ -677,6 +683,15 @@ NewSocketListenTCP(struct sockaddr *addr
+ return -1;
+ }
- sock = socket(AF_INET6, SOCK_STREAM, 0);
++#ifdef ENABLE_IPV6
+#ifdef IPV6_V6ONLY
-+ setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&off, sizeof(off));
++ if (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&off, sizeof(off)) < 0) {
++ close(sock);
++ return -1;
++ }
+#endif
- #endif
-
- if (sock < 0) {
++#endif
++
+ if (bind(sock, addr, len) < 0) {
+ close(sock);
+ return -1;
diff --git a/net/vino/files/patch-server_vino-dbus-listener.c b/net/vino/files/patch-server_vino-dbus-listener.c
new file mode 100644
index 000000000000..8057b9410179
--- /dev/null
+++ b/net/vino/files/patch-server_vino-dbus-listener.c
@@ -0,0 +1,12 @@
+--- server/vino-dbus-listener.c.orig 2009-02-27 20:36:08.000000000 -0500
++++ server/vino-dbus-listener.c 2009-02-27 20:36:30.000000000 -0500
+@@ -35,6 +35,9 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <netdb.h>
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
+ #include <net/if.h>
+ #include <arpa/inet.h>
+
diff --git a/net/vino/pkg-plist b/net/vino/pkg-plist
index 2db9574163d6..1cde6837570c 100644
--- a/net/vino/pkg-plist
+++ b/net/vino/pkg-plist
@@ -1,10 +1,11 @@
bin/vino-passwd
bin/vino-preferences
+etc/xdg/autostart/vino-server.desktop
libexec/vino-server
share/applications/vino-preferences.desktop
-share/gnome/autostart/vino-server.desktop
share/locale/ar/LC_MESSAGES/vino.mo
share/locale/as/LC_MESSAGES/vino.mo
+share/locale/ast/LC_MESSAGES/vino.mo
share/locale/az/LC_MESSAGES/vino.mo
share/locale/be@latin/LC_MESSAGES/vino.mo
share/locale/bg/LC_MESSAGES/vino.mo
@@ -80,6 +81,7 @@ share/locale/zh_HK/LC_MESSAGES/vino.mo
share/locale/zh_TW/LC_MESSAGES/vino.mo
%%DATADIR%%/vino-preferences.glade
%%DATADIR%%/vino-prompt.glade
+%%DATADIR%%/webservices
@dirrm %%DATADIR%%
@dirrmtry share/applications
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -108,5 +110,7 @@ share/locale/zh_TW/LC_MESSAGES/vino.mo
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as