From 4065cd53ed559a1e157b72e79012093788e7e75b Mon Sep 17 00:00:00 2001 From: marcus Date: Wed, 10 Sep 2003 18:01:36 +0000 Subject: Update to 2.4.0. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1173 df743ca5-7f9a-e211-a948-0013205c9059 --- sysutils/gnome-system-monitor/Makefile | 4 +- sysutils/gnome-system-monitor/distinfo | 2 +- .../files/patch-src::proctable.c | 53 ++++++++++++++++++++++ sysutils/gnomesystemmonitor/Makefile | 4 +- sysutils/gnomesystemmonitor/distinfo | 2 +- .../files/patch-src::proctable.c | 53 ++++++++++++++++++++++ x11/gnome-applets/Makefile | 4 +- x11/gnome-applets/distinfo | 2 +- x11/gnome-applets/files/patch-charpick_charpick.c | 11 +++++ x11/gnome-applets/pkg-plist | 1 + x11/gnomeapplets2/Makefile | 4 +- x11/gnomeapplets2/distinfo | 2 +- x11/gnomeapplets2/files/patch-charpick_charpick.c | 11 +++++ x11/gnomeapplets2/pkg-plist | 1 + 14 files changed, 142 insertions(+), 12 deletions(-) create mode 100644 sysutils/gnome-system-monitor/files/patch-src::proctable.c create mode 100644 sysutils/gnomesystemmonitor/files/patch-src::proctable.c create mode 100644 x11/gnome-applets/files/patch-charpick_charpick.c create mode 100644 x11/gnomeapplets2/files/patch-charpick_charpick.c diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index c3aafad1f..d4b63995f 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomesystemmonitor -PORTVERSION= 2.3.1 +PORTVERSION= 2.4.0 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.3 +MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.4 DISTNAME= gnome-system-monitor-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo index 6ec5e073f..3063caabe 100644 --- a/sysutils/gnome-system-monitor/distinfo +++ b/sysutils/gnome-system-monitor/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-system-monitor-2.3.1.tar.bz2) = 05c408225aea97e414d63fe85c32600a +MD5 (gnome2/gnome-system-monitor-2.4.0.tar.bz2) = f855d85adcc2eb0f20f639cbc2f00cbf diff --git a/sysutils/gnome-system-monitor/files/patch-src::proctable.c b/sysutils/gnome-system-monitor/files/patch-src::proctable.c new file mode 100644 index 000000000..5cb348a5a --- /dev/null +++ b/sysutils/gnome-system-monitor/files/patch-src::proctable.c @@ -0,0 +1,53 @@ +--- src/proctable.c.orig Sat Jun 7 04:35:32 2003 ++++ src/proctable.c Thu Sep 4 16:29:18 2003 +@@ -539,6 +539,9 @@ + glibtop_get_proc_uid (&procuid, pid); + glibtop_get_proc_time (&proctime, pid); + newcputime = proctime.utime + proctime.stime; ++ if (proctime.frequency) { ++ newcputime /= (proctime.frequency/100); ++ } + model = gtk_tree_view_get_model (GTK_TREE_VIEW (procdata->tree)); + + info->mem = procmem.size; +@@ -620,6 +623,9 @@ + glibtop_get_proc_uid (&procuid, pid); + glibtop_get_proc_time (&proctime, pid); + newcputime = proctime.utime + proctime.stime; ++ if (proctime.frequency) { ++ newcputime /= (proctime.frequency/100); ++ } + + arguments = glibtop_get_proc_args (&procargs, pid, 0); + get_process_name (procdata, info, procstate.cmd, arguments); +@@ -709,12 +715,20 @@ + return NULL; + } + ++static int ++pid_compare(const void* first, const void* second) ++{ ++ return *(unsigned*)first - *(unsigned*)second; ++} ++ + static void + refresh_list (ProcData *data, unsigned *pid_list, gint n) + { + ProcData *procdata = data; + GList *list = procdata->info; + gint i = 0; ++ ++ qsort(pid_list, n, sizeof (*pid_list), pid_compare); + + while (i < n) + { +@@ -812,6 +826,9 @@ + ** should probably have a total_time_last gint in the ProcInfo structure */ + glibtop_get_cpu (&cpu); + total_time = cpu.total - total_time_last; ++ if (cpu.frequency) { ++ total_time /= (cpu.frequency/100); ++ } + total_time_last = cpu.total; + + refresh_list (procdata, pid_list, n); diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile index c3aafad1f..d4b63995f 100644 --- a/sysutils/gnomesystemmonitor/Makefile +++ b/sysutils/gnomesystemmonitor/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomesystemmonitor -PORTVERSION= 2.3.1 +PORTVERSION= 2.4.0 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.3 +MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.4 DISTNAME= gnome-system-monitor-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/sysutils/gnomesystemmonitor/distinfo b/sysutils/gnomesystemmonitor/distinfo index 6ec5e073f..3063caabe 100644 --- a/sysutils/gnomesystemmonitor/distinfo +++ b/sysutils/gnomesystemmonitor/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-system-monitor-2.3.1.tar.bz2) = 05c408225aea97e414d63fe85c32600a +MD5 (gnome2/gnome-system-monitor-2.4.0.tar.bz2) = f855d85adcc2eb0f20f639cbc2f00cbf diff --git a/sysutils/gnomesystemmonitor/files/patch-src::proctable.c b/sysutils/gnomesystemmonitor/files/patch-src::proctable.c new file mode 100644 index 000000000..5cb348a5a --- /dev/null +++ b/sysutils/gnomesystemmonitor/files/patch-src::proctable.c @@ -0,0 +1,53 @@ +--- src/proctable.c.orig Sat Jun 7 04:35:32 2003 ++++ src/proctable.c Thu Sep 4 16:29:18 2003 +@@ -539,6 +539,9 @@ + glibtop_get_proc_uid (&procuid, pid); + glibtop_get_proc_time (&proctime, pid); + newcputime = proctime.utime + proctime.stime; ++ if (proctime.frequency) { ++ newcputime /= (proctime.frequency/100); ++ } + model = gtk_tree_view_get_model (GTK_TREE_VIEW (procdata->tree)); + + info->mem = procmem.size; +@@ -620,6 +623,9 @@ + glibtop_get_proc_uid (&procuid, pid); + glibtop_get_proc_time (&proctime, pid); + newcputime = proctime.utime + proctime.stime; ++ if (proctime.frequency) { ++ newcputime /= (proctime.frequency/100); ++ } + + arguments = glibtop_get_proc_args (&procargs, pid, 0); + get_process_name (procdata, info, procstate.cmd, arguments); +@@ -709,12 +715,20 @@ + return NULL; + } + ++static int ++pid_compare(const void* first, const void* second) ++{ ++ return *(unsigned*)first - *(unsigned*)second; ++} ++ + static void + refresh_list (ProcData *data, unsigned *pid_list, gint n) + { + ProcData *procdata = data; + GList *list = procdata->info; + gint i = 0; ++ ++ qsort(pid_list, n, sizeof (*pid_list), pid_compare); + + while (i < n) + { +@@ -812,6 +826,9 @@ + ** should probably have a total_time_last gint in the ProcInfo structure */ + glibtop_get_cpu (&cpu); + total_time = cpu.total - total_time_last; ++ if (cpu.frequency) { ++ total_time /= (cpu.frequency/100); ++ } + total_time_last = cpu.total; + + refresh_list (procdata, pid_list, n); diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index c7179e016..4aad079cb 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomeapplets2 -PORTVERSION= 2.3.90 +PORTVERSION= 2.4.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-applets/2.3 +MASTER_SITE_SUBDIR= sources/gnome-applets/2.4 DISTNAME= gnome-applets-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo index 4998cc348..52d4f73ac 100644 --- a/x11/gnome-applets/distinfo +++ b/x11/gnome-applets/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-applets-2.3.90.tar.bz2) = 266df97b218e1553f32e99dbb927f685 +MD5 (gnome2/gnome-applets-2.4.0.tar.bz2) = c17dba203ea379af5da056862672026c diff --git a/x11/gnome-applets/files/patch-charpick_charpick.c b/x11/gnome-applets/files/patch-charpick_charpick.c new file mode 100644 index 000000000..7d0ee91eb --- /dev/null +++ b/x11/gnome-applets/files/patch-charpick_charpick.c @@ -0,0 +1,11 @@ +--- charpick/charpick.c.orig Wed Sep 10 13:33:00 2003 ++++ charpick/charpick.c Wed Sep 10 13:33:19 2003 +@@ -3,7 +3,7 @@ + */ + + #include +-#ifndef sun ++#if !defined(sun) && !defined(__FreeBSD__) + #include + #endif + #include diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist index 0973a959b..73b9b72d7 100644 --- a/x11/gnome-applets/pkg-plist +++ b/x11/gnome-applets/pkg-plist @@ -1152,6 +1152,7 @@ share/locale/ar/LC_MESSAGES/gnome-applets-2.0.mo share/locale/az/LC_MESSAGES/gnome-applets-2.0.mo share/locale/be/LC_MESSAGES/gnome-applets-2.0.mo share/locale/bg/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/bn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ca/LC_MESSAGES/gnome-applets-2.0.mo share/locale/cs/LC_MESSAGES/gnome-applets-2.0.mo share/locale/cy/LC_MESSAGES/gnome-applets-2.0.mo diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile index c7179e016..4aad079cb 100644 --- a/x11/gnomeapplets2/Makefile +++ b/x11/gnomeapplets2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomeapplets2 -PORTVERSION= 2.3.90 +PORTVERSION= 2.4.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-applets/2.3 +MASTER_SITE_SUBDIR= sources/gnome-applets/2.4 DISTNAME= gnome-applets-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo index 4998cc348..52d4f73ac 100644 --- a/x11/gnomeapplets2/distinfo +++ b/x11/gnomeapplets2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-applets-2.3.90.tar.bz2) = 266df97b218e1553f32e99dbb927f685 +MD5 (gnome2/gnome-applets-2.4.0.tar.bz2) = c17dba203ea379af5da056862672026c diff --git a/x11/gnomeapplets2/files/patch-charpick_charpick.c b/x11/gnomeapplets2/files/patch-charpick_charpick.c new file mode 100644 index 000000000..7d0ee91eb --- /dev/null +++ b/x11/gnomeapplets2/files/patch-charpick_charpick.c @@ -0,0 +1,11 @@ +--- charpick/charpick.c.orig Wed Sep 10 13:33:00 2003 ++++ charpick/charpick.c Wed Sep 10 13:33:19 2003 +@@ -3,7 +3,7 @@ + */ + + #include +-#ifndef sun ++#if !defined(sun) && !defined(__FreeBSD__) + #include + #endif + #include diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist index 0973a959b..73b9b72d7 100644 --- a/x11/gnomeapplets2/pkg-plist +++ b/x11/gnomeapplets2/pkg-plist @@ -1152,6 +1152,7 @@ share/locale/ar/LC_MESSAGES/gnome-applets-2.0.mo share/locale/az/LC_MESSAGES/gnome-applets-2.0.mo share/locale/be/LC_MESSAGES/gnome-applets-2.0.mo share/locale/bg/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/bn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ca/LC_MESSAGES/gnome-applets-2.0.mo share/locale/cs/LC_MESSAGES/gnome-applets-2.0.mo share/locale/cy/LC_MESSAGES/gnome-applets-2.0.mo -- cgit v1.2.3