From owner-svn-ports-head@FreeBSD.ORG Mon Jul 22 18:15:41 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id CD41A23B; Mon, 22 Jul 2013 18:15:41 +0000 (UTC) (envelope-from marino@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 BD4192CD6; Mon, 22 Jul 2013 18:15:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6MIFfR4067209; Mon, 22 Jul 2013 18:15:41 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6MIFebW067202; Mon, 22 Jul 2013 18:15:40 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201307221815.r6MIFebW067202@svn.freebsd.org> From: John Marino Date: Mon, 22 Jul 2013 18:15:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323490 - 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-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jul 2013 18:15:41 -0000 Author: marino Date: Mon Jul 22 18:15:40 2013 New Revision: 323490 URL: http://svnweb.freebsd.org/changeset/ports/323490 Log: sysutils/gkrelltop: Upgrade to 2.2.10 to unbreak fetch The MASTER_SITES of the current version of gkrelltop, 2.2.6 has disappeared. The project moved to SourceForge, but the earliest version available there is 2.2.7. However, 2.2.7 failed to build on FreeBSD 8.4 i386 and FreeBSD 9.1 amd64. Version 2.2.13, the latest, fails to build on all platforms, including DragonFly. Upgrading to version 2.2.10 results in successful builds on all platforms. Also, the header was trimmed and USE_GMAKE was replaced with USES+=gmake. PR: ports/178534 Approved by: bapt (mentor), maintainer timeout (~10 weeks) Added: head/sysutils/gkrelltop/files/patch-top__three.c (contents, props changed) Deleted: head/sysutils/gkrelltop/files/patch-gkrelltop.c Modified: head/sysutils/gkrelltop/Makefile head/sysutils/gkrelltop/distinfo head/sysutils/gkrelltop/files/patch-Makefile Modified: head/sysutils/gkrelltop/Makefile ============================================================================== --- head/sysutils/gkrelltop/Makefile Mon Jul 22 18:03:15 2013 (r323489) +++ head/sysutils/gkrelltop/Makefile Mon Jul 22 18:15:40 2013 (r323490) @@ -1,16 +1,11 @@ -# New ports collection makefile for: gkrelltop -# Date created: 12 April 2004 -# Whom: David Gardner -# +# Whom: David Gardner # $FreeBSD$ -# PORTNAME= gkrelltop -PORTVERSION= 2.2.6 -PORTREVISION= 12 +PORTVERSION= 2.2.10 CATEGORIES= sysutils -MASTER_SITES= http://psychology.rutgers.edu/~zaimi/html/gkrelltop/ -DISTNAME= ${PORTNAME}_2.2-6 +MASTER_SITES= SF +DISTNAME= ${PORTNAME}_${PORTVERSION}.orig MAINTAINER= david@pinko.net COMMENT= Plugin for gkrellm 2.x shows top three processes, requires procfs @@ -18,7 +13,7 @@ COMMENT= Plugin for gkrellm 2.x shows to RUN_DEPENDS= gkrellmd:${PORTSDIR}/sysutils/gkrellm2 BUILD_DEPENDS:= ${RUN_DEPENDS} -USE_GMAKE= yes +USES= gmake MAKE_ARGS= INSTALLDIR=${LOCALBASE}/libexec/gkrellm2/plugins \ INSTALLDIRD=${PREFIX}/libexec/gkrellm2/plugins-gkrellmd @@ -30,7 +25,7 @@ PLIST_SUB+= CLIENT="@comment " PLIST_SUB+= CLIENT="" .endif -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} post-patch: .if defined(GKRELLM_SERVER_ONLY) Modified: head/sysutils/gkrelltop/distinfo ============================================================================== --- head/sysutils/gkrelltop/distinfo Mon Jul 22 18:03:15 2013 (r323489) +++ head/sysutils/gkrelltop/distinfo Mon Jul 22 18:15:40 2013 (r323490) @@ -1,2 +1,2 @@ -SHA256 (gkrelltop_2.2-6.tar.gz) = 8ba11fbbfd5b1cdf33ef489310b565c8dc4252d54ee406effabb43d7ce7cd1d3 -SIZE (gkrelltop_2.2-6.tar.gz) = 23384 +SHA256 (gkrelltop_2.2.10.orig.tar.gz) = 7975dcd2b242639948ad69d07b347037dd6074b37eead80aaf544aa48ec45c6c +SIZE (gkrelltop_2.2.10.orig.tar.gz) = 46018 Modified: head/sysutils/gkrelltop/files/patch-Makefile ============================================================================== --- head/sysutils/gkrelltop/files/patch-Makefile Mon Jul 22 18:03:15 2013 (r323489) +++ head/sysutils/gkrelltop/files/patch-Makefile Mon Jul 22 18:15:40 2013 (r323490) @@ -1,18 +1,18 @@ ---- Makefile.orig Fri Dec 10 19:50:39 2004 -+++ Makefile Mon Jun 13 08:29:12 2005 +--- Makefile.orig 2007-07-21 04:52:00.000000000 +0000 ++++ Makefile @@ -28,9 +28,9 @@ - OSFLAG = `uname | tr '[:lower:]' '[:upper:]'` + 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 sh -c 'pkg-config gtk+-2.0 --cflags &>/dev/null && echo 0') - GKRELLTOP= gkrelltop.so ++#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 -@@ -61,11 +61,11 @@ +@@ -65,11 +65,11 @@ WANT_GLIB12 = yes endif ifeq ($(WANT_GLIB12),yes) @@ -25,4 +25,4 @@ +CFLAGSD = -D$(OSFLAG) -I${PREFIX}/include -fPIC -Wall `pkg-config glib-2.0 --cflags` LIBSD = `pkg-config glib-2.0 --libs` endif - INSTALLDIRD=$(HOME)/.gkrellm2/plugins-gkrellmd + INSTALLDIRD ?= $(PREFIXD)/$(DESTDIR) Added: head/sysutils/gkrelltop/files/patch-top__three.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/gkrelltop/files/patch-top__three.c Mon Jul 22 18:15:40 2013 (r323490) @@ -0,0 +1,12 @@ +--- top_three.c.orig 2009-07-24 03:53:17.000000000 +0000 ++++ top_three.c +@@ -16,6 +16,9 @@ + * because every OS has it's own way of revealing CPU/memory usage. + * compile with gcc -DOS ... + */ ++#if defined(DRAGONFLY) ++#define FREEBSD ++#endif + #if defined(FREEBSD) + #define OS_DEFINED + #endif /* defined(FREEBSD) */