Attachment #158744 for bug #201514




# $FreeBSD: head/net-mgmt/collectd5/Makefile 388844 2015-06-08 16:43:01Z brd $

PORTNAME=	collectd
PORTVERSION=	5.5.0
PORTREVISION=	3
CATEGORIES=	net-mgmt
MASTER_SITES=	https://collectd.org/files/
PKGNAMESUFFIX=	5

MAINTAINER=	ports@bsdserwis.com

OPTIONS_DEFINE=		CGI DEBUG GCRYPT VIRT
OPTIONS_GROUP=		INPUT OUTPUT
OPTIONS_GROUP_OUTPUT=	RRDTOOL NOTIFYEMAIL NOTIFYDESKTOP RIEMANN
OPTIONS_GROUP_INPUT=	CURL IPMI DBI JSON MEMCACHEC MODBUS MONGODB MYSQL \
			NUTUPS OLSRD ONEWIRE OPENLDAP PERL PGSQL PINBA PING \
			PYTHON RABBITMQ REDIS ROUTEROS SIGROK SNMP STATGRAB \
			STATSD TOKYOTYRANT VARNISH XML XMMS ZOOKEEPER

CGI_DESC=		Install collection.cgi (requires rrdtool)
CURL_DESC=		Enable curl-based plugins (apache, nginx, etc)
DEBUG_DESC=		Enable debugging
DBI_DESC=		Enable dbi plugin
GCRYPT_DESC=		Build with libgcrypt
IPMI_DESC=		Enable OpenIPMI plugin
JSON_DESC=		Enable JSON plugins
MEMCACHEC_DESC=		Enable memcachec plugin
MODBUS_DESC=		Enable modbus plugin

NOTIFYEMAIL_DESC=	Enable notifications via email
NOTIFYDESKTOP_DESC=	Enable desktop notifications
NUTUPS_DESC=		Enable nut (ups) plugin
OLRSD_DESC=		Enable olsrd plugin
ONEWIRE_DESC=		Eanble onewire plugin (via owfs)
OPENLDAP_DESC=		Enable OpenLDAP plugin
PERL_DESC=		Enable libperl plugin and binding
PGSQL_DESC=		Enable postgresql-based plugins
PINBA_DESC=		Enable pinba plugin (via protobuf-c)
PING_DESC=		Enable ping plugin
PYTHON_DESC=		Enable python-based plugins
RABBITMQ_DESC=		Enable rabbitmq-based plugins

SIGROK_DESC=		Enable sigrok plugin
SNMP_DESC=		Enable SNMP plugin
STATGRAB_DESC=		Enable statgrab-based plugins (disk, interface, etc)
STATSD_DESC=		Enable statsd plugin
TOKYOTYRANT_DESC=	Enable tokyotyrant plugin
VARNISH_DESC=		Enable varnish 3.x cache statistics (does not build with varnish 4.x)
VIRT_DESC=		Enable libvirt plugin (requires XML)
XML_DESC=		Enable XML plugins
XMMS_DESC=		Enable xmms plugin
ZOOKEEPER_DESC=		Enable zookeeper plugin

USE_RC_SUBR=	collectd collectdmon


		--without-libganglia \
		--without-libiptc \
		--without-libjvm \
		--without-liblvm2app \
		--without-libkstat \
		--without-libldap \
		--without-libmnl \
		--without-libmodbus \
		--without-libnetlink \
		--without-libnetapp \
		--without-libopenipmi \
		--without-libowcapi \
		--without-libperfstat \
		--without-librdkafka \
		--without-libsensors \
		--without-libvarnish \
		--without-lvm \
		--without-mic \
		--without-oracle \
		--disable-turbostat

# NOTE: Plugins without external dependencies
CONFIGURE_ARGS+=	\

		--enable-dns \
		--enable-email \
		--enable-exec \
		--enable-fhcount \
		--enable-filecount \
		--enable-load \
		--enable-logfile \
		--enable-log_logstash \
		--enable-match_empty_counter \
		--enable-match_hashed \
		--enable-match_regex \

		--enable-syslog \
		--enable-table \
		--enable-tail \
		--enable-tail_csv \
		--enable-target_notification \
		--enable-target_replace \
		--enable-target_scale \

		--enable-uptime \
		--enable-uuid \
		--enable-write_graphite \
		--enable-write_log \
		--enable-zfs_arc \

.if ${PORT_OPTIONS:MCGI}
RUN_DEPENDS+=	p5-URI>=0:${PORTSDIR}/net/p5-URI \

CONFIGURE_ARGS+=--without-libgcrypt
.endif

.if ${PORT_OPTIONS:MIPMI}
LIB_DEPENDS+=	libOpenIPMI.so:${PORTSDIR}/sysutils/openipmi
CONFIGURE_ARGS+=--enable-ipmi
PLIST_SUB+=	IPMI=""
.else
CONFIGURE_ARGS+=--disable-ipmi
PLIST_SUB+=	IPMI="@comment "
.endif

.if ${PORT_OPTIONS:MJSON}
LIB_DEPENDS+=	libyajl.so:${PORTSDIR}/devel/yajl
CONFIGURE_ARGS+=--with-libyajl=${LOCALBASE}


.if ${PORT_OPTIONS:MMODBUS}
LIB_DEPENDS+=	libmodbus.so:${PORTSDIR}/comms/libmodbus
CONFIGURE_ARGS+=--with-libmodbus=${LOCALBASE} --enable-modbus
PLIST_SUB+=	MODBUS=""
.else
PLIST_SUB+=	MODBUS="@comment "

PLIST_SUB+=	NUTUPS="@comment "
.endif

.if ${PORT_OPTIONS:MOLSRD}
CONFIGURE_ARGS+=--enable-olsrd
PLIST_SUB+=	OLSRD=""
.else
CONFIGURE_ARGS+=--enable-olsrd
PLIST_SUB+=	OLSRD="@comment "
.endif

.if ${PORT_OPTIONS:MONEWIRE}
LIB_DEPENDS+=	libow.so:${PORTSDIR}/comms/owfs
CONFIGURE_ARGS+=--with-libowcapi=${LOCALBASE} --enable-onewire
PLIST_SUB+=	ONEWIRE=""
.else
CONFIGURE_ARGS+=--disable-onewire
PLIST_SUB+=	ONEWIRE="@comment "
.endif

.if ${PORT_OPTIONS:MOPENLDAP}
USE_OPENLDAP=	yes
CONFIGURE_ARGS+=--with-libldap=${LOCALBASE} --enable-openldap
PLIST_SUB+=	OPENLDAP=""
.else
CONFIGURE_ARGS+=--disable-openldap
PLIST_SUB+=	OPENLDAP="@comment "
.endif

.if ${PORT_OPTIONS:MPERL}
USES+=		perl5
CONFIGURE_ARGS+=--with-perl=${PERL} --with-perl-bindings --enable-perl

PLIST_SUB+=	PGSQL="@comment "
.endif

.if ${PORT_OPTIONS:MPINBA}
LIB_DEPENDS+=	libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
CONFIGURE_ARGS+=--enable-pinba
PLIST_SUB+=	PINBA=""
.else
CONFIGURE_ARGS+=--disable-pinba
PLIST_SUB+=	PINBA="@comment "
.endif

.if ${PORT_OPTIONS:MPING}
LIB_DEPENDS+=	liboping.so:${PORTSDIR}/net/liboping
CONFIGURE_ARGS+=--with-liboping=${LOCALBASE} --enable-ping

.endif

