Sorry, forgot to cvs delete before diff. The correct diff for sysutils/collectd attached.
-- With best regards, Pavel Korovin
Index: Makefile =================================================================== RCS file: /cvs/ports/sysutils/collectd/Makefile,v retrieving revision 1.40 diff -u -p -r1.40 Makefile --- Makefile 7 Nov 2016 10:51:36 -0000 1.40 +++ Makefile 14 Nov 2016 17:31:23 -0000 @@ -9,10 +9,9 @@ COMMENT-virt = collectd libvirt plugin COMMENT-python = collectd python plugin COMMENT-memcachec = collectd memcachec plugin COMMENT-nut = collectd nut plugin +COMMENT-riemann = collectd riemann plugin -V = 5.5.1 -REVISION-main = 0 -REVISION-virt = 1 +V = 5.6.1 DISTNAME = collectd-$V PKGNAME-main = collectd-$V PKGNAME-mysql = collectd-mysql-$V @@ -23,6 +22,7 @@ PKGNAME-virt = collectd-virt-$V PKGNAME-python = collectd-python-$V PKGNAME-memcachec = collectd-memcachec-$V PKGNAME-nut = collectd-nut-$V +PKGNAME-riemann = collectd-riemann-$V CATEGORIES = sysutils HOMEPAGE = http://www.collectd.org/ @@ -32,11 +32,13 @@ SHARED_LIBS += collectdclient 1.0 PERMIT_PACKAGE_CDROM = Yes MASTER_SITES = ${HOMEPAGE}/files/ +EXTRACT_SUFX = .tar.bz2 MODULES = devel/gettext lang/python MODPY_RUNDEP = No -MULTI_PACKAGES = -main -mysql -pgsql -rrdtool -snmp -virt -python -memcachec -nut +MULTI_PACKAGES = -main -mysql -pgsql -rrdtool -snmp -virt -python -memcachec -nut -riemann + WANTLIB-mysql = crypto m ssl z mysqlclient_r pthread LIB_DEPENDS-mysql = databases/mariadb @@ -78,6 +80,11 @@ LIB_DEPENDS-nut = nut->=2.7.3p0:sysutils RUN_DEPENDS-nut = collectd-$V:${BASE_PKGPATH},-main WANTLIB-nut = crypto pthread ssl upsclient +LIB_DEPENDS-riemann = sysutils/riemann-c-client +WANTLIB-riemann = c gmp gnutls ffi hogweed intl iconv idn json-c m \ + nettle protobuf p11-kit pthread riemann-client stdc++ tasn1 z +RUN_DEPENDS-riemann = collectd-$V:${BASE_PKGPATH},-main + LIB_DEPENDS += net/curl \ net/liboping \ textproc/libxml \ @@ -99,7 +106,7 @@ CONFIGURE_ARGS +=--with-ltdl-include=${L --with-ltdl-lib=${LOCALBASE}/lib \ --with-librrd=${LOCALBASE} \ --with-libstatgrab=${LOCALBASE} \ - --with-libnetsnmp=${LOCALBASE}/bin/net-snmp-config \ + --with-libnetsnmp=${LOCALBASE} \ --with-python=${MODPY_BIN} \ --enable-all-plugins=no @@ -117,12 +124,14 @@ ENABLED_PLUGINS = apache apcups ascent b users uuid write_http write_graphite pf python virt memcachec nut \ aggregation curl_json log_logstash memcached \ threshold write_log write_riemann +# threshold write_log .for _plugin in ${ENABLED_PLUGINS} CONFIGURE_ARGS += --enable-${_plugin} .endfor -CONFIGURE_ENV += CPPFLAGS='-I${LOCALBASE}/include' \ +CONFIGURE_ENV += PYTHON_CONFIG='${LOCALBASE}/bin/python2.7-config' \ + CPPFLAGS='-I${LOCALBASE}/include' \ LDFLAGS='-L${LOCALBASE}/lib -L${X11BASE}/lib -pthread' .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/sysutils/collectd/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- distinfo 13 Jun 2016 09:12:40 -0000 1.7 +++ distinfo 14 Nov 2016 17:31:23 -0000 @@ -1,2 +1,2 @@ -SHA256 (collectd-5.5.1.tar.gz) = TbpR1iQ/93hY//H/vv5vZShoH/IZBR8SKqJyfiYnEHk= -SIZE (collectd-5.5.1.tar.gz) = 2254181 +SHA256 (collectd-5.6.1.tar.bz2) = ww/2RPkUB7TcLZl4e5nMRewA5Ti9HMJpQp08XopK7iw= +SIZE (collectd-5.6.1.tar.bz2) = 1903962 Index: patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/sysutils/collectd/patches/patch-Makefile_in,v retrieving revision 1.6 diff -u -p -r1.6 patch-Makefile_in --- patches/patch-Makefile_in 13 Jun 2016 09:12:40 -0000 1.6 +++ patches/patch-Makefile_in 14 Nov 2016 17:31:23 -0000 @@ -1,8 +1,7 @@ -$OpenBSD: patch-Makefile_in,v 1.6 2016/06/13 09:12:40 landry Exp $ -dont create var/{run,lib,log} ---- Makefile.in.orig Fri Jan 22 10:55:46 2016 -+++ Makefile.in Mon Jun 6 09:18:40 2016 -@@ -947,9 +947,6 @@ uninstall-am: +$OpenBSD$ +--- Makefile.in.orig Wed Nov 9 19:58:43 2016 ++++ Makefile.in Wed Nov 9 19:59:27 2016 +@@ -988,9 +988,6 @@ uninstall-am: install-exec-hook: Index: patches/patch-configure =================================================================== RCS file: patches/patch-configure diff -N patches/patch-configure --- patches/patch-configure 13 Jun 2016 09:12:40 -0000 1.10 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,26 +0,0 @@ -$OpenBSD: patch-configure,v 1.10 2016/06/13 09:12:40 landry Exp $ - -- no Werror, breaks with gcrypt deprecation warnings -- dont check for pcap-bpf.h, not installed on openbsd -- in rrdtool the main librrd.so is now threadsafe, there is no more librrd_th.so - ---- configure.orig Fri Jan 22 10:55:47 2016 -+++ configure Mon Jun 6 09:18:40 2016 -@@ -17470,7 +17470,7 @@ SAVE_CFLAGS="$CFLAGS" - # Emulate behavior of src/Makefile.am - if test "x$GCC" = "xyes" - then -- CFLAGS="$CFLAGS -Wall -Werror" -+ CFLAGS="$CFLAGS -Wall" - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strtok_r" >&5 -@@ -25194,7 +25194,7 @@ then - - - fi --if test "x$librrd_threadsafe" = "xyes" -+if 1 - then - - $as_echo "#define HAVE_THREADSAFE_LIBRRD 1" >>confdefs.h Index: patches/patch-src_Makefile_in =================================================================== RCS file: /cvs/ports/sysutils/collectd/patches/patch-src_Makefile_in,v retrieving revision 1.9 diff -u -p -r1.9 patch-src_Makefile_in --- patches/patch-src_Makefile_in 13 Jun 2016 09:12:40 -0000 1.9 +++ patches/patch-src_Makefile_in 14 Nov 2016 17:31:23 -0000 @@ -1,21 +1,16 @@ -$OpenBSD: patch-src_Makefile_in,v 1.9 2016/06/13 09:12:40 landry Exp $ ---- src/Makefile.in.orig Fri Jan 22 10:55:46 2016 -+++ src/Makefile.in Mon Jun 6 09:18:40 2016 +$OpenBSD$ +--- src/Makefile.in.orig Wed Nov 9 20:02:37 2016 ++++ src/Makefile.in Wed Nov 9 20:05:56 2016 @@ -80,7 +80,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ @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 = collectdmon$(EXEEXT) - bin_PROGRAMS = collectd-nagios$(EXEEXT) collectdctl$(EXEEXT) \ - collectd-tg$(EXEEXT) -@@ -2422,11 +2422,11 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - SUBDIRS = libcollectdclient $(am__append_1) daemon - PLUGIN_LDFLAGS = -module -avoid-version -export-symbols-regex '\<module_register\>' --@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror -+@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall + check_PROGRAMS = $(am__EXEEXT_1) test_utils_latency$(EXEEXT) \ + test_utils_vl_lookup$(EXEEXT) test_utils_mount$(EXEEXT) \ + $(am__EXEEXT_2) +@@ -2610,7 +2610,7 @@ PLUGIN_LDFLAGS = -module -avoid-version -export-symbol AM_CPPFLAGS = -I$(srcdir)/daemon -DPREFIX='"${prefix}"' \ -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \ -DLOCALSTATEDIR='"${localstatedir}"' \ @@ -23,9 +18,9 @@ $OpenBSD: patch-src_Makefile_in,v 1.9 20 + -DPKGLOCALSTATEDIR='"${localstatedir}/${PACKAGE_NAME}"' \ $(am__append_2) -DPLUGINDIR='"${pkglibdir}"' \ -DPKGDATADIR='"${pkgdatadir}"' - AUTOMAKE_OPTIONS = subdir-objects -@@ -5120,13 +5120,8 @@ uninstall-man: uninstall-man1 uninstall-man5 - @BUILD_PLUGIN_WRITE_RIEMANN_TRUE@ $(AM_V_PROTOC_C)protoc-c -I$(srcdir) --c_out . $(srcdir)/riemann.proto + LOG_COMPILER = env VALGRIND="@VALGRIND@" $(abs_top_srcdir)/testwrapper.sh +@@ -5519,13 +5519,8 @@ uninstall-man: uninstall-man1 uninstall-man5 + @BUILD_PLUGIN_PINBA_TRUE@ $(AM_V_PROTOC_C)$(PROTOC_C) -I$(srcdir) --c_out . $(srcdir)/pinba.proto install-exec-hook: - $(mkinstalldirs) $(DESTDIR)$(sysconfdir) Index: patches/patch-src_collectd_conf_in =================================================================== RCS file: /cvs/ports/sysutils/collectd/patches/patch-src_collectd_conf_in,v retrieving revision 1.2 diff -u -p -r1.2 patch-src_collectd_conf_in --- patches/patch-src_collectd_conf_in 26 Sep 2014 22:19:32 -0000 1.2 +++ patches/patch-src_collectd_conf_in 14 Nov 2016 17:31:23 -0000 @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_collectd_conf_in,v 1.2 2014/09/26 22:19:32 landry Exp $ ---- src/collectd.conf.in.orig Fri Sep 26 20:53:46 2014 -+++ src/collectd.conf.in Fri Sep 26 20:54:09 2014 +$OpenBSD$ +--- src/collectd.conf.in.orig Wed Nov 9 20:06:20 2016 ++++ src/collectd.conf.in Wed Nov 9 20:07:11 2016 @@ -12,8 +12,8 @@ #Hostname "localhost" Index: patches/patch-src_daemon_Makefile_in =================================================================== RCS file: /cvs/ports/sysutils/collectd/patches/patch-src_daemon_Makefile_in,v retrieving revision 1.2 diff -u -p -r1.2 patch-src_daemon_Makefile_in --- patches/patch-src_daemon_Makefile_in 13 Jun 2016 09:12:40 -0000 1.2 +++ patches/patch-src_daemon_Makefile_in 14 Nov 2016 17:31:23 -0000 @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_daemon_Makefile_in,v 1.2 2016/06/13 09:12:40 landry Exp $ ---- src/daemon/Makefile.in.orig Fri Jan 22 10:55:46 2016 -+++ src/daemon/Makefile.in Mon Jun 6 09:19:46 2016 +$OpenBSD$ +--- src/daemon/Makefile.in.orig Wed Nov 9 20:07:31 2016 ++++ src/daemon/Makefile.in Wed Nov 9 20:08:36 2016 @@ -79,7 +79,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ @@ -10,7 +10,7 @@ $OpenBSD: patch-src_daemon_Makefile_in,v @BUILD_WITH_LIBRT_TRUE@am__append_2 = -lrt @BUILD_WITH_LIBPOSIX4_TRUE@am__append_3 = -lposix4 @BUILD_WITH_LIBSOCKET_TRUE@am__append_4 = -lsocket -@@ -713,7 +713,7 @@ top_srcdir = @top_srcdir@ +@@ -771,7 +771,7 @@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/src -DPREFIX='"${prefix}"' \ -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \ -DLOCALSTATEDIR='"${localstatedir}"' \ Index: patches/patch-src_libcollectdclient_Makefile_in =================================================================== RCS file: patches/patch-src_libcollectdclient_Makefile_in diff -N patches/patch-src_libcollectdclient_Makefile_in --- patches/patch-src_libcollectdclient_Makefile_in 31 Jul 2015 12:05:36 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_libcollectdclient_Makefile_in,v 1.3 2015/07/31 12:05:36 landry Exp $ ---- src/libcollectdclient/Makefile.in.orig Wed May 27 09:51:49 2015 -+++ src/libcollectdclient/Makefile.in Fri Jul 31 13:55:59 2015 -@@ -472,7 +472,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_pf_c =================================================================== RCS file: /cvs/ports/sysutils/collectd/patches/patch-src_pf_c,v retrieving revision 1.3 diff -u -p -r1.3 patch-src_pf_c --- patches/patch-src_pf_c 13 Jun 2016 09:12:40 -0000 1.3 +++ patches/patch-src_pf_c 14 Nov 2016 17:31:23 -0000 @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_pf_c,v 1.3 2016/06/13 09:12:40 landry Exp $ ---- src/pf.c.orig Fri Jan 22 10:51:17 2016 -+++ src/pf.c Mon Jun 6 09:18:40 2016 -@@ -36,6 +36,7 @@ +$OpenBSD$ +--- src/pf.c.orig Wed Nov 9 20:10:17 2016 ++++ src/pf.c Wed Nov 9 20:10:57 2016 +@@ -34,6 +34,7 @@ # include <netinet/in.h> #endif Index: patches/patch-src_processes_c =================================================================== RCS file: patches/patch-src_processes_c diff -N patches/patch-src_processes_c --- patches/patch-src_processes_c 13 Jun 2016 09:12:40 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_processes_c,v 1.4 2016/06/13 09:12:40 landry Exp $ - -https://github.com/collectd/collectd/issues/1674 - ---- src/processes.c.orig Mon Jun 6 10:05:24 2016 -+++ src/processes.c Mon Jun 6 10:05:35 2016 -@@ -2046,9 +2046,6 @@ static int ps_read (void) - pse.io_syscr = -1; - pse.io_syscw = -1; - -- pse.cswitch_vol = -1; -- pse.cswitch_invol = -1; -- - ps_list_add (procs[i].p_comm, have_cmdline ? cmdline : NULL, &pse); - - switch (procs[i].p_stat) Index: pkg/DESCR-riemann =================================================================== RCS file: pkg/DESCR-riemann diff -N pkg/DESCR-riemann --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/DESCR-riemann 14 Nov 2016 17:31:23 -0000 @@ -0,0 +1 @@ +Riemann plugin for collectd. Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/sysutils/collectd/pkg/PLIST-main,v retrieving revision 1.10 diff -u -p -r1.10 PLIST-main --- pkg/PLIST-main 13 Jun 2016 09:12:40 -0000 1.10 +++ pkg/PLIST-main 14 Nov 2016 17:31:23 -0000 @@ -124,14 +124,12 @@ lib/collectd/write_graphite.so lib/collectd/write_http.so @comment lib/collectd/write_log.la lib/collectd/write_log.so -@comment lib/collectd/write_riemann.la -lib/collectd/write_riemann.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.20.2/ -@comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.20.2/perllocal.pod +@comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.20.3/ +@comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.20.3/perllocal.pod libdata/perl5/site_perl/Collectd/ libdata/perl5/site_perl/Collectd.pm libdata/perl5/site_perl/Collectd/Plugins/ @@ -146,6 +144,7 @@ libdata/perl5/site_perl/Collectd/Unixsoc @man man/man5/collectd-email.5 @man man/man5/collectd-exec.5 @man man/man5/collectd-java.5 +@man man/man5/collectd-lua.5 @man man/man5/collectd-perl.5 @man man/man5/collectd-python.5 @man man/man5/collectd-threshold.5 Index: pkg/PLIST-riemann =================================================================== RCS file: pkg/PLIST-riemann diff -N pkg/PLIST-riemann --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/PLIST-riemann 14 Nov 2016 17:31:23 -0000 @@ -0,0 +1,3 @@ +@comment $OpenBSD$ +@comment lib/collectd/write_riemann.la +lib/collectd/write_riemann.so
