diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-07-26 10:28:58 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-07-26 10:28:58 +0800 |
commit | 9994358fb74aa1a32a3ce6f3c9899321683ac4ac (patch) | |
tree | 7e5864e5422ac9bb558d19d68b1508bfc5c01684 | |
parent | 497d910e008c57ed7741e3cb9501cf712695c6bc (diff) | |
download | marcuscom-ports-9994358fb74aa1a32a3ce6f3c9899321683ac4ac.tar marcuscom-ports-9994358fb74aa1a32a3ce6f3c9899321683ac4ac.tar.gz marcuscom-ports-9994358fb74aa1a32a3ce6f3c9899321683ac4ac.tar.bz2 marcuscom-ports-9994358fb74aa1a32a3ce6f3c9899321683ac4ac.tar.lz marcuscom-ports-9994358fb74aa1a32a3ce6f3c9899321683ac4ac.tar.xz marcuscom-ports-9994358fb74aa1a32a3ce6f3c9899321683ac4ac.tar.zst marcuscom-ports-9994358fb74aa1a32a3ce6f3c9899321683ac4ac.zip |
Update to 2.11.90.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4318 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r-- | sysutils/gnome-system-monitor/Makefile | 4 | ||||
-rw-r--r-- | sysutils/gnome-system-monitor/distinfo | 4 | ||||
-rw-r--r-- | sysutils/gnome-system-monitor/files/patch-src::proctable.c | 12 | ||||
-rw-r--r-- | sysutils/gnomesystemmonitor/Makefile | 4 | ||||
-rw-r--r-- | sysutils/gnomesystemmonitor/distinfo | 4 | ||||
-rw-r--r-- | sysutils/gnomesystemmonitor/files/patch-src::proctable.c | 12 |
6 files changed, 20 insertions, 20 deletions
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index cd59c8266..8c49e3e73 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnomesystemmonitor/Makefile,v 1.44 2005/07/03 23:29:29 marcus Exp $ +# $MCom: ports/sysutils/gnomesystemmonitor/Makefile,v 1.45 2005/07/14 00:13:25 marcus Exp $ # PORTNAME= gnomesystemmonitor -PORTVERSION= 2.11.5 +PORTVERSION= 2.11.90 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.11 diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo index 828dd962b..5f3a7dda2 100644 --- a/sysutils/gnome-system-monitor/distinfo +++ b/sysutils/gnome-system-monitor/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-system-monitor-2.11.5.tar.bz2) = 0bf524ae3c70255a1ffcdc3964a84891 -SIZE (gnome2/gnome-system-monitor-2.11.5.tar.bz2) = 944274 +MD5 (gnome2/gnome-system-monitor-2.11.90.tar.bz2) = 65d00ba0d6a3dc5b7f0d2e5c11e4bfbe +SIZE (gnome2/gnome-system-monitor-2.11.90.tar.bz2) = 958895 diff --git a/sysutils/gnome-system-monitor/files/patch-src::proctable.c b/sysutils/gnome-system-monitor/files/patch-src::proctable.c index 49a699641..70b2f9e30 100644 --- a/sysutils/gnome-system-monitor/files/patch-src::proctable.c +++ b/sysutils/gnome-system-monitor/files/patch-src::proctable.c @@ -1,7 +1,7 @@ ---- src/proctable.c.orig Tue Nov 30 01:28:31 2004 -+++ src/proctable.c Wed Dec 1 13:25:55 2004 -@@ -772,6 +772,12 @@ - +--- src/proctable.c.orig Fri Jul 22 18:58:42 2005 ++++ src/proctable.c Mon Jul 25 22:25:58 2005 +@@ -853,6 +853,12 @@ static void cb_exclude(ProcInfo* info, G + } +static int @@ -13,7 +13,7 @@ static void refresh_list (ProcData *procdata, const unsigned *pid_list, const guint n) { -@@ -863,10 +869,15 @@ +@@ -945,10 +951,15 @@ proctable_update_list (ProcData * const pid_list = glibtop_get_proclist (&proclist, which, arg); @@ -22,7 +22,7 @@ /* FIXME: total cpu time elapsed should be calculated on an individual basis here ** should probably have a total_time_last gint in the ProcInfo structure */ glibtop_get_cpu (&cpu); - total_time = cpu.total - total_time_last; + total_time = MAX(cpu.total - total_time_last, 1); + if (cpu.frequency) { + total_time /= (cpu.frequency/100); + } diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile index cd59c8266..8c49e3e73 100644 --- a/sysutils/gnomesystemmonitor/Makefile +++ b/sysutils/gnomesystemmonitor/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnomesystemmonitor/Makefile,v 1.44 2005/07/03 23:29:29 marcus Exp $ +# $MCom: ports/sysutils/gnomesystemmonitor/Makefile,v 1.45 2005/07/14 00:13:25 marcus Exp $ # PORTNAME= gnomesystemmonitor -PORTVERSION= 2.11.5 +PORTVERSION= 2.11.90 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.11 diff --git a/sysutils/gnomesystemmonitor/distinfo b/sysutils/gnomesystemmonitor/distinfo index 828dd962b..5f3a7dda2 100644 --- a/sysutils/gnomesystemmonitor/distinfo +++ b/sysutils/gnomesystemmonitor/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-system-monitor-2.11.5.tar.bz2) = 0bf524ae3c70255a1ffcdc3964a84891 -SIZE (gnome2/gnome-system-monitor-2.11.5.tar.bz2) = 944274 +MD5 (gnome2/gnome-system-monitor-2.11.90.tar.bz2) = 65d00ba0d6a3dc5b7f0d2e5c11e4bfbe +SIZE (gnome2/gnome-system-monitor-2.11.90.tar.bz2) = 958895 diff --git a/sysutils/gnomesystemmonitor/files/patch-src::proctable.c b/sysutils/gnomesystemmonitor/files/patch-src::proctable.c index 49a699641..70b2f9e30 100644 --- a/sysutils/gnomesystemmonitor/files/patch-src::proctable.c +++ b/sysutils/gnomesystemmonitor/files/patch-src::proctable.c @@ -1,7 +1,7 @@ ---- src/proctable.c.orig Tue Nov 30 01:28:31 2004 -+++ src/proctable.c Wed Dec 1 13:25:55 2004 -@@ -772,6 +772,12 @@ - +--- src/proctable.c.orig Fri Jul 22 18:58:42 2005 ++++ src/proctable.c Mon Jul 25 22:25:58 2005 +@@ -853,6 +853,12 @@ static void cb_exclude(ProcInfo* info, G + } +static int @@ -13,7 +13,7 @@ static void refresh_list (ProcData *procdata, const unsigned *pid_list, const guint n) { -@@ -863,10 +869,15 @@ +@@ -945,10 +951,15 @@ proctable_update_list (ProcData * const pid_list = glibtop_get_proclist (&proclist, which, arg); @@ -22,7 +22,7 @@ /* FIXME: total cpu time elapsed should be calculated on an individual basis here ** should probably have a total_time_last gint in the ProcInfo structure */ glibtop_get_cpu (&cpu); - total_time = cpu.total - total_time_last; + total_time = MAX(cpu.total - total_time_last, 1); + if (cpu.frequency) { + total_time /= (cpu.frequency/100); + } |