diff options
author | marcus <marcus@FreeBSD.org> | 2005-03-12 18:39:38 +0800 |
---|---|---|
committer | marcus <marcus@FreeBSD.org> | 2005-03-12 18:39:38 +0800 |
commit | 0b42143dea1a55d0f1f6d09704bbc131e1b633ed (patch) | |
tree | bc54902eb18f738e45a91362b2b0faf1ec6d04fa /net | |
parent | 773c9ca4ac44ac67652d01f1e985e4df8dab5301 (diff) | |
download | freebsd-ports-gnome-0b42143dea1a55d0f1f6d09704bbc131e1b633ed.tar.gz freebsd-ports-gnome-0b42143dea1a55d0f1f6d09704bbc131e1b633ed.tar.zst freebsd-ports-gnome-0b42143dea1a55d0f1f6d09704bbc131e1b633ed.zip |
Presenting GNOME 2.10 for FreeBSD!
The release notes can be found at
http://www.gnome.org/start/2.10/notes/rnwhatsnew.html, and will give you a
good idea of what has gone into this release overall. However, a lot of
FreeBSD specific additions and fixes have been made. For example, this
release offers fixed ACPI support as well as new CPU freqeuncy monitoring
support. See the FreeBSD GNOME 2.10 upgrade page at
http://www.FreeBSD.org/gnome/docs/faq210.html for the entire list as well
as a list of known issues and upgrade instructions.
GNOME 2.10, as well as all of our releases, would not be possible without
the great team that goes into porting and testign each and every component.
Thanks definitely goes out to ahze, adamw, bland, kwm, mezz, and pav for all
their work. We would also like to thank our adventurous users that chose to
ride the walrus. We'd especially like to thank the following users that
provided patches for GNOME 2.10:
ade
Yasuda Keisuke
Franz Klammer
Khairil Yusof
Radek Kozlowsk
And anyone else I may have accidentally omitted.
As with GNOME 2.8, 2.10 comes with a brand-spankin' new splashscreen
courtesy of Franz Klammer. However, unlike GNOME 2.8, we've included all
of the FreeBSD GNOME splashscreen entries with gnomesession. You can
use the deskutils/splashsetter port to choose the one you like best.
As always, GNOME users should _not_ use portupgrade alone to upgrade to
2.10. Instead, get the gnome_upgrade.sh script from
http://www.FreeBSD.org/gnome/gnome_upgrade.sh.
Enjoy!
Diffstat (limited to 'net')
23 files changed, 302 insertions, 184 deletions
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile index ee735aa98d5d..169dbc31877d 100644 --- a/net/gnome-netstatus/Makefile +++ b/net/gnome-netstatus/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomenetstatus -PORTVERSION= 2.8.0 -PORTREVISION= 2 +PORTVERSION= 2.10.0 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-netstatus/2.8 +MASTER_SITE_SUBDIR= sources/gnome-netstatus/2.10 DISTNAME= gnome-netstatus-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/net/gnome-netstatus/distinfo b/net/gnome-netstatus/distinfo index 1ad8a9f94236..48e9fbf2c961 100644 --- a/net/gnome-netstatus/distinfo +++ b/net/gnome-netstatus/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-netstatus-2.8.0.tar.bz2) = fadc8a26ff7142e1372740d2edc435b1 -SIZE (gnome2/gnome-netstatus-2.8.0.tar.bz2) = 492599 +MD5 (gnome2/gnome-netstatus-2.10.0.tar.bz2) = b1a044cfbe3299e00d514d966d4766e8 +SIZE (gnome2/gnome-netstatus-2.10.0.tar.bz2) = 510277 diff --git a/net/gnome-netstatus/files/patch-src_netstatus-iface.c b/net/gnome-netstatus/files/patch-src_netstatus-iface.c index 1ffae4384ecb..64c9ad52f8c9 100644 --- a/net/gnome-netstatus/files/patch-src_netstatus-iface.c +++ b/net/gnome-netstatus/files/patch-src_netstatus-iface.c @@ -1,16 +1,15 @@ ---- src/netstatus-iface.c.orig Mon Mar 22 17:49:17 2004 -+++ src/netstatus-iface.c Mon Mar 22 17:50:12 2004 -@@ -32,6 +32,8 @@ +--- src/netstatus-iface.c.orig Tue Nov 30 18:35:23 2004 ++++ src/netstatus-iface.c Tue Nov 30 18:35:43 2004 +@@ -33,6 +33,7 @@ #include <libgnome/gnome-i18n.h> +#include <sys/types.h> -+#include <sys/socket.h> #include <sys/ioctl.h> #ifdef HAVE_SYS_SOCKIO_H #include <sys/sockio.h> -@@ -39,6 +41,7 @@ - #include <sys/param.h> +@@ -41,6 +42,7 @@ + #include <sys/socket.h> #include <net/if.h> #include <net/if_arp.h> +#include <netinet/in.h> diff --git a/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c b/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c index a13a23161769..03e1d89c1d96 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 Fri Jul 30 04:19:31 2004 -+++ src/netstatus-sysdeps.c Tue Sep 21 00:27:19 2004 +--- src/netstatus-sysdeps.c.orig Fri Jul 30 04:21:30 2004 ++++ src/netstatus-sysdeps.c Thu Mar 3 03:04:41 2005 @@ -35,6 +35,16 @@ #include <glib.h> #include <libgnome/gnome-i18n.h> @@ -17,7 +17,7 @@ static inline gboolean parse_stats (char *buf, int prx_idx, -@@ -384,6 +394,163 @@ +@@ -384,6 +394,173 @@ } } @@ -37,16 +37,18 @@ + + s = socket (AF_INET, SOCK_DGRAM, 0); + -+ if (s == -1) { -+ *error = g_strdup_printf (_("Could not connect to interface, '%s'"), iface); -+ return FALSE; -+ } ++ if (s == -1) ++ { ++ *error = g_strdup_printf (_("Could not connect to interface, '%s'"), iface); ++ return FALSE; ++ } + -+ if (ioctl (s, req_type, &ifr) == -1) { -+ *error = g_strdup_printf (_("Could not send ioctl to interface, '%s'"), iface); -+ close (s); -+ return FALSE; -+ } ++ if (ioctl (s, req_type, &ifr) == -1) ++ { ++ *error = g_strdup_printf (_("Could not send ioctl to interface, '%s'"), iface); ++ close (s); ++ return FALSE; ++ } + + close (s); + return TRUE; @@ -110,35 +112,39 @@ + level = (int) (wreq.wi_val[1]); + +#ifdef WI_RID_READ_APS -+ if (signal_strength <= 0) { -+ /* we fail to get signal strength by usual means, try another way */ -+ static time_t last_scan; -+ static long int cached; -+ time_t now = time (NULL); -+ -+ /* XXX: this is long operation, and we will scan station not often then one in 5 secs */ -+ if (now > last_scan + 5) { -+ struct wi_apinfo *w; -+ int nstations; -+ -+ bzero ((char *)&wreq, sizeof(wreq)); -+ wreq.wi_len = WI_MAX_DATALEN; -+ wreq.wi_type = WI_RID_READ_APS; -+ -+ if (!wireless_getval (iface, (gpointer) &wreq, SIOCGWAVELAN, &error)) -+ return error; -+ nstations = *(int *)wreq.wi_val; -+ if (nstations > 0) { -+ w = (struct wi_apinfo *)(((char *)&wreq.wi_val) + sizeof(int)); -+ signal_strength = (long int)w->signal; -+ } -+ -+ cached = signal_strength; -+ last_scan = now; -+ } else { -+ signal_strength = cached; -+ } -+ } ++ if (signal_strength <= 0) ++ { ++ /* we fail to get signal strength by usual means, try another way */ ++ static time_t last_scan; ++ static long int cached; ++ time_t now = time (NULL); ++ ++ /* XXX: this is long operation, and we will scan station not often then one in 5 secs */ ++ if (now > last_scan + 5) ++ { ++ struct wi_apinfo *w; ++ int nstations; ++ ++ bzero ((char *)&wreq, sizeof(wreq)); ++ wreq.wi_len = WI_MAX_DATALEN; ++ wreq.wi_type = WI_RID_READ_APS; ++ if (!wireless_getval (iface, (gpointer) &wreq, SIOCGWAVELAN, &error)) ++ return error; ++ nstations = *(int *)wreq.wi_val; ++ if (nstations > 0) ++ { ++ w = (struct wi_apinfo *)(((char *)&wreq.wi_val) + sizeof(int)); ++ signal_strength = (long int)w->signal; ++ } ++ ++ cached = signal_strength; ++ last_scan = now; ++ } ++ else ++ { ++ signal_strength = cached; ++ } ++ } +#endif + + memcpy (signal_strength, &level, sizeof (signal_strength)); @@ -163,17 +169,21 @@ + *signal_strength = 0; + + if (g_strncasecmp (iface, "an", 2) && g_strncasecmp (iface, "wi", 2) && -+ g_strncasecmp (iface, "ath", 3) && g_strncasecmp (iface, "ndis", 4)) ++ g_strncasecmp (iface, "ath", 3) && g_strncasecmp (iface, "ndis", 4) && ++ g_strncasecmp (iface, "ipw", 3) && g_strncasecmp (iface, "iwi", 3) && ++ g_strncasecmp (iface, "acx", 3)) + return error_message; + -+ if (g_strncasecmp (iface, "an", 2) == 0) { -+ error_message = get_an_data (iface, signal_strength); -+ *is_wireless = TRUE; -+ } -+ else { -+ error_message = get_wi_data (iface, signal_strength); -+ *is_wireless = TRUE; -+ } ++ if (g_strncasecmp (iface, "an", 2) == 0) ++ { ++ error_message = get_an_data (iface, signal_strength); ++ *is_wireless = TRUE; ++ } ++ else ++ { ++ error_message = get_wi_data (iface, signal_strength); ++ *is_wireless = TRUE; ++ } + + return error_message; +} @@ -181,7 +191,42 @@ char * netstatus_sysdeps_read_iface_statistics (const char *iface, gulong *in_packets, -@@ -485,23 +652,6 @@ +@@ -413,11 +590,11 @@ + if (!g_shell_parse_argv (command_line, NULL, &argv, &error)) + { + error_message = g_strdup_printf (_("Could not parse command line '%s': %s"), +- command_line, +- error->message); ++ command_line, ++ error->message); + g_error_free (error); + g_free (command_line); +- ++ + return error_message; + } + g_free (command_line); +@@ -456,8 +633,8 @@ + g_io_channel_read_line (channel, &buf, NULL, NULL, NULL); + + if (!parse_stats (buf, +- prx_idx, ptx_idx, in_packets, out_packets, +- brx_idx, btx_idx, in_bytes, out_bytes)) ++ prx_idx, ptx_idx, in_packets, out_packets, ++ brx_idx, btx_idx, in_bytes, out_bytes)) + { + error_message = g_strdup_printf (_("Could not parse interface statistics from '%s'. " + "prx_idx = %d; ptx_idx = %d; brx_idx = %d; btx_idx = %d;"), +@@ -477,7 +654,7 @@ + } + else + { +- error_message = g_strdup_printf ("Error running /usr/bin/netstat for '%s': %s", ++ error_message = g_strdup_printf ("Error running /usr/bin/netstat for '%s': %s", + iface, error->message); + g_error_free (error); + } +@@ -485,23 +662,6 @@ g_strfreev (argv); return error_message; diff --git a/net/gnome-netstatus/pkg-plist b/net/gnome-netstatus/pkg-plist index b4258eef7f23..bf881c64c294 100644 --- a/net/gnome-netstatus/pkg-plist +++ b/net/gnome-netstatus/pkg-plist @@ -130,6 +130,7 @@ share/locale/eu/LC_MESSAGES/gnome-netstatus.mo share/locale/fi/LC_MESSAGES/gnome-netstatus.mo share/locale/fr/LC_MESSAGES/gnome-netstatus.mo share/locale/ga/LC_MESSAGES/gnome-netstatus.mo +share/locale/gl/LC_MESSAGES/gnome-netstatus.mo share/locale/gu/LC_MESSAGES/gnome-netstatus.mo share/locale/hi/LC_MESSAGES/gnome-netstatus.mo share/locale/hr/LC_MESSAGES/gnome-netstatus.mo @@ -142,6 +143,7 @@ share/locale/lt/LC_MESSAGES/gnome-netstatus.mo share/locale/mn/LC_MESSAGES/gnome-netstatus.mo share/locale/ms/LC_MESSAGES/gnome-netstatus.mo share/locale/nb/LC_MESSAGES/gnome-netstatus.mo +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/no/LC_MESSAGES/gnome-netstatus.mo diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile index fd1c3489b785..354f8005f5bc 100644 --- a/net/gnome-nettool/Makefile +++ b/net/gnome-nettool/Makefile @@ -6,12 +6,11 @@ # PORTNAME= gnomenettool -PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTVERSION= 1.2.0 PORTEPOCH= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-nettool/1.0 +MASTER_SITE_SUBDIR= sources/gnome-nettool/1.2 DISTNAME= gnome-nettool-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/net/gnome-nettool/distinfo b/net/gnome-nettool/distinfo index 68ada1f9d863..9606b0ac5244 100644 --- a/net/gnome-nettool/distinfo +++ b/net/gnome-nettool/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-nettool-1.0.0.tar.bz2) = a3261bd247960ba066b965c5a9a662e1 -SIZE (gnome2/gnome-nettool-1.0.0.tar.bz2) = 515045 +MD5 (gnome2/gnome-nettool-1.2.0.tar.bz2) = 277338cf5d54ae9941260dd993a14f7a +SIZE (gnome2/gnome-nettool-1.2.0.tar.bz2) = 572511 diff --git a/net/gnome-nettool/files/patch-src_info.c b/net/gnome-nettool/files/patch-src_info.c index 0891475e90ff..2d95d26204ac 100644 --- a/net/gnome-nettool/files/patch-src_info.c +++ b/net/gnome-nettool/files/patch-src_info.c @@ -1,6 +1,14 @@ ---- src/info.c.orig Mon Jun 14 06:52:59 2004 -+++ src/info.c Sun Oct 31 23:35:06 2004 -@@ -37,6 +37,11 @@ +--- src/info.c.orig Tue Feb 1 06:05:58 2005 ++++ src/info.c Thu Mar 3 23:39:57 2005 +@@ -20,6 +20,7 @@ + #include <gtk/gtk.h> + #include <glib/gi18n.h> + #include <glib/gprintf.h> ++#include <sys/types.h> + + #ifdef HAVE_CONFIG_H + # include <config.h> +@@ -38,6 +39,11 @@ #include <sys/ioctl.h> #include <stdlib.h> #include <net/if.h> @@ -12,7 +20,7 @@ #include "info.h" #include "utils.h" -@@ -57,6 +62,7 @@ +@@ -58,6 +64,7 @@ { 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 }, @@ -20,7 +28,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 }, -@@ -97,9 +103,42 @@ +@@ -128,9 +135,42 @@ { gint i; gchar *path; @@ -65,7 +73,7 @@ (*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); -@@ -187,17 +226,26 @@ +@@ -217,38 +257,87 @@ gchar tx[10], tx_error[10], tx_drop[10], tx_ovr[10]; */ gchar iface[30]; /*, flags[30]; */ @@ -96,10 +104,9 @@ g_return_val_if_fail (info != NULL, FALSE); model = gtk_combo_box_get_model (GTK_COMBO_BOX (info->combo)); -@@ -206,21 +254,61 @@ - else + text = info_get_nic (info); + if (!text) return FALSE; - /*text = gtk_entry_get_text (GTK_ENTRY (info->nic));*/ - + #if defined(__linux__) @@ -160,7 +167,7 @@ if (g_ascii_strcasecmp (iface, text) == 0) { /* -@@ -248,7 +336,9 @@ +@@ -276,7 +365,9 @@ } g_io_channel_unref (io); @@ -171,7 +178,7 @@ return TRUE; } -@@ -382,8 +472,16 @@ +@@ -405,8 +496,16 @@ InfoIpAddr *ip; gint flags; mii_data_result data; @@ -188,7 +195,7 @@ for (ifr6 = ifa0; ifr6; ifr6 = ifr6->ifa_next) { if (strcmp (ifr6->ifa_name, nic) != 0) { -@@ -429,7 +527,9 @@ +@@ -452,7 +551,9 @@ ifc.ifc_req = (struct ifreq *) buf; ioctl (sockfd, SIOCGIFCONF, &ifc); @@ -198,7 +205,7 @@ for (ptr = buf; ptr < buf + ifc.ifc_len;) { ifr = (struct ifreq *) ptr; -@@ -460,6 +560,45 @@ +@@ -483,6 +584,45 @@ (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[3], (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[4], (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[5]); diff --git a/net/gnome-nettool/files/patch-src_nettool.c b/net/gnome-nettool/files/patch-src_nettool.c index 51f11e3f1e96..cae4f648fdf8 100644 --- a/net/gnome-nettool/files/patch-src_nettool.c +++ b/net/gnome-nettool/files/patch-src_nettool.c @@ -1,14 +1,14 @@ ---- src/nettool.c.orig Wed Dec 22 07:07:36 2004 -+++ src/nettool.c Mon Dec 27 21:22:28 2004 -@@ -21,6 +21,7 @@ - #include <gnome.h> +--- src/nettool.c.orig Fri Jan 7 23:13:56 2005 ++++ src/nettool.c Mon Jan 24 21:03:48 2005 +@@ -22,6 +22,7 @@ + #include <glib/gi18n.h> #include <sys/types.h> #include <sys/socket.h> +#include <netinet/in.h> #include <signal.h> #include <errno.h> #include <sys/wait.h> -@@ -361,6 +362,10 @@ +@@ -357,6 +358,10 @@ len, NULL); } @@ -19,17 +19,15 @@ } else if (status == G_IO_STATUS_AGAIN) { char buf[1]; -@@ -372,12 +377,14 @@ +@@ -368,12 +373,13 @@ } g_string_append_c (netinfo->command_output, buf[0]); } + + g_free (text); -+ + return TRUE; } else if (status == G_IO_STATUS_EOF) { -- } -+ } + } g_free (text); - diff --git a/net/gnome-nettool/pkg-plist b/net/gnome-nettool/pkg-plist index a61ce1a0947e..b1f5ab614ccf 100644 --- a/net/gnome-nettool/pkg-plist +++ b/net/gnome-nettool/pkg-plist @@ -24,21 +24,26 @@ 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/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/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/ko/LC_MESSAGES/gnome-nettool.mo share/locale/lt/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/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/no/LC_MESSAGES/gnome-nettool.mo share/locale/pa/LC_MESSAGES/gnome-nettool.mo @@ -53,6 +58,7 @@ share/locale/sr/LC_MESSAGES/gnome-nettool.mo share/locale/sr@Latn/LC_MESSAGES/gnome-nettool.mo share/locale/sv/LC_MESSAGES/gnome-nettool.mo share/locale/ta/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/vi/LC_MESSAGES/gnome-nettool.mo diff --git a/net/gnomenetstatus/Makefile b/net/gnomenetstatus/Makefile index ee735aa98d5d..169dbc31877d 100644 --- a/net/gnomenetstatus/Makefile +++ b/net/gnomenetstatus/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomenetstatus -PORTVERSION= 2.8.0 -PORTREVISION= 2 +PORTVERSION= 2.10.0 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-netstatus/2.8 +MASTER_SITE_SUBDIR= sources/gnome-netstatus/2.10 DISTNAME= gnome-netstatus-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/net/gnomenetstatus/distinfo b/net/gnomenetstatus/distinfo index 1ad8a9f94236..48e9fbf2c961 100644 --- a/net/gnomenetstatus/distinfo +++ b/net/gnomenetstatus/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-netstatus-2.8.0.tar.bz2) = fadc8a26ff7142e1372740d2edc435b1 -SIZE (gnome2/gnome-netstatus-2.8.0.tar.bz2) = 492599 +MD5 (gnome2/gnome-netstatus-2.10.0.tar.bz2) = b1a044cfbe3299e00d514d966d4766e8 +SIZE (gnome2/gnome-netstatus-2.10.0.tar.bz2) = 510277 diff --git a/net/gnomenetstatus/files/patch-src_netstatus-iface.c b/net/gnomenetstatus/files/patch-src_netstatus-iface.c index 1ffae4384ecb..64c9ad52f8c9 100644 --- a/net/gnomenetstatus/files/patch-src_netstatus-iface.c +++ b/net/gnomenetstatus/files/patch-src_netstatus-iface.c @@ -1,16 +1,15 @@ ---- src/netstatus-iface.c.orig Mon Mar 22 17:49:17 2004 -+++ src/netstatus-iface.c Mon Mar 22 17:50:12 2004 -@@ -32,6 +32,8 @@ +--- src/netstatus-iface.c.orig Tue Nov 30 18:35:23 2004 ++++ src/netstatus-iface.c Tue Nov 30 18:35:43 2004 +@@ -33,6 +33,7 @@ #include <libgnome/gnome-i18n.h> +#include <sys/types.h> -+#include <sys/socket.h> #include <sys/ioctl.h> #ifdef HAVE_SYS_SOCKIO_H #include <sys/sockio.h> -@@ -39,6 +41,7 @@ - #include <sys/param.h> +@@ -41,6 +42,7 @@ + #include <sys/socket.h> #include <net/if.h> #include <net/if_arp.h> +#include <netinet/in.h> diff --git a/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c b/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c index a13a23161769..03e1d89c1d96 100644 --- a/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c +++ b/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c @@ -1,5 +1,5 @@ ---- src/netstatus-sysdeps.c.orig Fri Jul 30 04:19:31 2004 -+++ src/netstatus-sysdeps.c Tue Sep 21 00:27:19 2004 +--- src/netstatus-sysdeps.c.orig Fri Jul 30 04:21:30 2004 ++++ src/netstatus-sysdeps.c Thu Mar 3 03:04:41 2005 @@ -35,6 +35,16 @@ #include <glib.h> #include <libgnome/gnome-i18n.h> @@ -17,7 +17,7 @@ static inline gboolean parse_stats (char *buf, int prx_idx, -@@ -384,6 +394,163 @@ +@@ -384,6 +394,173 @@ } } @@ -37,16 +37,18 @@ + + s = socket (AF_INET, SOCK_DGRAM, 0); + -+ if (s == -1) { -+ *error = g_strdup_printf (_("Could not connect to interface, '%s'"), iface); -+ return FALSE; -+ } ++ if (s == -1) ++ { ++ *error = g_strdup_printf (_("Could not connect to interface, '%s'"), iface); ++ return FALSE; ++ } + -+ if (ioctl (s, req_type, &ifr) == -1) { -+ *error = g_strdup_printf (_("Could not send ioctl to interface, '%s'"), iface); -+ close (s); -+ return FALSE; -+ } ++ if (ioctl (s, req_type, &ifr) == -1) ++ { ++ *error = g_strdup_printf (_("Could not send ioctl to interface, '%s'"), iface); ++ close (s); ++ return FALSE; ++ } + + close (s); + return TRUE; @@ -110,35 +112,39 @@ + level = (int) (wreq.wi_val[1]); + +#ifdef WI_RID_READ_APS -+ if (signal_strength <= 0) { -+ /* we fail to get signal strength by usual means, try another way */ -+ static time_t last_scan; -+ static long int cached; -+ time_t now = time (NULL); -+ -+ /* XXX: this is long operation, and we will scan station not often then one in 5 secs */ -+ if (now > last_scan + 5) { -+ struct wi_apinfo *w; -+ int nstations; -+ -+ bzero ((char *)&wreq, sizeof(wreq)); -+ wreq.wi_len = WI_MAX_DATALEN; -+ wreq.wi_type = WI_RID_READ_APS; -+ -+ if (!wireless_getval (iface, (gpointer) &wreq, SIOCGWAVELAN, &error)) -+ return error; -+ nstations = *(int *)wreq.wi_val; -+ if (nstations > 0) { -+ w = (struct wi_apinfo *)(((char *)&wreq.wi_val) + sizeof(int)); -+ signal_strength = (long int)w->signal; -+ } -+ -+ cached = signal_strength; -+ last_scan = now; -+ } else { -+ signal_strength = cached; -+ } -+ } ++ if (signal_strength <= 0) ++ { ++ /* we fail to get signal strength by usual means, try another way */ ++ static time_t last_scan; ++ static long int cached; ++ time_t now = time (NULL); ++ ++ /* XXX: this is long operation, and we will scan station not often then one in 5 secs */ ++ if (now > last_scan + 5) ++ { ++ struct wi_apinfo *w; ++ int nstations; ++ ++ bzero ((char *)&wreq, sizeof(wreq)); ++ wreq.wi_len = WI_MAX_DATALEN; ++ wreq.wi_type = WI_RID_READ_APS; ++ if (!wireless_getval (iface, (gpointer) &wreq, SIOCGWAVELAN, &error)) ++ return error; ++ nstations = *(int *)wreq.wi_val; ++ if (nstations > 0) ++ { ++ w = (struct wi_apinfo *)(((char *)&wreq.wi_val) + sizeof(int)); ++ signal_strength = (long int)w->signal; ++ } ++ ++ cached = signal_strength; ++ last_scan = now; ++ } ++ else ++ { ++ signal_strength = cached; ++ } ++ } +#endif + + memcpy (signal_strength, &level, sizeof (signal_strength)); @@ -163,17 +169,21 @@ + *signal_strength = 0; + + if (g_strncasecmp (iface, "an", 2) && g_strncasecmp (iface, "wi", 2) && -+ g_strncasecmp (iface, "ath", 3) && g_strncasecmp (iface, "ndis", 4)) ++ g_strncasecmp (iface, "ath", 3) && g_strncasecmp (iface, "ndis", 4) && ++ g_strncasecmp (iface, "ipw", 3) && g_strncasecmp (iface, "iwi", 3) && ++ g_strncasecmp (iface, "acx", 3)) + return error_message; + -+ if (g_strncasecmp (iface, "an", 2) == 0) { -+ error_message = get_an_data (iface, signal_strength); -+ *is_wireless = TRUE; -+ } -+ else { -+ error_message = get_wi_data (iface, signal_strength); -+ *is_wireless = TRUE; -+ } ++ if (g_strncasecmp (iface, "an", 2) == 0) ++ { ++ error_message = get_an_data (iface, signal_strength); ++ *is_wireless = TRUE; ++ } ++ else ++ { ++ error_message = get_wi_data (iface, signal_strength); ++ *is_wireless = TRUE; ++ } + + return error_message; +} @@ -181,7 +191,42 @@ char * netstatus_sysdeps_read_iface_statistics (const char *iface, gulong *in_packets, -@@ -485,23 +652,6 @@ +@@ -413,11 +590,11 @@ + if (!g_shell_parse_argv (command_line, NULL, &argv, &error)) + { + error_message = g_strdup_printf (_("Could not parse command line '%s': %s"), +- command_line, +- error->message); ++ command_line, ++ error->message); + g_error_free (error); + g_free (command_line); +- ++ + return error_message; + } + g_free (command_line); +@@ -456,8 +633,8 @@ + g_io_channel_read_line (channel, &buf, NULL, NULL, NULL); + + if (!parse_stats (buf, +- prx_idx, ptx_idx, in_packets, out_packets, +- brx_idx, btx_idx, in_bytes, out_bytes)) ++ prx_idx, ptx_idx, in_packets, out_packets, ++ brx_idx, btx_idx, in_bytes, out_bytes)) + { + error_message = g_strdup_printf (_("Could not parse interface statistics from '%s'. " + "prx_idx = %d; ptx_idx = %d; brx_idx = %d; btx_idx = %d;"), +@@ -477,7 +654,7 @@ + } + else + { +- error_message = g_strdup_printf ("Error running /usr/bin/netstat for '%s': %s", ++ error_message = g_strdup_printf ("Error running /usr/bin/netstat for '%s': %s", + iface, error->message); + g_error_free (error); + } +@@ -485,23 +662,6 @@ g_strfreev (argv); return error_message; diff --git a/net/gnomenetstatus/pkg-plist b/net/gnomenetstatus/pkg-plist index b4258eef7f23..bf881c64c294 100644 --- a/net/gnomenetstatus/pkg-plist +++ b/net/gnomenetstatus/pkg-plist @@ -130,6 +130,7 @@ share/locale/eu/LC_MESSAGES/gnome-netstatus.mo share/locale/fi/LC_MESSAGES/gnome-netstatus.mo share/locale/fr/LC_MESSAGES/gnome-netstatus.mo share/locale/ga/LC_MESSAGES/gnome-netstatus.mo +share/locale/gl/LC_MESSAGES/gnome-netstatus.mo share/locale/gu/LC_MESSAGES/gnome-netstatus.mo share/locale/hi/LC_MESSAGES/gnome-netstatus.mo share/locale/hr/LC_MESSAGES/gnome-netstatus.mo @@ -142,6 +143,7 @@ share/locale/lt/LC_MESSAGES/gnome-netstatus.mo share/locale/mn/LC_MESSAGES/gnome-netstatus.mo share/locale/ms/LC_MESSAGES/gnome-netstatus.mo share/locale/nb/LC_MESSAGES/gnome-netstatus.mo +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/no/LC_MESSAGES/gnome-netstatus.mo diff --git a/net/gnomenettool/Makefile b/net/gnomenettool/Makefile index fd1c3489b785..354f8005f5bc 100644 --- a/net/gnomenettool/Makefile +++ b/net/gnomenettool/Makefile @@ -6,12 +6,11 @@ # PORTNAME= gnomenettool -PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTVERSION= 1.2.0 PORTEPOCH= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-nettool/1.0 +MASTER_SITE_SUBDIR= sources/gnome-nettool/1.2 DISTNAME= gnome-nettool-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/net/gnomenettool/distinfo b/net/gnomenettool/distinfo index 68ada1f9d863..9606b0ac5244 100644 --- a/net/gnomenettool/distinfo +++ b/net/gnomenettool/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-nettool-1.0.0.tar.bz2) = a3261bd247960ba066b965c5a9a662e1 -SIZE (gnome2/gnome-nettool-1.0.0.tar.bz2) = 515045 +MD5 (gnome2/gnome-nettool-1.2.0.tar.bz2) = 277338cf5d54ae9941260dd993a14f7a +SIZE (gnome2/gnome-nettool-1.2.0.tar.bz2) = 572511 diff --git a/net/gnomenettool/files/patch-src_info.c b/net/gnomenettool/files/patch-src_info.c index 0891475e90ff..2d95d26204ac 100644 --- a/net/gnomenettool/files/patch-src_info.c +++ b/net/gnomenettool/files/patch-src_info.c @@ -1,6 +1,14 @@ ---- src/info.c.orig Mon Jun 14 06:52:59 2004 -+++ src/info.c Sun Oct 31 23:35:06 2004 -@@ -37,6 +37,11 @@ +--- src/info.c.orig Tue Feb 1 06:05:58 2005 ++++ src/info.c Thu Mar 3 23:39:57 2005 +@@ -20,6 +20,7 @@ + #include <gtk/gtk.h> + #include <glib/gi18n.h> + #include <glib/gprintf.h> ++#include <sys/types.h> + + #ifdef HAVE_CONFIG_H + # include <config.h> +@@ -38,6 +39,11 @@ #include <sys/ioctl.h> #include <stdlib.h> #include <net/if.h> @@ -12,7 +20,7 @@ #include "info.h" #include "utils.h" -@@ -57,6 +62,7 @@ +@@ -58,6 +64,7 @@ { 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 }, @@ -20,7 +28,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 }, -@@ -97,9 +103,42 @@ +@@ -128,9 +135,42 @@ { gint i; gchar *path; @@ -65,7 +73,7 @@ (*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); -@@ -187,17 +226,26 @@ +@@ -217,38 +257,87 @@ gchar tx[10], tx_error[10], tx_drop[10], tx_ovr[10]; */ gchar iface[30]; /*, flags[30]; */ @@ -96,10 +104,9 @@ g_return_val_if_fail (info != NULL, FALSE); model = gtk_combo_box_get_model (GTK_COMBO_BOX (info->combo)); -@@ -206,21 +254,61 @@ - else + text = info_get_nic (info); + if (!text) return FALSE; - /*text = gtk_entry_get_text (GTK_ENTRY (info->nic));*/ - + #if defined(__linux__) @@ -160,7 +167,7 @@ if (g_ascii_strcasecmp (iface, text) == 0) { /* -@@ -248,7 +336,9 @@ +@@ -276,7 +365,9 @@ } g_io_channel_unref (io); @@ -171,7 +178,7 @@ return TRUE; } -@@ -382,8 +472,16 @@ +@@ -405,8 +496,16 @@ InfoIpAddr *ip; gint flags; mii_data_result data; @@ -188,7 +195,7 @@ for (ifr6 = ifa0; ifr6; ifr6 = ifr6->ifa_next) { if (strcmp (ifr6->ifa_name, nic) != 0) { -@@ -429,7 +527,9 @@ +@@ -452,7 +551,9 @@ ifc.ifc_req = (struct ifreq *) buf; ioctl (sockfd, SIOCGIFCONF, &ifc); @@ -198,7 +205,7 @@ for (ptr = buf; ptr < buf + ifc.ifc_len;) { ifr = (struct ifreq *) ptr; -@@ -460,6 +560,45 @@ +@@ -483,6 +584,45 @@ (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[3], (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[4], (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[5]); diff --git a/net/gnomenettool/files/patch-src_nettool.c b/net/gnomenettool/files/patch-src_nettool.c index 51f11e3f1e96..cae4f648fdf8 100644 --- a/net/gnomenettool/files/patch-src_nettool.c +++ b/net/gnomenettool/files/patch-src_nettool.c @@ -1,14 +1,14 @@ ---- src/nettool.c.orig Wed Dec 22 07:07:36 2004 -+++ src/nettool.c Mon Dec 27 21:22:28 2004 -@@ -21,6 +21,7 @@ - #include <gnome.h> +--- src/nettool.c.orig Fri Jan 7 23:13:56 2005 ++++ src/nettool.c Mon Jan 24 21:03:48 2005 +@@ -22,6 +22,7 @@ + #include <glib/gi18n.h> #include <sys/types.h> #include <sys/socket.h> +#include <netinet/in.h> #include <signal.h> #include <errno.h> #include <sys/wait.h> -@@ -361,6 +362,10 @@ +@@ -357,6 +358,10 @@ len, NULL); } @@ -19,17 +19,15 @@ } else if (status == G_IO_STATUS_AGAIN) { char buf[1]; -@@ -372,12 +377,14 @@ +@@ -368,12 +373,13 @@ } g_string_append_c (netinfo->command_output, buf[0]); } + + g_free (text); -+ + return TRUE; } else if (status == G_IO_STATUS_EOF) { -- } -+ } + } g_free (text); - diff --git a/net/gnomenettool/pkg-plist b/net/gnomenettool/pkg-plist index a61ce1a0947e..b1f5ab614ccf 100644 --- a/net/gnomenettool/pkg-plist +++ b/net/gnomenettool/pkg-plist @@ -24,21 +24,26 @@ 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/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/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/ko/LC_MESSAGES/gnome-nettool.mo share/locale/lt/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/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/no/LC_MESSAGES/gnome-nettool.mo share/locale/pa/LC_MESSAGES/gnome-nettool.mo @@ -53,6 +58,7 @@ share/locale/sr/LC_MESSAGES/gnome-nettool.mo share/locale/sr@Latn/LC_MESSAGES/gnome-nettool.mo share/locale/sv/LC_MESSAGES/gnome-nettool.mo share/locale/ta/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/vi/LC_MESSAGES/gnome-nettool.mo diff --git a/net/vino/Makefile b/net/vino/Makefile index df3d97b11d66..fbe9e90e857d 100644 --- a/net/vino/Makefile +++ b/net/vino/Makefile @@ -6,10 +6,10 @@ # PORTNAME= vino -PORTVERSION= 2.8.1 +PORTVERSION= 2.10.0 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 MAINTAINER= gnome@FreeBSD.org COMMENT= VNC server that allows for remote access to your GNOME desktop diff --git a/net/vino/distinfo b/net/vino/distinfo index 6785d59f40ee..b7aee1de50d9 100644 --- a/net/vino/distinfo +++ b/net/vino/distinfo @@ -1,2 +1,2 @@ -MD5 (vino-2.8.1.tar.bz2) = 2005c5df2481f6d4f16d37a750989199 -SIZE (vino-2.8.1.tar.bz2) = 542710 +MD5 (vino-2.10.0.tar.bz2) = a9b5c811807e01e7fb420f52820f0150 +SIZE (vino-2.10.0.tar.bz2) = 581602 diff --git a/net/vino/pkg-plist b/net/vino/pkg-plist index 551b7dc0c42e..9d7a4550c201 100644 --- a/net/vino/pkg-plist +++ b/net/vino/pkg-plist @@ -2,10 +2,10 @@ bin/vino-preferences bin/vino-session libdata/bonobo/servers/GNOME_RemoteDesktop.server libexec/vino-server -share/gnome/control-center-2.0/capplets/vino-preferences.desktop -share/gnome/pixmaps/gnome-remote-desktop.png +share/gnome/applications/vino-preferences.desktop share/gnome/vino/vino-preferences.glade share/gnome/vino/vino-prompt.glade +share/icons/hicolor/48x48/apps/gnome-remote-desktop.png share/locale/ar/LC_MESSAGES/vino.mo share/locale/az/LC_MESSAGES/vino.mo share/locale/bg/LC_MESSAGES/vino.mo @@ -13,24 +13,30 @@ share/locale/bn/LC_MESSAGES/vino.mo share/locale/bs/LC_MESSAGES/vino.mo share/locale/ca/LC_MESSAGES/vino.mo share/locale/cs/LC_MESSAGES/vino.mo +share/locale/cy/LC_MESSAGES/vino.mo share/locale/da/LC_MESSAGES/vino.mo share/locale/de/LC_MESSAGES/vino.mo share/locale/el/LC_MESSAGES/vino.mo share/locale/en_CA/LC_MESSAGES/vino.mo share/locale/en_GB/LC_MESSAGES/vino.mo share/locale/es/LC_MESSAGES/vino.mo +share/locale/et/LC_MESSAGES/vino.mo share/locale/eu/LC_MESSAGES/vino.mo share/locale/fi/LC_MESSAGES/vino.mo share/locale/fr/LC_MESSAGES/vino.mo share/locale/gu/LC_MESSAGES/vino.mo +share/locale/hi/LC_MESSAGES/vino.mo share/locale/hu/LC_MESSAGES/vino.mo share/locale/id/LC_MESSAGES/vino.mo share/locale/it/LC_MESSAGES/vino.mo share/locale/ja/LC_MESSAGES/vino.mo share/locale/ko/LC_MESSAGES/vino.mo +share/locale/lt/LC_MESSAGES/vino.mo share/locale/mk/LC_MESSAGES/vino.mo +share/locale/mn/LC_MESSAGES/vino.mo share/locale/ms/LC_MESSAGES/vino.mo share/locale/nb/LC_MESSAGES/vino.mo +share/locale/ne/LC_MESSAGES/vino.mo share/locale/nl/LC_MESSAGES/vino.mo share/locale/nn/LC_MESSAGES/vino.mo share/locale/no/LC_MESSAGES/vino.mo @@ -41,6 +47,7 @@ share/locale/pt/LC_MESSAGES/vino.mo share/locale/pt_BR/LC_MESSAGES/vino.mo share/locale/ro/LC_MESSAGES/vino.mo share/locale/ru/LC_MESSAGES/vino.mo +share/locale/sk/LC_MESSAGES/vino.mo share/locale/sq/LC_MESSAGES/vino.mo share/locale/sr/LC_MESSAGES/vino.mo share/locale/sr@Latn/LC_MESSAGES/vino.mo @@ -48,6 +55,7 @@ share/locale/sv/LC_MESSAGES/vino.mo share/locale/ta/LC_MESSAGES/vino.mo share/locale/tr/LC_MESSAGES/vino.mo share/locale/uk/LC_MESSAGES/vino.mo +share/locale/vi/LC_MESSAGES/vino.mo share/locale/zh_CN/LC_MESSAGES/vino.mo share/locale/zh_TW/LC_MESSAGES/vino.mo @dirrm share/gnome/vino |