diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile index 398a63e07f1..3033e26bad2 100644 --- a/net-mgmt/collectd5/Makefile +++ b/net-mgmt/collectd5/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= collectd -PORTVERSION= 5.8.0 -PORTREVISION= 1 +PORTVERSION= 5.8.1 CATEGORIES= net-mgmt MASTER_SITES= https://storage.googleapis.com/collectd-tarballs/ PKGNAMESUFFIX= 5 diff --git a/net-mgmt/collectd5/distinfo b/net-mgmt/collectd5/distinfo index 9ce4c580684..4f1b584441d 100644 --- a/net-mgmt/collectd5/distinfo +++ b/net-mgmt/collectd5/distinfo @@ -1,3 +1,3 @@ TIMESTAMP = 1511130105 -SHA256 (collectd-5.8.0.tar.bz2) = b06ff476bbf05533cb97ae6749262cc3c76c9969f032bd8496690084ddeb15c9 -SIZE (collectd-5.8.0.tar.bz2) = 1686017 +SHA256 (collectd-5.8.1.tar.bz2) = e796fda27ce06377f491ad91aa286962a68c2b54076aa77a29673d53204453da +SIZE (collectd-5.8.1.tar.bz2) = 1789228 diff --git a/net-mgmt/collectd5/files/patch-Makefile.in b/net-mgmt/collectd5/files/patch-Makefile.in deleted file mode 100644 index 2243b811955..00000000000 --- a/net-mgmt/collectd5/files/patch-Makefile.in +++ /dev/null @@ -1,216 +0,0 @@ ---- 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; \