From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Aug 5 18:10:02 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 55335420 for ; Mon, 5 Aug 2013 18:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3783E2CD7 for ; Mon, 5 Aug 2013 18:10:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r75IA2sa020127 for ; Mon, 5 Aug 2013 18:10:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r75IA2to020126; Mon, 5 Aug 2013 18:10:02 GMT (envelope-from gnats) Resent-Date: Mon, 5 Aug 2013 18:10:02 GMT Resent-Message-Id: <201308051810.r75IA2to020126@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id BF5D4322 for ; Mon, 5 Aug 2013 18:02:06 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from omta02.auone-net.jp (mail-or1-f17.auone-net.jp [106.187.231.17]) by mx1.freebsd.org (Postfix) with ESMTP id 7E5572C69 for ; Mon, 5 Aug 2013 18:02:06 +0000 (UTC) Received: from localhost.localdomain (ZT034070.ppp.dion.ne.jp [59.128.34.70]) by omta02.auone-net.jp (au one net mail) with ESMTP id 60068156000A for ; Tue, 6 Aug 2013 03:02:03 +0900 (JST) Message-Id: <20130806025452.d831b39967387c5972a36131@yahoo.com> Date: Tue, 6 Aug 2013 02:54:52 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/181059: sysutils/gkrelltop: Update to version 2.2.13 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Aug 2013 18:10:02 -0000 >Number: 181059 >Category: ports >Synopsis: sysutils/gkrelltop: Update to version 2.2.13 >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: Mon Aug 05 18:10:01 UTC 2013 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 8.4-RELEASE-p2 i386 >Organization: >Environment: >Description: - Update to version 2.2.13 New file: files/patch-gkrelltop.c Remove file: files/patch-Makefile pkg-plist >How-To-Repeat: >Fix: diff -urN /usr/ports/sysutils/gkrelltop/Makefile sysutils/gkrelltop/Makefile --- /usr/ports/sysutils/gkrelltop/Makefile 2013-07-27 14:18:22.000000000 +0900 +++ sysutils/gkrelltop/Makefile 2013-08-06 00:00:00.000000000 +0900 @@ -2,7 +2,7 @@ # $FreeBSD: head/sysutils/gkrelltop/Makefile 323756 2013-07-26 22:02:09Z marino $ PORTNAME= gkrelltop -PORTVERSION= 2.2.10 +PORTVERSION= 2.2.13 CATEGORIES= sysutils MASTER_SITES= SF DISTNAME= ${PORTNAME}_${PORTVERSION}.orig @@ -10,29 +10,36 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Plugin for gkrellm 2.x shows top three processes, requires procfs -RUN_DEPENDS= gkrellmd:${PORTSDIR}/sysutils/gkrellm2 -BUILD_DEPENDS:= ${RUN_DEPENDS} +LICENSE= GPLv2 + +BUILD_DEPENDS= gkrellmd:${PORTSDIR}/sysutils/gkrellm2 +RUN_DEPENDS:= ${BUILD_DEPENDS} + +WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} USES= gmake -MAKE_ARGS= INSTALLDIR=${LOCALBASE}/libexec/gkrellm2/plugins \ +MAKE_ARGS= CC="${CC} ${CFLAGS} $$(pkg-config gtk+-2.0 --cflags)" \ +MAKE_ARGS= CCD="${CC} ${CFLAGS} $$(pkg-config glib-2.0 --cflags)" \ + INSTALLDIR=${PREFIX}/libexec/gkrellm2/plugins \ INSTALLDIRD=${PREFIX}/libexec/gkrellm2/plugins-gkrellmd +CFLAGS+= -fPIC -DFREEBSD -DGKRELLM2 + +PLIST_FILES= libexec/gkrellm2/plugins-gkrellmd/gkrelltopd.so + .if defined(GKRELLM_SERVER_ONLY) ALL_TARGET= server -INSTALL_TARGET= install-server -PLIST_SUB+= CLIENT="@comment " .else -PLIST_SUB+= CLIENT="" +PLIST_FILES+= libexec/gkrellm2/plugins/gkrelltop.so .endif -WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} - -post-patch: -.if defined(GKRELLM_SERVER_ONLY) - ${REINPLACE_CMD} 's/^\(PKG.*\)gkrellm/\1gkrellmd/' ${WRKSRC}/configure +do-install: + (cd ${WRKSRC} && ${INSTALL_DATA} gkrelltopd.so \ + ${PREFIX}/libexec/gkrellm2/plugins-gkrellmd) +.if !defined(GKRELLM_SERVER_ONLY) + (cd ${WRKSRC} && ${INSTALL_DATA} gkrelltop.so \ + ${PREFIX}/libexec/gkrellm2/plugins) .endif - -post-install: @${CAT} ${PKGMESSAGE} .include diff -urN /usr/ports/sysutils/gkrelltop/distinfo sysutils/gkrelltop/distinfo --- /usr/ports/sysutils/gkrelltop/distinfo 2013-07-23 04:32:27.000000000 +0900 +++ sysutils/gkrelltop/distinfo 2013-08-06 00:00:00.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (gkrelltop_2.2.10.orig.tar.gz) = 7975dcd2b242639948ad69d07b347037dd6074b37eead80aaf544aa48ec45c6c -SIZE (gkrelltop_2.2.10.orig.tar.gz) = 46018 +SHA256 (gkrelltop_2.2.13.orig.tar.gz) = b2585c4186cc3805fcde73645a71d8eb3f798358caeb31cf3f598795e6ea42e6 +SIZE (gkrelltop_2.2.13.orig.tar.gz) = 49023 diff -urN /usr/ports/sysutils/gkrelltop/files/patch-Makefile sysutils/gkrelltop/files/patch-Makefile --- /usr/ports/sysutils/gkrelltop/files/patch-Makefile 2013-07-23 04:32:27.000000000 +0900 +++ sysutils/gkrelltop/files/patch-Makefile 1970-01-01 09:00:00.000000000 +0900 @@ -1,28 +0,0 @@ ---- Makefile.orig 2007-07-21 04:52:00.000000000 +0000 -+++ Makefile -@@ -28,9 +28,9 @@ - OSFLAG = $(shell uname | tr '[:lower:]' '[:upper:]') - SHELL=/bin/sh - --GKRELL1FLAG=1 -+GKRELL1FLAG=0 - #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 bash -c 'pkg-config gtk+-2.0 --cflags &>/dev/null && echo 0') - GKRELLTOP = gkrelltop.so - OBJ = top_three.o gkrelltop.o - EXTRA = krell_panel1.xpm -@@ -65,11 +65,11 @@ WANT_GLIB12 = yes - endif - - ifeq ($(WANT_GLIB12),yes) --CFLAGSD = -I/usr/X11R6/include -D$(OSFLAG) -fPIC -Wall `glib-config --cflags` -+CFLAGSD = -I${PREFIX}/include -D$(OSFLAG) -fPIC -Wall `glib-config --cflags` - LIBSD = `glib-config --libs` - CONFIGURE_ARGS += --with-glib12 - else --CFLAGSD = -D$(OSFLAG) -fPIC -Wall `pkg-config glib-2.0 --cflags` -+CFLAGSD = -D$(OSFLAG) -I${PREFIX}/include -fPIC -Wall `pkg-config glib-2.0 --cflags` - LIBSD = `pkg-config glib-2.0 --libs` - endif - INSTALLDIRD ?= $(PREFIXD)/$(DESTDIR) diff -urN /usr/ports/sysutils/gkrelltop/files/patch-gkrelltop.c sysutils/gkrelltop/files/patch-gkrelltop.c --- /usr/ports/sysutils/gkrelltop/files/patch-gkrelltop.c 1970-01-01 09:00:00.000000000 +0900 +++ sysutils/gkrelltop/files/patch-gkrelltop.c 2013-08-06 00:00:00.000000000 +0900 @@ -0,0 +1,18 @@ +--- gkrelltop.c.orig ++++ gkrelltop.c +@@ -354,6 +354,7 @@ + if(pluginMode == cpu) + snprintf(tmp,sizeof(tmp), "%d: %4.1f%c %6.2d %.30s%c", + i+1, best[i]->amount, '%', best[i]->pid, best[i]->name, ch); ++#if defined(LINUX) + else if(pluginMode == mem) + snprintf(tmp,sizeof(tmp), "%d: %4.1f%c %6.2dMB %6.2d %.30s%c", + i+1, best[i]->amount, '%', best[i]->rss/MEG, +@@ -365,6 +366,7 @@ + (float)(best[i]->io_read - best[i]->previous_io_read)/KIL, + (float)(best[i]->io_write - best[i]->previous_io_write)/KIL, + best[i]->pid, best[i]->name, ch); ++#endif + + strncat(g_tooltip_text,tmp,sizeof(g_tooltip_text)-strlen(g_tooltip_text)); + } diff -urN /usr/ports/sysutils/gkrelltop/pkg-descr sysutils/gkrelltop/pkg-descr --- /usr/ports/sysutils/gkrelltop/pkg-descr 2013-06-21 03:42:27.000000000 +0900 +++ sysutils/gkrelltop/pkg-descr 2013-08-06 00:00:00.000000000 +0900 @@ -2,5 +2,5 @@ Plugin that displays top three processes. Requires /proc to be mounted. -Author: Adi Zaimi -WWW: http://psychology.rutgers.edu/~zaimi/software.html +Author: Adi Zaimi +WWW: http://sourceforge.net/projects/gkrelltop/ diff -urN /usr/ports/sysutils/gkrelltop/pkg-plist sysutils/gkrelltop/pkg-plist --- /usr/ports/sysutils/gkrelltop/pkg-plist 2013-06-21 03:42:27.000000000 +0900 +++ sysutils/gkrelltop/pkg-plist 1970-01-01 09:00:00.000000000 +0900 @@ -1,2 +0,0 @@ -libexec/gkrellm2/plugins-gkrellmd/gkrelltopd.so -%%CLIENT%%libexec/gkrellm2/plugins/gkrelltop.so >Release-Note: >Audit-Trail: >Unformatted: