From owner-svn-ports-all@freebsd.org Tue Nov 21 18:40:27 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BD0B5DF6782; Tue, 21 Nov 2017 18:40:27 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 856CC7B092; Tue, 21 Nov 2017 18:40:27 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vALIeQNq013713; Tue, 21 Nov 2017 18:40:26 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vALIeQtN013705; Tue, 21 Nov 2017 18:40:26 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201711211840.vALIeQtN013705@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Tue, 21 Nov 2017 18:40:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r454647 - in head/net-mgmt/collectd5: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/net-mgmt/collectd5: . files X-SVN-Commit-Revision: 454647 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Nov 2017 18:40:27 -0000 Author: swills Date: Tue Nov 21 18:40:25 2017 New Revision: 454647 URL: https://svnweb.freebsd.org/changeset/ports/454647 Log: net-mgmt/collectd5: update to 5.8.0 PR: 223789 Submitted by: Krzysztof (maintainer) Added: head/net-mgmt/collectd5/files/patch-Makefile.in (contents, props changed) head/net-mgmt/collectd5/files/patch-src_daemon_collectd.h (contents, props changed) Deleted: head/net-mgmt/collectd5/files/patch-configure.ac head/net-mgmt/collectd5/files/patch-src__Makefile.am head/net-mgmt/collectd5/files/patch-src__daemon__Makefile.am head/net-mgmt/collectd5/files/patch-src__daemon__collectd.h head/net-mgmt/collectd5/files/patch-src__dns.c head/net-mgmt/collectd5/files/patch-src__modbus.c head/net-mgmt/collectd5/files/patch-src__tcpconns.c head/net-mgmt/collectd5/files/patch-src_config.h.in head/net-mgmt/collectd5/files/patch-src_write__mongodb.c Modified: head/net-mgmt/collectd5/Makefile head/net-mgmt/collectd5/distinfo head/net-mgmt/collectd5/files/patch-Makefile.am head/net-mgmt/collectd5/files/patch-src_zfs__arc.c head/net-mgmt/collectd5/files/patch-version-gen.sh head/net-mgmt/collectd5/pkg-plist Modified: head/net-mgmt/collectd5/Makefile ============================================================================== --- head/net-mgmt/collectd5/Makefile Tue Nov 21 18:16:03 2017 (r454646) +++ head/net-mgmt/collectd5/Makefile Tue Nov 21 18:40:25 2017 (r454647) @@ -2,11 +2,9 @@ # $FreeBSD$ PORTNAME= collectd -PORTVERSION= 5.7.2 -PORTREVISION= 1 +PORTVERSION= 5.8.0 CATEGORIES= net-mgmt -MASTER_SITES= https://collectd.org/files/ \ - http://collectd.org/files/ +MASTER_SITES= https://storage.googleapis.com/collectd-tarballs/ PKGNAMESUFFIX= 5 MAINTAINER= ports@bsdserwis.com @@ -18,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= autoreconf gmake libtool pkgconfig shebangfix tar:bzip2 GNU_CONFIGURE= yes -OPTIONS_DEFINE= CGI DEBUG GCRYPT LOGSTASH VIRT +OPTIONS_DEFINE= CGI JAVA LOGGING GCRYPT LOGSTASH VIRT OPTIONS_GROUP= INPUT OUTPUT OPTIONS_GROUP_OUTPUT= KAFKA MONGODB NOTIFYDESKTOP NOTIFYEMAIL RIEMANN RRDTOOL \ TSDB @@ -28,7 +26,7 @@ OPTIONS_GROUP_INPUT= CHRONY CURL CURL_JSON CURL_XML DB SIGROK SNMP STATSD TOKYOTYRANT VARNISH XML \ XMMS ZOOKEEPER -OPTIONS_DEFAULT= DEBUG GCRYPT PING +OPTIONS_DEFAULT= LOGGING GCRYPT PING CGI_DESC= Install collection.cgi (requires rrdtool) CHRONY_DESC= Enable chronyd plugin @@ -40,6 +38,7 @@ GCRYPT_DESC= Build with libgcrypt IPMI_DESC= Enable OpenIPMI plugin JSON_DESC= Enable JSON plugins KAFKA_DESC= Enable write_kafka plugin +LOGGING_DESC= Enable debug logging LOGSTASH_DESC= Enable log_logstash plugin (requires json) MEMCACHEC_DESC= Enable memcachec plugin MODBUS_DESC= Enable modbus plugin @@ -90,11 +89,9 @@ CONFIGURE_ARGS= --localstatedir=/var \ --disable-ceph \ --disable-cgroups \ --disable-fhcount \ - --without-java \ --without-libaquaero5 \ --without-libganglia \ --without-libiptc \ - --without-libjvm \ --without-liblvm2app \ --without-libkstat \ --without-libldap \ @@ -127,7 +124,9 @@ CURL_JSON_CONFIGURE_ENABLE= curl_json CURL_XML_IMPLIES= CURL XML CURL_XML_CONFIGURE_ENABLE= ascent bind curl_xml -DEBUG_CONFIGURE_ENABLE= debug +JAVA_USE= java +JAVA_CONFIGURE_ENABLE= java +JAVA_CONFIGURE_WITH= java=${LOCALBASE} libjvm DBI_LIB_DEPENDS= libdbi.so:databases/libdbi DBI_CONFIGURE_WITH= libdbi=${LOCALBASE} @@ -148,6 +147,8 @@ JSON_CONFIGURE_WITH= libyajl=${LOCALBASE} KAFKA_LIB_DEPENDS= librdkafka.so:net/librdkafka KAFKA_CONFIGURE_ENABLE= write_kafka +LOGGING_CONFIGURE_ENABLE= debug + LOGSTASH_CONFIGURE_ENABLE= log_logstash LOGSTASH_IMPLIES= JSON @@ -199,7 +200,8 @@ OPENLDAP_CONFIGURE_WITH= libldap=${LOCALBASE} PERL_USES= perl5 PERL_CONFIGURE_ENABLE= perl -PERL_CONFIGURE_WITH= perl=${PERL} perl-bindings +PERL_CONFIGURE_DISABLE= perl +PERL_CONFIGURE_WITH= perl=${PERL} perl-bindings libperl PGSQL_USES= pgsql PGSQL_CONFIGURE_ENABLE= postgresql @@ -338,14 +340,14 @@ SHEBANG_FILES= contrib/collection.cgi post-patch: @${REINPLACE_CMD} 's/-Werror//' \ - ${WRKSRC}/configure.ac ${WRKSRC}/src/Makefile.am \ - ${WRKSRC}/src/libcollectdclient/Makefile.am + ${WRKSRC}/configure.ac @${REINPLACE_CMD} \ -e 's;@prefix@/var/;/var/;' \ -e 's;/var/lib/;/var/db/;' \ -e 's;@localstatedir@/lib/;/var/db/;' \ ${WRKSRC}/src/collectd.conf.in \ - ${WRKSRC}/src/collectd.conf.5 + ${WRKSRC}/src/collectd.conf.5 \ + ${WRKSRC}/src/collectd.conf.pod @${REINPLACE_CMD} \ -e 's;/etc/collection\.conf;${WWWDIR}/collection.conf;' \ ${WRKSRC}/contrib/collection.cgi Modified: head/net-mgmt/collectd5/distinfo ============================================================================== --- head/net-mgmt/collectd5/distinfo Tue Nov 21 18:16:03 2017 (r454646) +++ head/net-mgmt/collectd5/distinfo Tue Nov 21 18:40:25 2017 (r454647) @@ -1,3 +1,3 @@ -TIMESTAMP = 1500286881 -SHA256 (collectd-5.7.2.tar.bz2) = 9d20a0221569a8d6b80bbc52b86e5e84965f5bafdbf5dfc3790e0fed0763e592 -SIZE (collectd-5.7.2.tar.bz2) = 1798777 +TIMESTAMP = 1511130105 +SHA256 (collectd-5.8.0.tar.bz2) = b06ff476bbf05533cb97ae6749262cc3c76c9969f032bd8496690084ddeb15c9 +SIZE (collectd-5.8.0.tar.bz2) = 1686017 Modified: head/net-mgmt/collectd5/files/patch-Makefile.am ============================================================================== --- head/net-mgmt/collectd5/files/patch-Makefile.am Tue Nov 21 18:16:03 2017 (r454646) +++ head/net-mgmt/collectd5/files/patch-Makefile.am Tue Nov 21 18:40:25 2017 (r454647) @@ -1,10 +1,29 @@ ---- Makefile.am.orig 2016-09-11 08:10:25 UTC +--- Makefile.am.orig 2017-11-18 09:03:27 UTC +++ Makefile.am -@@ -14,7 +14,6 @@ EXTRA_DIST = contrib version-gen.sh test +@@ -165,7 +165,7 @@ AM_CPPFLAGS = \ + -DPREFIX='"${prefix}"' \ + -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \ + -DLOCALSTATEDIR='"${localstatedir}"' \ +- -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' \ ++ -DPKGLOCALSTATEDIR='"/var/db/${PACKAGE_NAME}"' \ + -DPLUGINDIR='"${pkglibdir}"' \ + -DPKGDATADIR='"${pkgdatadir}"' +@@ -1964,15 +1964,10 @@ endif + install-exec-hook: $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run - $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME) ++ $(mkinstalldirs) $(DESTDIR)/var/db/$(PACKAGE_NAME) $(mkinstalldirs) $(DESTDIR)$(localstatedir)/log - - maintainer-clean-local: + $(mkinstalldirs) $(DESTDIR)$(sysconfdir) +- if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \ +- then \ +- $(INSTALL) -m 0640 $(srcdir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.pkg-orig; \ +- else \ +- $(INSTALL) -m 0640 $(srcdir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \ +- fi; \ ++ $(INSTALL) -m 0640 src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.sample + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) + $(INSTALL) -m 0644 $(srcdir)/src/types.db $(DESTDIR)$(pkgdatadir)/types.db; + $(INSTALL) -m 0644 $(srcdir)/src/postgresql_default.conf \ Added: head/net-mgmt/collectd5/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/collectd5/files/patch-Makefile.in Tue Nov 21 18:40:25 2017 (r454647) @@ -0,0 +1,216 @@ +--- Makefile.in.orig 2017-11-18 09:03:50 UTC ++++ Makefile.in +@@ -1,7 +1,7 @@ +-# Makefile.in generated by automake 1.14.1 from Makefile.am. ++# Makefile.in generated by automake 1.15.1 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994-2013 Free Software Foundation, Inc. ++# Copyright (C) 1994-2017 Free Software Foundation, Inc. + + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -18,7 +18,17 @@ + + + VPATH = @srcdir@ +-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__is_gnu_make = { \ ++ if test -z '$(MAKELEVEL)'; then \ ++ false; \ ++ elif test -n '$(MAKE_HOST)'; then \ ++ true; \ ++ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ ++ true; \ ++ else \ ++ false; \ ++ fi; \ ++} + am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ +@@ -351,26 +361,6 @@ check_PROGRAMS = test_common$(EXEEXT) te + @BUILD_PLUGIN_WRITE_PROMETHEUS_TRUE@am__append_237 = prometheus.pb-c.c prometheus.pb-c.h + @HAVE_GRPC_CPP_TRUE@@HAVE_PROTOC3_TRUE@am__append_238 = collectd.grpc.pb.cc collectd.pb.cc types.pb.cc + subdir = . +-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ +- $(top_srcdir)/configure $(am__configure_deps) \ +- $(top_srcdir)/src/config.h.in \ +- $(top_srcdir)/src/libcollectdclient/collectd/lcc_features.h.in \ +- $(top_srcdir)/src/collectd.conf.in \ +- $(top_srcdir)/src/libcollectdclient/libcollectdclient.pc.in \ +- src/liboconfig/scanner.c src/liboconfig/parser.h \ +- src/liboconfig/parser.c $(top_srcdir)/build-aux/depcomp \ +- $(top_srcdir)/build-aux/ylwrap $(am__dist_noinst_JAVA_DIST) \ +- $(dist_man_MANS) $(pkginclude_HEADERS) \ +- $(top_srcdir)/build-aux/test-driver AUTHORS COPYING ChangeLog \ +- README build-aux/compile build-aux/config.guess \ +- build-aux/config.sub build-aux/depcomp build-aux/install-sh \ +- build-aux/missing build-aux/ylwrap build-aux/ltmain.sh \ +- $(top_srcdir)/build-aux/compile \ +- $(top_srcdir)/build-aux/config.guess \ +- $(top_srcdir)/build-aux/config.sub \ +- $(top_srcdir)/build-aux/install-sh \ +- $(top_srcdir)/build-aux/ltmain.sh \ +- $(top_srcdir)/build-aux/missing + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \ + $(top_srcdir)/m4/ax_compiler_vendor.m4 \ +@@ -379,6 +369,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) ++DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ ++ $(am__configure_deps) $(am__dist_noinst_JAVA_DIST) \ ++ $(pkginclude_HEADERS) $(am__DIST_COMMON) + am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno config.status.lineno + mkinstalldirs = $(install_sh) -d +@@ -2673,6 +2666,25 @@ TEST_LOGS = $(am__test_logs2:.test.log=. + TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver + TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) ++am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \ ++ $(top_srcdir)/build-aux/compile \ ++ $(top_srcdir)/build-aux/config.guess \ ++ $(top_srcdir)/build-aux/config.sub \ ++ $(top_srcdir)/build-aux/depcomp \ ++ $(top_srcdir)/build-aux/install-sh \ ++ $(top_srcdir)/build-aux/ltmain.sh \ ++ $(top_srcdir)/build-aux/missing \ ++ $(top_srcdir)/build-aux/test-driver \ ++ $(top_srcdir)/build-aux/ylwrap \ ++ $(top_srcdir)/src/collectd.conf.in \ ++ $(top_srcdir)/src/config.h.in \ ++ $(top_srcdir)/src/libcollectdclient/collectd/lcc_features.h.in \ ++ $(top_srcdir)/src/libcollectdclient/libcollectdclient.pc.in \ ++ AUTHORS COPYING ChangeLog INSTALL NEWS README \ ++ build-aux/compile build-aux/config.guess build-aux/config.sub \ ++ build-aux/depcomp build-aux/install-sh build-aux/ltmain.sh \ ++ build-aux/missing build-aux/ylwrap src/liboconfig/parser.c \ ++ src/liboconfig/parser.h src/liboconfig/scanner.c + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + distdir = $(PACKAGE)-$(VERSION) + top_distdir = $(distdir) +@@ -2908,6 +2920,7 @@ LOAD_PLUGIN_NETWORK = @LOAD_PLUGIN_NETWO + LOAD_PLUGIN_RRDTOOL = @LOAD_PLUGIN_RRDTOOL@ + LOAD_PLUGIN_SYSLOG = @LOAD_PLUGIN_SYSLOG@ + LTLIBOBJS = @LTLIBOBJS@ ++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ + LUA_CFLAGS = @LUA_CFLAGS@ + LUA_LIBS = @LUA_LIBS@ + MAKEINFO = @MAKEINFO@ +@@ -3183,7 +3196,7 @@ AM_CPPFLAGS = \ + -DPREFIX='"${prefix}"' \ + -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \ + -DLOCALSTATEDIR='"${localstatedir}"' \ +- -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' \ ++ -DPKGLOCALSTATEDIR='"/var/db/${PACKAGE_NAME}"' \ + -DPLUGINDIR='"${pkglibdir}"' \ + -DPKGDATADIR='"${pkgdatadir}"' + +@@ -4172,7 +4185,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign Makefile +-.PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ +@@ -7114,7 +7126,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ +- else \ ++ elif test -n "$$redo_logs"; then \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ +@@ -7385,7 +7397,7 @@ distdir: $(DISTFILES) + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r "$(distdir)" + dist-gzip: distdir +- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz + $(am__post_remove_distdir) + dist-bzip2: distdir + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 +@@ -7400,17 +7412,17 @@ dist-xz: distdir + $(am__post_remove_distdir) + + dist-tarZ: distdir +- @echo WARNING: "Support for shar distribution archives is" \ +- "deprecated." >&2 ++ @echo WARNING: "Support for distribution archives compressed with" \ ++ "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__post_remove_distdir) + + dist-shar: distdir +- @echo WARNING: "Support for distribution archives compressed with" \ +- "legacy program 'compress' is deprecated." >&2 ++ @echo WARNING: "Support for shar distribution archives is" \ ++ "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 +- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz ++ shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz + $(am__post_remove_distdir) + + dist-zip: distdir +@@ -7428,7 +7440,7 @@ dist dist-all: + distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ +- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ ++ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lz*) \ +@@ -7438,23 +7450,23 @@ distcheck: dist + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ ++ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac + chmod -R a-w $(distdir) + chmod u+w $(distdir) +- mkdir $(distdir)/_build $(distdir)/_inst ++ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst + chmod a-w $(distdir) + test -d $(distdir)/_build || exit 0; \ + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ + && am__cwd=`pwd` \ +- && $(am__cd) $(distdir)/_build \ +- && ../configure \ ++ && $(am__cd) $(distdir)/_build/sub \ ++ && ../../configure \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ + $(DISTCHECK_CONFIGURE_FLAGS) \ +- --srcdir=.. --prefix="$$dc_install_base" \ ++ --srcdir=../.. --prefix="$$dc_install_base" \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ +@@ -7686,6 +7698,8 @@ uninstall-man: uninstall-man1 uninstall- + uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES \ + uninstall-sbinPROGRAMS + ++.PRECIOUS: Makefile ++ + + .pod.1: + $(AM_V_POD2MAN_C)pod2man --release=$(VERSION) --center=$(PACKAGE) $< \ +@@ -7721,7 +7735,7 @@ uninstall-man: uninstall-man1 uninstall- + + install-exec-hook: + $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run +- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME) ++ $(mkinstalldirs) $(DESTDIR)/var/db/$(PACKAGE_NAME) + $(mkinstalldirs) $(DESTDIR)$(localstatedir)/log + $(mkinstalldirs) $(DESTDIR)$(sysconfdir) + if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \ Added: head/net-mgmt/collectd5/files/patch-src_daemon_collectd.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/collectd5/files/patch-src_daemon_collectd.h Tue Nov 21 18:40:25 2017 (r454647) @@ -0,0 +1,11 @@ +--- src/daemon/collectd.h.orig 2017-11-18 09:03:27 UTC ++++ src/daemon/collectd.h +@@ -207,7 +207,7 @@ + #endif + + #ifndef PKGLOCALSTATEDIR +-#define PKGLOCALSTATEDIR PREFIX "/var/lib/" PACKAGE_NAME ++#define PKGLOCALSTATEDIR PREFIX "/var/db/" PACKAGE_NAME + #endif + + #ifndef PIDFILE Modified: head/net-mgmt/collectd5/files/patch-src_zfs__arc.c ============================================================================== --- head/net-mgmt/collectd5/files/patch-src_zfs__arc.c Tue Nov 21 18:16:03 2017 (r454646) +++ head/net-mgmt/collectd5/files/patch-src_zfs__arc.c Tue Nov 21 18:40:25 2017 (r454647) @@ -1,6 +1,6 @@ ---- src/zfs_arc.c.orig 2017-01-23 07:53:57 UTC +--- src/zfs_arc.c.orig 2017-11-18 09:03:27 UTC +++ src/zfs_arc.c -@@ -286,8 +286,6 @@ static int za_read(void) { +@@ -301,8 +301,6 @@ static int za_read(void) { za_read_derive(ksp, "prefetch_metadata_hits", "cache_result", "prefetch_metadata-hit"); za_read_derive(ksp, "demand_data_misses", "cache_result", "demand_data-miss"); Modified: head/net-mgmt/collectd5/files/patch-version-gen.sh ============================================================================== --- head/net-mgmt/collectd5/files/patch-version-gen.sh Tue Nov 21 18:16:03 2017 (r454646) +++ head/net-mgmt/collectd5/files/patch-version-gen.sh Tue Nov 21 18:40:25 2017 (r454647) @@ -1,8 +1,8 @@ ---- version-gen.sh.orig 2017-02-03 20:46:49 UTC +--- version-gen.sh.orig 2017-11-18 09:03:27 UTC +++ version-gen.sh @@ -2,10 +2,6 @@ - DEFAULT_VERSION="5.7.1.git" + DEFAULT_VERSION="5.8.0.git" -if [ -d .git ]; then - VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null | grep collectd | sed -e 's/^collectd-//' -e 's/-/./g'`" Modified: head/net-mgmt/collectd5/pkg-plist ============================================================================== --- head/net-mgmt/collectd5/pkg-plist Tue Nov 21 18:16:03 2017 (r454646) +++ head/net-mgmt/collectd5/pkg-plist Tue Nov 21 18:40:25 2017 (r454647) @@ -10,9 +10,12 @@ include/collectd/client.h include/collectd/lcc_features.h include/collectd/network.h include/collectd/network_buffer.h +include/collectd/network_parse.h +include/collectd/server.h +include/collectd/types.h lib/libcollectdclient.so lib/libcollectdclient.so.1 -lib/libcollectdclient.so.1.0.0 +lib/libcollectdclient.so.1.1.0 lib/collectd/aggregation.so %%CURL%%lib/collectd/apache.so lib/collectd/apcups.so @@ -34,6 +37,7 @@ lib/collectd/exec.so lib/collectd/filecount.so lib/collectd/interface.so %%IPMI%%lib/collectd/ipmi.so +%%JAVA%%lib/collectd/java.so lib/collectd/load.so %%LOGSTASH%%lib/collectd/log_logstash.so lib/collectd/logfile.so @@ -105,6 +109,8 @@ lib/collectd/write_log.so %%TSDB%%lib/collectd/write_tsdb.so %%XMMS%%lib/collectd/xmms.so lib/collectd/zfs_arc.so +%%JAVA%%%%DATADIR%%/java/collectd-api.jar +%%JAVA%%%%DATADIR%%/java/generic-jmx.jar %%ZOOKEEPER%%lib/collectd/zookeeper.so libdata/pkgconfig/libcollectdclient.pc %%DATADIR%%/postgresql_default.conf