From owner-freebsd-ports-bugs@FreeBSD.ORG Mon May 12 21:30:01 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 ESMTPS id 7A4918F3 for ; Mon, 12 May 2014 21:30:01 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FB8722EB for ; Mon, 12 May 2014 21:30:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s4CLU1TR021303 for ; Mon, 12 May 2014 21:30:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4CLU1if021302; Mon, 12 May 2014 21:30:01 GMT (envelope-from gnats) Resent-Date: Mon, 12 May 2014 21:30:01 GMT Resent-Message-Id: <201405122130.s4CLU1if021302@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, Tim Bishop 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 0791588E for ; Mon, 12 May 2014 21:23:12 +0000 (UTC) Received: from mx1.kent.ac.uk (mx1.kent.ac.uk [129.12.21.39]) (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 BE03522A7 for ; Mon, 12 May 2014 21:23:11 +0000 (UTC) Received: from hathor.ukc.ac.uk ([129.12.4.12]) by mx1.kent.ac.uk with esmtps (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1WjxMa-0001ey-Gs; Mon, 12 May 2014 22:02:20 +0100 Received: from aberfal.kent.ac.uk ([129.12.41.25]) by hathor.ukc.ac.uk with esmtps (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.80.1) (envelope-from ) id 1WjxMZ-0002bJ-PR; Mon, 12 May 2014 22:02:19 +0100 Received: from aberfal.kent.ac.uk (localhost [127.0.0.1]) by aberfal.kent.ac.uk (8.14.8/8.14.8) with ESMTP id s4CKKsvA005540 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 12 May 2014 21:20:54 +0100 (BST) (envelope-from tdb@aberfal.kent.ac.uk) Received: (from tdb@localhost) by aberfal.kent.ac.uk (8.14.8/8.14.8/Submit) id s4CKKs91005539; Mon, 12 May 2014 21:20:54 +0100 (BST) (envelope-from tdb) Message-Id: <201405122020.s4CKKs91005539@aberfal.kent.ac.uk> Date: Mon, 12 May 2014 21:20:54 +0100 (BST) From: Tim Bishop To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/189740: [PATCH] net-mgmt/collectd: Fix build with libstatgrab 0.90 Cc: ports@bsdserwis.com X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 May 2014 21:30:01 -0000 >Number: 189740 >Category: ports >Synopsis: [PATCH] net-mgmt/collectd: Fix build with libstatgrab 0.90 >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 May 12 21:30:01 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Tim Bishop >Release: FreeBSD 10.0-STABLE amd64 >Organization: >Environment: System: FreeBSD aberfal.kent.ac.uk 10.0-STABLE FreeBSD 10.0-STABLE #0 r264471: Wed Apr 16 12:43:29 BST >Description: - Fix build with libstatgrab 0.90 Port maintainer (ports@bsdserwis.com) is cc'd. Generated with FreeBSD Port Tools 1.02 (mode: change, diff: SVN) >How-To-Repeat: >Fix: --- collectd-4.10.9.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 353892) +++ Makefile (working copy) @@ -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 @@ .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 Index: files/patch-src__collectd.c =================================================================== --- files/patch-src__collectd.c (revision 0) +++ files/patch-src__collectd.c (working copy) @@ -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); Property changes on: files/patch-src__collectd.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-src__disk.c =================================================================== --- files/patch-src__disk.c (revision 0) +++ files/patch-src__disk.c (working copy) @@ -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) Property changes on: files/patch-src__disk.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property --- collectd-4.10.9.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: