diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-12-18 11:28:13 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-12-18 11:28:13 +0800 |
| commit | a342bb25af8c51629297cd05580a4a257b1a6dd2 (patch) | |
| tree | 3590e453b6784312d70102124d787a36a47558c3 | |
| parent | d57b219e8e5329f011f33bf19ed3bdbc1fa7905f (diff) | |
| download | marcuscom-ports-a342bb25af8c51629297cd05580a4a257b1a6dd2.tar marcuscom-ports-a342bb25af8c51629297cd05580a4a257b1a6dd2.tar.gz marcuscom-ports-a342bb25af8c51629297cd05580a4a257b1a6dd2.tar.bz2 marcuscom-ports-a342bb25af8c51629297cd05580a4a257b1a6dd2.tar.lz marcuscom-ports-a342bb25af8c51629297cd05580a4a257b1a6dd2.tar.xz marcuscom-ports-a342bb25af8c51629297cd05580a4a257b1a6dd2.tar.zst marcuscom-ports-a342bb25af8c51629297cd05580a4a257b1a6dd2.zip | |
Fix up the patches to make the gnome-network developers a little happier.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1492 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | net/gnomenetwork/Makefile | 1 | ||||
| -rw-r--r-- | net/gnomenetwork/files/patch-gnome-netinfo::info.c | 24 | ||||
| -rw-r--r-- | net/gnomenetwork/files/patch-gnome-netinfo_netstat.c | 2 |
3 files changed, 8 insertions, 19 deletions
diff --git a/net/gnomenetwork/Makefile b/net/gnomenetwork/Makefile index eb963cd70..4e955b393 100644 --- a/net/gnomenetwork/Makefile +++ b/net/gnomenetwork/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnomenetwork PORTVERSION= 1.99.5 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-network/1.99 diff --git a/net/gnomenetwork/files/patch-gnome-netinfo::info.c b/net/gnomenetwork/files/patch-gnome-netinfo::info.c index 258d2fbe0..54c795546 100644 --- a/net/gnomenetwork/files/patch-gnome-netinfo::info.c +++ b/net/gnomenetwork/files/patch-gnome-netinfo::info.c @@ -1,5 +1,5 @@ --- gnome-netinfo/info.c.orig Mon Nov 24 18:29:43 2003 -+++ gnome-netinfo/info.c Sat Dec 6 23:37:03 2003 ++++ gnome-netinfo/info.c Wed Dec 17 22:27:46 2003 @@ -27,6 +27,7 @@ #endif @@ -8,15 +8,6 @@ #include <sys/socket.h> /* basic socket definitions */ #include <arpa/inet.h> /* inet(3) functions */ #include <sys/un.h> /* for Unix domain sockets */ -@@ -164,7 +165,7 @@ - gint flags; - mii_data_result data; - -- sockfd = socket (AF_INET, SOCK_DGRAM, 0); -+ sockfd = socket (AF_INET, SOCK_STREAM, 0); - - ifc.ifc_len = sizeof (buf); - ifc.ifc_req = (struct ifreq *) buf; @@ -173,7 +174,7 @@ for (ptr = buf; ptr < buf + ifc.ifc_len;) { ifr = (struct ifreq *) ptr; @@ -31,7 +22,7 @@ continue; } + -+ bzero (&data, sizeof(data)); ++ memset (&data, 0, sizeof(data)); +#ifdef __linux__ data = mii_get_basic (nic); @@ -47,15 +38,12 @@ } static GList * -@@ -319,8 +323,10 @@ - struct ifreq *ifr; - int sockfd, len; +@@ -321,6 +325,8 @@ -- sockfd = socket (AF_INET, SOCK_DGRAM, 0); -+ sockfd = socket (AF_INET, SOCK_STREAM, 0); + sockfd = socket (AF_INET, SOCK_DGRAM, 0); -+ bzero (&ifc, sizeof (struct ifconf)); -+ bzero (&buf, sizeof (buf)); ++ memset (&ifc, 0, sizeof (struct ifconf)); ++ memset (&buf, 0, sizeof (buf)); ifc.ifc_len = sizeof (buf); ifc.ifc_req = (struct ifreq *) buf; diff --git a/net/gnomenetwork/files/patch-gnome-netinfo_netstat.c b/net/gnomenetwork/files/patch-gnome-netinfo_netstat.c index 011cc667a..4f0a7240b 100644 --- a/net/gnomenetwork/files/patch-gnome-netinfo_netstat.c +++ b/net/gnomenetwork/files/patch-gnome-netinfo_netstat.c @@ -112,7 +112,7 @@ column = gtk_tree_view_column_new_with_attributes +#ifdef __FreeBSD__ -+ ("Destination/Prefix", renderer, "text", 0, NULL); ++ (_("Destination/Prefix"), renderer, "text", 0, NULL); +#else (_("Destination"), renderer, "text", 0, NULL); +#endif |