From owner-svn-ports-all@FreeBSD.ORG Fri Nov 1 21:42:35 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org 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 66D6B4A3; Fri, 1 Nov 2013 21:42:35 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (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 3FC282A26; Fri, 1 Nov 2013 21:42:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA1LgZBW065047; Fri, 1 Nov 2013 21:42:35 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA1LgYIr065043; Fri, 1 Nov 2013 21:42:34 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201311012142.rA1LgYIr065043@svn.freebsd.org> From: Pawel Pekala Date: Fri, 1 Nov 2013 21:42:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332412 - in head/sysutils/gkrelltop: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Nov 2013 21:42:35 -0000 Author: pawel Date: Fri Nov 1 21:42:34 2013 New Revision: 332412 URL: http://svnweb.freebsd.org/changeset/ports/332412 Log: - Update to version 2.2.13 - Add LICENSE - Switch to PLIST_FILES - Support staging - Remove Author tag from pkg-descr PR: ports/181059 Submitted by: KATO Tsuguru Added: head/sysutils/gkrelltop/files/patch-gkrelltop.c (contents, props changed) Deleted: head/sysutils/gkrelltop/files/patch-Makefile head/sysutils/gkrelltop/pkg-plist Modified: head/sysutils/gkrelltop/Makefile (contents, props changed) head/sysutils/gkrelltop/distinfo (contents, props changed) head/sysutils/gkrelltop/pkg-descr (contents, props changed) Modified: head/sysutils/gkrelltop/Makefile ============================================================================== --- head/sysutils/gkrelltop/Makefile Fri Nov 1 21:41:40 2013 (r332411) +++ head/sysutils/gkrelltop/Makefile Fri Nov 1 21:42:34 2013 (r332412) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gkrelltop -PORTVERSION= 2.2.10 +PORTVERSION= 2.2.13 CATEGORIES= sysutils MASTER_SITES= SF DISTNAME= ${PORTNAME}_${PORTVERSION}.orig @@ -10,30 +10,40 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}.ori 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 pkgconfig -MAKE_ARGS= INSTALLDIR=${LOCALBASE}/libexec/gkrellm2/plugins \ +MAKE_ARGS= CC="${CC} ${CFLAGS} $$(pkg-config gtk+-2.0 --cflags)" \ + 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 +PLIST_DIRS= libexec/gkrellm2/plugins-gkrellmd \ + libexec/gkrellm2/plugins \ + libexec/gkrellm2 + .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/_/-/} - -NO_STAGE= yes -post-patch: -.if defined(GKRELLM_SERVER_ONLY) - ${REINPLACE_CMD} 's/^\(PKG.*\)gkrellm/\1gkrellmd/' ${WRKSRC}/configure +do-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/gkrellm2/plugins-gkrellmd + (cd ${WRKSRC} && ${INSTALL_DATA} gkrelltopd.so \ + ${STAGEDIR}${PREFIX}/libexec/gkrellm2/plugins-gkrellmd) +.if !defined(GKRELLM_SERVER_ONLY) + @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/gkrellm2/plugins + (cd ${WRKSRC} && ${INSTALL_DATA} gkrelltop.so \ + ${STAGEDIR}${PREFIX}/libexec/gkrellm2/plugins) .endif -post-install: - @${CAT} ${PKGMESSAGE} - .include Modified: head/sysutils/gkrelltop/distinfo ============================================================================== --- head/sysutils/gkrelltop/distinfo Fri Nov 1 21:41:40 2013 (r332411) +++ head/sysutils/gkrelltop/distinfo Fri Nov 1 21:42:34 2013 (r332412) @@ -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 Added: head/sysutils/gkrelltop/files/patch-gkrelltop.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/gkrelltop/files/patch-gkrelltop.c Fri Nov 1 21:42:34 2013 (r332412) @@ -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)); + } Modified: head/sysutils/gkrelltop/pkg-descr ============================================================================== --- head/sysutils/gkrelltop/pkg-descr Fri Nov 1 21:41:40 2013 (r332411) +++ head/sysutils/gkrelltop/pkg-descr Fri Nov 1 21:42:34 2013 (r332412) @@ -2,5 +2,4 @@ GKrellM top plugin Plugin that displays top three processes. Requires /proc to be mounted. -Author: Adi Zaimi -WWW: http://psychology.rutgers.edu/~zaimi/software.html +WWW: http://sourceforge.net/projects/gkrelltop/