Bug 189740 - [PATCH] net-mgmt/collectd: Fix build with libstatgrab 0.90
Summary: [PATCH] net-mgmt/collectd: Fix build with libstatgrab 0.90
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Tim Bishop
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-05-12 22:30 UTC by Tim Bishop
Modified: 2014-05-12 23:10 UTC (History)
1 user (show)

See Also:


Attachments
collectd-4.10.9.patch (2.29 KB, patch)
2014-05-12 22:30 UTC, Tim Bishop
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Tim Bishop freebsd_committer freebsd_triage 2014-05-12 22:30:01 UTC
- 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)
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2014-05-12 22:30:10 UTC
Maintainer of net-mgmt/collectd,

Please note that PR ports/189740 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/189740

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2014-05-12 22:30:11 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Tim Bishop freebsd_committer freebsd_triage 2014-05-12 22:39:08 UTC
Responsible Changed
From-To: freebsd-ports-bugs->tdb

I'll take it.
Comment 4 Krzysztof 2014-05-12 22:48:19 UTC
Hello,

On Mon, May 12, 2014 at 09:30:10PM +0000, Edwin Groothuis wrote:
> Maintainer of net-mgmt/collectd,
> 
> Please note that PR ports/189740 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/189740
> 
> -- 
> 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.
Comment 5 dfilter service freebsd_committer freebsd_triage 2014-05-12 23:07:43 UTC
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)
_______________________________________________
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"
Comment 6 Tim Bishop freebsd_committer freebsd_triage 2014-05-12 23:09:13 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!