diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-03-01 13:25:44 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-03-01 13:25:44 +0800 |
commit | 4a36d7437d51eac1e5c82c0698f1564e407ba9fa (patch) | |
tree | fde3470953fb8b44c621ec764174db9f81f74f53 | |
parent | 47cc9d9f867dae6a239c153922e2216b05a60984 (diff) | |
download | marcuscom-ports-4a36d7437d51eac1e5c82c0698f1564e407ba9fa.tar marcuscom-ports-4a36d7437d51eac1e5c82c0698f1564e407ba9fa.tar.gz marcuscom-ports-4a36d7437d51eac1e5c82c0698f1564e407ba9fa.tar.bz2 marcuscom-ports-4a36d7437d51eac1e5c82c0698f1564e407ba9fa.tar.lz marcuscom-ports-4a36d7437d51eac1e5c82c0698f1564e407ba9fa.tar.xz marcuscom-ports-4a36d7437d51eac1e5c82c0698f1564e407ba9fa.tar.zst marcuscom-ports-4a36d7437d51eac1e5c82c0698f1564e407ba9fa.zip |
Update to 2.17.95.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8448 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r-- | sysutils/gnome-system-monitor/Makefile | 5 | ||||
-rw-r--r-- | sysutils/gnome-system-monitor/distinfo | 6 | ||||
-rw-r--r-- | sysutils/gnome-system-monitor/files/patch-src_openfiles.cpp | 22 | ||||
-rw-r--r-- | sysutils/gnome-system-monitor/files/patch-src_sysinfo.cpp | 62 |
4 files changed, 5 insertions, 90 deletions
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index b30babe40..eb405290b 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.90 2007/02/28 04:56:59 mezz Exp $ +# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.91 2007/02/28 05:18:44 marcus Exp $ # PORTNAME= gnome-system-monitor -PORTVERSION= 2.17.94 -PORTREVISION= 1 +PORTVERSION= 2.17.95 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-system-monitor/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo index df0c9e663..bdad56184 100644 --- a/sysutils/gnome-system-monitor/distinfo +++ b/sysutils/gnome-system-monitor/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-system-monitor-2.17.94.tar.bz2) = b8f1ec2cf6c77a634d3452ed94a17b55 -SHA256 (gnome2/gnome-system-monitor-2.17.94.tar.bz2) = b89bb8c0cff62cd01ddc2e2cf133be3cf12c979810bf7e62151d9ef416307b6e -SIZE (gnome2/gnome-system-monitor-2.17.94.tar.bz2) = 1561721 +MD5 (gnome2/gnome-system-monitor-2.17.95.tar.bz2) = e76c59b47578c8724abf1caae918758f +SHA256 (gnome2/gnome-system-monitor-2.17.95.tar.bz2) = a2820838e545c8a88e678b32bc44f0bae8b85ee702b46331623b8052abe74b21 +SIZE (gnome2/gnome-system-monitor-2.17.95.tar.bz2) = 1581789 diff --git a/sysutils/gnome-system-monitor/files/patch-src_openfiles.cpp b/sysutils/gnome-system-monitor/files/patch-src_openfiles.cpp deleted file mode 100644 index b30001818..000000000 --- a/sysutils/gnome-system-monitor/files/patch-src_openfiles.cpp +++ /dev/null @@ -1,22 +0,0 @@ ---- src/openfiles.cpp.orig Thu Dec 14 17:49:02 2006 -+++ src/openfiles.cpp Fri Dec 22 13:49:23 2006 -@@ -6,6 +6,7 @@ - #include <netdb.h> - #include <sys/types.h> - #include <sys/socket.h> -+#include <netinet/in.h> - #include <arpa/inet.h> - - #include "procman.h" -@@ -53,7 +54,11 @@ friendlier_hostname(const char *dotted_q - goto failsafe; - - -+#if defined(__FreeBSD__) && __FreeBSD_version < 601103 -+ host = gethostbyaddr((char *) &addr4, sizeof addr4, AF_INET); -+#else - host = gethostbyaddr(&addr4, sizeof addr4, AF_INET); -+#endif - - if(!host) - goto failsafe; diff --git a/sysutils/gnome-system-monitor/files/patch-src_sysinfo.cpp b/sysutils/gnome-system-monitor/files/patch-src_sysinfo.cpp deleted file mode 100644 index bfb088676..000000000 --- a/sysutils/gnome-system-monitor/files/patch-src_sysinfo.cpp +++ /dev/null @@ -1,62 +0,0 @@ ---- src/sysinfo.cpp.orig Tue Feb 27 01:52:44 2007 -+++ src/sysinfo.cpp Wed Feb 28 00:17:06 2007 -@@ -14,11 +14,13 @@ - #include <sys/wait.h> - #include <math.h> - #include <errno.h> -- - #include <string> - #include <vector> - #include <fstream> - #include <sstream> -+#ifdef __FreeBSD__ -+#include <sys/utsname.h> -+#endif - - #include "sysinfo.h" - #include "util.h" -@@ -243,6 +245,30 @@ namespace { - } - }; - -+#ifdef __FreeBSD__ -+ class UnameSysInfo -+ : public SysInfo -+ { -+ public: -+ UnameSysInfo() -+ { -+ this->load_uname_info(); -+ } -+ -+ private: -+ -+ void load_uname_info() -+ { -+ struct utsname name; -+ -+ uname(&name); -+ -+ this->distro_name = name.sysname; -+ this->distro_release = name.release; -+ this->distro_codename = name.machine; -+ } -+ }; -+#endif - - SysInfo* get_sysinfo() - { -@@ -250,9 +276,12 @@ namespace { - g_free(p); - return new LSBSysInfo; - } -+#ifdef __FreeBSD__ -+ return new UnameSysInfo; -+#else - else if (g_file_test("/etc/release", G_FILE_TEST_EXISTS)) - return new SolarisSysInfo; -- -+#endif - return new SysInfo(_("Unknown distribution")); - } - } |