Attachment #159449 for bug #201514




# $FreeBSD$

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

MAINTAINER=	ports@bsdserwis.com

USES=		autoreconf gmake libtool pkgconfig shebangfix tar:bzip2
GNU_CONFIGURE=	yes

OPTIONS_DEFINE=		CGI DEBUG GCRYPT LOGSTASH VIRT
OPTIONS_GROUP=		INPUT OUTPUT
OPTIONS_GROUP_OUTPUT=	RRDTOOL NOTIFYEMAIL NOTIFYDESKTOP RIEMANN
OPTIONS_GROUP_INPUT=	CURL DBI IPMI 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
LOGSTASH_DESC=		Enable log_logstash plugin (requires json)
MEMCACHEC_DESC=		Enable memcachec plugin
MODBUS_DESC=		Enable modbus plugin
MONGODB_DESC=		Enable MongoDB-based plugins

NOTIFYEMAIL_DESC=	Enable notifications via email
NOTIFYDESKTOP_DESC=	Enable desktop notifications
NUTUPS_DESC=		Enable nut (ups) plugin
OLSRD_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 4.x cache statistics
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-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}

CONFIGURE_ARGS+=--without-libyajl
.endif

.if ${PORT_OPTIONS:MLOGSTASH}
CONFIGURE_ARGS+=--enable-log_logstash
PLIST_SUB+=	LOGSTASH=""
.if empty(PORT_OPTIONS:MJSON)
IGNORE=		LOGSTASH requires JSON. Either select JSON or deselect LOGSTASH
.endif
.else
PLIST_SUB+=	LOGSTASH="@comment "
.endif

.if ${PORT_OPTIONS:MMEMCACHEC}
LIB_DEPENDS+=	libmemcached.so:${PORTSDIR}/databases/libmemcached
CONFIGURE_ARGS+=--with-libmemcached=${LOCALBASE} --enable-memcachec


.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=""

.endif

.if ${PORT_OPTIONS:MSTATGRAB}
USES+=		pkgconfig
LIB_DEPENDS+=	libstatgrab.so:${PORTSDIR}/devel/libstatgrab
LIBS+=		`pkg-config --libs libstatgrab`
CONFIGURE_ARGS+=--with-libstatgrab=${LOCALBASE} \

USE_GNOME+=	glib20
LIB_DEPENDS+=	libsigrok.so:${PORTSDIR}/devel/libsigrok
CONFIGURE_ARGS+=--with-libsigrok --enable-sigrok
CFLAGS+=	`pkg-config --cflags glib-2.0`
PLIST_SUB+=	SIGROK=""
.else
CONFIGURE_ARGS+=--disable-sigrok

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}
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

(-)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

Line 0 Link Here

(-)files/patch-Makefile.am (+10 lines)
	1	--- Makefile.am.orig 2015-03-09 09:38:22 UTC
	2	+++ Makefile.am
	3	@@ -8,7 +8,6 @@ EXTRA_DIST = contrib version-gen.sh
	4
	5	install-exec-hook:
	6	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run
	7	- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME)
	8	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log
	9
	10	maintainer-clean-local:




--- configure.ac.orig	2015-02-26 11:49:16 UTC
+++ configure.ac
@@ -120,7 +120,7 @@ then
 fi
 
 # Where to install .pc files.

 AC_SUBST(pkgconfigdir)
 
 # Check for standards compliance mode
@@ -1495,6 +1495,7 @@ if test "x$with_kstat" = "xyes"
 then
 	AC_CHECK_LIB(kstat, kstat_open, [with_kstat="yes"], [with_kstat="no (libkstat not found)"], [])
 fi

 if test "x$with_kstat" = "xyes"
 then
 	AC_CHECK_LIB(devinfo, di_init, [with_devinfo="yes"], [with_devinfo="no (not found)"], [])
@@ -1504,6 +1505,8 @@ if test "x$with_kstat" = "xyes"
 then
 	AC_DEFINE(HAVE_LIBKSTAT, 1,
 		  [Define to 1 if you have the 'kstat' library (-lkstat)])

 fi
 AM_CONDITIONAL(BUILD_WITH_LIBKSTAT, test "x$with_kstat" = "xyes")
 AM_CONDITIONAL(BUILD_WITH_LIBDEVINFO, test "x$with_devinfo" = "xyes")