.if ${PORT_OPTIONS:MREDIS}
LIB_DEPENDS+=	libhiredis.so:${PORTSDIR}/databases/hiredis
CONFIGURE_ARGS+=--with-libhiredis=${LOCALBASE} \
		--enable-redis \
		--enable-write_redis
PLIST_SUB+=	REDIS=""

PLIST_SUB+=	SNMP="@comment "
.endif

.if ${PORT_OPTIONS:MSTATSD}
CONFIGURE_ARGS+=--enable-statsd
PLIST_SUB+=	STATSD=""
.else
CONFIGURE_ARGS+=--disable-statsd
PLIST_SUB+=	STATSD="@comment "
.endif

.if ${PORT_OPTIONS:MTOKYOTYRANT}
LIB_DEPENDS+=	libtokyotyrant.so:${PORTSDIR}/databases/tokyotyrant
CONFIGURE_ARGS+=--with-libtokyotyrant=${LOCALBASE} --enable-tokyotyrant

.endif

.if ${PORT_OPTIONS:MVARNISH}
BROKEN=		"Only libvarnish 3.x support. Does not build with libvarnish4"
LIB_DEPENDS+=	libvarnishapi.so:${PORTSDIR}/www/varnish4
CONFIGURE_ARGS+=--with-libvarnish=${LOCALBASE} --enable-varnish
PLIST_SUB+=	VARNISH=""
.else

IGNORE=		VIRT requires XML. Either select XML or deselect VIRT.
.endif
LIB_DEPENDS+=	libvirt.so:${PORTSDIR}/devel/libvirt
CONFIGURE_ARGS+=--enable-virt
PLIST_SUB+=	VIRT=""
.else
CONFIGURE_ARGS+=--without-virt --disable-virt
PLIST_SUB+=	VIRT="@comment "
.endif


PLIST_SUB+=	XMMS="@comment "
.endif

.if ${PORT_OPTIONS:MZOOKEEPER}
LIB_DEPENDS+=	libzookeeper_mt.so:${PORTSDIR}/devel/libzookeeper
CONFIGURE_ARGS+=--with-libzookeeper=${LOCALBASE} --enable-zookeeper
PLIST_SUB+=	ZOOKEEPER=""
.else
CONFIGURE_ARGS+=--without-libzookeeper --disable-zookeeper
PLIST_SUB+=	ZOOKEEPER="@comment "
.endif

INSTALL_TARGET=install-strip
SHEBANG_FILES=	contrib/collection.cgi


Lines 1-2 Link Here

(-)collectd5.new/distinfo (-2 / +2 lines)
1	SHA256 (collectd-5.4.2.tar.bz2) = 9789e900c138b5dbe907d3d744143f12b1e30022276cb1d8c65bbabaf0c4e393	1	SHA256 (collectd-5.5.0.tar.bz2) = 847684cf5c10de1dc34145078af3fcf6e0d168ba98c14f1343b1062a4b569e88
2	SIZE (collectd-5.4.2.tar.bz2) = 1633610	2	SIZE (collectd-5.5.0.tar.bz2) = 1824495

Lines 1-11 Link Here

(-)collectd5.new/files/patch-src-curl_xml.c (-11 lines)
1	--- src/curl_xml.c.orig 2015-03-28 23:25:34.546602000 +0300
2	+++ src/curl_xml.c 2015-03-28 23:25:51.513304000 +0300
3	@@ -385,7 +385,7 @@ static int cx_handle_instance_xpath (xml
4	/* If the base xpath returns more than one block, the result is assumed to be
5	* a table. The `Instance' option is not optional in this case. Check for the
6	* condition and inform the user. */
7	- if (is_table)
8	+ if (is_table && (vl->type_instance == NULL))
9	{
10	WARNING ("curl_xml plugin: "
11	"Base-XPath %s is a table (more than one result was returned), "




--- src/Makefile.am.orig	2015-05-26 21:38:14.116865000 +0200
+++ src/Makefile.am	2015-07-14 10:15:28.397127883 +0200
@@ -14,7 +14,7 @@
 AM_CPPFLAGS += -DPREFIX='"${prefix}"'
 AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"'
 AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"'
-AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"'

 if BUILD_FEATURE_DAEMON
 AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
 endif
@@ -218,7 +218,7 @@
 cpu_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 cpu_la_LIBADD =
 if BUILD_WITH_LIBKSTAT
-collectd_LDADD += -lkstat
+collectd_LDADD += $(BUILD_WITH_LIBKSTAT_LIBS)
 endif
 if BUILD_WITH_LIBDEVINFO
 collectd_LDADD += -ldevinfo
@@ -275,7 +275,7 @@
 cpu_la_LDFLAGS = -module -avoid-version
 cpu_la_LIBADD = 
 if BUILD_WITH_LIBKSTAT
-cpu_la_LIBADD += -lkstat
+cpu_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS)
 endif
 if BUILD_WITH_LIBDEVINFO
 cpu_la_LIBADD += -ldevinfo
@@ -303,7 +303,7 @@
 disk_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 disk_la_LIBADD =
 if BUILD_WITH_LIBKSTAT
-disk_la_LIBADD += -lkstat
+disk_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS)
 endif
 if BUILD_WITH_LIBDEVINFO
 disk_la_LIBADD += -ldevinfo
@@ -408,7 +408,7 @@
 interface_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
 else
 if BUILD_WITH_LIBKSTAT

 endif
 if BUILD_WITH_LIBDEVINFO
 interface_la_LIBADD += -ldevinfo
@@ -591,7 +591,7 @@
 memory_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 memory_la_LIBADD =
 if BUILD_WITH_LIBKSTAT
-memory_la_LIBADD += -lkstat
+memory_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS)
 endif
 if BUILD_WITH_LIBDEVINFO
 memory_la_LIBADD += -ldevinfo
@@ -964,7 +964,7 @@
 swap_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 swap_la_LIBADD =
 notify_email_la_LDFLAGS = -module -avoid-version
-notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread -ldl
+notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread
 collectd_LDADD += "-dlopen" notify_email.la
 collectd_DEPENDENCIES += notify_email.la
 endif
@@ -1108,7 +1108,7 @@
 collectd_LDADD += "-dlopen" swap.la
 collectd_DEPENDENCIES += swap.la
 if BUILD_WITH_LIBKSTAT
-swap_la_LIBADD += -lkstat
+swap_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS)
 endif
 if BUILD_WITH_LIBDEVINFO
 swap_la_LIBADD += -ldevinfo
@@ -1010,7 +1010,7 @@
 pkglib_LTLIBRARIES += tape.la
 tape_la_SOURCES = tape.c
 tape_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-tape_la_LIBADD = -lkstat -ldevinfo
+tape_la_LIBADD = $(BUILD_WITH_LIBKSTAT_LIBS) -ldevinfo
 collectd_LDADD += "-dlopen" tape.la
 collectd_DEPENDENCIES += tape.la
 endif
 
 if BUILD_PLUGIN_TARGET_NOTIFICATION
@@ -1116,7 +1116,7 @@
 uptime_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 uptime_la_LIBADD =
 if BUILD_WITH_LIBKSTAT
-uptime_la_LIBADD += -lkstat

 endif
 if BUILD_WITH_PERFSTAT
 uptime_la_LIBADD += -lperfstat
@@ -1275,7 +1275,7 @@
 # zfs_arc requires no library on linux
 else
 # solaris
-zfs_arc_la_LIBADD = -lkstat
+zfs_arc_la_LIBADD = $(BUILD_WITH_LIBKSTAT_LIBS)
 endif
 endif
 endif
