From owner-svn-ports-head@FreeBSD.ORG Mon May 12 22:07:40 2014 Return-Path: Delivered-To: svn-ports-head@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 ESMTPS id 5E856865; Mon, 12 May 2014 22:07:40 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 31E4E265B; Mon, 12 May 2014 22:07:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4CM7eZt082675; Mon, 12 May 2014 22:07:40 GMT (envelope-from tdb@svn.freebsd.org) Received: (from tdb@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4CM7diX082671; Mon, 12 May 2014 22:07:39 GMT (envelope-from tdb@svn.freebsd.org) Message-Id: <201405122207.s4CM7diX082671@svn.freebsd.org> From: Tim Bishop Date: Mon, 12 May 2014 22:07:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353903 - in head/net-mgmt/collectd: . 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.18 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, 12 May 2014 22:07:40 -0000 Author: tdb Date: Mon May 12 22:07:39 2014 New Revision: 353903 URL: http://svnweb.freebsd.org/changeset/ports/353903 QAT: https://qat.redports.org/buildarchive/r353903/ Log: - Fix build with libstatgrab 0.90 PR: ports/189740 Approved by: portmgr (antoine), maintainer Added: head/net-mgmt/collectd/files/patch-src__collectd.c (contents, props changed) head/net-mgmt/collectd/files/patch-src__disk.c (contents, props changed) Modified: head/net-mgmt/collectd/Makefile Modified: head/net-mgmt/collectd/Makefile ============================================================================== --- head/net-mgmt/collectd/Makefile Mon May 12 22:06:36 2014 (r353902) +++ head/net-mgmt/collectd/Makefile Mon May 12 22:07:39 2014 (r353903) @@ -3,7 +3,7 @@ PORTNAME= collectd PORTVERSION= 4.10.9 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt MASTER_SITES= http://collectd.org/files/ @@ -252,7 +252,7 @@ PLIST_SUB+= NUTUPS="@comment " .if ${PORT_OPTIONS:MINTERFACE} USES+= pkgconfig CONFIGURE_ARGS+=--enable-interface -LIB_DEPENDS+= statgrab:${PORTSDIR}/devel/libstatgrab +LIB_DEPENDS+= libstatgrab.so:${PORTSDIR}/devel/libstatgrab PLIST_SUB+= INTERFACE="" CONFIGURE_ENV+= LIBS="`pkg-config --libs libstatgrab`" .else Added: head/net-mgmt/collectd/files/patch-src__collectd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/collectd/files/patch-src__collectd.c Mon May 12 22:07:39 2014 (r353903) @@ -0,0 +1,11 @@ +--- ./src/collectd.c.orig 2013-11-23 22:04:05.130103822 +0000 ++++ ./src/collectd.c 2013-11-23 22:04:25.627104708 +0000 +@@ -294,7 +294,7 @@ + #endif + + #if HAVE_LIBSTATGRAB +- if (sg_init ()) ++ if (sg_init (0)) + { + ERROR ("sg_init: %s", sg_str_error (sg_get_error ())); + return (-1); Added: head/net-mgmt/collectd/files/patch-src__disk.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/collectd/files/patch-src__disk.c Mon May 12 22:07:39 2014 (r353903) @@ -0,0 +1,12 @@ +--- ./src/disk.c.orig 2013-11-23 22:36:13.757103756 +0000 ++++ ./src/disk.c 2013-11-23 22:36:15.058103844 +0000 +@@ -691,7 +691,8 @@ + + #elif defined(HAVE_LIBSTATGRAB) + sg_disk_io_stats *ds; +- int disks, counter; ++ size_t disks; ++ int counter; + char name[DATA_MAX_NAME_LEN]; + + if ((ds = sg_get_disk_io_stats(&disks)) == NULL)