5 files changed, 55 insertions, 10 deletions

diff --git a/sysutils/gkrelltop/Makefile b/sysutils/gkrelltop/Makefile
index 2dfabad80716..8ecc34583a2d 100644
--- a/sysutils/gkrelltop/Makefile
+++ b/sysutils/gkrelltop/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gkrelltop
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://psychology.rutgers.edu/~zaimi/html/gkrelltop/
 DISTNAME=	${PORTNAME}.${PORTVERSION}
@@ -18,16 +18,14 @@ COMMENT=	Plugin for gkrellm 2.x shows top three processes, requires procfs
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
 BUILD_DEPENDS=	${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
 
-post-extract:
-	@${CHMOD} u+rwx ${WRKSRC}
-	@${RM} ${WRKSRC}/*.o ${WRKSRC}/*.so
-
-MAKE_ARGS=	INSTALLDIR2=${PREFIX}/libexec/gkrellm2/plugins
-INSTALL_TARGET=	install2
+USE_GMAKE=	yes
+MAKE_ARGS=	INSTALLDIR=${PREFIX}/libexec/gkrellm2/plugins \
+		INSTALLDIRD=${PREFIX}/libexec/gkrellm2/plugins
 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-PLIST_FILES=	libexec/gkrellm2/plugins/gkrelltop2.so
+PLIST_FILES=	libexec/gkrellm2/plugins/gkrelltop.so \
+		libexec/gkrellm2/plugins/gkrelltopd.so
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/sysutils/gkrelltop/distinfo b/sysutils/gkrelltop/distinfo
index ef10f2e17a8c..7d2c52f3794e 100644
--- a/sysutils/gkrelltop/distinfo
+++ b/sysutils/gkrelltop/distinfo
@@ -1,2 +1,2 @@
-MD5 (gkrelltop.2.2.1.tgz) = 4756f310d86a36978cc4ee14ce4203a3
-SIZE (gkrelltop.2.2.1.tgz) = 45344
+MD5 (gkrelltop.2.2.4.tgz) = 4d45358e6a752a9125a91e7c03697657
+SIZE (gkrelltop.2.2.4.tgz) = 16387
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;
+ }