Update to 2.5.1.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1331 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 206 insertions, 0 deletions

diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile
new file mode 100644
index 000000000..2261a7121
--- /dev/null
+++ b/sysutils/gnomesystemmonitor/Makefile
@@ -0,0 +1,30 @@
+# New ports collection makefile for:	gnomesystemmonitor
+# Date created:				09 May 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD: ports/sysutils/gnomesystemmonitor/Makefile,v 1.49 2003/09/18 06:49:27 marcus Exp $
+#
+
+PORTNAME=	gnomesystemmonitor
+PORTVERSION=	2.5.1
+CATEGORIES=	sysutils gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/gnome-system-monitor/2.5
+DISTNAME=	gnome-system-monitor-${PORTVERSION}
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	GNOME 2 system monitor program
+
+LIB_DEPENDS=	gtop-2.0.2:${PORTSDIR}/devel/libgtop2
+
+USE_BZIP2=	yes
+USE_X_PREFIX=	yes
+USE_GMAKE=	yes
+USE_REINPLACE=	yes
+USE_GNOME=	gnomeprefix gnomehack libgnomeui libwnck
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -lutil"
+
+.include <bsd.port.mk>
diff --git a/sysutils/gnomesystemmonitor/distinfo b/sysutils/gnomesystemmonitor/distinfo
new file mode 100644
index 000000000..0127855d1
--- /dev/null
+++ b/sysutils/gnomesystemmonitor/distinfo
@@ -0,0 +1 @@
+MD5 (gnome2/gnome-system-monitor-2.5.1.tar.bz2) = 1cd9e5d21c33212498bf7fe1933f315c
diff --git a/sysutils/gnomesystemmonitor/files/patch-configure b/sysutils/gnomesystemmonitor/files/patch-configure
new file mode 100644
index 000000000..504276306
--- /dev/null
+++ b/sysutils/gnomesystemmonitor/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig	Mon Nov 25 21:02:50 2002
++++ configure	Fri Nov 29 20:30:44 2002
+@@ -3731,7 +3731,7 @@
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define GNOME_ICONDIR "${prefix}/share/pixmaps"
++#define GNOME_ICONDIR "${datadir}/pixmaps"
+ _ACEOF
+ 
+ 
+@@ -6630,7 +6630,7 @@
+ s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
+ s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+ s,@PROCMAN_CFLAGS@,$PROCMAN_CFLAGS,;t t
+-s,@PROCMAN_LIBS@,$PROCMAN_LIBS,;t t
++s,@PROCMAN_LIBS@, $PROCMAN_LIBS,;t t
+ s,@GCONF_SCHEMA_CONFIG_SOURCE@,$GCONF_SCHEMA_CONFIG_SOURCE,;t t
+ s,@GCONF_SCHEMA_FILE_DIR@,$GCONF_SCHEMA_FILE_DIR,;t t
+ s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
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/sysutils/gnomesystemmonitor/files/patch-src_util.c b/sysutils/gnomesystemmonitor/files/patch-src_util.c
new file mode 100644
index 000000000..b7e262b0c
--- /dev/null
+++ b/sysutils/gnomesystemmonitor/files/patch-src_util.c
@@ -0,0 +1,10 @@
+--- src/util.c.orig	Thu May  9 01:16:48 2002
++++ src/util.c	Thu May  9 01:17:13 2002
+@@ -16,6 +16,7 @@
+ 
+ #ifdef __FreeBSD__
+ # include <errno.h>
++# include <termios.h>
+ # include <libutil.h>
+ #endif
+ 
diff --git a/sysutils/gnomesystemmonitor/pkg-descr b/sysutils/gnomesystemmonitor/pkg-descr
new file mode 100644
index 000000000..40caee647
--- /dev/null
+++ b/sysutils/gnomesystemmonitor/pkg-descr
@@ -0,0 +1 @@
+GNOME 2.0 system monitor program.
diff --git a/sysutils/gnomesystemmonitor/pkg-plist b/sysutils/gnomesystemmonitor/pkg-plist
new file mode 100644
index 000000000..42f0f82ed
--- /dev/null
+++ b/sysutils/gnomesystemmonitor/pkg-plist
@@ -0,0 +1,91 @@
+bin/gnome-system-monitor
+etc/gconf/gconf.xml.defaults/apps/procman/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/procman/disktree/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/procman/memmapstree/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/procman/proctree/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/procman/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/procman/disktree/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/procman/memmapstree/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/procman/proctree/%gconf.xml
+etc/gconf/schemas/gnome-system-monitor.schemas
+share/gnome/applications/gnome-system-monitor.desktop
+share/gnome/help/gnome-system-monitor/C/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/C/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/C/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/C/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/C/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/C/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/C/figures/processListing.png
+share/gnome/help/gnome-system-monitor/C/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/C/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/C/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/C/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/C/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/C/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/C/legal.xml
+share/gnome/omf/gnome-system-monitor/gnome-system-monitor-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-system-monitor/gnome-system-monitor-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/pixmaps/procman.png
+share/locale/am/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ar/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/az/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/be/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/bg/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/bn/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ca/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/cs/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/cy/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/da/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/de/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/el/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/es/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/fa/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/fi/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/fr/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ga/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/gl/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/he/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/hi/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/hu/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/id/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/it/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ja/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ko/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/li/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/lv/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/mk/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ml/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/mn/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ms/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/nl/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/no/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/pl/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/pt/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ro/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ru/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/sk/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/sl/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/sr/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/sq/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ta/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/tr/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo
+@dirrm share/gnome/omf/gnome-system-monitor
+@dirrm share/gnome/help/gnome-system-monitor/C/figures
+@dirrm share/gnome/help/gnome-system-monitor/C
+@dirrm share/gnome/help/gnome-system-monitor
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/procman/proctree
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/procman/memmapstree
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/procman/disktree
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/procman
+@dirrm etc/gconf/gconf.xml.defaults/apps/procman/proctree
+@dirrm etc/gconf/gconf.xml.defaults/apps/procman/memmapstree
+@dirrm etc/gconf/gconf.xml.defaults/apps/procman/disktree
+@dirrm etc/gconf/gconf.xml.defaults/apps/procman
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-system-monitor/gnome-system-monitor-C.omf 2>/dev/null || /usr/bin/true