@@ -1364,12 +1364,7 @@
 
 install-exec-hook:
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)

Lines 1-11 Link Here

(-)collectd5.new/files/patch-src__collectd.c (-11 lines)
1	--- ./src/collectd.c.orig 2014-01-26 08:09:14.840391000 +0000
2	+++ ./src/collectd.c 2014-05-10 23:35:17.226683756 +0100
3	@@ -288,7 +288,7 @@
4	#endif
5
6	#if HAVE_LIBSTATGRAB
7	- if (sg_init ())
8	+ if (sg_init (0))
9	{
10	ERROR ("sg_init: %s", sg_str_error (sg_get_error ()));
11	return (-1);




--- ./src/collectd.h.orig	2013-01-27 13:47:18.246255000 +0000
+++ ./src/collectd.h	2013-05-21 21:00:55.000000000 +0000
@@ -235,15 +235,15 @@
 #endif
 
 #ifndef LOCALSTATEDIR
-#define LOCALSTATEDIR PREFIX "/var"
+#define LOCALSTATEDIR "/var"
 #endif
 
 #ifndef PKGLOCALSTATEDIR
-#define PKGLOCALSTATEDIR PREFIX "/var/lib/" PACKAGE_NAME
+#define PKGLOCALSTATEDIR PREFIX "/var/db/" PACKAGE_NAME
 #endif
 
 #ifndef PIDFILE
-#define PIDFILE PREFIX "/var/run/" PACKAGE_NAME ".pid"
+#define PIDFILE "/var/run/" PACKAGE_NAME ".pid"
 #endif
 
 #ifndef PLUGINDIR

Line 0 Link Here

(-)collectd5.new/files/patch-src__daemon__Makefile.am (+11 lines)
	1	--- src/daemon/Makefile.am.orig 2015-05-26 21:38:31.425174000 +0200
	2	+++ src/daemon/Makefile.am 2015-07-14 12:08:36.825660450 +0200
	3	@@ -49,7 +49,7 @@
	4	collectd_CFLAGS = $(AM_CFLAGS)
	5	collectd_LDFLAGS = -export-dynamic
	6	collectd_LDADD = libavltree.la libcommon.la libheap.la -lm
	7	-collectd_DEPENDENCIES =
	8	+collectd_DEPENDENCIES = libavltree.la libcommon.la libheap.la
	9
	10	# Link to these libraries..
	11	if BUILD_WITH_LIBRT




--- src/daemon/collectd.h.orig	2015-05-22 12:04:36.951771000 +0200
+++ src/daemon/collectd.h	2015-07-14 12:31:41.940566159 +0200
@@ -240,15 +240,15 @@
 #endif
 
 #ifndef LOCALSTATEDIR
-#define LOCALSTATEDIR PREFIX "/var"
+#define LOCALSTATEDIR "/var"
 #endif
 
 #ifndef PKGLOCALSTATEDIR
-#define PKGLOCALSTATEDIR PREFIX "/var/lib/" PACKAGE_NAME
+#define PKGLOCALSTATEDIR PREFIX "/var/db/" PACKAGE_NAME
 #endif
 
 #ifndef PIDFILE
-#define PIDFILE PREFIX "/var/run/" PACKAGE_NAME ".pid"
+#define PIDFILE "/var/run/" PACKAGE_NAME ".pid"
 #endif
 
 #ifndef PLUGINDIR




--- ./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)

Line 0 Link Here

(-)collectd5.new/files/patch-src__modbus.c (+12 lines)
	1	--- src/modbus.c.orig 2013-01-27 17:47:18.246255000 +0400
	2	+++ src/modbus.c 2013-05-14 18:40:05.000000000 +0400
	3	@@ -25,6 +25,9 @@
	4	#include "plugin.h"
	5	#include "configfile.h"
	6
	7	+/* FreeBSD needs this */
	8	+#include <sys/socket.h>
	9	+
	10	#include <netdb.h>
	11
	12	#include <modbus/modbus.h>




--- ./src/users.c.orig	2014-06-02 22:12:33.650261000 -0700
+++ ./src/users.c	2014-06-11 00:10:39.000000000 -0700
@@ -101,12 +101,13 @@
 
 #elif HAVE_LIBSTATGRAB
 	sg_user_stats *us;
+	size_t num_entries;
 
-	us = sg_get_user_stats ();
+	us = sg_get_user_stats (&num_entries);
 	if (us == NULL)
 		return (-1);   
 
-	users_submit ((gauge_t) us->num_entries);
+	users_submit ((gauge_t) num_entries);
 /* #endif HAVE_LIBSTATGRAB */
 
 #else

Lines 1-12 Link Here

(-)collectd5.new/files/patch-src_modbus.c (-12 lines)
1	--- src/modbus.c.orig 2013-01-27 17:47:18.246255000 +0400
2	+++ src/modbus.c 2013-05-14 18:40:05.000000000 +0400
3	@@ -25,6 +25,9 @@
4	#include "plugin.h"
5	#include "configfile.h"
6
7	+/* FreeBSD needs this */
8	+#include <sys/socket.h>
9	+
10	#include <netdb.h>
11
12	#include <modbus/modbus.h>

Lines 1-18 Link Here

(-)collectd5.new/files/patch-version-gen.sh (-10 / +9 lines)
1	--- version-gen.sh.orig 2015-03-02 20:20:43 UTC	1	--- version-gen.sh.orig 2015-05-26 22:23:28.891814000 +0200
2	+++ version-gen.sh	2	+++ version-gen.sh 2015-07-14 10:27:43.464077709 +0200
3	@@ -1,13 +1,3 @@	3	@@ -1,13 +1,3 @@
4	-#!/usr/bin/env bash	4	#!/bin/sh
5	-	5
6	-DEFAULT_VERSION="5.4.2.git"	6	-DEFAULT_VERSION="5.5.0.git"
7	-	7	-
8	-VERSION="`git describe 2> /dev/null \| sed -e 's/^collectd-//'`"	8	-VERSION="`git describe 2> /dev/null \| grep collectd \| sed -e 's/^collectd-//'`"
9	-	9	-
10	-if test -z "$VERSION"; then	10	-if test -z "$VERSION"; then
11	- VERSION="$DEFAULT_VERSION"	11	- VERSION="$DEFAULT_VERSION"
12	-fi	12	-fi
13	-	13	-
14	-VERSION="`echo \"$VERSION\" \| sed -e 's/-/./g'`"	14	-VERSION="`echo \"$VERSION\" \| sed -e 's/-/./g'`"
15	+#!/bin/sh	15	-
16		16	-printf "%s" "$VERSION"
17	-echo -n "$VERSION"	17	+echo -n "5.5.0.git"
18	+echo -n "5.4.2.git"

Lines 3-6 Link Here

(-)collectd5.new/pkg-descr (-1 / +1 lines)
3	The daemon is very fast and allows for frequent polling of values, with	3	The daemon is very fast and allows for frequent polling of values, with
4	support for polling as frequent as every 10 seconds.	4	support for polling as frequent as every 10 seconds.
5		5
6	WWW: http://www.collectd.org/	6	WWW: https://www.collectd.org/

Lines 10-15 Link Here

(-)collectd5.new/pkg-plist (-10 / +22 lines)
10	include/collectd/lcc_features.h	10	include/collectd/lcc_features.h
11	include/collectd/network.h	11	include/collectd/network.h
12	include/collectd/network_buffer.h	12	include/collectd/network_buffer.h
		13	lib/libcollectdclient.so
		14	lib/libcollectdclient.so.1
		15	lib/libcollectdclient.so.1.0.0
