Date: Sun, 15 Aug 2004 12:24:09 -0700 From: "David Gardner" <david@pinko.net> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/70496: [Maintainer Update] sysutils/gkrelltop: update from 2.2.1 to 2.2.4 Message-ID: <1092597849.0@eden> Resent-Message-ID: <200408151930.i7FJUSwZ021251@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 70496
>Category: ports
>Synopsis: [Maintainer Update] sysutils/gkrelltop: update from 2.2.1 to 2.2.4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Aug 15 19:30:28 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: David Gardner
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
na
>Environment:
System: FreeBSD 5.2-CURRENT #4: Sat Aug 14 16:17:44 PDT 2004
root@eden:/usr/src/sys/i386/compile/Worker
>Description:
Update from v2.2.1 to 2.2.4
>How-To-Repeat:
>Fix:
--- gkrelltop-2.2.4-port.diff begins here ---
diff -ruN gkrelltop.bak/Makefile gkrelltop/Makefile
--- gkrelltop.bak/Makefile Sun May 30 02:31:13 2004
+++ gkrelltop/Makefile Mon Aug 2 19:19:05 2004
@@ -1,12 +1,12 @@
# New ports collection makefile for: gkrelltop
-# Date created: 12 April 2004
+# Date created: August 2004
# Whom: David Gardner
#
-# $FreeBSD: ports/sysutils/gkrelltop/Makefile,v 1.3 2004/05/30 09:31:13 pav Exp $
+# $FreeBSD$
#
PORTNAME= gkrelltop
-PORTVERSION= 2.2.1
+PORTVERSION= 2.2.4
CATEGORIES= sysutils
MASTER_SITES= http://psychology.rutgers.edu/~zaimi/html/gkrelltop/
DISTNAME= ${PORTNAME}.${PORTVERSION}
@@ -17,17 +17,16 @@
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellmd.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
+MAKE_ARGS+= 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
+PLIST_FILES+= libexec/gkrellm2/plugins/gkrelltopd.so
post-install:
@${CAT} ${PKGMESSAGE}
diff -ruN gkrelltop.bak/distinfo gkrelltop/distinfo
--- gkrelltop.bak/distinfo Fri May 21 06:03:47 2004
+++ gkrelltop/distinfo Mon Aug 2 17:08:32 2004
@@ -1,2 +1,2 @@
-MD5 (gkrelltop.2.2.1.tgz) = 4756f310d86a36978cc4ee14ce4203a3
-SIZE (gkrelltop.2.2.1.tgz) = 45344
+MD5 (gkrelltop.2.2.4.tgz) = 090020396582619189389e6f342a748b
+SIZE (gkrelltop.2.2.4.tgz) = 16407
diff -ruN gkrelltop.bak/files/patch-makefile gkrelltop/files/patch-makefile
--- gkrelltop.bak/files/patch-makefile Wed Dec 31 16:00:00 1969
+++ gkrelltop/files/patch-makefile Mon Aug 2 17:26:33 2004
@@ -0,0 +1,11 @@
+--- Makefile Wed May 26 23:46:10 2004
++++ Makefile Mon Jul 26 13:26:40 2004
+@@ -65,7 +65,7 @@
+ LIBSD = `pkg-config glib-2.0 --libs`
+ endif
+ INSTALLDIRD=$(HOME)/.gkrellm2/plugins-gkrellmd
+-CCD = gcc $(CFLAGSD)
++CCD = gcc -I/usr/X11R6/include $(CFLAGSD)
+ OBJD = gkrelltopd.o top_three.o
+
+ DUMMY_VAR := $(shell ./configure $(CONFIGURE_ARGS))
diff -ruN gkrelltop.bak/files/patch-src-gkrelltop.c gkrelltop/files/patch-src-gkrelltop.c
--- gkrelltop.bak/files/patch-src-gkrelltop.c Wed Dec 31 16:00:00 1969
+++ gkrelltop/files/patch-src-gkrelltop.c Mon Aug 2 19:05:19 2004
@@ -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 -ruN gkrelltop.bak/files/patch-src-top_three.c gkrelltop/files/patch-src-top_three.c
--- gkrelltop.bak/files/patch-src-top_three.c Wed Dec 31 16:00:00 1969
+++ gkrelltop/files/patch-src-top_three.c Mon Aug 2 17:26:51 2004
@@ -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;
+ }
--- gkrelltop-2.2.4-port.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1092597849.0>