From 99bf496f590cc2eaaace6d569ecbf81ff91ae086 Mon Sep 17 00:00:00 2001
From: Pav Lucistnik <pav@FreeBSD.org>
Date: Mon, 16 Aug 2004 08:40:00 +0000
Subject: - Update to 2.2.4

PR:		ports/70496
Submitted by:	David Gardner <david@pinko.net> (maintainer)
---
 sysutils/gkrelltop/files/patch-makefile        | 20 ++++++++++++++++++++
 sysutils/gkrelltop/files/patch-src-gkrelltop.c | 11 +++++++++++
 sysutils/gkrelltop/files/patch-src-top_three.c | 16 ++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 sysutils/gkrelltop/files/patch-makefile
 create mode 100644 sysutils/gkrelltop/files/patch-src-gkrelltop.c
 create mode 100644 sysutils/gkrelltop/files/patch-src-top_three.c

(limited to 'sysutils/gkrelltop/files')

diff --git a/sysutils/gkrelltop/files/patch-makefile b/sysutils/gkrelltop/files/patch-makefile
new file mode 100644
index 000000000000..e0094d8e21ac
--- /dev/null
+++ b/sysutils/gkrelltop/files/patch-makefile
@@ -0,0 +1,20 @@
+--- Makefile.orig	Thu May 27 08:46:10 2004
++++ Makefile	Mon Aug 16 10:27:36 2004
+@@ -27,7 +27,7 @@
+ 
+ GKRELL1FLAG=1
+ #find out if we have gkrellm 2 or 1 (from the gtk+ version)
+-GKRELL1FLAG=$(shell bash -c 'pkg-config gtk+-2.0 --cflags &>/dev/null && echo 0')
++GKRELL1FLAG=$(shell sh -c 'pkg-config gtk+-2.0 --cflags >/dev/null && echo 0')
+ GKRELLTOP= gkrelltop.so
+ OBJ = top_three.o gkrelltop.o 
+ 
+@@ -65,7 +65,7 @@
+ LIBSD = `pkg-config glib-2.0 --libs`
+ endif
+ INSTALLDIRD=$(HOME)/.gkrellm2/plugins-gkrellmd
+-CCD = gcc $(CFLAGSD)
++CCD = gcc -I${X11BASE}/include $(CFLAGSD)
+ OBJD = gkrelltopd.o top_three.o
+ 
+ DUMMY_VAR := $(shell ./configure $(CONFIGURE_ARGS))
diff --git a/sysutils/gkrelltop/files/patch-src-gkrelltop.c b/sysutils/gkrelltop/files/patch-src-gkrelltop.c
new file mode 100644
index 000000000000..f51861395bd9
--- /dev/null
+++ b/sysutils/gkrelltop/files/patch-src-gkrelltop.c
@@ -0,0 +1,11 @@
+--- gkrelltop.c	Sat May 29 00:11:48 2004
++++ gkrelltop.c	Mon Aug  2 19:03:22 2004
+@@ -414,7 +414,7 @@
+ 
+     /* -- About -- */
+     about_text = g_strdup_printf(
+-      "gkrelltop version 2.2.3\n"
++      "gkrelltop version 2.2.4\n"
+       "GKrellM Top Plugin\n"
+       "Copyright (c) 2002,2003 Adi Zaimi\n"
+       "zaimi-at-pegasus.rutgers.edu\n"
diff --git a/sysutils/gkrelltop/files/patch-src-top_three.c b/sysutils/gkrelltop/files/patch-src-top_three.c
new file mode 100644
index 000000000000..03e23a578c91
--- /dev/null
+++ b/sysutils/gkrelltop/files/patch-src-top_three.c
@@ -0,0 +1,16 @@
+--- top_three.c	Fri May 28 23:23:33 2004
++++ top_three.c	Mon Jul 26 13:26:18 2004
+@@ -307,11 +307,13 @@
+     process->user_time = user_time;
+     process->kernel_time = kernel_time;
+ 
++#if defined(LINUX)
+     /* set it to zero for niced processes */
+     if(show_nice_processes==0 && nice_val > 1) {
+         process->user_time = 0;
+         process->kernel_time = 0;
+     }
++#endif
+ 
+     return 0;
+ }
-- 
cgit v1.2.3