13	lib/collectd/aggregation.so	16	lib/collectd/aggregation.so
14	%%CURL%%lib/collectd/apache.so	17	%%CURL%%lib/collectd/apache.so
15	lib/collectd/apcups.so	18	lib/collectd/apcups.so
Lines 27-35 Link Here
27	lib/collectd/dns.so	30	lib/collectd/dns.so
28	lib/collectd/email.so	31	lib/collectd/email.so
29	lib/collectd/exec.so	32	lib/collectd/exec.so
		33	lib/collectd/fhcount.so
30	lib/collectd/filecount.so	34	lib/collectd/filecount.so
31	%%STATGRAB%%lib/collectd/interface.so	35	%%STATGRAB%%lib/collectd/interface.so
		36	%%IPMI%%lib/collectd/ipmi.so
		37	@dir /var/lib/collectd
32	lib/collectd/load.so	38	lib/collectd/load.so
		39	lib/collectd/log_logstash.so
33	lib/collectd/logfile.so	40	lib/collectd/logfile.so
34	lib/collectd/match_empty_counter.so	41	lib/collectd/match_empty_counter.so
35	lib/collectd/match_hashed.so	42	lib/collectd/match_hashed.so
Lines 40-60 Link Here
40	%%MEMCACHEC%%lib/collectd/memcachec.so	47	%%MEMCACHEC%%lib/collectd/memcachec.so
41	lib/collectd/memcached.so	48	lib/collectd/memcached.so
42	lib/collectd/memory.so	49	lib/collectd/memory.so
		50	%%MODBUS%%lib/collectd/modbus.so
43	%%MYSQL%%lib/collectd/mysql.so	51	%%MYSQL%%lib/collectd/mysql.so
44	lib/collectd/network.so	52	lib/collectd/network.so
45	%%CURL%%lib/collectd/nginx.so	53	%%CURL%%lib/collectd/nginx.so
46	%%NOTIFYEMAIL%%lib/collectd/notify_email.so
47	%%NOTIFYDESKTOP%%lib/collectd/notify_desktop.so	54	%%NOTIFYDESKTOP%%lib/collectd/notify_desktop.so
		55	%%NOTIFYEMAIL%%lib/collectd/notify_email.so
48	lib/collectd/ntpd.so	56	lib/collectd/ntpd.so
49	%%NUTUPS%%lib/collectd/nut.so	57	%%NUTUPS%%lib/collectd/nut.so
		58	%%OLSRD%%lib/collectd/olsrd.so
		59	%%ONEWIRE%%lib/collectd/onewire.so
		60	%%OPENLDAP%%lib/collectd/openldap.so
50	lib/collectd/openvpn.so	61	lib/collectd/openvpn.so
51	%%PERL%%lib/collectd/perl.so	62	%%PERL%%lib/collectd/perl.so
52	%%PERL%%%%PERL5_MAN3%%/Collectd::Unixsock.3.gz	63	lib/collectd/pf.so
53	%%PERL%%%%SITE_PERL%%/Collectd/Plugins/OpenVZ.pm	64	%%PINBA%%lib/collectd/pinba.so
54	%%PING%%lib/collectd/ping.so	65	%%PING%%lib/collectd/ping.so
55	%%PGSQL%%lib/collectd/postgresql.so	66	%%PGSQL%%lib/collectd/postgresql.so
56	lib/collectd/powerdns.so	67	lib/collectd/powerdns.so
57	lib/collectd/pf.so
58	lib/collectd/processes.so	68	lib/collectd/processes.so
59	%%PYTHON%%lib/collectd/python.so	69	%%PYTHON%%lib/collectd/python.so
60	%%REDIS%%lib/collectd/redis.so	70	%%REDIS%%lib/collectd/redis.so
Lines 63-73 Link Here
63	%%RRDTOOL%%lib/collectd/rrdtool.so	73	%%RRDTOOL%%lib/collectd/rrdtool.so
64	%%SIGROK%%lib/collectd/sigrok.so	74	%%SIGROK%%lib/collectd/sigrok.so
65	%%SNMP%%lib/collectd/snmp.so	75	%%SNMP%%lib/collectd/snmp.so
66	lib/collectd/statsd.so	76	%%STATSD%%lib/collectd/statsd.so
67	lib/collectd/swap.so	77	lib/collectd/swap.so
68	lib/collectd/syslog.so	78	lib/collectd/syslog.so
69	lib/collectd/table.so	79	lib/collectd/table.so
70	lib/collectd/tail.so	80	lib/collectd/tail.so
		81	lib/collectd/tail_csv.so
71	lib/collectd/target_notification.so	82	lib/collectd/target_notification.so
72	lib/collectd/target_replace.so	83	lib/collectd/target_replace.so
73	lib/collectd/target_scale.so	84	lib/collectd/target_scale.so
Lines 83-102 Link Here
83	%%USERS%%lib/collectd/users.so	94	%%USERS%%lib/collectd/users.so
84	lib/collectd/uuid.so	95	lib/collectd/uuid.so
85	%%VARNISH%%lib/collectd/varnish.so	96	%%VARNISH%%lib/collectd/varnish.so
86	%%VIRT%%lib/collectd/libvirt.so	97	%%VARNISH%%lib/collectd/varnish.so
		98	%%VIRT%%lib/collectd/virt.so
87	lib/collectd/write_graphite.so	99	lib/collectd/write_graphite.so
88	%%CURL%%lib/collectd/write_http.so	100	%%CURL%%lib/collectd/write_http.so
		101	lib/collectd/write_log.so
89	%%MONGODB%%lib/collectd/write_mongodb.so	102	%%MONGODB%%lib/collectd/write_mongodb.so
90	%%REDIS%%lib/collectd/write_redis.so	103	%%REDIS%%lib/collectd/write_redis.so
91	%%RIEMANN%%lib/collectd/write_riemann.so	104	%%RIEMANN%%lib/collectd/write_riemann.so
92	%%XMMS%%lib/collectd/xmms.so	105	%%XMMS%%lib/collectd/xmms.so
93	lib/collectd/zfs_arc.so	106	lib/collectd/zfs_arc.so
94	lib/libcollectdclient.so	107	%%ZOOKEEPER%%lib/collectd/zookeeper.so
95	lib/libcollectdclient.so.1
96	lib/libcollectdclient.so.1.0.0
97	libdata/pkgconfig/libcollectdclient.pc	108	libdata/pkgconfig/libcollectdclient.pc
98	%%DATADIR%%/postgresql_default.conf	109	%%DATADIR%%/postgresql_default.conf
99	%%DATADIR%%/types.db	110	%%DATADIR%%/types.db
		111	%%PERL%%%%PERL5_MAN3%%/Collectd::Unixsock.3.gz
		112	%%PERL%%%%SITE_PERL%%/Collectd/Plugins/OpenVZ.pm
100	%%PERL%%%%SITE_PERL%%/Collectd.pm	113	%%PERL%%%%SITE_PERL%%/Collectd.pm
101	%%PERL%%%%SITE_PERL%%/Collectd/Unixsock.pm	114	%%PERL%%%%SITE_PERL%%/Collectd/Unixsock.pm
102	man/man1/collectd-nagios.1.gz	115	man/man1/collectd-nagios.1.gz
Lines 115-119 Link Here
115	man/man5/collectd.conf.5.gz	128	man/man5/collectd.conf.5.gz
116	man/man5/types.db.5.gz	129	man/man5/types.db.5.gz
117	@dir /var/db/collectd	130	@dir /var/db/collectd
118	@dir /var/lib/collectd
119	@dir /var/lib	131	@dir /var/lib

