Hi, our collectd port is ancient and crufty, let's try to update it a bit, even giving it an rc script. Liiightly tested here (understand: installed altogether with the rrdtool subpackage, started fine on my desktop and writes to rrd files in var/collectd). While here i've enabled pf, tail_csv and write_graphite plugins.
Real life testing from actual collectd users welcomed. Landry
Index: Makefile =================================================================== RCS file: /cvs/ports/sysutils/collectd/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- Makefile 13 Sep 2014 18:09:22 -0000 1.23 +++ Makefile 22 Sep 2014 15:52:28 -0000 @@ -6,7 +6,7 @@ COMMENT-rrdtool = collectd rrdtool plugin COMMENT-snmp = collectd snmp plugin -V = 4.10.2 +V = 5.4.1 DISTNAME = collectd-$V PKGNAME-main = collectd-$V PKGNAME-mysql = collectd-mysql-$V @@ -15,14 +15,8 @@ PKGNAME-snmp = collectd-snmp-$V CATEGORIES = sysutils -REVISION-main= 4 -REVISION-mysql = 4 -REVISION-pgsql = 3 -REVISION-rrdtool = 2 -REVISION-snmp = 1 - HOMEPAGE = http://www.collectd.org/ -SHARED_LIBS += collectdclient 0.0 +SHARED_LIBS += collectdclient 1.0 SHARED_ONLY = Yes # GPLv2 @@ -34,7 +28,7 @@ MULTI_PACKAGES = -main -mysql -pgsql -rrdtool -snmp -WANTLIB-mysql = crypto m ssl z mysqlclient pthread +WANTLIB-mysql = crypto m ssl z mysqlclient_r stdc++ pthread LIB_DEPENDS-mysql = databases/mariadb RUN_DEPENDS-mysql = collectd-$V:${BASE_PKGPATH},-main @@ -80,10 +74,10 @@ logfile match_empty_counter match_hashed match_regex \ match_timediff match_value memcached memory mysql \ network nginx ntpd olsrd openvpn postgresql powerdns \ - rrdtool snmp swap syslog table tail \ + rrdtool snmp swap syslog table tail tail_csv \ target_notification target_replace target_scale \ - target_set tcpconns teamspeak2 ted unixsock uptime \ - users uuid write_http + target_set target_v5upgrade tcpconns teamspeak2 ted unixsock uptime \ + users uuid write_http write_graphite pf .for _plugin in ${ENABLED_PLUGINS} CONFIGURE_ARGS += --enable-${_plugin} Index: distinfo =================================================================== RCS file: /cvs/ports/sysutils/collectd/distinfo,v retrieving revision 1.3 diff -u -r1.3 distinfo --- distinfo 29 Nov 2010 20:20:41 -0000 1.3 +++ distinfo 22 Sep 2014 15:52:28 -0000 @@ -1,5 +1,2 @@ -MD5 (collectd-4.10.2.tar.gz) = EJHvuQ5NWTfjpzb8kwncBw== -RMD160 (collectd-4.10.2.tar.gz) = dDs8tBuZ3lUeuVrll9Eb7rNsrBI= -SHA1 (collectd-4.10.2.tar.gz) = QWO+PeT19yNOykOiOyIFx5Mbpvc= -SHA256 (collectd-4.10.2.tar.gz) = N9bE3kP7dbcbiXV00YciocNlg7ep4X6+X7Fagm8vj+4= -SIZE (collectd-4.10.2.tar.gz) = 1736547 +SHA256 (collectd-5.4.1.tar.gz) = hTaAk2iT3wC/wr5Y9hq5GB/ssc9F/Fzdy30l2piFX2U= +SIZE (collectd-5.4.1.tar.gz) = 1894132 Index: patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/sysutils/collectd/patches/patch-Makefile_in,v retrieving revision 1.2 diff -u -r1.2 patch-Makefile_in --- patches/patch-Makefile_in 7 Sep 2010 11:12:05 -0000 1.2 +++ patches/patch-Makefile_in 22 Sep 2014 15:52:28 -0000 @@ -1,8 +1,8 @@ $OpenBSD: patch-Makefile_in,v 1.2 2010/09/07 11:12:05 landry Exp $ dont create var/{run,lib,log} ---- Makefile.in.orig Fri Jul 9 12:02:16 2010 -+++ Makefile.in Thu Aug 5 13:07:16 2010 -@@ -815,9 +815,6 @@ uninstall-am: +--- Makefile.in.orig Sun Jan 26 09:09:57 2014 ++++ Makefile.in Mon Sep 22 16:59:12 2014 +@@ -881,9 +881,6 @@ uninstall-am: install-exec-hook: @@ -10,5 +10,5 @@ - $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME) - $(mkinstalldirs) $(DESTDIR)$(localstatedir)/log - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. + maintainer-clean-local: + -rm -f -r libltdl Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/sysutils/collectd/patches/patch-configure,v retrieving revision 1.3 diff -u -r1.3 patch-configure --- patches/patch-configure 29 Nov 2010 20:20:41 -0000 1.3 +++ patches/patch-configure 22 Sep 2014 15:52:28 -0000 @@ -1,7 +1,10 @@ $OpenBSD: patch-configure,v 1.3 2010/11/29 20:20:41 jasper Exp $ ---- configure.orig Sat Nov 27 11:10:52 2010 -+++ configure Mon Nov 29 20:20:38 2010 -@@ -11718,7 +11718,7 @@ LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""` +no Werror, breaks with gcrypt deprecation warnings +dont check for pcap-bpf.h, not installed on openbsd +need to include sys/param.h and unistd.h to properly reach swapctl() prototype +--- configure.orig Sun Jan 26 09:10:00 2014 ++++ configure Mon Sep 22 17:32:52 2014 +@@ -12793,7 +12793,7 @@ eval "LTDLOPEN=\"$libname_spec\"" @@ -10,7 +13,7 @@ -@@ -15457,7 +15457,7 @@ SAVE_CFLAGS="$CFLAGS" +@@ -16812,7 +16812,7 @@ SAVE_CFLAGS="$CFLAGS" # Emulate behavior of src/Makefile.am if test "x$GCC" = "xyes" then @@ -19,7 +22,53 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strtok_r" >&5 -@@ -20752,7 +20752,7 @@ then +@@ -17524,8 +17524,11 @@ else + # undef _LARGEFILE64_SOURCE + #endif + #include <sys/stat.h> ++#include <sys/param.h> + #include <sys/swap.h> ++#include <unistd.h> + ++ + int + main () + { +@@ -17561,7 +17564,9 @@ else + # undef _LARGEFILE64_SOURCE + #endif + #include <sys/stat.h> ++#include <sys/param.h> + #include <sys/swap.h> ++#include <unistd.h> + + int + main () +@@ -22812,23 +22817,7 @@ fi + done + + fi +-if test "x$with_libpcap" = "xyes" +-then +- for ac_header in pcap-bpf.h +-do : +- ac_fn_c_check_header_mongrel "$LINENO" "pcap-bpf.h" "ac_cv_header_pcap_bpf_h" "$ac_includes_default" +-if test "x$ac_cv_header_pcap_bpf_h" = xyes; then : +- cat >>confdefs.h <<_ACEOF +-#define HAVE_PCAP_BPF_H 1 +-_ACEOF + +-else +- with_libpcap="no (pcap-bpf.h not found)" +-fi +- +-done +- +-fi + if test "x$with_libpcap" = "xyes" + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libpcap has PCAP_ERROR_IFACE_NOT_UP" >&5 +@@ -23057,7 +23046,7 @@ then SAVE_LDFLAGS="$LDFLAGS" # trigger an error if Perl_load_module*() uses __attribute__nonnull__(3) # (see issues #41 and #42) Index: patches/patch-src_Makefile_in =================================================================== RCS file: /cvs/ports/sysutils/collectd/patches/patch-src_Makefile_in,v retrieving revision 1.5 diff -u -r1.5 patch-src_Makefile_in --- patches/patch-src_Makefile_in 24 Jan 2014 20:40:17 -0000 1.5 +++ patches/patch-src_Makefile_in 22 Sep 2014 15:52:28 -0000 @@ -1,29 +1,20 @@ $OpenBSD: patch-src_Makefile_in,v 1.5 2014/01/24 20:40:17 landry Exp $ Install config file in examples/ ---- src/Makefile.in.orig Sat Nov 27 11:10:51 2010 -+++ src/Makefile.in Sun Sep 23 21:17:24 2012 -@@ -37,7 +37,7 @@ build_triplet = @build@ +--- src/Makefile.in.orig Sun Jan 26 09:09:56 2014 ++++ src/Makefile.in Mon Sep 22 17:27:47 2014 +@@ -36,7 +36,7 @@ POST_UNINSTALL = : + build_triplet = @build@ host_triplet = @host@ - @BUILD_WITH_OWN_LIBIPTC_TRUE@am__append_1 = owniptc - @BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_2 = liboconfig --@BUILD_FEATURE_DAEMON_TRUE@am__append_3 = -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"' -+@BUILD_FEATURE_DAEMON_TRUE@am__append_3 = -DPIDFILE='"${localstatedir}/${PACKAGE_NAME}/${PACKAGE_NAME}.pid"' + @BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_1 = liboconfig +-@BUILD_FEATURE_DAEMON_TRUE@am__append_2 = -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"' ++@BUILD_FEATURE_DAEMON_TRUE@am__append_2 = -DPIDFILE='"${localstatedir}/${PACKAGE_NAME}/${PACKAGE_NAME}.pid"' sbin_PROGRAMS = collectd$(EXEEXT) collectdmon$(EXEEXT) - bin_PROGRAMS = collectd-nagios$(EXEEXT) - -@@ -57,7 +57,7 @@ bin_PROGRAMS = collectd-nagios$(EXEEXT) - @BUILD_WITH_LIBSTATGRAB_TRUE@am__append_13 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS) - @BUILD_WITH_LIBSTATGRAB_TRUE@am__append_14 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) - @BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_15 = $(LIBLTDL) liboconfig/liboconfig.la --@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_16 = $(LIBLTDL) liboconfig/liboconfig.la -+@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_16 = liboconfig/liboconfig.la - @BUILD_WITH_OWN_LIBOCONFIG_FALSE@am__append_17 = -loconfig - @BUILD_WITH_LIBSOCKET_TRUE@am__append_18 = -lsocket - @BUILD_AIX_TRUE@am__append_19 = -lm -@@ -1836,11 +1836,11 @@ top_build_prefix = @top_build_prefix@ + bin_PROGRAMS = collectd-nagios$(EXEEXT) collectdctl$(EXEEXT) \ + collectd-tg$(EXEEXT) $(am__EXEEXT_1) +@@ -2235,11 +2235,11 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ - SUBDIRS = libcollectdclient $(am__append_1) $(am__append_2) + SUBDIRS = libcollectdclient $(am__append_1) -@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror +@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall AM_CPPFLAGS = -DPREFIX='"${prefix}"' \ @@ -31,10 +22,10 @@ -DLOCALSTATEDIR='"${localstatedir}"' \ - -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' \ + -DPKGLOCALSTATEDIR='"${localstatedir}/${PACKAGE_NAME}"' \ - $(am__append_3) -DPLUGINDIR='"${pkglibdir}"' \ + $(am__append_2) -DPLUGINDIR='"${pkglibdir}"' \ -DPKGDATADIR='"${pkgdatadir}"' collectd_SOURCES = collectd.c collectd.h \ -@@ -2187,7 +2187,7 @@ CLEANFILES = $(am__append_250) +@@ -2655,7 +2655,7 @@ CLEANFILES = $(am__append_449) @BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE@notify_desktop_la_LIBADD = $(LIBNOTIFY_LIBS) @BUILD_PLUGIN_NOTIFY_EMAIL_TRUE@notify_email_la_SOURCES = notify_email.c @BUILD_PLUGIN_NOTIFY_EMAIL_TRUE@notify_email_la_LDFLAGS = -module -avoid-version @@ -42,9 +33,9 @@ +@BUILD_PLUGIN_NOTIFY_EMAIL_TRUE@notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread @BUILD_PLUGIN_NTPD_TRUE@ntpd_la_SOURCES = ntpd.c @BUILD_PLUGIN_NTPD_TRUE@ntpd_la_LDFLAGS = -module -avoid-version - @BUILD_PLUGIN_NTPD_TRUE@ntpd_la_LIBADD = $(am__append_226) -@@ -4039,13 +4039,8 @@ pinba.pb-c.c pinba.pb-c.h: pinba.proto - protoc-c --c_out $(builddir) pinba.proto + @BUILD_PLUGIN_NTPD_TRUE@ntpd_la_LIBADD = $(am__append_254) +@@ -4856,13 +4856,8 @@ uninstall-man: uninstall-man1 uninstall-man5 + @HAVE_PROTOC_C_TRUE@ protoc-c -I$(srcdir) --c_out . $(srcdir)/riemann.proto install-exec-hook: - $(mkinstalldirs) $(DESTDIR)$(sysconfdir) Index: patches/patch-src_collectd_conf_in =================================================================== RCS file: patches/patch-src_collectd_conf_in diff -N patches/patch-src_collectd_conf_in --- patches/patch-src_collectd_conf_in 23 Jun 2010 18:04:26 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_collectd_conf_in,v 1.1.1.1 2010/06/23 18:04:26 landry Exp $ ---- src/collectd.conf.in.orig Sun Jun 20 15:33:30 2010 -+++ src/collectd.conf.in Sun Jun 20 15:34:29 2010 -@@ -12,8 +12,8 @@ - - #Hostname "localhost" - FQDNLookup true --#BaseDir "@prefix@/var/lib/@PACKAGE_NAME@" --#PIDFile "@prefix@/var/run/@PACKAGE_NAME@.pid" -+#BaseDir "/var/@PACKAGE_NAME@" -+#PIDFile "/var/@PACKAGE_NAME@/@PACKAGE_NAME@.pid" - #PluginDir "@prefix@/lib/@PACKAGE_NAME@" - #TypesDB "@prefix@/share/@PACKAGE_NAME@/types.db" - #Interval 10 Index: patches/patch-src_dns_c =================================================================== RCS file: patches/patch-src_dns_c diff -N patches/patch-src_dns_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_dns_c 22 Sep 2014 15:52:28 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +We dont install nor need pcap-bpf.h on openbsd +--- src/dns.c.orig Mon Sep 22 17:26:48 2014 ++++ src/dns.c Mon Sep 22 17:26:52 2014 +@@ -33,7 +33,6 @@ + #include <poll.h> + + #include <pcap.h> +-#include <pcap-bpf.h> + + /* + * Private data types Index: patches/patch-src_libcollectdclient_Makefile_in =================================================================== RCS file: patches/patch-src_libcollectdclient_Makefile_in diff -N patches/patch-src_libcollectdclient_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_libcollectdclient_Makefile_in 22 Sep 2014 15:52:28 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- src/libcollectdclient/Makefile.in.orig Mon Sep 22 17:21:37 2014 ++++ src/libcollectdclient/Makefile.in Mon Sep 22 17:21:47 2014 +@@ -386,7 +386,7 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = foreign no-dependencies +-@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror ++@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall + pkginclude_HEADERS = collectd/client.h collectd/network.h collectd/network_buffer.h collectd/lcc_features.h + lib_LTLIBRARIES = libcollectdclient.la + nodist_pkgconfig_DATA = libcollectdclient.pc Index: patches/patch-src_plugin_h =================================================================== RCS file: patches/patch-src_plugin_h diff -N patches/patch-src_plugin_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_plugin_h 22 Sep 2014 15:52:28 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +missing include for pthread_t type +--- src/plugin.h.orig Mon Sep 22 17:24:30 2014 ++++ src/plugin.h Mon Sep 22 17:26:33 2014 +@@ -22,6 +22,7 @@ + * Sebastian Harl <sh at tokkee.org> + **/ + ++#include <pthread.h> + #include "collectd.h" + #include "configfile.h" + #include "meta_data.h" Index: patches/patch-src_tcpconns_c =================================================================== RCS file: /cvs/ports/sysutils/collectd/patches/patch-src_tcpconns_c,v retrieving revision 1.1 diff -u -r1.1 patch-src_tcpconns_c --- patches/patch-src_tcpconns_c 28 Dec 2013 20:44:21 -0000 1.1 +++ patches/patch-src_tcpconns_c 22 Sep 2014 15:52:28 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_tcpconns_c,v 1.1 2013/12/28 20:44:21 krw Exp $ ---- src/tcpconns.c.orig Fri Dec 27 11:33:41 2013 -+++ src/tcpconns.c Fri Dec 27 11:37:20 2013 -@@ -659,7 +659,6 @@ static int conn_init (void) +--- src/tcpconns.c.orig Sun Jan 26 09:09:14 2014 ++++ src/tcpconns.c Mon Sep 22 16:59:13 2014 +@@ -896,7 +896,6 @@ static int conn_init (void) static int conn_read (void) { struct inpcbtable table; @@ -9,7 +9,7 @@ struct inpcb *next; struct inpcb inpcb; struct tcpcb tcpcb; -@@ -672,18 +671,16 @@ static int conn_read (void) +@@ -909,18 +908,16 @@ static int conn_read (void) if (status != 0) return (-1); @@ -31,7 +31,7 @@ /* Ignore sockets, that are not connected. */ #ifdef __NetBSD__ -@@ -700,7 +697,7 @@ static int conn_read (void) +@@ -937,7 +934,7 @@ static int conn_read (void) kread ((u_long) inpcb.inp_ppcb, &tcpcb, sizeof (tcpcb)); conn_handle_ports (ntohs(inpcb.inp_lport), ntohs(inpcb.inp_fport), tcpcb.t_state); Index: patches/patch-src_utils_db_query_c =================================================================== RCS file: patches/patch-src_utils_db_query_c diff -N patches/patch-src_utils_db_query_c --- patches/patch-src_utils_db_query_c 23 Jun 2010 18:04:26 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,93 +0,0 @@ -$OpenBSD: patch-src_utils_db_query_c,v 1.1.1.1 2010/06/23 18:04:26 landry Exp $ ---- src/utils_db_query.c.orig Sat May 1 11:15:45 2010 -+++ src/utils_db_query.c Sat Jun 19 11:22:07 2010 -@@ -193,7 +193,7 @@ static int udb_config_set_uint (unsigned int *ret_valu - /* - * Legacy result private functions - */ --static void udb_legacy_result_finish_result (const udb_result_t const *r, /* {{{ */ -+static void udb_legacy_result_finish_result (const udb_result_t *r, /* {{{ */ - udb_result_preparation_area_t *prep_area) - { - if ((r == NULL) || (prep_area)) -@@ -207,7 +207,7 @@ static void udb_legacy_result_finish_result (const udb - static int udb_legacy_result_handle_result (udb_result_t *r, /* {{{ */ - udb_query_preparation_area_t *q_area, - udb_result_preparation_area_t *r_area, -- const udb_query_t const *q, char **column_values) -+ const udb_query_t *q, char **column_values) - { - value_list_t vl = VALUE_LIST_INIT; - value_t value; -@@ -247,7 +247,7 @@ static int udb_legacy_result_handle_result (udb_result - return (0); - } /* }}} int udb_legacy_result_handle_result */ - --static int udb_legacy_result_prepare_result (const udb_result_t const *r, /* {{{ */ -+static int udb_legacy_result_prepare_result (const udb_result_t *r, /* {{{ */ - udb_result_preparation_area_t *prep_area, - char **column_names, size_t column_num) - { -@@ -362,7 +362,7 @@ static int udb_legacy_result_create (const char *query - */ - static int udb_result_submit (udb_result_t *r, /* {{{ */ - udb_result_preparation_area_t *r_area, -- const udb_query_t const *q, udb_query_preparation_area_t *q_area) -+ const udb_query_t *q, udb_query_preparation_area_t *q_area) - { - value_list_t vl = VALUE_LIST_INIT; - size_t i; -@@ -438,7 +438,7 @@ static int udb_result_submit (udb_result_t *r, /* {{{ - return (0); - } /* }}} void udb_result_submit */ - --static void udb_result_finish_result (const udb_result_t const *r, /* {{{ */ -+static void udb_result_finish_result (const udb_result_t *r, /* {{{ */ - udb_result_preparation_area_t *prep_area) - { - if ((r == NULL) || (prep_area == NULL)) -@@ -462,7 +462,7 @@ static void udb_result_finish_result (const udb_result - static int udb_result_handle_result (udb_result_t *r, /* {{{ */ - udb_query_preparation_area_t *q_area, - udb_result_preparation_area_t *r_area, -- const udb_query_t const *q, char **column_values) -+ const udb_query_t *q, char **column_values) - { - size_t i; - -@@ -483,7 +483,7 @@ static int udb_result_handle_result (udb_result_t *r, - return udb_result_submit (r, r_area, q, q_area); - } /* }}} int udb_result_handle_result */ - --static int udb_result_prepare_result (const udb_result_t const *r, /* {{{ */ -+static int udb_result_prepare_result (const udb_result_t *r, /* {{{ */ - udb_result_preparation_area_t *prep_area, - char **column_names, size_t column_num) - { -@@ -1065,7 +1065,7 @@ int udb_query_check_version (udb_query_t *q, unsigned - return (1); - } /* }}} int udb_query_check_version */ - --void udb_query_finish_result (const udb_query_t const *q, /* {{{ */ -+void udb_query_finish_result (const udb_query_t *q, /* {{{ */ - udb_query_preparation_area_t *prep_area) - { - udb_result_preparation_area_t *r_area; -@@ -1091,7 +1091,7 @@ void udb_query_finish_result (const udb_query_t const - } - } /* }}} void udb_query_finish_result */ - --int udb_query_handle_result (const udb_query_t const *q, /* {{{ */ -+int udb_query_handle_result (const udb_query_t *q, /* {{{ */ - udb_query_preparation_area_t *prep_area, char **column_values) - { - udb_result_preparation_area_t *r_area; -@@ -1144,7 +1144,7 @@ int udb_query_handle_result (const udb_query_t const * - return (0); - } /* }}} int udb_query_handle_result */ - --int udb_query_prepare_result (const udb_query_t const *q, /* {{{ */ -+int udb_query_prepare_result (const udb_query_t *q, /* {{{ */ - udb_query_preparation_area_t *prep_area, - const char *host, const char *plugin, const char *db_name, - char **column_names, size_t column_num, int interval) Index: patches/patch-src_utils_db_query_h =================================================================== RCS file: patches/patch-src_utils_db_query_h diff -N patches/patch-src_utils_db_query_h --- patches/patch-src_utils_db_query_h 23 Jun 2010 18:04:26 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -$OpenBSD: patch-src_utils_db_query_h,v 1.1.1.1 2010/06/23 18:04:26 landry Exp $ ---- src/utils_db_query.h.orig Sat May 1 11:15:45 2010 -+++ src/utils_db_query.h Sat Jun 19 11:22:07 2010 -@@ -65,13 +65,13 @@ void *udb_query_get_user_data (udb_query_t *q); - */ - int udb_query_check_version (udb_query_t *q, unsigned int version); - --int udb_query_prepare_result (const udb_query_t const *q, -+int udb_query_prepare_result (const udb_query_t *q, - udb_query_preparation_area_t *prep_area, - const char *host, const char *plugin, const char *db_name, - char **column_names, size_t column_num, int interval); --int udb_query_handle_result (const udb_query_t const *q, -+int udb_query_handle_result (const udb_query_t *q, - udb_query_preparation_area_t *prep_area, char **column_values); --void udb_query_finish_result (const udb_query_t const *q, -+void udb_query_finish_result (const udb_query_t *q, - udb_query_preparation_area_t *prep_area); - - udb_query_preparation_area_t * Index: pkg/MESSAGE-main =================================================================== RCS file: pkg/MESSAGE-main diff -N pkg/MESSAGE-main --- pkg/MESSAGE-main 23 Jun 2010 18:04:26 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,4 +0,0 @@ -First, configure collectd in ${SYSCONFDIR}/collectd.conf, -Then use the following to start the daemon: - - sudo -u _collectd ${TRUEPREFIX}/sbin/collectd Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/sysutils/collectd/pkg/PLIST-main,v retrieving revision 1.5 diff -u -r1.5 PLIST-main --- pkg/PLIST-main 24 Jan 2014 20:40:17 -0000 1.5 +++ pkg/PLIST-main 22 Sep 2014 15:52:28 -0000 @@ -2,9 +2,13 @@ @newgroup _collectd:652 @newuser _collectd:652:652:daemon:Collectd Daemon:/var/empty:/sbin/nologin @bin bin/collectd-nagios +@bin bin/collectd-tg +@bin bin/collectdctl include/collectd/ include/collectd/client.h include/collectd/lcc_features.h +include/collectd/network.h +include/collectd/network_buffer.h lib/collectd/ @comment lib/collectd/apache.la lib/collectd/apache.so @@ -64,6 +68,8 @@ lib/collectd/olsrd.so @comment lib/collectd/openvpn.la lib/collectd/openvpn.so +@comment lib/collectd/pf.la +lib/collectd/pf.so @comment lib/collectd/powerdns.la lib/collectd/powerdns.so @comment lib/collectd/swap.la @@ -74,6 +80,8 @@ lib/collectd/table.so @comment lib/collectd/tail.la lib/collectd/tail.so +@comment lib/collectd/tail_csv.la +lib/collectd/tail_csv.so @comment lib/collectd/target_notification.la lib/collectd/target_notification.so @comment lib/collectd/target_replace.la @@ -82,6 +90,8 @@ lib/collectd/target_scale.so @comment lib/collectd/target_set.la lib/collectd/target_set.so +@comment lib/collectd/target_v5upgrade.la +lib/collectd/target_v5upgrade.so @comment lib/collectd/tcpconns.la lib/collectd/tcpconns.so @comment lib/collectd/teamspeak2.la @@ -96,22 +106,25 @@ lib/collectd/users.so @comment lib/collectd/uuid.la lib/collectd/uuid.so +@comment lib/collectd/write_graphite.la +lib/collectd/write_graphite.so @comment lib/collectd/write_http.la lib/collectd/write_http.so @comment lib/libcollectdclient.la @lib lib/libcollectdclient.so.${LIBcollectdclient_VERSION} lib/pkgconfig/libcollectdclient.pc @comment libdata/perl5/${MACHINE_ARCH}-openbsd/ -@comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.12.2/ -@comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.12.2/perllocal.pod +@comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.18.2/ +@comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.18.2/perllocal.pod libdata/perl5/site_perl/Collectd/ libdata/perl5/site_perl/Collectd.pm libdata/perl5/site_perl/Collectd/Plugins/ -libdata/perl5/site_perl/Collectd/Plugins/Monitorus.pm libdata/perl5/site_perl/Collectd/Plugins/OpenVZ.pm libdata/perl5/site_perl/Collectd/Unixsock.pm @man man/man1/collectd-nagios.1 +@man man/man1/collectd-tg.1 @man man/man1/collectd.1 +@man man/man1/collectdctl.1 @man man/man1/collectdmon.1 @man man/man3p/Collectd::Unixsock.3p @man man/man5/collectd-email.5 @@ -119,6 +132,7 @@ @man man/man5/collectd-java.5 @man man/man5/collectd-perl.5 @man man/man5/collectd-python.5 +@man man/man5/collectd-threshold.5 @man man/man5/collectd-unixsock.5 @man man/man5/collectd.conf.5 @man man/man5/types.db.5 @@ -134,3 +148,6 @@ @owner _collectd @group _collectd @sample /var/collectd/ +@owner +@group +@rcscript ${RCDIR}/collectd Index: pkg/collectd.rc =================================================================== RCS file: pkg/collectd.rc diff -N pkg/collectd.rc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/collectd.rc 22 Sep 2014 15:52:28 -0000 @@ -0,0 +1,11 @@ +#!/bin/sh +# +# $OpenBSD$ + +daemon="${TRUEPREFIX}/sbin/collectd" + +. /etc/rc.d/rc.subr + +rc_reload=NO + +rc_cmd $1
