Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv11573

Modified Files:
        gnome-netstatus.info gnome-netstatus.patch 
Log Message:
overhaul internals--we're not a /proc system


Index: gnome-netstatus.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-netstatus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gnome-netstatus.patch       20 Jan 2006 20:25:02 -0000      1.1
+++ gnome-netstatus.patch       26 Apr 2010 07:43:21 -0000      1.2
@@ -1,11 +1,95 @@
-diff -Naur gnome-netstatus-2.6.0-old/src/netstatus-iface.c 
gnome-netstatus-2.6.0/src/netstatus-iface.c
---- gnome-netstatus-2.6.0-old/src/netstatus-iface.c    Fri Mar 19 15:25:10 2004
-+++ gnome-netstatus-2.6.0/src/netstatus-iface.c        Wed Apr  7 22:06:58 2004
-@@ -37,6 +37,7 @@
- #include <sys/sockio.h>
- #endif /* HAVE_SYS_SOCKIO_H */
- #include <sys/param.h>
-+#include <sys/socket.h>
+diff -Nurd -x'*~' gnome-netstatus-2.28.1.orig/src/netstatus-sysdeps.c 
gnome-netstatus-2.28.1/src/netstatus-sysdeps.c
+--- gnome-netstatus-2.28.1.orig/src/netstatus-sysdeps.c        2009-04-19 
14:24:53.000000000 -0400
++++ gnome-netstatus-2.28.1/src/netstatus-sysdeps.c     2010-04-26 
03:34:45.000000000 -0400
+@@ -35,14 +35,17 @@
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ 
+-#ifdef __FreeBSD__
++#if defined (__FreeBSD__) || defined (__APPLE__)
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
  #include <net/if.h>
- #include <net/if_arp.h>
- #include <arpa/inet.h>
+ #include <net/if_var.h>
++#ifdef __FREEBSD__
+ #include <dev/an/if_aironet_ieee.h>
+ #include <dev/wi/if_wavelan_ieee.h>
++#define HAVE_AIRONET
++#endif
+ #endif
+ 
+ static inline gboolean
+@@ -78,7 +81,7 @@
+   return TRUE;
+ }
+ 
+-#if !defined (__FreeBSD__)
++#if !defined (__FreeBSD__) && !defined (__APPLE__)
+ 
+ static inline char *
+ parse_iface_name (const char *buf)
+@@ -430,13 +433,16 @@
+ get_an_data (const char *iface,
+            int        *signal_strength)
+ {
++#ifdef HAVE_AIRONET
+ #ifdef AN_RID_RSSI_MAP
+   struct an_ltv_rssi_map  an_rssimap;
+ #endif
+   struct an_req         areq;
+   struct an_ltv_status *sts;
+   int                   level;
++#endif /* HAVE_AIRONET */
+   char                 *error = NULL;
++#ifdef HAVE_AIRONET
+   gboolean              rssimap_valid = FALSE;
+ 
+ #ifdef AN_RID_RSSI_MAP
+@@ -464,6 +470,7 @@
+ 
+   memcpy (signal_strength, &level, sizeof (signal_strength));
+ 
++#endif /* HAVE_AIRONET */
+   return error;
+ }
+ 
+@@ -471,9 +478,12 @@
+ get_wi_data (const char *iface,
+            int        *signal_strength)
+ {
++#ifdef HAVE_AIRONET
+   struct wi_req  wreq;
+   int            level;
++#endif /* HAVE_AIRONET */
+   char          *error = NULL;
++#ifdef HAVE_AIRONET
+ 
+   memset (&wreq, 0, sizeof (wreq));
+ 
+@@ -525,6 +535,7 @@
+ 
+   memcpy (signal_strength, &level, sizeof (signal_strength));
+ 
++#endif /* HAVE_AIRONET */
+   return error;
+ }
+ 
+@@ -592,7 +603,7 @@
+   *out_bytes   = -1;
+ 
+   error = NULL;
+-  command_line = g_strdup_printf ("/usr/bin/netstat -n -I %s -b -f inet", 
iface);
++  command_line = g_strdup_printf ("/usr/sbin/netstat -n -I %s -b -f inet", 
iface);
+   if (!g_shell_parse_argv (command_line, NULL, &argv, &error))
+     {
+       error_message = g_strdup_printf (_("Could not parse command line '%s': 
%s"),
+@@ -660,7 +671,7 @@
+     }
+   else
+     {
+-      error_message = g_strdup_printf ("Error running /usr/bin/netstat for 
'%s': %s", 
++      error_message = g_strdup_printf ("Error running /usr/sbin/netstat for 
'%s': %s", 
+                                      iface, error->message);
+       g_error_free (error);
+     }

Index: gnome-netstatus.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-netstatus.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gnome-netstatus.info        26 Apr 2010 07:04:19 -0000      1.9
+++ gnome-netstatus.info        26 Apr 2010 07:43:21 -0000      1.10
@@ -1,6 +1,6 @@
 Package: gnome-netstatus
 Version: 2.28.1
-Revision: 1
+Revision: 2
 Depends: <<
        atk1-shlibs (>= 1.28.0-1),
        cairo-shlibs (>= 1.8.8-3),
@@ -28,6 +28,7 @@
 BuildDepends: <<
        atk1 (>= 1.28.0-1),
        cairo (>= 1.8.8-3),
+       fink (>= 0.24.12),
        fink-package-precedence,
        fontconfig2-dev (>= 2.8.0-4),
        freetype219 (>= 2.3.12-1),
@@ -55,7 +56,12 @@
 <<
 Source: mirror:gnome:sources/%n/2.28/%n-%v.tar.bz2
 Source-MD5: 8ecc95396c9d1c7d963a7f232ca370f8
-PatchScript: perl -pi -e 's,-scrollkeeper-update.*,,' Makefile.in omf.make 
gnome-doc-utils.make help/*/Makefile.in
+PatchFile: %n.patch
+PatchFile-MD5: d64e75a06546e737852890675ff99852
+PatchScript: <<
+       %{default_script}
+       perl -pi -e 's,-scrollkeeper-update.*,,' Makefile.in omf.make 
gnome-doc-utils.make help/*/Makefile.in
+<<
 SetCFLAGS: -Os
 ConfigureParams: --disable-schemas-install --disable-scrollkeeper 
--libexecdir=%p/lib/%n --mandir=%p/share/man --enable-dependency-tracking 
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
 CompileScript: <<
@@ -80,6 +86,11 @@
        gtk-update-icon-cache -f -t %p/share/icons/hicolor || :
 <<
 DocFiles: AUTHORS COPYING ChangeLog MAINTAINERS NEWS README TODO
+DescPort: <<
+       Hack netstatus-sysdeps.c for darwin support: we're BSDish
+       (network info via system(netstat) not from /proc/net/dev) but
+       don't seem to have aironet (whatever that is).
+<<
 Description: Network Status Applet
 License: GPL
 Maintainer: The Gnome Core Team <fink-gnome-c...@lists.sourceforge.net>


------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to