ports/189740: [PATCH] net-mgmt/collectd: Fix build with libstatgrab 0.90
Tim Bishop
tim at bishnet.net
Mon May 12 21:30:01 UTC 2014
>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 at 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:
More information about the freebsd-ports-bugs
mailing list