Return to bug 201514

Lines 2-11 Link Here

(-)collectd5.new/Makefile (-17 / +94 lines)
2	# $FreeBSD: head/net-mgmt/collectd5/Makefile 388844 2015-06-08 16:43:01Z brd $	2	# $FreeBSD: head/net-mgmt/collectd5/Makefile 388844 2015-06-08 16:43:01Z brd $
3		3
4	PORTNAME= collectd	4	PORTNAME= collectd
5	PORTVERSION= 5.4.2	5	PORTVERSION= 5.5.0
6	PORTREVISION= 3
7	CATEGORIES= net-mgmt	6	CATEGORIES= net-mgmt
8	MASTER_SITES= http://collectd.org/files/	7	MASTER_SITES= https://collectd.org/files/
9	PKGNAMESUFFIX= 5	8	PKGNAMESUFFIX= 5
10		9
11	MAINTAINER= ports@bsdserwis.com	10	MAINTAINER= ports@bsdserwis.com
Lines 24-39 Link Here
24	OPTIONS_DEFINE= CGI DEBUG GCRYPT VIRT	23	OPTIONS_DEFINE= CGI DEBUG GCRYPT VIRT
25	OPTIONS_GROUP= INPUT OUTPUT	24	OPTIONS_GROUP= INPUT OUTPUT
26	OPTIONS_GROUP_OUTPUT= RRDTOOL NOTIFYEMAIL NOTIFYDESKTOP RIEMANN	25	OPTIONS_GROUP_OUTPUT= RRDTOOL NOTIFYEMAIL NOTIFYDESKTOP RIEMANN
27	OPTIONS_GROUP_INPUT= CURL DBI JSON MEMCACHEC MODBUS MONGODB MYSQL \	26	OPTIONS_GROUP_INPUT= CURL IPMI DBI JSON MEMCACHEC MODBUS MONGODB MYSQL \
28	NUTUPS PERL PGSQL PING PYTHON RABBITMQ REDIS \	27	NUTUPS OLSRD ONEWIRE OPENLDAP PERL PGSQL PINBA PING \
29	ROUTEROS SIGROK SNMP STATGRAB TOKYOTYRANT VARNISH \	28	PYTHON RABBITMQ REDIS ROUTEROS SIGROK SNMP STATGRAB \
30	XML XMMS	29	STATSD TOKYOTYRANT VARNISH XML XMMS ZOOKEEPER
31		30
32	CGI_DESC= Install collection.cgi (requires rrdtool)	31	CGI_DESC= Install collection.cgi (requires rrdtool)
33	CURL_DESC= Enable curl-based plugins (apache, nginx, etc)	32	CURL_DESC= Enable curl-based plugins (apache, nginx, etc)
34	DEBUG_DESC= Enable debugging	33	DEBUG_DESC= Enable debugging
35	DBI_DESC= Enable dbi plugin	34	DBI_DESC= Enable dbi plugin
36	GCRYPT_DESC= Build with libgcrypt	35	GCRYPT_DESC= Build with libgcrypt
		36	IPMI_DESC= Enable OpenIPMI plugin
37	JSON_DESC= Enable JSON plugins	37	JSON_DESC= Enable JSON plugins
38	MEMCACHEC_DESC= Enable memcachec plugin	38	MEMCACHEC_DESC= Enable memcachec plugin
39	MODBUS_DESC= Enable modbus plugin	39	MODBUS_DESC= Enable modbus plugin
Lines 42-49 Link Here
42	NOTIFYEMAIL_DESC= Enable notifications via email	42	NOTIFYEMAIL_DESC= Enable notifications via email
43	NOTIFYDESKTOP_DESC= Enable desktop notifications	43	NOTIFYDESKTOP_DESC= Enable desktop notifications
44	NUTUPS_DESC= Enable nut (ups) plugin	44	NUTUPS_DESC= Enable nut (ups) plugin
		45	OLRSD_DESC= Enable olsrd plugin
		46	ONEWIRE_DESC= Eanble onewire plugin (via owfs)
		47	OPENLDAP_DESC= Enable OpenLDAP plugin
45	PERL_DESC= Enable libperl plugin and binding	48	PERL_DESC= Enable libperl plugin and binding
46	PGSQL_DESC= Enable postgresql-based plugins	49	PGSQL_DESC= Enable postgresql-based plugins
		50	PINBA_DESC= Enable pinba plugin (via protobuf-c)
47	PING_DESC= Enable ping plugin	51	PING_DESC= Enable ping plugin
48	PYTHON_DESC= Enable python-based plugins	52	PYTHON_DESC= Enable python-based plugins
49	RABBITMQ_DESC= Enable rabbitmq-based plugins	53	RABBITMQ_DESC= Enable rabbitmq-based plugins
Lines 54-64 Link Here
54	SIGROK_DESC= Enable sigrok plugin	58	SIGROK_DESC= Enable sigrok plugin
55	SNMP_DESC= Enable SNMP plugin	59	SNMP_DESC= Enable SNMP plugin
56	STATGRAB_DESC= Enable statgrab-based plugins (disk, interface, etc)	60	STATGRAB_DESC= Enable statgrab-based plugins (disk, interface, etc)
		61	STATSD_DESC= Enable statsd plugin
57	TOKYOTYRANT_DESC= Enable tokyotyrant plugin	62	TOKYOTYRANT_DESC= Enable tokyotyrant plugin
58	VARNISH_DESC= Enable varnish 3.x cache statistics	63	VARNISH_DESC= Enable varnish 3.x cache statistics (does not build with varnish 4.x)
59	VIRT_DESC= Enable libvirt plugin (requires XML)	64	VIRT_DESC= Enable libvirt plugin (requires XML)
60	XML_DESC= Enable XML plugins	65	XML_DESC= Enable XML plugins
61	XMMS_DESC= Enable xmms plugin	66	XMMS_DESC= Enable xmms plugin
		67	ZOOKEEPER_DESC= Enable zookeeper plugin
62		68
63	USE_RC_SUBR= collectd collectdmon	69	USE_RC_SUBR= collectd collectdmon
64		70
Lines 81-97 Link Here
81	--without-libganglia \	87	--without-libganglia \
82	--without-libiptc \	88	--without-libiptc \
83	--without-libjvm \	89	--without-libjvm \
		90	--without-liblvm2app \
84	--without-libkstat \	91	--without-libkstat \
		92	--without-libldap \
		93	--without-libmnl \
85	--without-libmodbus \	94	--without-libmodbus \
86	--without-libnetlink \	95	--without-libnetlink \
87	--without-libnetapp \	96	--without-libnetapp \
88	--without-libopenipmi \
89	--without-libowcapi \	97	--without-libowcapi \
90	--without-libperfstat \	98	--without-libperfstat \
		99	--without-librdkafka \
91	--without-libsensors \	100	--without-libsensors \
		101	--without-libvarnish \
92	--without-lvm \	102	--without-lvm \
93	--without-mic \	103	--without-mic \
94	--without-oracle	104	--without-oracle \
		105	--disable-turbostat
95		106
96	# NOTE: Plugins without external dependencies	107	# NOTE: Plugins without external dependencies
97	CONFIGURE_ARGS+= \	108	CONFIGURE_ARGS+= \
Lines 104-112 Link Here
104	--enable-dns \	115	--enable-dns \
105	--enable-email \	116	--enable-email \
106	--enable-exec \	117	--enable-exec \
		118	--enable-fhcount \
