From tdb@aberfal.kent.ac.uk  Mon May 12 21:22:42 2014
Return-Path: <tdb@aberfal.kent.ac.uk>
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 57E27756
	for <FreeBSD-gnats-submit@FreeBSD.org>; Mon, 12 May 2014 21:22:42 +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 1A21B2292
	for <FreeBSD-gnats-submit@FreeBSD.org>; Mon, 12 May 2014 21:22:41 +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 <tdb@aberfal.kent.ac.uk>)
	id 1WjxMa-0001ex-BJ; 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 <tdb@aberfal.kent.ac.uk>)
	id 1WjxMZ-0002bJ-Lv; 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 s4CKKp0o005448
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO);
	Mon, 12 May 2014 21:20:51 +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 s4CKKpl2005438;
	Mon, 12 May 2014 21:20:51 +0100 (BST)
	(envelope-from tdb)
Message-Id: <201405122020.s4CKKpl2005438@aberfal.kent.ac.uk>
Date: Mon, 12 May 2014 21:20:51 +0100 (BST)
From: Tim Bishop <tim@bishnet.net>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc: ports@bsdserwis.com
Subject: [PATCH] net-mgmt/collectd5: Fix build with libstatgrab 0.90
X-Send-Pr-Version: 3.113
X-GNATS-Notify: ports@bsdserwis.com

>Number:         189738
>Category:       ports
>Synopsis:       [PATCH] net-mgmt/collectd5: Fix build with libstatgrab 0.90
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    tdb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 12 21:30:00 UTC 2014
>Closed-Date:    Mon May 12 22:09:02 UTC 2014
>Last-Modified:  Mon May 12 22:10:01 UTC 2014
>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:

--- collectd5-5.4.1.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 353892)
+++ Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	collectd
 PORTVERSION=	5.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	5
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://collectd.org/files/
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	2014-01-26 08:09:14.840391000 +0000
++++ ./src/collectd.c	2014-05-10 23:35:17.226683756 +0100
+@@ -288,7 +288,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	2014-01-26 08:09:14.856391000 +0000
++++ ./src/disk.c	2014-05-10 23:35:17.232681397 +0100
+@@ -732,7 +732,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: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
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
--- collectd5-5.4.1.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon May 12 21:30:05 UTC 2014 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=189738 
Responsible-Changed-From-To: freebsd-ports-bugs->tdb 
Responsible-Changed-By: tdb 
Responsible-Changed-When: Mon May 12 21:38:46 UTC 2014 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=189738 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: ports@bsdserwis.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/189738: [PATCH] net-mgmt/collectd5: Fix build with libstatgrab 0.90
Date: Mon, 12 May 2014 21:30:04 UT

 Maintainer of net-mgmt/collectd5,
 
 Please note that PR ports/189738 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/189738
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Krzysztof Stryjek <ports@bsdserwis.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/189738: [PATCH] net-mgmt/collectd5: Fix build with
 libstatgrab 0.90
Date: Mon, 12 May 2014 23:47:45 +0200

 Hello,
 
 On Mon, May 12, 2014 at 09:30:04PM +0000, Edwin Groothuis wrote:
 > Maintainer of net-mgmt/collectd5,
 > 
 > Please note that PR ports/189738 has just been submitted.
 > 
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 > 
 > The full text of the PR can be found at:
 >     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/189738
 > 
 > -- 
 > Edwin Groothuis via the GNATS Auto Assign Tool
 > edwin@FreeBSD.org
 Yes, I approve.
 
 Greetings,
 -- 
 Krzysztof Stryjek
 UNIX administrator/Juniper Networks Specialist
 email: wtp (at) bsdserwis (dot) com
 http://www.linkedin.com/in/KrzysztofStryjek
 GPG fingerprint: 8BD7 40CE 8994 0BBE CE6C  91CD 1292 8959 DC61 0E76
 
 In theory, there is no difference between theory and practice.
 In practice, there is.
State-Changed-From-To: feedback->closed 
State-Changed-By: tdb 
State-Changed-When: Mon May 12 22:09:01 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=189738 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/189738: commit references a PR
Date: Mon, 12 May 2014 22:06:41 +0000 (UTC)

 Author: tdb
 Date: Mon May 12 22:06:36 2014
 New Revision: 353902
 URL: http://svnweb.freebsd.org/changeset/ports/353902
 QAT: https://qat.redports.org/buildarchive/r353902/
 
 Log:
   - Fix build with libstatgrab 0.90
   
   PR:		ports/189738
   Approved by:	maintainer
 
 Added:
   head/net-mgmt/collectd5/files/patch-src__collectd.c   (contents, props changed)
   head/net-mgmt/collectd5/files/patch-src__disk.c   (contents, props changed)
 Modified:
   head/net-mgmt/collectd5/Makefile
 
 Modified: head/net-mgmt/collectd5/Makefile
 ==============================================================================
 --- head/net-mgmt/collectd5/Makefile	Mon May 12 22:01:10 2014	(r353901)
 +++ head/net-mgmt/collectd5/Makefile	Mon May 12 22:06:36 2014	(r353902)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	collectd
  PORTVERSION=	5.4.1
 -PORTREVISION=	1
 +PORTREVISION=	2
  PKGNAMESUFFIX=	5
  CATEGORIES=	net-mgmt
  MASTER_SITES=	http://collectd.org/files/
 
 Added: head/net-mgmt/collectd5/files/patch-src__collectd.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/net-mgmt/collectd5/files/patch-src__collectd.c	Mon May 12 22:06:36 2014	(r353902)
 @@ -0,0 +1,11 @@
 +--- ./src/collectd.c.orig	2014-01-26 08:09:14.840391000 +0000
 ++++ ./src/collectd.c	2014-05-10 23:35:17.226683756 +0100
 +@@ -288,7 +288,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/collectd5/files/patch-src__disk.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/net-mgmt/collectd5/files/patch-src__disk.c	Mon May 12 22:06:36 2014	(r353902)
 @@ -0,0 +1,12 @@
 +--- ./src/disk.c.orig	2014-01-26 08:09:14.856391000 +0000
 ++++ ./src/disk.c	2014-05-10 23:35:17.232681397 +0100
 +@@ -732,7 +732,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)
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
