5 files changed, 12 insertions, 48 deletions

diff --git a/sysutils/gkrelltop/Makefile b/sysutils/gkrelltop/Makefile
index 8a28ad5618fe..e714e7e75850 100644
--- a/sysutils/gkrelltop/Makefile
+++ b/sysutils/gkrelltop/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	gkrelltop
-PORTVERSION=	2.2.4
+PORTVERSION=	2.2.6
 PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://psychology.rutgers.edu/~zaimi/html/gkrelltop/
-DISTNAME=	${PORTNAME}.${PORTVERSION}
-EXTRACT_SUFX=	.tgz
+DISTNAME=	${PORTNAME}_2.2-6
+#EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	david@pinko.net
 COMMENT=	Plugin for gkrellm 2.x shows top three processes, requires procfs
diff --git a/sysutils/gkrelltop/distinfo b/sysutils/gkrelltop/distinfo
index 7d2c52f3794e..63b0193a5d6e 100644
--- a/sysutils/gkrelltop/distinfo
+++ b/sysutils/gkrelltop/distinfo
@@ -1,2 +1,2 @@
-MD5 (gkrelltop.2.2.4.tgz) = 4d45358e6a752a9125a91e7c03697657
-SIZE (gkrelltop.2.2.4.tgz) = 16387
+MD5 (gkrelltop_2.2-6.tar.gz) = b9c641b4d9ce130c07c7da66938244bf
+SIZE (gkrelltop_2.2-6.tar.gz) = 23384
diff --git a/sysutils/gkrelltop/files/patch-makefile b/sysutils/gkrelltop/files/patch-makefile
index e0094d8e21ac..9403be69ebb4 100644
--- a/sysutils/gkrelltop/files/patch-makefile
+++ b/sysutils/gkrelltop/files/patch-makefile
@@ -1,20 +1,11 @@
---- 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 
- 
+--- Makefile.orig	Sun Dec 19 14:25:10 2004
++++ Makefile	Sun Dec 19 14:02:12 2004
 @@ -65,7 +65,7 @@
+ LIBSD = `glib-config --libs`
+ CONFIGURE_ARGS += --with-glib12
+ else
+-CFLAGSD = -D$(OSFLAG) -fPIC -Wall `pkg-config glib-2.0 --cflags`
++CFLAGSD = -D$(OSFLAG) -I/usr/X11R6/include -fPIC -Wall `pkg-config glib-2.0 --cflags`
  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
deleted file mode 100644
index f51861395bd9..000000000000
--- a/sysutils/gkrelltop/files/patch-src-gkrelltop.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 03e23a578c91..000000000000
--- a/sysutils/gkrelltop/files/patch-src-top_three.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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;
- }