107	--enable-filecount \	119	--enable-filecount \
108	--enable-load \	120	--enable-load \
109	--enable-logfile \	121	--enable-logfile \
		122	--enable-log_logstash \
110	--enable-match_empty_counter \	123	--enable-match_empty_counter \
111	--enable-match_hashed \	124	--enable-match_hashed \
112	--enable-match_regex \	125	--enable-match_regex \
Lines 126-131 Link Here
126	--enable-syslog \	139	--enable-syslog \
127	--enable-table \	140	--enable-table \
128	--enable-tail \	141	--enable-tail \
		142	--enable-tail_csv \
129	--enable-target_notification \	143	--enable-target_notification \
130	--enable-target_replace \	144	--enable-target_replace \
131	--enable-target_scale \	145	--enable-target_scale \
Lines 139-145 Link Here
139	--enable-uptime \	153	--enable-uptime \
140	--enable-uuid \	154	--enable-uuid \
141	--enable-write_graphite \	155	--enable-write_graphite \
142	--enable-zfs_arc	156	--enable-write_log \
		157	--enable-zfs_arc \
143		158
144	.if ${PORT_OPTIONS:MCGI}	159	.if ${PORT_OPTIONS:MCGI}
145	RUN_DEPENDS+= p5-URI>=0:${PORTSDIR}/net/p5-URI \	160	RUN_DEPENDS+= p5-URI>=0:${PORTSDIR}/net/p5-URI \
Lines 217-222 Link Here
217	CONFIGURE_ARGS+=--without-libgcrypt	232	CONFIGURE_ARGS+=--without-libgcrypt
218	.endif	233	.endif
219		234
		235	.if ${PORT_OPTIONS:MIPMI}
		236	LIB_DEPENDS+= libOpenIPMI.so:${PORTSDIR}/sysutils/openipmi
		237	CONFIGURE_ARGS+=--enable-ipmi
		238	PLIST_SUB+= IPMI=""
		239	.else
		240	CONFIGURE_ARGS+=--disable-ipmi
		241	PLIST_SUB+= IPMI="@comment "
		242	.endif
		243
220	.if ${PORT_OPTIONS:MJSON}	244	.if ${PORT_OPTIONS:MJSON}
221	LIB_DEPENDS+= libyajl.so:${PORTSDIR}/devel/yajl	245	LIB_DEPENDS+= libyajl.so:${PORTSDIR}/devel/yajl
222	CONFIGURE_ARGS+=--with-libyajl=${LOCALBASE}	246	CONFIGURE_ARGS+=--with-libyajl=${LOCALBASE}
Lines 235-241 Link Here
235		259
236	.if ${PORT_OPTIONS:MMODBUS}	260	.if ${PORT_OPTIONS:MMODBUS}
237	LIB_DEPENDS+= libmodbus.so:${PORTSDIR}/comms/libmodbus	261	LIB_DEPENDS+= libmodbus.so:${PORTSDIR}/comms/libmodbus
238	CONFIGURE_ARGS+=--enable-modbus	262	CONFIGURE_ARGS+=--with-libmodbus=${LOCALBASE} --enable-modbus
239	PLIST_SUB+= MODBUS=""	263	PLIST_SUB+= MODBUS=""
240	.else	264	.else
241	PLIST_SUB+= MODBUS="@comment "	265	PLIST_SUB+= MODBUS="@comment "
Lines 290-295 Link Here
290	PLIST_SUB+= NUTUPS="@comment "	314	PLIST_SUB+= NUTUPS="@comment "
291	.endif	315	.endif
292		316
		317	.if ${PORT_OPTIONS:MOLSRD}
		318	CONFIGURE_ARGS+=--enable-olsrd
		319	PLIST_SUB+= OLSRD=""
		320	.else
		321	CONFIGURE_ARGS+=--enable-olsrd
		322	PLIST_SUB+= OLSRD="@comment "
		323	.endif
		324
		325	.if ${PORT_OPTIONS:MONEWIRE}
		326	LIB_DEPENDS+= libow.so:${PORTSDIR}/comms/owfs
		327	CONFIGURE_ARGS+=--with-libowcapi=${LOCALBASE} --enable-onewire
		328	PLIST_SUB+= ONEWIRE=""
		329	.else
		330	CONFIGURE_ARGS+=--disable-onewire
		331	PLIST_SUB+= ONEWIRE="@comment "
		332	.endif
		333
		334	.if ${PORT_OPTIONS:MOPENLDAP}
		335	USE_OPENLDAP= yes
		336	CONFIGURE_ARGS+=--with-libldap=${LOCALBASE} --enable-openldap
		337	PLIST_SUB+= OPENLDAP=""
		338	.else
		339	CONFIGURE_ARGS+=--disable-openldap
		340	PLIST_SUB+= OPENLDAP="@comment "
		341	.endif
		342
293	.if ${PORT_OPTIONS:MPERL}	343	.if ${PORT_OPTIONS:MPERL}
294	USES+= perl5	344	USES+= perl5
295	CONFIGURE_ARGS+=--with-perl=${PERL} --with-perl-bindings --enable-perl	345	CONFIGURE_ARGS+=--with-perl=${PERL} --with-perl-bindings --enable-perl
Lines 308-313 Link Here
308	PLIST_SUB+= PGSQL="@comment "	358	PLIST_SUB+= PGSQL="@comment "
309	.endif	359	.endif
310		360
		361	.if ${PORT_OPTIONS:MPINBA}
		362	LIB_DEPENDS+= libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
		363	CONFIGURE_ARGS+=--enable-pinba
		364	PLIST_SUB+= PINBA=""
		365	.else
		366	CONFIGURE_ARGS+=--disable-pinba
		367	PLIST_SUB+= PINBA="@comment "
		368	.endif
		369
311	.if ${PORT_OPTIONS:MPING}	370	.if ${PORT_OPTIONS:MPING}
312	LIB_DEPENDS+= liboping.so:${PORTSDIR}/net/liboping	371	LIB_DEPENDS+= liboping.so:${PORTSDIR}/net/liboping
313	CONFIGURE_ARGS+=--with-liboping=${LOCALBASE} --enable-ping	372	CONFIGURE_ARGS+=--with-liboping=${LOCALBASE} --enable-ping
Lines 338-345 Link Here
338	.endif	397	.endif
339		398
340	.if ${PORT_OPTIONS:MREDIS}	399	.if ${PORT_OPTIONS:MREDIS}
341	LIB_DEPENDS+= libcredis.so:${PORTSDIR}/databases/credis	400	LIB_DEPENDS+= libhiredis.so:${PORTSDIR}/databases/hiredis
342	CONFIGURE_ARGS+=--with-libcredis=${LOCALBASE} \	401	CONFIGURE_ARGS+=--with-libhiredis=${LOCALBASE} \
343	--enable-redis \	402	--enable-redis \
344	--enable-write_redis	403	--enable-write_redis
345	PLIST_SUB+= REDIS=""	404	PLIST_SUB+= REDIS=""
Lines 423-428 Link Here
423	PLIST_SUB+= SNMP="@comment "	482	PLIST_SUB+= SNMP="@comment "
424	.endif	483	.endif
425		484
		485	.if ${PORT_OPTIONS:MSTATSD}
		486	CONFIGURE_ARGS+=--enable-statsd
		487	PLIST_SUB+= STATSD=""
		488	.else
		489	CONFIGURE_ARGS+=--disable-statsd
		490	PLIST_SUB+= STATSD="@comment "
		491	.endif
		492
