diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-12-05 02:42:20 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-12-05 02:42:20 +0800 |
| commit | 410d4d4e34564e8431ec999f7315afa59a741e7b (patch) | |
| tree | b2fdc34605ec6c4f5794b2fb3bcb03f0915be67e /sysutils | |
| parent | 2bdad0608f6b03f5cc29fcd336e9cc840c062e0d (diff) | |
| download | marcuscom-ports-410d4d4e34564e8431ec999f7315afa59a741e7b.tar marcuscom-ports-410d4d4e34564e8431ec999f7315afa59a741e7b.tar.gz marcuscom-ports-410d4d4e34564e8431ec999f7315afa59a741e7b.tar.bz2 marcuscom-ports-410d4d4e34564e8431ec999f7315afa59a741e7b.tar.lz marcuscom-ports-410d4d4e34564e8431ec999f7315afa59a741e7b.tar.xz marcuscom-ports-410d4d4e34564e8431ec999f7315afa59a741e7b.tar.zst marcuscom-ports-410d4d4e34564e8431ec999f7315afa59a741e7b.zip | |
Update to 2.17.3.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7974 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils')
| -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_sysinfo.cpp | 61 |
3 files changed, 39 insertions, 33 deletions
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index 50986cc6b..1acf73206 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.78 2006/11/09 21:10:22 marcus Exp $ +# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.79 2006/11/24 08:03:19 marcus Exp $ # PORTNAME= gnome-system-monitor -PORTVERSION= 2.17.2.1 -PORTREVISION= 1 +PORTVERSION= 2.17.3 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 c6bb50046..adc6c8a44 100644 --- a/sysutils/gnome-system-monitor/distinfo +++ b/sysutils/gnome-system-monitor/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-system-monitor-2.17.2.1.tar.bz2) = 25f4cbe51f49e3cbbad967af288441be -SHA256 (gnome2/gnome-system-monitor-2.17.2.1.tar.bz2) = 6bc6dc08541bf2e769696ab08c18f066f6ecaeedd0938f7b403eabb8c61ff3d4 -SIZE (gnome2/gnome-system-monitor-2.17.2.1.tar.bz2) = 1491424 +MD5 (gnome2/gnome-system-monitor-2.17.3.tar.bz2) = af2f3d794768b52df5c737b9aadcc9d8 +SHA256 (gnome2/gnome-system-monitor-2.17.3.tar.bz2) = 50fd90d2bba4ef3a5d3549aa1f6edf767ff1476c3f98f31ea1598ec99db5fa5e +SIZE (gnome2/gnome-system-monitor-2.17.3.tar.bz2) = 1483250 diff --git a/sysutils/gnome-system-monitor/files/patch-src_sysinfo.cpp b/sysutils/gnome-system-monitor/files/patch-src_sysinfo.cpp index 0b08ad656..7af65a835 100644 --- a/sysutils/gnome-system-monitor/files/patch-src_sysinfo.cpp +++ b/sysutils/gnome-system-monitor/files/patch-src_sysinfo.cpp @@ -1,6 +1,11 @@ ---- src/sysinfo.cpp.orig Fri Nov 24 02:41:14 2006 -+++ src/sysinfo.cpp Fri Nov 24 02:54:59 2006 -@@ -11,6 +11,9 @@ +--- src/sysinfo.cpp.orig Mon Nov 20 15:41:52 2006 ++++ src/sysinfo.cpp Mon Dec 4 13:39:52 2006 +@@ -8,9 +8,14 @@ + #include <glibtop/mem.h> + #include <glibtop/sysinfo.h> + ++#include <sys/types.h> ++#include <sys/wait.h> #include <unistd.h> #include <netdb.h> #include <sys/socket.h> @@ -10,44 +15,46 @@ #include <string> #include <vector> -@@ -140,16 +143,39 @@ namespace { +@@ -191,6 +196,29 @@ namespace { } }; -+ class FreeBSDSysInfo -+ : public SysInfo ++#ifdef __FreeBSD__ ++ class UnameSysInfo ++ : public SysInfo + { -+ public: -+ FreeBSDSysInfo() -+ : SysInfo("FreeBSD") -+ { -+ this->load_freebsd_info(); -+ } ++ public: ++ UnameSysInfo() ++ { ++ this->load_uname_info(); ++ } + -+ private: -+ void load_freebsd_info() -+ { -+ struct utsname name; ++ private: + -+ uname(&name); ++ void load_uname_info() ++ { ++ struct utsname name; + -+ this->distro_version = name.release; -+ } ++ uname(&name); ++ ++ this->distro_name = name.sysname; ++ this->distro_release = name.release; ++ } + }; ++#endif SysInfo* get_sysinfo() { - if (g_file_test("/etc/debian_version", G_FILE_TEST_EXISTS)) - return new DebianSysInfo; - else +@@ -198,8 +226,11 @@ namespace { + g_free(p); + return new LSBSysInfo; + } +- +#ifdef __FreeBSD__ -+ return new FreeBSDSysInfo; ++ return new UnameSysInfo; +#else - return new SysInfo(_("Unknown distro")); + return new SysInfo(_("Unknown distribution")); +#endif } } -- - GtkWidget * - procman_create_sysinfo_view(void) |