diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2005-11-05 04:53:48 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2005-11-05 04:53:48 +0000 |
| commit | e18151212d3326dbf04797c6d5300fb1211ee875 (patch) | |
| tree | 1ca56d6a4227efdb653cc8e2b2cbedbbc8de3d88 /net | |
| parent | Add bsdav 1.3, BSD native set of programs for audio and video reading (diff) | |
Presenting GNOME 2.12 for FreeBSD. The release is chock full of bug fixes
and new features. Don't believe me? Then see for yourself at
http://www.gnome.org/start/2.12/notes/en/.
DO NOT USE portupgrade by itself to upgrade to GNOME 2.12. Instead, use
the gnome_upgrade.sh script from
http://www.marcuscom.com/downloads/gnome_upgrade212.sh. This script will
circumvent some potential pitfalls users can see if they use portupgrade
by itself.
In keeping with tradition, GNOME 2.12 for FreeBSD comes with a special
splash screen. The winner of this release's contest is
Dominique Goncalves <dominique.goncalves@gmail.com>. His splash screen
was inspired by http://art.gnome.org/contests/2.12-splash/83.
The FreeBSD GNOME Team would lank to thank the following users for
their contributions to this release:
Matthew Luckie <mjl@luckie.org.nz>
ade
sajd on #freebsd-gnome
Caelian on #freebsd-gnome
mnag
Yasuda Keisuke <kysd@po.harenet.ne.jp>
Mark Hobden <markhobden@gmail.com>
Sergey Akifyev <asa@agava.com>
Andreas Kohn
For more information on GNOME on FreeBSD, checkout
http://www.FreeBSD.org/gnome/. The 2.12 documentation will be
posted shortly.
Diffstat (limited to 'net')
25 files changed, 160 insertions, 629 deletions
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile index b455b8fb7edf..5c8a5647d921 100644 --- a/net/gnome-netstatus/Makefile +++ b/net/gnome-netstatus/Makefile @@ -3,14 +3,15 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/net/gnomenetstatus/Makefile,v 1.39 2005/10/08 19:41:39 marcus Exp $ # PORTNAME= gnomenetstatus -PORTVERSION= 2.10.0 +PORTVERSION= 2.12.0 PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-netstatus/2.10 +MASTER_SITE_SUBDIR= sources/gnome-netstatus/2.12 DISTNAME= gnome-netstatus-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -19,11 +20,13 @@ COMMENT= A GNOME applet that shows network status USE_X_PREFIX= yes INSTALLS_OMF= yes +INSTALLS_ICONS= yes USE_BZIP2= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomehack intlhack gnomeprefix libgnome gnomepanel libglade2 +USE_GNOME= gnomehack intlhack gnomeprefix libgnome gnomepanel libglade2 \ + gnomedocutils USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/net/gnome-netstatus/distinfo b/net/gnome-netstatus/distinfo index 48e9fbf2c961..6b98eac7f423 100644 --- a/net/gnome-netstatus/distinfo +++ b/net/gnome-netstatus/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-netstatus-2.10.0.tar.bz2) = b1a044cfbe3299e00d514d966d4766e8 -SIZE (gnome2/gnome-netstatus-2.10.0.tar.bz2) = 510277 +MD5 (gnome2/gnome-netstatus-2.12.0.tar.bz2) = a5f23731a3bf232969e82afef8792a36 +SIZE (gnome2/gnome-netstatus-2.12.0.tar.bz2) = 473226 diff --git a/net/gnome-netstatus/files/patch-src_netstatus-iface.c b/net/gnome-netstatus/files/patch-src_netstatus-iface.c deleted file mode 100644 index 64c9ad52f8c9..000000000000 --- a/net/gnome-netstatus/files/patch-src_netstatus-iface.c +++ /dev/null @@ -1,18 +0,0 @@ ---- 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/ioctl.h> - #ifdef HAVE_SYS_SOCKIO_H - #include <sys/sockio.h> -@@ -41,6 +42,7 @@ - #include <sys/socket.h> - #include <net/if.h> - #include <net/if_arp.h> -+#include <netinet/in.h> - #include <arpa/inet.h> - #include <errno.h> - #include <unistd.h> diff --git a/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c b/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c index 00ba2cb1e7eb..bf655bd6a0a8 100644 --- a/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c +++ b/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c @@ -1,253 +1,11 @@ ---- src/netstatus-sysdeps.c.orig Fri Jul 30 04:21:30 2004 -+++ src/netstatus-sysdeps.c Mon Jun 27 14:14:19 2005 -@@ -35,6 +35,16 @@ - #include <glib.h> - #include <libgnome/gnome-i18n.h> - -+#ifdef __FreeBSD__ -+#include <sys/types.h> -+#include <sys/socket.h> -+#include <sys/ioctl.h> -+#include <net/if.h> -+#include <net/if_var.h> -+#include <dev/an/if_aironet_ieee.h> -+#include <dev/wi/if_wavelan_ieee.h> -+#endif -+ - static inline gboolean - parse_stats (char *buf, - int prx_idx, -@@ -384,6 +394,174 @@ parse_header (char *buf, - } - } - -+static inline gboolean -+wireless_getval (const char *iface, -+ gpointer req, -+ unsigned long req_type, -+ char **error) -+{ -+ struct ifreq ifr; -+ int s; -+ -+ memset (&ifr, 0, sizeof (ifr)); -+ -+ strlcpy (ifr.ifr_name, iface, sizeof (ifr.ifr_name)); -+ ifr.ifr_data = (caddr_t) req; -+ -+ s = socket (AF_INET, SOCK_DGRAM, 0); -+ -+ 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; -+ } -+ -+ close (s); -+ return TRUE; -+} -+ -+static inline char* -+get_an_data (const char *iface, -+ int *signal_strength) -+{ -+ struct an_req areq; -+ struct an_ltv_status *sts; -+#ifdef AN_RID_RSSI_MAP -+ struct an_ltv_rssi_map an_rssimap; -+#endif -+ int level; -+ char *error = NULL; -+ gboolean rssimap_valid = FALSE; -+ -+#ifdef AN_RID_RSSI_MAP -+ an_rssimap.an_len = sizeof (an_rssimap); -+ an_rssimap.an_type = AN_RID_RSSI_MAP; -+ rssimap_valid = wireless_getval (iface, (gpointer) &an_rssimap, SIOCGAIRONET, &error); -+#endif -+ -+ areq.an_len = sizeof (areq); -+ areq.an_type = AN_RID_STATUS; -+ -+ if (!wireless_getval (iface, (gpointer) &areq, SIOCGAIRONET, &error)) -+ return error; -+ -+ sts = (struct an_ltv_status *)&areq; -+#ifdef AN_RID_RSSI_MAP -+ if (rssimap_valid) -+ level = (int) (an_rssimap.an_entries[sts->an_normalized_strength].an_rss_pct); -+ else -+ level = (int) (sts->an_normalized_strength); -+#else -+ level = (int) (sts->an_normalized_rssi); -+#endif -+ memcpy (signal_strength, &level, sizeof (signal_strength)); -+ -+ return error; -+} -+ -+static inline char* -+get_wi_data (const char *iface, -+ int *signal_strength) -+{ -+ struct wi_req wreq; -+ int level; -+ char *error = NULL; -+ -+ memset (&wreq, 0, sizeof (wreq)); -+ -+ wreq.wi_len = WI_MAX_DATALEN; -+ wreq.wi_type = WI_RID_COMMS_QUALITY; -+ -+ if (!wireless_getval (iface, (gpointer) &wreq, SIOCGWAVELAN, &error)) -+ return error; -+ -+ 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; -+ } -+ } -+#endif -+ -+ memcpy (signal_strength, &level, sizeof (signal_strength)); -+ -+ return error; -+} -+ -+char * -+netstatus_sysdeps_read_iface_wireless_details (const char *iface, -+ gboolean *is_wireless, -+ int *signal_strength) -+{ -+ char *error_message = NULL; -+ -+ g_return_val_if_fail (iface != NULL, NULL); -+ g_return_val_if_fail (is_wireless != NULL, NULL); -+ g_return_val_if_fail (signal_strength != NULL, NULL); -+ -+ if (is_wireless) -+ *is_wireless = FALSE; -+ if (signal_strength) -+ *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, "ural", 4) && g_strncasecmp (iface, "ral", 3) && -+ 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; -+ } -+ -+ return error_message; -+} -+ - char * - netstatus_sysdeps_read_iface_statistics (const char *iface, - gulong *in_packets, -@@ -413,11 +591,11 @@ netstatus_sysdeps_read_iface_statistics - 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 +634,8 @@ netstatus_sysdeps_read_iface_statistics - 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 +655,7 @@ netstatus_sysdeps_read_iface_statistics - } - 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 +663,6 @@ netstatus_sysdeps_read_iface_statistics - g_strfreev (argv); - - return error_message; --} -- --char * --netstatus_sysdeps_read_iface_wireless_details (const char *iface, -- gboolean *is_wireless, -- int *signal_strength) --{ -- g_return_val_if_fail (iface != NULL, NULL); -- g_return_val_if_fail (is_wireless != NULL, NULL); -- g_return_val_if_fail (signal_strength_wireless != NULL, NULL); -- -- if (is_wireless) -- *is_wireless = FALSE; -- if (signal_strength) -- *signal_strength = 0; -- -- return NULL; - } - - #endif /* !defined(__FreeBSD__) */ +--- src/netstatus-sysdeps.c.orig Mon Jun 27 14:29:53 2005 ++++ src/netstatus-sysdeps.c Mon Jun 27 14:30:18 2005 +@@ -548,6 +548,8 @@ netstatus_sysdeps_read_iface_wireless_de + 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, "acx", 3)) diff --git a/net/gnome-netstatus/pkg-plist b/net/gnome-netstatus/pkg-plist index bf881c64c294..266c5b3ad9be 100644 --- a/net/gnome-netstatus/pkg-plist +++ b/net/gnome-netstatus/pkg-plist @@ -2,12 +2,6 @@ libdata/bonobo/servers/GNOME_NetstatusApplet_Factory.server libexec/gnome-netstatus-applet share/gnome/gnome-2.0/ui/GNOME_NetstatusApplet.xml share/gnome/gnome-netstatus/gnome-netstatus.glade -share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-disconn.png -share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-error.png -share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-idle.png -share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-rx.png -share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-tx.png -share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-txrx.png share/gnome/help/gnome-netstatus/C/gnome-netstatus.xml share/gnome/help/gnome-netstatus/C/legal.xml share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-disconn.png @@ -18,14 +12,7 @@ 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/es/figures/gnome-netstatus-disconn.png -share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-error.png -share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-idle.png -share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-rx.png -share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-tx.png -share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-txrx.png share/gnome/help/gnome-netstatus/es/gnome-netstatus.xml -share/gnome/help/gnome-netstatus/es/legal.xml share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-disconn.png share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-error.png share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-idle.png @@ -66,6 +53,7 @@ share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-tx.png share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-txrx.png share/gnome/help/gnome-netstatus/sv/gnome-netstatus.xml share/gnome/help/gnome-netstatus/sv/legal.xml +share/gnome/help/gnome-netstatus/uk/gnome-netstatus.xml share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-disconn.png share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-error.png share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-idle.png @@ -98,6 +86,7 @@ share/gnome/omf/gnome-netstatus/gnome-netstatus-it.omf share/gnome/omf/gnome-netstatus/gnome-netstatus-ja.omf share/gnome/omf/gnome-netstatus/gnome-netstatus-ko.omf share/gnome/omf/gnome-netstatus/gnome-netstatus-sv.omf +share/gnome/omf/gnome-netstatus/gnome-netstatus-uk.omf share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_CN.omf share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_HK.omf share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf @@ -126,7 +115,9 @@ share/locale/el/LC_MESSAGES/gnome-netstatus.mo share/locale/en_CA/LC_MESSAGES/gnome-netstatus.mo share/locale/en_GB/LC_MESSAGES/gnome-netstatus.mo share/locale/es/LC_MESSAGES/gnome-netstatus.mo +share/locale/et/LC_MESSAGES/gnome-netstatus.mo share/locale/eu/LC_MESSAGES/gnome-netstatus.mo +share/locale/fa/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 @@ -153,6 +144,7 @@ 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/sq/LC_MESSAGES/gnome-netstatus.mo share/locale/sr/LC_MESSAGES/gnome-netstatus.mo @@ -164,6 +156,7 @@ share/locale/tr/LC_MESSAGES/gnome-netstatus.mo share/locale/uk/LC_MESSAGES/gnome-netstatus.mo 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_TW/LC_MESSAGES/gnome-netstatus.mo @dirrm share/gnome/omf/gnome-netstatus @@ -173,6 +166,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo @dirrm share/gnome/help/gnome-netstatus/zh_HK @dirrm share/gnome/help/gnome-netstatus/zh_CN/figures @dirrm share/gnome/help/gnome-netstatus/zh_CN +@dirrm share/gnome/help/gnome-netstatus/uk @dirrm share/gnome/help/gnome-netstatus/sv/figures @dirrm share/gnome/help/gnome-netstatus/sv @dirrm share/gnome/help/gnome-netstatus/ko/figures @@ -183,11 +177,9 @@ share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo @dirrm share/gnome/help/gnome-netstatus/it @dirrm share/gnome/help/gnome-netstatus/fr/figures @dirrm share/gnome/help/gnome-netstatus/fr -@dirrm share/gnome/help/gnome-netstatus/es/figures @dirrm share/gnome/help/gnome-netstatus/es @dirrm share/gnome/help/gnome-netstatus/de/figures @dirrm share/gnome/help/gnome-netstatus/de -@dirrm share/gnome/help/gnome-netstatus/C/figures @dirrm share/gnome/help/gnome-netstatus/C @dirrm share/gnome/help/gnome-netstatus @dirrm share/gnome/gnome-netstatus diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile index 354f8005f5bc..ef5791839707 100644 --- a/net/gnome-nettool/Makefile +++ b/net/gnome-nettool/Makefile @@ -3,14 +3,15 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/net/gnomenettool/Makefile,v 1.11 2005/10/04 03:12:16 ahze Exp $ # PORTNAME= gnomenettool -PORTVERSION= 1.2.0 +PORTVERSION= 1.4.1 PORTEPOCH= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-nettool/1.2 +MASTER_SITE_SUBDIR= sources/gnome-nettool/1.4 DISTNAME= gnome-nettool-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -19,9 +20,9 @@ COMMENT= A GNOME utility that provides network information statistics USE_X_PREFIX= yes USE_BZIP2= yes -USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui +USE_GNOME= gnomehack intlhack gnomeprefix libglade2 gconf2 USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CFLAGS+= -DHAVE_SOCKADDR_SA_LEN diff --git a/net/gnome-nettool/distinfo b/net/gnome-nettool/distinfo index 9606b0ac5244..97d559067edb 100644 --- a/net/gnome-nettool/distinfo +++ b/net/gnome-nettool/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-nettool-1.2.0.tar.bz2) = 277338cf5d54ae9941260dd993a14f7a -SIZE (gnome2/gnome-nettool-1.2.0.tar.bz2) = 572511 +MD5 (gnome2/gnome-nettool-1.4.1.tar.bz2) = a64f7b39f24b4d3a843d545f2dbb611d +SIZE (gnome2/gnome-nettool-1.4.1.tar.bz2) = 477548 diff --git a/net/gnome-nettool/files/patch-src_info.c b/net/gnome-nettool/files/patch-src_info.c index 2d95d26204ac..9b895e8fd67f 100644 --- a/net/gnome-nettool/files/patch-src_info.c +++ b/net/gnome-nettool/files/patch-src_info.c @@ -1,14 +1,15 @@ ---- 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 @@ +--- src/info.c.orig Thu Jan 27 18:26:53 2005 ++++ src/info.c Sun Jul 3 17:46:31 2005 +@@ -20,6 +20,8 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> #include <glib/gprintf.h> +#include <sys/types.h> ++#include <string.h> #ifdef HAVE_CONFIG_H # include <config.h> -@@ -38,6 +39,11 @@ +@@ -38,6 +40,11 @@ #include <sys/ioctl.h> #include <stdlib.h> #include <net/if.h> @@ -20,7 +21,7 @@ #include "info.h" #include "utils.h" -@@ -58,6 +64,7 @@ +@@ -58,6 +65,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 }, @@ -28,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 +135,42 @@ +@@ -128,9 +136,42 @@ info_get_interface_from_dev_name (const { gint i; gchar *path; @@ -73,7 +74,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); -@@ -217,38 +257,87 @@ +@@ -217,38 +258,87 @@ info_nic_update_stats (gpointer data) gchar tx[10], tx_error[10], tx_drop[10], tx_ovr[10]; */ gchar iface[30]; /*, flags[30]; */ @@ -167,7 +168,7 @@ if (g_ascii_strcasecmp (iface, text) == 0) { /* -@@ -276,7 +365,9 @@ +@@ -276,7 +366,9 @@ info_nic_update_stats (gpointer data) } g_io_channel_unref (io); @@ -178,7 +179,7 @@ return TRUE; } -@@ -405,8 +496,16 @@ +@@ -405,8 +497,16 @@ info_get_nic_information (const gchar *n InfoIpAddr *ip; gint flags; mii_data_result data; @@ -195,7 +196,7 @@ for (ifr6 = ifa0; ifr6; ifr6 = ifr6->ifa_next) { if (strcmp (ifr6->ifa_name, nic) != 0) { -@@ -452,7 +551,9 @@ +@@ -452,7 +552,9 @@ info_get_nic_information (const gchar *n ifc.ifc_req = (struct ifreq *) buf; ioctl (sockfd, SIOCGIFCONF, &ifc); @@ -205,7 +206,7 @@ for (ptr = buf; ptr < buf + ifc.ifc_len;) { ifr = (struct ifreq *) ptr; -@@ -483,6 +584,45 @@ +@@ -483,6 +585,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]); diff --git a/net/gnome-nettool/files/patch-src_lookup.c b/net/gnome-nettool/files/patch-src_lookup.c new file mode 100644 index 000000000000..9744c13973da --- /dev/null +++ b/net/gnome-nettool/files/patch-src_lookup.c @@ -0,0 +1,10 @@ +--- 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" diff --git a/net/gnome-nettool/files/patch-src_utils.c b/net/gnome-nettool/files/patch-src_utils.c index 0c8111ade4bf..921c780498c1 100644 --- a/net/gnome-nettool/files/patch-src_utils.c +++ b/net/gnome-nettool/files/patch-src_utils.c @@ -1,6 +1,15 @@ ---- src/utils.c.orig Sun Jul 4 20:11:49 2004 -+++ src/utils.c Sun Jul 4 20:12:14 2004 -@@ -240,7 +240,7 @@ +--- 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; diff --git a/net/gnome-nettool/pkg-plist b/net/gnome-nettool/pkg-plist index b1f5ab614ccf..0d3d6886cd50 100644 --- a/net/gnome-nettool/pkg-plist +++ b/net/gnome-nettool/pkg-plist @@ -23,6 +23,7 @@ share/locale/el/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/es/LC_MESSAGES/gnome-nettool.mo +share/locale/et/LC_MESSAGES/gnome-nettool.mo share/locale/eu/LC_MESSAGES/gnome-nettool.mo share/locale/fa/LC_MESSAGES/gnome-nettool.mo share/locale/fi/LC_MESSAGES/gnome-nettool.mo @@ -52,6 +53,7 @@ share/locale/pt/LC_MESSAGES/gnome-nettool.mo share/locale/pt_BR/LC_MESSAGES/gnome-nettool.mo share/locale/ro/LC_MESSAGES/gnome-nettool.mo share/locale/ru/LC_MESSAGES/gnome-nettool.mo +share/locale/rw/LC_MESSAGES/gnome-nettool.mo share/locale/sk/LC_MESSAGES/gnome-nettool.mo share/locale/sq/LC_MESSAGES/gnome-nettool.mo share/locale/sr/LC_MESSAGES/gnome-nettool.mo @@ -63,6 +65,7 @@ share/locale/tr/LC_MESSAGES/gnome-nettool.mo share/locale/uk/LC_MESSAGES/gnome-nettool.mo share/locale/vi/LC_MESSAGES/gnome-nettool.mo share/locale/wa/LC_MESSAGES/gnome-nettool.mo +share/locale/xh/LC_MESSAGES/gnome-nettool.mo share/locale/zh_CN/LC_MESSAGES/gnome-nettool.mo share/locale/zh_TW/LC_MESSAGES/gnome-nettool.mo @dirrm share/gnome/gnome-nettool/pixmaps diff --git a/net/gnomenetstatus/Makefile b/net/gnomenetstatus/Makefile index b455b8fb7edf..5c8a5647d921 100644 --- a/net/gnomenetstatus/Makefile +++ b/net/gnomenetstatus/Makefile @@ -3,14 +3,15 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/net/gnomenetstatus/Makefile,v 1.39 2005/10/08 19:41:39 marcus Exp $ # PORTNAME= gnomenetstatus -PORTVERSION= 2.10.0 +PORTVERSION= 2.12.0 PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-netstatus/2.10 +MASTER_SITE_SUBDIR= sources/gnome-netstatus/2.12 DISTNAME= gnome-netstatus-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -19,11 +20,13 @@ COMMENT= A GNOME applet that shows network status USE_X_PREFIX= yes INSTALLS_OMF= yes +INSTALLS_ICONS= yes USE_BZIP2= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomehack intlhack gnomeprefix libgnome gnomepanel libglade2 +USE_GNOME= gnomehack intlhack gnomeprefix libgnome gnomepanel libglade2 \ + gnomedocutils USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/net/gnomenetstatus/distinfo b/net/gnomenetstatus/distinfo index 48e9fbf2c961..6b98eac7f423 100644 --- a/net/gnomenetstatus/distinfo +++ b/net/gnomenetstatus/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-netstatus-2.10.0.tar.bz2) = b1a044cfbe3299e00d514d966d4766e8 -SIZE (gnome2/gnome-netstatus-2.10.0.tar.bz2) = 510277 +MD5 (gnome2/gnome-netstatus-2.12.0.tar.bz2) = a5f23731a3bf232969e82afef8792a36 +SIZE (gnome2/gnome-netstatus-2.12.0.tar.bz2) = 473226 diff --git a/net/gnomenetstatus/files/patch-src_netstatus-iface.c b/net/gnomenetstatus/files/patch-src_netstatus-iface.c deleted file mode 100644 index 64c9ad52f8c9..000000000000 --- a/net/gnomenetstatus/files/patch-src_netstatus-iface.c +++ /dev/null @@ -1,18 +0,0 @@ ---- 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/ioctl.h> - #ifdef HAVE_SYS_SOCKIO_H - #include <sys/sockio.h> -@@ -41,6 +42,7 @@ - #include <sys/socket.h> - #include <net/if.h> - #include <net/if_arp.h> -+#include <netinet/in.h> - #include <arpa/inet.h> - #include <errno.h> - #include <unistd.h> diff --git a/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c b/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c index 00ba2cb1e7eb..bf655bd6a0a8 100644 --- a/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c +++ b/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c @@ -1,253 +1,11 @@ ---- src/netstatus-sysdeps.c.orig Fri Jul 30 04:21:30 2004 -+++ src/netstatus-sysdeps.c Mon Jun 27 14:14:19 2005 -@@ -35,6 +35,16 @@ - #include <glib.h> - #include <libgnome/gnome-i18n.h> - -+#ifdef __FreeBSD__ -+#include <sys/types.h> -+#include <sys/socket.h> -+#include <sys/ioctl.h> -+#include <net/if.h> -+#include <net/if_var.h> -+#include <dev/an/if_aironet_ieee.h> -+#include <dev/wi/if_wavelan_ieee.h> -+#endif -+ - static inline gboolean - parse_stats (char *buf, - int prx_idx, -@@ -384,6 +394,174 @@ parse_header (char *buf, - } - } - -+static inline gboolean -+wireless_getval (const char *iface, -+ gpointer req, -+ unsigned long req_type, -+ char **error) -+{ -+ struct ifreq ifr; -+ int s; -+ -+ memset (&ifr, 0, sizeof (ifr)); -+ -+ strlcpy (ifr.ifr_name, iface, sizeof (ifr.ifr_name)); -+ ifr.ifr_data = (caddr_t) req; -+ -+ s = socket (AF_INET, SOCK_DGRAM, 0); -+ -+ 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; -+ } -+ -+ close (s); -+ return TRUE; -+} -+ -+static inline char* -+get_an_data (const char *iface, -+ int *signal_strength) -+{ -+ struct an_req areq; -+ struct an_ltv_status *sts; -+#ifdef AN_RID_RSSI_MAP -+ struct an_ltv_rssi_map an_rssimap; -+#endif -+ int level; -+ char *error = NULL; -+ gboolean rssimap_valid = FALSE; -+ -+#ifdef AN_RID_RSSI_MAP -+ an_rssimap.an_len = sizeof (an_rssimap); -+ an_rssimap.an_type = AN_RID_RSSI_MAP; -+ rssimap_valid = wireless_getval (iface, (gpointer) &an_rssimap, SIOCGAIRONET, &error); -+#endif -+ -+ areq.an_len = sizeof (areq); -+ areq.an_type = AN_RID_STATUS; -+ -+ if (!wireless_getval (iface, (gpointer) &areq, SIOCGAIRONET, &error)) -+ return error; -+ -+ sts = (struct an_ltv_status *)&areq; -+#ifdef AN_RID_RSSI_MAP -+ if (rssimap_valid) -+ level = (int) (an_rssimap.an_entries[sts->an_normalized_strength].an_rss_pct); -+ else -+ level = (int) (sts->an_normalized_strength); -+#else -+ level = (int) (sts->an_normalized_rssi); -+#endif -+ memcpy (signal_strength, &level, sizeof (signal_strength)); -+ -+ return error; -+} -+ -+static inline char* -+get_wi_data (const char *iface, -+ int *signal_strength) -+{ -+ struct wi_req wreq; -+ int level; -+ char *error = NULL; -+ -+ memset (&wreq, 0, sizeof (wreq)); -+ -+ wreq.wi_len = WI_MAX_DATALEN; -+ wreq.wi_type = WI_RID_COMMS_QUALITY; -+ -+ if (!wireless_getval (iface, (gpointer) &wreq, SIOCGWAVELAN, &error)) -+ return error; -+ -+ 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; -+ } -+ } -+#endif -+ -+ memcpy (signal_strength, &level, sizeof (signal_strength)); -+ -+ return error; -+} -+ -+char * -+netstatus_sysdeps_read_iface_wireless_details (const char *iface, -+ gboolean *is_wireless, -+ int *signal_strength) -+{ -+ char *error_message = NULL; -+ -+ g_return_val_if_fail (iface != NULL, NULL); -+ g_return_val_if_fail (is_wireless != NULL, NULL); -+ g_return_val_if_fail (signal_strength != NULL, NULL); -+ -+ if (is_wireless) -+ *is_wireless = FALSE; -+ if (signal_strength) -+ *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, "ural", 4) && g_strncasecmp (iface, "ral", 3) && -+ 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; -+ } -+ -+ return error_message; -+} -+ - char * - netstatus_sysdeps_read_iface_statistics (const char *iface, - gulong *in_packets, -@@ -413,11 +591,11 @@ netstatus_sysdeps_read_iface_statistics - 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 +634,8 @@ netstatus_sysdeps_read_iface_statistics - 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 +655,7 @@ netstatus_sysdeps_read_iface_statistics - } - 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 +663,6 @@ netstatus_sysdeps_read_iface_statistics - g_strfreev (argv); - - return error_message; --} -- --char * --netstatus_sysdeps_read_iface_wireless_details (const char *iface, -- gboolean *is_wireless, -- int *signal_strength) --{ -- g_return_val_if_fail (iface != NULL, NULL); -- g_return_val_if_fail (is_wireless != NULL, NULL); -- g_return_val_if_fail (signal_strength_wireless != NULL, NULL); -- -- if (is_wireless) -- *is_wireless = FALSE; -- if (signal_strength) -- *signal_strength = 0; -- -- return NULL; - } - - #endif /* !defined(__FreeBSD__) */ +--- src/netstatus-sysdeps.c.orig Mon Jun 27 14:29:53 2005 ++++ src/netstatus-sysdeps.c Mon Jun 27 14:30:18 2005 +@@ -548,6 +548,8 @@ netstatus_sysdeps_read_iface_wireless_de + 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, "acx", 3)) diff --git a/net/gnomenetstatus/pkg-plist b/net/gnomenetstatus/pkg-plist index bf881c64c294..266c5b3ad9be 100644 --- a/net/gnomenetstatus/pkg-plist +++ b/net/gnomenetstatus/pkg-plist @@ -2,12 +2,6 @@ libdata/bonobo/servers/GNOME_NetstatusApplet_Factory.server libexec/gnome-netstatus-applet share/gnome/gnome-2.0/ui/GNOME_NetstatusApplet.xml share/gnome/gnome-netstatus/gnome-netstatus.glade -share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-disconn.png -share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-error.png -share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-idle.png -share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-rx.png -share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-tx.png -share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-txrx.png share/gnome/help/gnome-netstatus/C/gnome-netstatus.xml share/gnome/help/gnome-netstatus/C/legal.xml share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-disconn.png @@ -18,14 +12,7 @@ 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/es/figures/gnome-netstatus-disconn.png -share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-error.png -share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-idle.png -share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-rx.png -share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-tx.png -share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-txrx.png share/gnome/help/gnome-netstatus/es/gnome-netstatus.xml -share/gnome/help/gnome-netstatus/es/legal.xml share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-disconn.png share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-error.png share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-idle.png @@ -66,6 +53,7 @@ share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-tx.png share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-txrx.png share/gnome/help/gnome-netstatus/sv/gnome-netstatus.xml share/gnome/help/gnome-netstatus/sv/legal.xml +share/gnome/help/gnome-netstatus/uk/gnome-netstatus.xml share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-disconn.png share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-error.png share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-idle.png @@ -98,6 +86,7 @@ share/gnome/omf/gnome-netstatus/gnome-netstatus-it.omf share/gnome/omf/gnome-netstatus/gnome-netstatus-ja.omf share/gnome/omf/gnome-netstatus/gnome-netstatus-ko.omf share/gnome/omf/gnome-netstatus/gnome-netstatus-sv.omf +share/gnome/omf/gnome-netstatus/gnome-netstatus-uk.omf share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_CN.omf share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_HK.omf share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf @@ -126,7 +115,9 @@ share/locale/el/LC_MESSAGES/gnome-netstatus.mo share/locale/en_CA/LC_MESSAGES/gnome-netstatus.mo share/locale/en_GB/LC_MESSAGES/gnome-netstatus.mo share/locale/es/LC_MESSAGES/gnome-netstatus.mo +share/locale/et/LC_MESSAGES/gnome-netstatus.mo share/locale/eu/LC_MESSAGES/gnome-netstatus.mo +share/locale/fa/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 @@ -153,6 +144,7 @@ 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/sq/LC_MESSAGES/gnome-netstatus.mo share/locale/sr/LC_MESSAGES/gnome-netstatus.mo @@ -164,6 +156,7 @@ share/locale/tr/LC_MESSAGES/gnome-netstatus.mo share/locale/uk/LC_MESSAGES/gnome-netstatus.mo 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_TW/LC_MESSAGES/gnome-netstatus.mo @dirrm share/gnome/omf/gnome-netstatus @@ -173,6 +166,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo @dirrm share/gnome/help/gnome-netstatus/zh_HK @dirrm share/gnome/help/gnome-netstatus/zh_CN/figures @dirrm share/gnome/help/gnome-netstatus/zh_CN +@dirrm share/gnome/help/gnome-netstatus/uk @dirrm share/gnome/help/gnome-netstatus/sv/figures @dirrm share/gnome/help/gnome-netstatus/sv @dirrm share/gnome/help/gnome-netstatus/ko/figures @@ -183,11 +177,9 @@ share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo @dirrm share/gnome/help/gnome-netstatus/it @dirrm share/gnome/help/gnome-netstatus/fr/figures @dirrm share/gnome/help/gnome-netstatus/fr -@dirrm share/gnome/help/gnome-netstatus/es/figures @dirrm share/gnome/help/gnome-netstatus/es @dirrm share/gnome/help/gnome-netstatus/de/figures @dirrm share/gnome/help/gnome-netstatus/de -@dirrm share/gnome/help/gnome-netstatus/C/figures @dirrm share/gnome/help/gnome-netstatus/C @dirrm share/gnome/help/gnome-netstatus @dirrm share/gnome/gnome-netstatus diff --git a/net/gnomenettool/Makefile b/net/gnomenettool/Makefile index 354f8005f5bc..ef5791839707 100644 --- a/net/gnomenettool/Makefile +++ b/net/gnomenettool/Makefile @@ -3,14 +3,15 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/net/gnomenettool/Makefile,v 1.11 2005/10/04 03:12:16 ahze Exp $ # PORTNAME= gnomenettool -PORTVERSION= 1.2.0 +PORTVERSION= 1.4.1 PORTEPOCH= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-nettool/1.2 +MASTER_SITE_SUBDIR= sources/gnome-nettool/1.4 DISTNAME= gnome-nettool-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -19,9 +20,9 @@ COMMENT= A GNOME utility that provides network information statistics USE_X_PREFIX= yes USE_BZIP2= yes -USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui +USE_GNOME= gnomehack intlhack gnomeprefix libglade2 gconf2 USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CFLAGS+= -DHAVE_SOCKADDR_SA_LEN diff --git a/net/gnomenettool/distinfo b/net/gnomenettool/distinfo index 9606b0ac5244..97d559067edb 100644 --- a/net/gnomenettool/distinfo +++ b/net/gnomenettool/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-nettool-1.2.0.tar.bz2) = 277338cf5d54ae9941260dd993a14f7a -SIZE (gnome2/gnome-nettool-1.2.0.tar.bz2) = 572511 +MD5 (gnome2/gnome-nettool-1.4.1.tar.bz2) = a64f7b39f24b4d3a843d545f2dbb611d +SIZE (gnome2/gnome-nettool-1.4.1.tar.bz2) = 477548 diff --git a/net/gnomenettool/files/patch-src_info.c b/net/gnomenettool/files/patch-src_info.c index 2d95d26204ac..9b895e8fd67f 100644 --- a/net/gnomenettool/files/patch-src_info.c +++ b/net/gnomenettool/files/patch-src_info.c @@ -1,14 +1,15 @@ ---- 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 @@ +--- src/info.c.orig Thu Jan 27 18:26:53 2005 ++++ src/info.c Sun Jul 3 17:46:31 2005 +@@ -20,6 +20,8 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> #include <glib/gprintf.h> +#include <sys/types.h> ++#include <string.h> #ifdef HAVE_CONFIG_H # include <config.h> -@@ -38,6 +39,11 @@ +@@ -38,6 +40,11 @@ #include <sys/ioctl.h> #include <stdlib.h> #include <net/if.h> @@ -20,7 +21,7 @@ #include "info.h" #include "utils.h" -@@ -58,6 +64,7 @@ +@@ -58,6 +65,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 }, @@ -28,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 +135,42 @@ +@@ -128,9 +136,42 @@ info_get_interface_from_dev_name (const { gint i; gchar *path; @@ -73,7 +74,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); -@@ -217,38 +257,87 @@ +@@ -217,38 +258,87 @@ info_nic_update_stats (gpointer data) gchar tx[10], tx_error[10], tx_drop[10], tx_ovr[10]; */ gchar iface[30]; /*, flags[30]; */ @@ -167,7 +168,7 @@ if (g_ascii_strcasecmp (iface, text) == 0) { /* -@@ -276,7 +365,9 @@ +@@ -276,7 +366,9 @@ info_nic_update_stats (gpointer data) } g_io_channel_unref (io); @@ -178,7 +179,7 @@ return TRUE; } -@@ -405,8 +496,16 @@ +@@ -405,8 +497,16 @@ info_get_nic_information (const gchar *n InfoIpAddr *ip; gint flags; mii_data_result data; @@ -195,7 +196,7 @@ for (ifr6 = ifa0; ifr6; ifr6 = ifr6->ifa_next) { if (strcmp (ifr6->ifa_name, nic) != 0) { -@@ -452,7 +551,9 @@ +@@ -452,7 +552,9 @@ info_get_nic_information (const gchar *n ifc.ifc_req = (struct ifreq *) buf; ioctl (sockfd, SIOCGIFCONF, &ifc); @@ -205,7 +206,7 @@ for (ptr = buf; ptr < buf + ifc.ifc_len;) { ifr = (struct ifreq *) ptr; -@@ -483,6 +584,45 @@ +@@ -483,6 +585,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]); diff --git a/net/gnomenettool/files/patch-src_lookup.c b/net/gnomenettool/files/patch-src_lookup.c new file mode 100644 index 000000000000..9744c13973da --- /dev/null +++ b/net/gnomenettool/files/patch-src_lookup.c @@ -0,0 +1,10 @@ +--- 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" diff --git a/net/gnomenettool/files/patch-src_utils.c b/net/gnomenettool/files/patch-src_utils.c index 0c8111ade4bf..921c780498c1 100644 --- a/net/gnomenettool/files/patch-src_utils.c +++ b/net/gnomenettool/files/patch-src_utils.c @@ -1,6 +1,15 @@ ---- src/utils.c.orig Sun Jul 4 20:11:49 2004 -+++ src/utils.c Sun Jul 4 20:12:14 2004 -@@ -240,7 +240,7 @@ +--- 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; diff --git a/net/gnomenettool/pkg-plist b/net/gnomenettool/pkg-plist index b1f5ab614ccf..0d3d6886cd50 100644 --- a/net/gnomenettool/pkg-plist +++ b/net/gnomenettool/pkg-plist @@ -23,6 +23,7 @@ share/locale/el/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/es/LC_MESSAGES/gnome-nettool.mo +share/locale/et/LC_MESSAGES/gnome-nettool.mo share/locale/eu/LC_MESSAGES/gnome-nettool.mo share/locale/fa/LC_MESSAGES/gnome-nettool.mo share/locale/fi/LC_MESSAGES/gnome-nettool.mo @@ -52,6 +53,7 @@ share/locale/pt/LC_MESSAGES/gnome-nettool.mo share/locale/pt_BR/LC_MESSAGES/gnome-nettool.mo share/locale/ro/LC_MESSAGES/gnome-nettool.mo share/locale/ru/LC_MESSAGES/gnome-nettool.mo +share/locale/rw/LC_MESSAGES/gnome-nettool.mo share/locale/sk/LC_MESSAGES/gnome-nettool.mo share/locale/sq/LC_MESSAGES/gnome-nettool.mo share/locale/sr/LC_MESSAGES/gnome-nettool.mo @@ -63,6 +65,7 @@ share/locale/tr/LC_MESSAGES/gnome-nettool.mo share/locale/uk/LC_MESSAGES/gnome-nettool.mo share/locale/vi/LC_MESSAGES/gnome-nettool.mo share/locale/wa/LC_MESSAGES/gnome-nettool.mo +share/locale/xh/LC_MESSAGES/gnome-nettool.mo share/locale/zh_CN/LC_MESSAGES/gnome-nettool.mo share/locale/zh_TW/LC_MESSAGES/gnome-nettool.mo @dirrm share/gnome/gnome-nettool/pixmaps diff --git a/net/vino/Makefile b/net/vino/Makefile index fbe9e90e857d..740f9bb9025e 100644 --- a/net/vino/Makefile +++ b/net/vino/Makefile @@ -3,13 +3,15 @@ # Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org> # # $FreeBSD$ +# $MCom: ports/net/vino/Makefile,v 1.21 2005/10/08 19:41:39 marcus Exp $ # PORTNAME= vino -PORTVERSION= 2.10.0 +PORTVERSION= 2.12.0 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 MAINTAINER= gnome@FreeBSD.org COMMENT= VNC server that allows for remote access to your GNOME desktop @@ -21,7 +23,8 @@ USE_X_PREFIX= yes USE_GNOME= gnomeprefix intlhack gnomehack gnomepanel USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 +INSTALLS_ICONS= yes CONFIGURE_ARGS= --enable-session-support CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/net/vino/distinfo b/net/vino/distinfo index b7aee1de50d9..f751f70367a3 100644 --- a/net/vino/distinfo +++ b/net/vino/distinfo @@ -1,2 +1,2 @@ -MD5 (vino-2.10.0.tar.bz2) = a9b5c811807e01e7fb420f52820f0150 -SIZE (vino-2.10.0.tar.bz2) = 581602 +MD5 (vino-2.12.0.tar.bz2) = eba0962a0e1b9f21719c5688d3d0728b +SIZE (vino-2.12.0.tar.bz2) = 564627 diff --git a/net/vino/pkg-plist b/net/vino/pkg-plist index 9d7a4550c201..c3823708470b 100644 --- a/net/vino/pkg-plist +++ b/net/vino/pkg-plist @@ -22,9 +22,12 @@ 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/fa/LC_MESSAGES/vino.mo share/locale/fi/LC_MESSAGES/vino.mo share/locale/fr/LC_MESSAGES/vino.mo +share/locale/gl/LC_MESSAGES/vino.mo share/locale/gu/LC_MESSAGES/vino.mo +share/locale/he/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 @@ -47,15 +50,22 @@ 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/rw/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 share/locale/sv/LC_MESSAGES/vino.mo share/locale/ta/LC_MESSAGES/vino.mo +share/locale/th/LC_MESSAGES/vino.mo share/locale/tr/LC_MESSAGES/vino.mo +share/locale/ug/LC_MESSAGES/vino.mo share/locale/uk/LC_MESSAGES/vino.mo share/locale/vi/LC_MESSAGES/vino.mo +share/locale/wa/LC_MESSAGES/vino.mo +share/locale/xh/LC_MESSAGES/vino.mo share/locale/zh_CN/LC_MESSAGES/vino.mo share/locale/zh_TW/LC_MESSAGES/vino.mo @dirrm share/gnome/vino +@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ug 2> /dev/null || true |