426	.if ${PORT_OPTIONS:MTOKYOTYRANT}	493	.if ${PORT_OPTIONS:MTOKYOTYRANT}
427	LIB_DEPENDS+= libtokyotyrant.so:${PORTSDIR}/databases/tokyotyrant	494	LIB_DEPENDS+= libtokyotyrant.so:${PORTSDIR}/databases/tokyotyrant
428	CONFIGURE_ARGS+=--with-libtokyotyrant=${LOCALBASE} --enable-tokyotyrant	495	CONFIGURE_ARGS+=--with-libtokyotyrant=${LOCALBASE} --enable-tokyotyrant
Lines 433-439 Link Here
433	.endif	500	.endif
434		501
435	.if ${PORT_OPTIONS:MVARNISH}	502	.if ${PORT_OPTIONS:MVARNISH}
436	LIB_DEPENDS+= libvarnishapi.so:${PORTSDIR}/www/varnish	503	BROKEN= "Only libvarnish 3.x support. Does not build with libvarnish4"
		504	LIB_DEPENDS+= libvarnishapi.so:${PORTSDIR}/www/varnish4
437	CONFIGURE_ARGS+=--with-libvarnish=${LOCALBASE} --enable-varnish	505	CONFIGURE_ARGS+=--with-libvarnish=${LOCALBASE} --enable-varnish
438	PLIST_SUB+= VARNISH=""	506	PLIST_SUB+= VARNISH=""
439	.else	507	.else
Lines 446-455 Link Here
446	IGNORE= VIRT requires XML. Either select XML or deselect VIRT.	514	IGNORE= VIRT requires XML. Either select XML or deselect VIRT.
447	.endif	515	.endif
448	LIB_DEPENDS+= libvirt.so:${PORTSDIR}/devel/libvirt	516	LIB_DEPENDS+= libvirt.so:${PORTSDIR}/devel/libvirt
449	CONFIGURE_ARGS+=--enable-libvirt	517	CONFIGURE_ARGS+=--enable-virt
450	PLIST_SUB+= VIRT=""	518	PLIST_SUB+= VIRT=""
451	.else	519	.else
452	CONFIGURE_ARGS+=--without-libvirt --disable-libvirt	520	CONFIGURE_ARGS+=--without-virt --disable-virt
453	PLIST_SUB+= VIRT="@comment "	521	PLIST_SUB+= VIRT="@comment "
454	.endif	522	.endif
455		523
Lines 468-473 Link Here
468	PLIST_SUB+= XMMS="@comment "	536	PLIST_SUB+= XMMS="@comment "
469	.endif	537	.endif
470		538
		539	.if ${PORT_OPTIONS:MZOOKEEPER}
		540	LIB_DEPENDS+= libzookeeper_mt.so:${PORTSDIR}/devel/libzookeeper
		541	CONFIGURE_ARGS+=--with-libzookeeper=${LOCALBASE} --enable-zookeeper
		542	PLIST_SUB+= ZOOKEEPER=""
		543	.else
		544	CONFIGURE_ARGS+=--without-libzookeeper --disable-zookeeper
		545	PLIST_SUB+= ZOOKEEPER="@comment "
		546	.endif
		547
471	INSTALL_TARGET=install-strip	548	INSTALL_TARGET=install-strip
472	SHEBANG_FILES= contrib/collection.cgi	549	SHEBANG_FILES= contrib/collection.cgi
473		550

Lines 1-7 Link Here

(-)collectd5.new/files/patch-src__Makefile.am (-42 / +33 lines)
1	--- src/Makefile.am.orig 2013-08-18 04:24:25.061973000 -0600	1	--- src/Makefile.am.orig 2015-05-26 21:38:14.116865000 +0200
2	+++ src/Makefile.am 2013-08-20 21:34:14.000000000 -0600	2	+++ src/Makefile.am 2015-07-14 10:15:28.397127883 +0200
3	@@ -10,7 +10,7 @@	3	@@ -14,7 +14,7 @@
4	AM_CPPFLAGS = -DPREFIX='"${prefix}"'	4	AM_CPPFLAGS += -DPREFIX='"${prefix}"'
5	AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"'	5	AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"'
6	AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"'	6	AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"'
7	-AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"'	7	-AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"'
Lines 9-42 Link Here
9	if BUILD_FEATURE_DAEMON	9	if BUILD_FEATURE_DAEMON
10	AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'	10	AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
11	endif	11	endif
12	@@ -64,7 +64,7 @@	12	@@ -218,7 +218,7 @@
13	collectd_LDADD += -lpthread	13	cpu_la_LDFLAGS = $(PLUGIN_LDFLAGS)
14	endif	14	cpu_la_LIBADD =
15	if BUILD_WITH_LIBKSTAT
16	-collectd_LDADD += -lkstat
17	+collectd_LDADD += $(BUILD_WITH_LIBKSTAT_LIBS)
18	endif
19	if BUILD_WITH_LIBDEVINFO
20	collectd_LDADD += -ldevinfo
21	@@ -275,7 +275,7 @@
22	cpu_la_LDFLAGS = -module -avoid-version
23	cpu_la_LIBADD =
24	if BUILD_WITH_LIBKSTAT	15	if BUILD_WITH_LIBKSTAT
25	-cpu_la_LIBADD += -lkstat	16	-cpu_la_LIBADD += -lkstat
26	+cpu_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS)	17	+cpu_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS)
27	endif	18	endif
28	if BUILD_WITH_LIBDEVINFO	19	if BUILD_WITH_LIBDEVINFO
29	cpu_la_LIBADD += -ldevinfo	20	cpu_la_LIBADD += -ldevinfo
30	@@ -373,7 +373,7 @@	21	@@ -303,7 +303,7 @@
31	disk_la_LDFLAGS = -module -avoid-version	22	disk_la_LDFLAGS = $(PLUGIN_LDFLAGS)
32	disk_la_LIBADD =	23	disk_la_LIBADD =
33	if BUILD_WITH_LIBKSTAT	24	if BUILD_WITH_LIBKSTAT
34	-disk_la_LIBADD += -lkstat	25	-disk_la_LIBADD += -lkstat
35	+disk_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS)	26	+disk_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS)
36	endif	27	endif
37	if BUILD_WITH_LIBDEVINFO	28	if BUILD_WITH_LIBDEVINFO
38	disk_la_LIBADD += -ldevinfo	29	disk_la_LIBADD += -ldevinfo
39	@@ -480,7 +480,7 @@	30	@@ -408,7 +408,7 @@
40	interface_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)	31	interface_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
41	else	32	else
42	if BUILD_WITH_LIBKSTAT	33	if BUILD_WITH_LIBKSTAT
Lines 45-88 Link Here
45	endif	36	endif
46	if BUILD_WITH_LIBDEVINFO	37	if BUILD_WITH_LIBDEVINFO
47	interface_la_LIBADD += -ldevinfo	38	interface_la_LIBADD += -ldevinfo
48	@@ -694,7 +694,7 @@	39	@@ -591,7 +591,7 @@
49	collectd_LDADD += "-dlopen" memory.la	40	memory_la_LDFLAGS = $(PLUGIN_LDFLAGS)
50	collectd_DEPENDENCIES += memory.la	41	memory_la_LIBADD =
51	if BUILD_WITH_LIBKSTAT	42	if BUILD_WITH_LIBKSTAT
52	-memory_la_LIBADD += -lkstat	43	-memory_la_LIBADD += -lkstat
53	+memory_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS)	44	+memory_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS)
54	endif	45	endif
55	if BUILD_WITH_LIBDEVINFO	46	if BUILD_WITH_LIBDEVINFO
56	memory_la_LIBADD += -ldevinfo	47	memory_la_LIBADD += -ldevinfo
57	@@ -823,7 +823,7 @@	48	@@ -964,7 +964,7 @@
58	pkglib_LTLIBRARIES += notify_email.la	49	swap_la_LDFLAGS = $(PLUGIN_LDFLAGS)
59	notify_email_la_SOURCES = notify_email.c	50	swap_la_LIBADD =
60	notify_email_la_LDFLAGS = -module -avoid-version
61	-notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread -ldl
62	+notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread
63	collectd_LDADD += "-dlopen" notify_email.la
64	collectd_DEPENDENCIES += notify_email.la
65	endif
66	@@ -1108,7 +1108,7 @@
67	collectd_LDADD += "-dlopen" swap.la
68	collectd_DEPENDENCIES += swap.la
69	if BUILD_WITH_LIBKSTAT	51	if BUILD_WITH_LIBKSTAT
70	-swap_la_LIBADD += -lkstat	52	-swap_la_LIBADD += -lkstat
71	+swap_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS)	53	+swap_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS)
72	endif	54	endif
73	if BUILD_WITH_LIBDEVINFO	55	if BUILD_WITH_LIBDEVINFO
74	swap_la_LIBADD += -ldevinfo	56	swap_la_LIBADD += -ldevinfo
75	@@ -1162,7 +1162,7 @@	57	@@ -1010,7 +1010,7 @@
76	pkglib_LTLIBRARIES += tape.la	58	pkglib_LTLIBRARIES += tape.la
77	tape_la_SOURCES = tape.c	59	tape_la_SOURCES = tape.c
78	tape_la_LDFLAGS = -module -avoid-version	60	tape_la_LDFLAGS = $(PLUGIN_LDFLAGS)
79	-tape_la_LIBADD = -lkstat -ldevinfo	61	-tape_la_LIBADD = -lkstat -ldevinfo
80	+tape_la_LIBADD = $(BUILD_WITH_LIBKSTAT_LIBS) -ldevinfo	62	+tape_la_LIBADD = $(BUILD_WITH_LIBKSTAT_LIBS) -ldevinfo
81	collectd_LDADD += "-dlopen" tape.la
82	collectd_DEPENDENCIES += tape.la
83	endif	63	endif
84	@@ -1285,7 +1285,7 @@	64
85	uptime_la_LDFLAGS = -module -avoid-version	65	if BUILD_PLUGIN_TARGET_NOTIFICATION
		66	@@ -1116,7 +1116,7 @@
		67	uptime_la_LDFLAGS = $(PLUGIN_LDFLAGS)