@@ -3629,7 +3632,7 @@ fi
 if test "x$with_python" = "xyes"
 then
 	LDFLAGS="-L$python_library_path $LDFLAGS"

 
 	AC_CHECK_FUNC(PyObject_CallFunction,
 		      [with_python="yes"],
@@ -4692,8 +4695,8 @@ AC_ARG_WITH(libvarnish, [AS_HELP_STRING(
 	else if test -d "$with_libvarnish/lib"
 	then
 		AC_MSG_NOTICE([Not checking for libvarnish: Manually configured])
-		with_libvarnish_cflags="-I$withval/include"
-		with_libvarnish_libs="-L$withval/lib -lvarnishapi"
+		with_libvarnish_cflags="-I$withval/include/varnish"
+		with_libvarnish_libs="-L$withval/lib/varnish -lvarnishapi"
 		with_libvarnish="yes"
 	fi; fi; fi

Lines 1-11 Link Here

(-)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 19:38:14 UTC
+++ src/Makefile.am
@@ -14,7 +14,7 @@ AM_CPPFLAGS = -I$(srcdir)/daemon
 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_CFLAGS = $(AM_CFLAGS)
 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_CFLAGS = $(AM_CFLAGS)
 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_CFLAGS += $(BUILD_WITH_LIBS
 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_CFLAGS = $(AM_CFLAGS)
 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_CFLAGS = $(AM_CFLAGS)
 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 @@ if BUILD_PLUGIN_TAPE
 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_CFLAGS = $(AM_CFLAGS)
 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 @@ if BUILD_LINUX
 # 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 @@ endif
 
 install-exec-hook:
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)

Lines 1-11 Link Here

(-)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

(-)files/patch-src__daemon__Makefile.am (+11 lines)
	1	--- src/daemon/Makefile.am.orig 2015-05-26 19:38:31 UTC
	2	+++ src/daemon/Makefile.am
	3	@@ -49,7 +49,7 @@ collectd_CPPFLAGS = $(AM_CPPFLAGS) $(LT
	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 10:04:36 UTC
+++ src/daemon/collectd.h
@@ -240,15 +240,15 @@ typedef int _Bool;
 #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)

Lines 1-8 Link Here

(-)files/patch-src__dns.c (-4 / +2 lines)
1	diff --git src/dns.c src/dns.c	1	--- src/dns.c.orig 2015-03-10 14:14:45 UTC
2	index fe3b672..0c43985 100644
3	--- src/dns.c
4	+++ src/dns.c	2	+++ src/dns.c
5	@@ -223,6 +223,15 @@ static void dns_child_loop (__attribute__((unused)) void dummy)	3	@@ -224,6 +224,15 @@ static int dns_run_pcap_loop (void)
6	pthread_sigmask (SIG_SETMASK, &sigmask, NULL);	4	pthread_sigmask (SIG_SETMASK, &sigmask, NULL);
7	}	5	}
8		6

Lines 1-5 Link Here

(-)files/patch-src__modbus.c (-2 / +2 lines)
1	--- src/modbus.c.orig 2013-01-27 17:47:18.246255000 +0400	1	--- src/modbus.c.orig 2015-05-20 12:04:47 UTC
2	+++ src/modbus.c 2013-05-14 18:40:05.000000000 +0400	2	+++ src/modbus.c
3	@@ -25,6 +25,9 @@	3	@@ -25,6 +25,9 @@
4	#include "plugin.h"	4	#include "plugin.h"
5	#include "configfile.h"	5	#include "configfile.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

(-)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>




--- version-gen.sh.orig	2015-05-26 20:23:28 UTC
+++ version-gen.sh
@@ -1,13 +1,3 @@
 #!/bin/sh
 
-DEFAULT_VERSION="5.5.0.git"
-
-VERSION="`git describe 2> /dev/null | grep collectd | sed -e 's/^collectd-//'`"
-
-VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"
-
-if test -z "$VERSION"; then
-	VERSION="$DEFAULT_VERSION"
-fi
-
-VERSION="`echo \"$VERSION\" | sed -e 's/-/./g'`"
-
-printf "%s" "$VERSION"
+echo -n "5.5.0.git"
+echo -n "5.4.2.git"

Lines 3-6 Link Here

(-)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

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

Return to bug 201514

Lines 2-11 Link Here

(-)Makefile (-19 / +106 lines)
2	# $FreeBSD$	2	# $FreeBSD$
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/ \
		8	http://collectd.org/files/
9	PKGNAMESUFFIX= 5	9	PKGNAMESUFFIX= 5
10		10
11	MAINTAINER= ports@bsdserwis.com	11	MAINTAINER= ports@bsdserwis.com
Lines 21-33 Link Here
21	USES= autoreconf gmake libtool pkgconfig shebangfix tar:bzip2	21	USES= autoreconf gmake libtool pkgconfig shebangfix tar:bzip2
22	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
23		23
24	OPTIONS_DEFINE= CGI DEBUG GCRYPT VIRT	24	OPTIONS_DEFINE= CGI DEBUG GCRYPT LOGSTASH VIRT
25	OPTIONS_GROUP= INPUT OUTPUT	25	OPTIONS_GROUP= INPUT OUTPUT
26	OPTIONS_GROUP_OUTPUT= RRDTOOL NOTIFYEMAIL NOTIFYDESKTOP RIEMANN	26	OPTIONS_GROUP_OUTPUT= RRDTOOL NOTIFYEMAIL NOTIFYDESKTOP RIEMANN
27	OPTIONS_GROUP_INPUT= CURL DBI JSON MEMCACHEC MODBUS MONGODB MYSQL \	27	OPTIONS_GROUP_INPUT= CURL DBI IPMI JSON MEMCACHEC MODBUS MONGODB MYSQL \
28	NUTUPS PERL PGSQL PING PYTHON RABBITMQ REDIS \	28	NUTUPS OLSRD ONEWIRE OPENLDAP PERL PGSQL PINBA PING \
29	ROUTEROS SIGROK SNMP STATGRAB TOKYOTYRANT VARNISH \	29	PYTHON RABBITMQ REDIS ROUTEROS SIGROK SNMP STATGRAB \
30	XML XMMS	30	STATSD TOKYOTYRANT VARNISH XML XMMS ZOOKEEPER
31		31
32	CGI_DESC= Install collection.cgi (requires rrdtool)	32	CGI_DESC= Install collection.cgi (requires rrdtool)
33	CURL_DESC= Enable curl-based plugins (apache, nginx, etc)	33	CURL_DESC= Enable curl-based plugins (apache, nginx, etc)
Lines 34-40 Link Here
34	DEBUG_DESC= Enable debugging	34	DEBUG_DESC= Enable debugging
35	DBI_DESC= Enable dbi plugin	35	DBI_DESC= Enable dbi plugin
36	GCRYPT_DESC= Build with libgcrypt	36	GCRYPT_DESC= Build with libgcrypt
		37	IPMI_DESC= Enable OpenIPMI plugin
37	JSON_DESC= Enable JSON plugins	38	JSON_DESC= Enable JSON plugins
		39	LOGSTASH_DESC= Enable log_logstash plugin (requires json)
38	MEMCACHEC_DESC= Enable memcachec plugin	40	MEMCACHEC_DESC= Enable memcachec plugin
39	MODBUS_DESC= Enable modbus plugin	41	MODBUS_DESC= Enable modbus plugin
40	MONGODB_DESC= Enable MongoDB-based plugins	42	MONGODB_DESC= Enable MongoDB-based plugins
Lines 42-49 Link Here
42	NOTIFYEMAIL_DESC= Enable notifications via email	44	NOTIFYEMAIL_DESC= Enable notifications via email
43	NOTIFYDESKTOP_DESC= Enable desktop notifications	45	NOTIFYDESKTOP_DESC= Enable desktop notifications
44	NUTUPS_DESC= Enable nut (ups) plugin	46	NUTUPS_DESC= Enable nut (ups) plugin
		47	OLSRD_DESC= Enable olsrd plugin
		48	ONEWIRE_DESC= Eanble onewire plugin (via owfs)
		49	OPENLDAP_DESC= Enable OpenLDAP plugin
45	PERL_DESC= Enable libperl plugin and binding	50	PERL_DESC= Enable libperl plugin and binding
46	PGSQL_DESC= Enable postgresql-based plugins	51	PGSQL_DESC= Enable postgresql-based plugins
		52	PINBA_DESC= Enable pinba plugin (via protobuf-c)
47	PING_DESC= Enable ping plugin	53	PING_DESC= Enable ping plugin
48	PYTHON_DESC= Enable python-based plugins	54	PYTHON_DESC= Enable python-based plugins
49	RABBITMQ_DESC= Enable rabbitmq-based plugins	55	RABBITMQ_DESC= Enable rabbitmq-based plugins
Lines 54-64 Link Here
54	SIGROK_DESC= Enable sigrok plugin	60	SIGROK_DESC= Enable sigrok plugin
55	SNMP_DESC= Enable SNMP plugin	61	SNMP_DESC= Enable SNMP plugin
56	STATGRAB_DESC= Enable statgrab-based plugins (disk, interface, etc)	62	STATGRAB_DESC= Enable statgrab-based plugins (disk, interface, etc)
		63	STATSD_DESC= Enable statsd plugin
57	TOKYOTYRANT_DESC= Enable tokyotyrant plugin	64	TOKYOTYRANT_DESC= Enable tokyotyrant plugin
58	VARNISH_DESC= Enable varnish 3.x cache statistics	65	VARNISH_DESC= Enable varnish 4.x cache statistics
59	VIRT_DESC= Enable libvirt plugin (requires XML)	66	VIRT_DESC= Enable libvirt plugin (requires XML)
60	XML_DESC= Enable XML plugins	67	XML_DESC= Enable XML plugins
61	XMMS_DESC= Enable xmms plugin	68	XMMS_DESC= Enable xmms plugin
		69	ZOOKEEPER_DESC= Enable zookeeper plugin
62		70
63	USE_RC_SUBR= collectd collectdmon	71	USE_RC_SUBR= collectd collectdmon
64		72
Lines 81-97 Link Here
81	--without-libganglia \	89	--without-libganglia \
82	--without-libiptc \	90	--without-libiptc \
83	--without-libjvm \	91	--without-libjvm \
		92	--without-liblvm2app \
84	--without-libkstat \	93	--without-libkstat \
		94	--without-libldap \
		95	--without-libmnl \
85	--without-libmodbus \	96	--without-libmodbus \
86	--without-libnetlink \	97	--without-libnetlink \
87	--without-libnetapp \	98	--without-libnetapp \
88	--without-libopenipmi \
89	--without-libowcapi \	99	--without-libowcapi \
90	--without-libperfstat \	100	--without-libperfstat \
		101	--without-librdkafka \
91	--without-libsensors \	102	--without-libsensors \
		103	--without-libvarnish \
92	--without-lvm \	104	--without-lvm \
93	--without-mic \	105	--without-mic \
94	--without-oracle	106	--without-oracle \
		107	--disable-turbostat
95		108
96	# NOTE: Plugins without external dependencies	109	# NOTE: Plugins without external dependencies
97	CONFIGURE_ARGS+= \	110	CONFIGURE_ARGS+= \
Lines 104-109 Link Here
104	--enable-dns \	117	--enable-dns \
105	--enable-email \	118	--enable-email \
106	--enable-exec \	119	--enable-exec \
		120	--enable-fhcount \
107	--enable-filecount \	121	--enable-filecount \
108	--enable-load \	122	--enable-load \
109	--enable-logfile \	123	--enable-logfile \
Lines 126-131 Link Here
126	--enable-syslog \	140	--enable-syslog \
127	--enable-table \	141	--enable-table \
128	--enable-tail \	142	--enable-tail \
		143	--enable-tail_csv \
129	--enable-target_notification \	144	--enable-target_notification \
130	--enable-target_replace \	145	--enable-target_replace \
131	--enable-target_scale \	146	--enable-target_scale \
Lines 139-145 Link Here
139	--enable-uptime \	154	--enable-uptime \
140	--enable-uuid \	155	--enable-uuid \
141	--enable-write_graphite \	156	--enable-write_graphite \
142	--enable-zfs_arc	157	--enable-write_log \
		158	--enable-zfs_arc \
143		159
144	.if ${PORT_OPTIONS:MCGI}	160	.if ${PORT_OPTIONS:MCGI}
145	RUN_DEPENDS+= p5-URI>=0:${PORTSDIR}/net/p5-URI \	161	RUN_DEPENDS+= p5-URI>=0:${PORTSDIR}/net/p5-URI \
Lines 217-222 Link Here
217	CONFIGURE_ARGS+=--without-libgcrypt	233	CONFIGURE_ARGS+=--without-libgcrypt
218	.endif	234	.endif
219		235
		236	.if ${PORT_OPTIONS:MIPMI}
		237	LIB_DEPENDS+= libOpenIPMI.so:${PORTSDIR}/sysutils/openipmi
		238	CONFIGURE_ARGS+=--enable-ipmi
		239	PLIST_SUB+= IPMI=""
		240	.else
		241	CONFIGURE_ARGS+=--disable-ipmi
		242	PLIST_SUB+= IPMI="@comment "
		243	.endif
		244
220	.if ${PORT_OPTIONS:MJSON}	245	.if ${PORT_OPTIONS:MJSON}
221	LIB_DEPENDS+= libyajl.so:${PORTSDIR}/devel/yajl	246	LIB_DEPENDS+= libyajl.so:${PORTSDIR}/devel/yajl
222	CONFIGURE_ARGS+=--with-libyajl=${LOCALBASE}	247	CONFIGURE_ARGS+=--with-libyajl=${LOCALBASE}
Lines 224-229 Link Here
224	CONFIGURE_ARGS+=--without-libyajl	249	CONFIGURE_ARGS+=--without-libyajl
225	.endif	250	.endif
226		251
		252	.if ${PORT_OPTIONS:MLOGSTASH}
		253	CONFIGURE_ARGS+=--enable-log_logstash
		254	PLIST_SUB+= LOGSTASH=""
		255	.if empty(PORT_OPTIONS:MJSON)
		256	IGNORE= LOGSTASH requires JSON. Either select JSON or deselect LOGSTASH
		257	.endif
		258	.else
		259	PLIST_SUB+= LOGSTASH="@comment "
		260	.endif
		261
227	.if ${PORT_OPTIONS:MMEMCACHEC}	262	.if ${PORT_OPTIONS:MMEMCACHEC}
228	LIB_DEPENDS+= libmemcached.so:${PORTSDIR}/databases/libmemcached	263	LIB_DEPENDS+= libmemcached.so:${PORTSDIR}/databases/libmemcached
229	CONFIGURE_ARGS+=--with-libmemcached=${LOCALBASE} --enable-memcachec	264	CONFIGURE_ARGS+=--with-libmemcached=${LOCALBASE} --enable-memcachec
Lines 235-241 Link Here
235		270
236	.if ${PORT_OPTIONS:MMODBUS}	271	.if ${PORT_OPTIONS:MMODBUS}
237	LIB_DEPENDS+= libmodbus.so:${PORTSDIR}/comms/libmodbus	272	LIB_DEPENDS+= libmodbus.so:${PORTSDIR}/comms/libmodbus
238	CONFIGURE_ARGS+=--enable-modbus	273	CONFIGURE_ARGS+=--with-libmodbus=${LOCALBASE} --enable-modbus
239	PLIST_SUB+= MODBUS=""	274	PLIST_SUB+= MODBUS=""
240	.else	275	.else
241	PLIST_SUB+= MODBUS="@comment "	276	PLIST_SUB+= MODBUS="@comment "
Lines 290-295 Link Here
290	PLIST_SUB+= NUTUPS="@comment "	325	PLIST_SUB+= NUTUPS="@comment "
291	.endif	326	.endif
292		327
		328	.if ${PORT_OPTIONS:MOLSRD}
		329	CONFIGURE_ARGS+=--enable-olsrd
		330	PLIST_SUB+= OLSRD=""
		331	.else
		332	CONFIGURE_ARGS+=--enable-olsrd
		333	PLIST_SUB+= OLSRD="@comment "
		334	.endif
		335
		336	.if ${PORT_OPTIONS:MONEWIRE}
		337	LIB_DEPENDS+= libow.so:${PORTSDIR}/comms/owfs
		338	CONFIGURE_ARGS+=--with-libowcapi=${LOCALBASE} --enable-onewire
		339	PLIST_SUB+= ONEWIRE=""
		340	.else
		341	CONFIGURE_ARGS+=--disable-onewire
		342	PLIST_SUB+= ONEWIRE="@comment "
		343	.endif
		344
		345	.if ${PORT_OPTIONS:MOPENLDAP}
		346	USE_OPENLDAP= yes
		347	CONFIGURE_ARGS+=--with-libldap=${LOCALBASE} --enable-openldap
		348	PLIST_SUB+= OPENLDAP=""
		349	.else
		350	CONFIGURE_ARGS+=--disable-openldap
		351	PLIST_SUB+= OPENLDAP="@comment "
		352	.endif
		353
293	.if ${PORT_OPTIONS:MPERL}	354	.if ${PORT_OPTIONS:MPERL}
294	USES+= perl5	355	USES+= perl5
295	CONFIGURE_ARGS+=--with-perl=${PERL} --with-perl-bindings --enable-perl	356	CONFIGURE_ARGS+=--with-perl=${PERL} --with-perl-bindings --enable-perl
Lines 308-313 Link Here
308	PLIST_SUB+= PGSQL="@comment "	369	PLIST_SUB+= PGSQL="@comment "
309	.endif	370	.endif
310		371
		372	.if ${PORT_OPTIONS:MPINBA}
		373	LIB_DEPENDS+= libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
		374	CONFIGURE_ARGS+=--enable-pinba
		375	PLIST_SUB+= PINBA=""
		376	.else
		377	CONFIGURE_ARGS+=--disable-pinba
		378	PLIST_SUB+= PINBA="@comment "
		379	.endif
		380
311	.if ${PORT_OPTIONS:MPING}	381	.if ${PORT_OPTIONS:MPING}
312	LIB_DEPENDS+= liboping.so:${PORTSDIR}/net/liboping	382	LIB_DEPENDS+= liboping.so:${PORTSDIR}/net/liboping
313	CONFIGURE_ARGS+=--with-liboping=${LOCALBASE} --enable-ping	383	CONFIGURE_ARGS+=--with-liboping=${LOCALBASE} --enable-ping
Lines 338-345 Link Here
338	.endif	408	.endif
339		409
340	.if ${PORT_OPTIONS:MREDIS}	410	.if ${PORT_OPTIONS:MREDIS}
341	LIB_DEPENDS+= libcredis.so:${PORTSDIR}/databases/credis	411	LIB_DEPENDS+= libhiredis.so:${PORTSDIR}/databases/hiredis
342	CONFIGURE_ARGS+=--with-libcredis=${LOCALBASE} \	412	CONFIGURE_ARGS+=--with-libhiredis=${LOCALBASE} \
343	--enable-redis \	413	--enable-redis \
344	--enable-write_redis	414	--enable-write_redis
345	PLIST_SUB+= REDIS=""	415	PLIST_SUB+= REDIS=""
Lines 382-388 Link Here
382	.endif	452	.endif
383		453
384	.if ${PORT_OPTIONS:MSTATGRAB}	454	.if ${PORT_OPTIONS:MSTATGRAB}
385	USES+= pkgconfig
386	LIB_DEPENDS+= libstatgrab.so:${PORTSDIR}/devel/libstatgrab	455	LIB_DEPENDS+= libstatgrab.so:${PORTSDIR}/devel/libstatgrab
387	LIBS+= `pkg-config --libs libstatgrab`	456	LIBS+= `pkg-config --libs libstatgrab`
388	CONFIGURE_ARGS+=--with-libstatgrab=${LOCALBASE} \	457	CONFIGURE_ARGS+=--with-libstatgrab=${LOCALBASE} \
Lines 408-413 Link Here
408	USE_GNOME+= glib20	477	USE_GNOME+= glib20
409	LIB_DEPENDS+= libsigrok.so:${PORTSDIR}/devel/libsigrok	478	LIB_DEPENDS+= libsigrok.so:${PORTSDIR}/devel/libsigrok
410	CONFIGURE_ARGS+=--with-libsigrok --enable-sigrok	479	CONFIGURE_ARGS+=--with-libsigrok --enable-sigrok
		480	CFLAGS+= `pkg-config --cflags glib-2.0`
411	PLIST_SUB+= SIGROK=""	481	PLIST_SUB+= SIGROK=""
412	.else	482	.else
413	CONFIGURE_ARGS+=--disable-sigrok	483	CONFIGURE_ARGS+=--disable-sigrok
Lines 423-428 Link Here
423	PLIST_SUB+= SNMP="@comment "	493	PLIST_SUB+= SNMP="@comment "
424	.endif	494	.endif
425		495
		496	.if ${PORT_OPTIONS:MSTATSD}
		497	CONFIGURE_ARGS+=--enable-statsd
		498	PLIST_SUB+= STATSD=""
		499	.else
		500	CONFIGURE_ARGS+=--disable-statsd
		501	PLIST_SUB+= STATSD="@comment "
		502	.endif
		503
426	.if ${PORT_OPTIONS:MTOKYOTYRANT}	504	.if ${PORT_OPTIONS:MTOKYOTYRANT}
427	LIB_DEPENDS+= libtokyotyrant.so:${PORTSDIR}/databases/tokyotyrant	505	LIB_DEPENDS+= libtokyotyrant.so:${PORTSDIR}/databases/tokyotyrant
428	CONFIGURE_ARGS+=--with-libtokyotyrant=${LOCALBASE} --enable-tokyotyrant	506	CONFIGURE_ARGS+=--with-libtokyotyrant=${LOCALBASE} --enable-tokyotyrant
Lines 433-439 Link Here
433	.endif	511	.endif
434		512
435	.if ${PORT_OPTIONS:MVARNISH}	513	.if ${PORT_OPTIONS:MVARNISH}
436	LIB_DEPENDS+= libvarnishapi.so:${PORTSDIR}/www/varnish	514	LIB_DEPENDS+= libvarnishapi.so:${PORTSDIR}/www/varnish4
437	CONFIGURE_ARGS+=--with-libvarnish=${LOCALBASE} --enable-varnish	515	CONFIGURE_ARGS+=--with-libvarnish=${LOCALBASE} --enable-varnish
438	PLIST_SUB+= VARNISH=""	516	PLIST_SUB+= VARNISH=""
439	.else	517	.else
Lines 446-455 Link Here
446	IGNORE= VIRT requires XML. Either select XML or deselect VIRT.	524	IGNORE= VIRT requires XML. Either select XML or deselect VIRT.
447	.endif	525	.endif
448	LIB_DEPENDS+= libvirt.so:${PORTSDIR}/devel/libvirt	526	LIB_DEPENDS+= libvirt.so:${PORTSDIR}/devel/libvirt
449	CONFIGURE_ARGS+=--enable-libvirt	527	CONFIGURE_ARGS+=--enable-virt
450	PLIST_SUB+= VIRT=""	528	PLIST_SUB+= VIRT=""
451	.else	529	.else
452	CONFIGURE_ARGS+=--without-libvirt --disable-libvirt	530	CONFIGURE_ARGS+=--without-virt --disable-virt
453	PLIST_SUB+= VIRT="@comment "	531	PLIST_SUB+= VIRT="@comment "
454	.endif	532	.endif
455		533
Lines 468-473 Link Here
468	PLIST_SUB+= XMMS="@comment "	546	PLIST_SUB+= XMMS="@comment "
469	.endif	547	.endif
470		548
		549	.if ${PORT_OPTIONS:MZOOKEEPER}
		550	LIB_DEPENDS+= libzookeeper_mt.so:${PORTSDIR}/devel/libzookeeper
		551	CONFIGURE_ARGS+=--with-libzookeeper=${LOCALBASE} --enable-zookeeper
		552	PLIST_SUB+= ZOOKEEPER=""
		553	.else
		554	CONFIGURE_ARGS+=--without-libzookeeper --disable-zookeeper
		555	PLIST_SUB+= ZOOKEEPER="@comment "
		556	.endif
		557
471	INSTALL_TARGET=install-strip	558	INSTALL_TARGET=install-strip
472	SHEBANG_FILES= contrib/collection.cgi	559	SHEBANG_FILES= contrib/collection.cgi
473		560

Lines 1-6 Link Here

(-)files/patch-configure.ac (-6 / +8 lines)
1	--- configure.ac.orig 2015-02-26 11:49:16 UTC	1	--- configure.ac.orig 2015-02-26 11:49:16 UTC
2	+++ configure.ac	2	+++ configure.ac
3	@@ -111,7 +111,7 @@ then	3	@@ -120,7 +120,7 @@ then
4	fi	4	fi
5		5
6	# Where to install .pc files.	6	# Where to install .pc files.
Lines 9-15 Link Here
9	AC_SUBST(pkgconfigdir)	9	AC_SUBST(pkgconfigdir)
10		10
11	# Check for standards compliance mode	11	# Check for standards compliance mode
12	@@ -1440,6 +1440,7 @@ if test "x$with_kstat" = "xyes"	12	@@ -1495,6 +1495,7 @@ if test "x$with_kstat" = "xyes"
13	then	13	then
14	AC_CHECK_LIB(kstat, kstat_open, [with_kstat="yes"], [with_kstat="no (libkstat not found)"], [])	14	AC_CHECK_LIB(kstat, kstat_open, [with_kstat="yes"], [with_kstat="no (libkstat not found)"], [])
15	fi	15	fi
Lines 17-23 Link Here
17	if test "x$with_kstat" = "xyes"	17	if test "x$with_kstat" = "xyes"
18	then	18	then
19	AC_CHECK_LIB(devinfo, di_init, [with_devinfo="yes"], [with_devinfo="no (not found)"], [])	19	AC_CHECK_LIB(devinfo, di_init, [with_devinfo="yes"], [with_devinfo="no (not found)"], [])
20	@@ -1449,6 +1450,8 @@ if test "x$with_kstat" = "xyes"	20	@@ -1504,6 +1505,8 @@ if test "x$with_kstat" = "xyes"
21	then	21	then
22	AC_DEFINE(HAVE_LIBKSTAT, 1,	22	AC_DEFINE(HAVE_LIBKSTAT, 1,
23	[Define to 1 if you have the 'kstat' library (-lkstat)])	23	[Define to 1 if you have the 'kstat' library (-lkstat)])
Lines 26-32 Link Here
26	fi	26	fi
27	AM_CONDITIONAL(BUILD_WITH_LIBKSTAT, test "x$with_kstat" = "xyes")	27	AM_CONDITIONAL(BUILD_WITH_LIBKSTAT, test "x$with_kstat" = "xyes")
28	AM_CONDITIONAL(BUILD_WITH_LIBDEVINFO, test "x$with_devinfo" = "xyes")	28	AM_CONDITIONAL(BUILD_WITH_LIBDEVINFO, test "x$with_devinfo" = "xyes")
29	@@ -3508,7 +3511,7 @@ fi	29	@@ -3629,7 +3632,7 @@ fi
30	if test "x$with_python" = "xyes"	30	if test "x$with_python" = "xyes"
31	then	31	then
32	LDFLAGS="-L$python_library_path $LDFLAGS"	32	LDFLAGS="-L$python_library_path $LDFLAGS"
Lines 35-45 Link Here
35		35
36	AC_CHECK_FUNC(PyObject_CallFunction,	36	AC_CHECK_FUNC(PyObject_CallFunction,
37	[with_python="yes"],	37	[with_python="yes"],
38	@@ -4415,7 +4418,7 @@ AC_ARG_WITH(libvarnish, [AS_HELP_STRING(	38	@@ -4692,8 +4695,8 @@ AC_ARG_WITH(libvarnish, [AS_HELP_STRING(
		39	else if test -d "$with_libvarnish/lib"
39	then	40	then
40	AC_MSG_NOTICE([Not checking for libvarnish: Manually configured])	41	AC_MSG_NOTICE([Not checking for libvarnish: Manually configured])
41	with_libvarnish_cflags="-I$withval/include"	42	- with_libvarnish_cflags="-I$withval/include"
42	- with_libvarnish_libs="-L$withval/lib -lvarnishapi"	43	- with_libvarnish_libs="-L$withval/lib -lvarnishapi"
		44	+ with_libvarnish_cflags="-I$withval/include/varnish"
43	+ with_libvarnish_libs="-L$withval/lib/varnish -lvarnishapi"	45	+ with_libvarnish_libs="-L$withval/lib/varnish -lvarnishapi"
44	with_libvarnish="yes"	46	with_libvarnish="yes"
45	fi; fi; fi	47	fi; fi; fi

Lines 1-7 Link Here

(-)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 19:38:14 UTC
2	+++ src/Makefile.am 2013-08-20 21:34:14.000000000 -0600	2	+++ src/Makefile.am
3	@@ -10,7 +10,7 @@	3	@@ -14,7 +14,7 @@ AM_CPPFLAGS = -I$(srcdir)/daemon
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-35 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 @@ cpu_la_CFLAGS = $(AM_CFLAGS)
13	collectd_LDADD += -lpthread	13	cpu_la_LDFLAGS = $(PLUGIN_LDFLAGS)
14	endif	14	cpu_la_LIBADD =
15	if BUILD_WITH_LIBKSTAT	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
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 @@ disk_la_CFLAGS = $(AM_CFLAGS)
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)
Lines 36-42 Link Here
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 @@ interface_la_CFLAGS += $(BUILD_WITH_LIBS
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-53 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 @@ memory_la_CFLAGS = $(AM_CFLAGS)
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)
Lines 54-71 Link Here
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 @@ swap_la_CFLAGS = $(AM_CFLAGS)
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)
Lines 72-88 Link Here
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 @@ if BUILD_PLUGIN_TAPE
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 @@ uptime_la_CFLAGS = $(AM_CFLAGS)
		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 @@ if BUILD_LINUX
		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 @@ endif
94		85
95	install-exec-hook:	86	install-exec-hook:
96	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)	87	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)

Lines 1-21 Link Here

(-)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

(-)files/patch-src__daemon__collectd.h (+21 lines)
	1	--- src/daemon/collectd.h.orig 2015-05-22 10:04:36 UTC
	2	+++ src/daemon/collectd.h
	3	@@ -240,15 +240,15 @@ typedef int _Bool;
	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

(-)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

(-)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

Lines 1-18 Link Here

(-)files/patch-version-gen.sh (-9 / +8 lines)
1	--- version-gen.sh.orig 2015-03-02 20:20:43 UTC	1	--- version-gen.sh.orig 2015-05-26 20:23:28 UTC
2	+++ version-gen.sh	2	+++ version-gen.sh
3	@@ -1,13 +1,3 @@	3	@@ -1,13 +1,3 @@
4	-#!/usr/bin/env bash	4	#!/bin/sh
		5
		6	-DEFAULT_VERSION="5.5.0.git"
5	-	7	-
6	-DEFAULT_VERSION="5.4.2.git"	8	-VERSION="`git describe 2> /dev/null \| grep collectd \| sed -e 's/^collectd-//'`"
7	-	9	-
8	-VERSION="`git describe 2> /dev/null \| sed -e 's/^collectd-//'`"
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"