86	uptime_la_LIBADD =	68	uptime_la_LIBADD =
87	if BUILD_WITH_LIBKSTAT	69	if BUILD_WITH_LIBKSTAT
88	-uptime_la_LIBADD += -lkstat	70	-uptime_la_LIBADD += -lkstat
Lines 90-96 Link Here
90	endif	72	endif
91	if BUILD_WITH_PERFSTAT	73	if BUILD_WITH_PERFSTAT
92	uptime_la_LIBADD += -lperfstat	74	uptime_la_LIBADD += -lperfstat
93	@@ -1519,12 +1519,7 @@	75	@@ -1275,7 +1275,7 @@
		76	# zfs_arc requires no library on linux
		77	else
		78	# solaris
		79	-zfs_arc_la_LIBADD = -lkstat
		80	+zfs_arc_la_LIBADD = $(BUILD_WITH_LIBKSTAT_LIBS)
		81	endif
		82	endif
		83	endif
		84	@@ -1364,12 +1364,7 @@
94		85
95	install-exec-hook:	86	install-exec-hook:
96	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)	87	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)

Lines 1-21 Link Here

(-)collectd5.new/files/patch-src__collectd.h (-21 lines)
1	--- ./src/collectd.h.orig 2013-01-27 13:47:18.246255000 +0000
2	+++ ./src/collectd.h 2013-05-21 21:00:55.000000000 +0000
3	@@ -235,15 +235,15 @@
4	#endif
5
6	#ifndef LOCALSTATEDIR
7	-#define LOCALSTATEDIR PREFIX "/var"
8	+#define LOCALSTATEDIR "/var"
9	#endif
10
11	#ifndef PKGLOCALSTATEDIR
12	-#define PKGLOCALSTATEDIR PREFIX "/var/lib/" PACKAGE_NAME
13	+#define PKGLOCALSTATEDIR PREFIX "/var/db/" PACKAGE_NAME
14	#endif
15
16	#ifndef PIDFILE
17	-#define PIDFILE PREFIX "/var/run/" PACKAGE_NAME ".pid"
18	+#define PIDFILE "/var/run/" PACKAGE_NAME ".pid"
19	#endif
20
21	#ifndef PLUGINDIR

Line 0 Link Here

(-)collectd5.new/files/patch-src__daemon__collectd.h (+21 lines)
	1	--- src/daemon/collectd.h.orig 2015-05-22 12:04:36.951771000 +0200
	2	+++ src/daemon/collectd.h 2015-07-14 12:31:41.940566159 +0200
	3	@@ -240,15 +240,15 @@
	4	#endif
	5
	6	#ifndef LOCALSTATEDIR
	7	-#define LOCALSTATEDIR PREFIX "/var"
	8	+#define LOCALSTATEDIR "/var"
	9	#endif
	10
	11	#ifndef PKGLOCALSTATEDIR
	12	-#define PKGLOCALSTATEDIR PREFIX "/var/lib/" PACKAGE_NAME
	13	+#define PKGLOCALSTATEDIR PREFIX "/var/db/" PACKAGE_NAME
	14	#endif
	15
	16	#ifndef PIDFILE
	17	-#define PIDFILE PREFIX "/var/run/" PACKAGE_NAME ".pid"
	18	+#define PIDFILE "/var/run/" PACKAGE_NAME ".pid"
	19	#endif
	20
	21	#ifndef PLUGINDIR

Lines 1-12 Link Here

(-)collectd5.new/files/patch-src__disk.c (-12 lines)
1	--- ./src/disk.c.orig 2014-01-26 08:09:14.856391000 +0000
2	+++ ./src/disk.c 2014-05-10 23:35:17.232681397 +0100
3	@@ -732,7 +732,8 @@
4
5	#elif defined(HAVE_LIBSTATGRAB)
6	sg_disk_io_stats *ds;
7	- int disks, counter;
8	+ size_t disks;
9	+ int counter;
10	char name[DATA_MAX_NAME_LEN];
11
12	if ((ds = sg_get_disk_io_stats(&disks)) == NULL)

Lines 1-18 Link Here

(-)collectd5.new/files/patch-src__users.c (-18 lines)
1	--- ./src/users.c.orig 2014-06-02 22:12:33.650261000 -0700
2	+++ ./src/users.c 2014-06-11 00:10:39.000000000 -0700
3	@@ -101,12 +101,13 @@
4
5	#elif HAVE_LIBSTATGRAB
6	sg_user_stats *us;
7	+ size_t num_entries;
8
9	- us = sg_get_user_stats ();
10	+ us = sg_get_user_stats (&num_entries);
11	if (us == NULL)
12	return (-1);
13
14	- users_submit ((gauge_t) us->num_entries);
15	+ users_submit ((gauge_t) num_entries);
16	/* #endif HAVE_LIBSTATGRAB */
17
18	#else