Attachment #188175 for bug #223789

View | Details | Raw Unified | Return to bug 223789
Collapse All | Expand All

Lines 1-3 Link Here

(-)net-mgmt/collectd5.new/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1500286881	1	TIMESTAMP = 1511130105
2	SHA256 (collectd-5.7.2.tar.bz2) = 9d20a0221569a8d6b80bbc52b86e5e84965f5bafdbf5dfc3790e0fed0763e592	2	SHA256 (collectd-5.8.0.tar.bz2) = b06ff476bbf05533cb97ae6749262cc3c76c9969f032bd8496690084ddeb15c9
3	SIZE (collectd-5.7.2.tar.bz2) = 1798777	3	SIZE (collectd-5.8.0.tar.bz2) = 1686017




--- configure.ac.orig	2016-09-11 08:10:25 UTC
+++ configure.ac
@@ -185,7 +185,7 @@ then
 fi
 
 # Where to install .pc files.
-pkgconfigdir="${libdir}/pkgconfig"
+pkgconfigdir="${prefix}/libdata/pkgconfig"
 AC_SUBST(pkgconfigdir)
 
 # Check for standards compliance mode
@@ -841,7 +841,7 @@ SAVE_CFLAGS="$CFLAGS"
 # Emulate behavior of src/Makefile.am
 if test "x$GCC" = "xyes"
 then
-	CFLAGS="$CFLAGS -Wall -Werror"
+	CFLAGS="$CFLAGS -Wall "
 fi
 
 AC_CACHE_CHECK([for strtok_r],
@@ -968,7 +968,7 @@ AC_CHECK_FUNCS(getutxent, [have_getutxen
 if test "x$GCC" = "xyes"
 then
 	SAVE_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS -Wall -Wextra -Werror"
+	CFLAGS="$CFLAGS -Wall -Wextra "
 fi
 
 AC_CHECK_FUNCS(strptime, [have_strptime="yes"], [have_strptime="no"])
@@ -1757,6 +1757,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)"], [])
@@ -1766,6 +1767,8 @@ if test "x$with_kstat" = "xyes"
 then
 	AC_DEFINE(HAVE_LIBKSTAT, 1,
 		  [Define to 1 if you have the 'kstat' library (-lkstat)])
+	BUILD_WITH_LIBKSTAT_LIBS="-lkstat"
+	AC_SUBST(BUILD_WITH_LIBKSTAT_LIBS)
 fi
 AM_CONDITIONAL(BUILD_WITH_LIBKSTAT, test "x$with_kstat" = "xyes")
 AM_CONDITIONAL(BUILD_WITH_LIBDEVINFO, test "x$with_devinfo" = "xyes")
@@ -3053,8 +3056,8 @@ AC_ARG_WITH(libmongoc, [AS_HELP_STRING([
 	 with_libmongoc="no"
  else
 	 with_libmongoc="yes"
-	 LIBMONGOC_CPPFLAGS="$LIBMONGOC_CPPFLAGS -I$withval/include"
-	 LIBMONGOC_LDFLAGS="$LIBMONGOC_LDFLAGS -L$withval/lib"
+	 LIBMONGOC_CPPFLAGS="$LIBMONGOC_CPPFLAGS -I$withval/include/libmongoc-1.0 -I$withval/include/libbson-1.0"
+	 LIBMONGOC_LDFLAGS="$LIBMONGOC_LDFLAGS -L$withval/lib -lsasl2 -lssl -lcrypto  -lmongoc-1.0 -lbson-1.0"
  fi; fi
 ],
 [with_libmongoc="yes"])
@@ -3071,7 +3074,7 @@ then
 	then
 		AC_MSG_NOTICE([libmongoc CPPFLAGS: $LIBMONGOC_CPPFLAGS])
 	fi
-	AC_CHECK_HEADERS(mongo.h,
+	AC_CHECK_HEADERS(mongoc.h,
 	[with_libmongoc="yes"],
 	[with_libmongoc="no ('mongo.h' not found)"],
 [#if HAVE_STDINT_H
@@ -3087,7 +3090,7 @@ then
 	then
 		AC_MSG_NOTICE([libmongoc LDFLAGS: $LIBMONGOC_LDFLAGS])
 	fi
-	AC_CHECK_LIB(mongoc, mongo_run_command,
+	AC_CHECK_LIB(mongoc-1.0, mongoc_client_command,
 	[with_libmongoc="yes"],
 	[with_libmongoc="no (symbol 'mongo_run_command' not found)"])
 fi
@@ -3873,7 +3876,7 @@ then
 	SAVE_LIBS="$LIBS"
 	# trigger an error if Perl_load_module*() uses __attribute__nonnull__(3)
 	# (see issues #41 and #42)
-	CFLAGS="$CFLAGS $PERL_CFLAGS -Wall -Werror"
+	CFLAGS="$CFLAGS $PERL_CFLAGS -Wall "
 	LIBS="$LIBS $PERL_LIBS"
 
 	AC_CACHE_CHECK([for broken Perl_load_module()],
@@ -5249,8 +5252,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
 ],




--- Makefile.am.orig	2017-11-18 09:03:27 UTC
+++ Makefile.am
@@ -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
 	$(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 \




--- 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; \




--- src/daemon/collectd.h.orig	2017-01-23 07:53:57 UTC
+++ src/daemon/collectd.h
@@ -243,15 +243,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 "/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

Lines 1-11 Link Here

(-)net-mgmt/collectd5.new/files/patch-src__daemon__Makefile.am (-11 lines)
1	--- src/daemon/Makefile.am.orig 2016-09-11 08:10:25 UTC
2	+++ src/daemon/Makefile.am
3	@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src
4	AM_CPPFLAGS += -DPREFIX='"${prefix}"'
5	AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"'
6	AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"'
7	-AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"'
8	+AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/db/${PACKAGE_NAME}"'
9	if BUILD_FEATURE_DAEMON
10	AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
11	endif




--- src/dns.c.orig	2017-01-23 07:53:57 UTC
+++ src/dns.c
@@ -198,6 +198,15 @@ static int dns_run_pcap_loop(void) {
     pthread_sigmask(SIG_SETMASK, &sigmask, NULL);
   }
 
+	/* Check for pcap_device, if needed */
+#ifdef __sparc64__
+  if (pcap_device == NULL)
+  {
+    ERROR ("dns plugin: Interface required");
+    return (NULL);
+  }
+#endif
+
   /* Passing `pcap_device == NULL' is okay and the same as passign "any" */
   DEBUG("dns plugin: Creating PCAP object..");
   pcap_obj = pcap_open_live((pcap_device != NULL) ? pcap_device : "any",




--- src/Makefile.am.orig	2016-09-11 08:10:25 UTC
+++ src/Makefile.am
@@ -10,7 +10,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}"'
+AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/db/${PACKAGE_NAME}"'
 if BUILD_FEATURE_DAEMON
 AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
 endif
@@ -274,7 +274,7 @@ cpu_la_CFLAGS = $(AM_CFLAGS)
 cpu_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 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
@@ -358,7 +358,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
@@ -381,6 +381,9 @@ endif
 if BUILD_WITH_PERFSTAT
 disk_la_LIBADD += -lperfstat
 endif
+if BUILD_FREEBSD
+disk_la_LIBADD += -ldevstat -lgeom
+endif
 endif
 
 if BUILD_PLUGIN_DNS
@@ -481,7 +484,7 @@ interface_la_CFLAGS += $(BUILD_WITH_LIBS
 interface_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
 else
 if BUILD_WITH_LIBKSTAT
-interface_la_LIBADD += -lkstat
+interface_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS)
 endif
 if BUILD_WITH_LIBDEVINFO
 interface_la_LIBADD += -ldevinfo
@@ -669,7 +672,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
@@ -1034,7 +1037,7 @@ swap_la_CFLAGS = $(AM_CFLAGS)
 swap_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 swap_la_LIBADD =
 if BUILD_WITH_LIBKSTAT
-swap_la_LIBADD += -lkstat
+swap_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS)
 endif
 if BUILD_WITH_LIBDEVINFO
 swap_la_LIBADD += -ldevinfo
@@ -1080,7 +1083,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
 endif
 
 if BUILD_PLUGIN_TARGET_NOTIFICATION
@@ -1184,7 +1187,7 @@ uptime_la_CFLAGS = $(AM_CFLAGS)
 uptime_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 uptime_la_LIBADD =
 if BUILD_WITH_LIBKSTAT
-uptime_la_LIBADD += -lkstat
+uptime_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS)
 endif
 if BUILD_WITH_PERFSTAT
 uptime_la_LIBADD += -lperfstat
@@ -1340,7 +1343,7 @@ if BUILD_FREEBSD
 zfs_arc_la_LIBADD = -lm
 endif
 if BUILD_SOLARIS
-zfs_arc_la_LIBADD = -lkstat
+zfs_arc_la_LIBADD = $(BUILD_WITH_LIBKSTAT_LIBS)
 endif
 endif
 
@@ -1433,12 +1436,7 @@ endif
 
 install-exec-hook:
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-	if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \
-	then \
-		$(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.pkg-orig; \
-	else \
-		$(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \
-	fi; \
+	$(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.sample
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
 	$(INSTALL) -m 0644 $(srcdir)/types.db $(DESTDIR)$(pkgdatadir)/types.db;
 	$(INSTALL) -m 0644 $(srcdir)/postgresql_default.conf \




--- src/modbus.c.orig	2017-01-23 07:53:57 UTC
+++ src/modbus.c
@@ -26,6 +26,9 @@
 #include "configfile.h"
 #include "plugin.h"
 
+/* FreeBSD needs this */
+#include <sys/socket.h> 
+
 #include <modbus.h>
 #include <netdb.h>
 #include <sys/socket.h>




--- src/tcpconns.c.orig	2017-03-21 00:18:33.371554000 -0700
+++ src/tcpconns.c	2017-03-21 00:21:09.631089000 -0700
@@ -745,9 +745,15 @@
   for (in_ptr = (struct xinpgen *)(((char *)in_orig) + in_orig->xig_len);
        in_ptr->xig_len > sizeof(struct xinpgen);
        in_ptr = (struct xinpgen *)(((char *)in_ptr) + in_ptr->xig_len)) {
+#if __FreeBSD_version >= 1200026
+    struct xtcpcb *tp = (struct xtcpcb *)in_ptr;
+    struct xinpcb *inp = &tp->xt_inp;
+    struct xsocket *so = &inp->xi_socket;
+#else
     struct tcpcb *tp = &((struct xtcpcb *)in_ptr)->xt_tp;
     struct inpcb *inp = &((struct xtcpcb *)in_ptr)->xt_inp;
     struct xsocket *so = &((struct xtcpcb *)in_ptr)->xt_socket;
+#endif
 
     /* Ignore non-TCP sockets */
     if (so->xso_protocol != IPPROTO_TCP)




--- src/config.h.in.orig	2016-09-11 08:10:42 UTC
+++ src/config.h.in
@@ -587,8 +587,8 @@
 /* Define to 1 if you have the <modbus.h> header file. */
 #undef HAVE_MODBUS_H
 
-/* Define to 1 if you have the <mongo.h> header file. */
-#undef HAVE_MONGO_H
+/* Define to 1 if you have the <mongoc.h> header file. */
+#undef HAVE_MONGOC_H
 
 /* Define to 1 if you have the <mosquitto.h> header file. */
 #undef HAVE_MOSQUITTO_H
@@ -1617,13 +1617,15 @@
    module search path. */
 #undef LT_MODULE_PATH_VAR
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
 #undef LT_OBJDIR
 
 /* Define to the shared library suffix, say, ".dylib". */
 #undef LT_SHARED_EXT
 
+/* Define to the shared archive member specification, say "(shr.o)". */
+#undef LT_SHARED_LIB_MEMBER
+
 /* Define if NAN is defined by default and can initialize static variables. */
 #undef NAN_STATIC_DEFAULT
 
@@ -1715,7 +1717,7 @@
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
-/* Define to a type to use for `error_t' if it is not otherwise available. */
+/* Define to a type to use for 'error_t' if it is not otherwise available. */
 #undef error_t
 
 /* Define to `int' if <sys/types.h> doesn't define. */

Line 0 Link Here

(-)net-mgmt/collectd5.new/files/patch-src_daemon_collectd.h (+11 lines)
	1	--- src/daemon/collectd.h.orig 2017-11-18 09:03:27 UTC
	2	+++ src/daemon/collectd.h
	3	@@ -207,7 +207,7 @@
	4	#endif
	5
	6	#ifndef PKGLOCALSTATEDIR
	7	-#define PKGLOCALSTATEDIR PREFIX "/var/lib/" PACKAGE_NAME
	8	+#define PKGLOCALSTATEDIR PREFIX "/var/db/" PACKAGE_NAME
	9	#endif
	10
	11	#ifndef PIDFILE

Lines 1-11 Link Here

(-)net-mgmt/collectd5.new/files/patch-src_write__mongodb.c (-11 lines)
1	--- src/write_mongodb.c.orig 2016-09-11 08:10:25 UTC
2	+++ src/write_mongodb.c
3	@@ -39,7 +39,7 @@
4	#else
5	# define MONGO_USE_LONG_LONG_INT 1
6	#endif
7	-#include <mongo.h>
8	+#include <mongoc.h>
9
10	#if (MONGO_MAJOR == 0) && (MONGO_MINOR < 8)
11	# define bson_alloc() bson_create()

Lines 1-6 Link Here

(-)net-mgmt/collectd5.new/files/patch-src_zfs__arc.c (-2 / +2 lines)
1	--- src/zfs_arc.c.orig 2017-01-23 07:53:57 UTC	1	--- src/zfs_arc.c.orig 2017-11-18 09:03:27 UTC
2	+++ src/zfs_arc.c	2	+++ src/zfs_arc.c
3	@@ -286,8 +286,6 @@ static int za_read(void) {	3	@@ -301,8 +301,6 @@ static int za_read(void) {
4	za_read_derive(ksp, "prefetch_metadata_hits", "cache_result",	4	za_read_derive(ksp, "prefetch_metadata_hits", "cache_result",
5	"prefetch_metadata-hit");	5	"prefetch_metadata-hit");
6	za_read_derive(ksp, "demand_data_misses", "cache_result", "demand_data-miss");	6	za_read_derive(ksp, "demand_data_misses", "cache_result", "demand_data-miss");

Lines 1-8 Link Here

(-)net-mgmt/collectd5.new/files/patch-version-gen.sh (-2 / +2 lines)
1	--- version-gen.sh.orig 2017-02-03 20:46:49 UTC	1	--- version-gen.sh.orig 2017-11-18 09:03:27 UTC
2	+++ version-gen.sh	2	+++ version-gen.sh
3	@@ -2,10 +2,6 @@	3	@@ -2,10 +2,6 @@
4		4
5	DEFAULT_VERSION="5.7.1.git"	5	DEFAULT_VERSION="5.8.0.git"
6		6
7	-if [ -d .git ]; then	7	-if [ -d .git ]; then
8	- VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null \| grep collectd \| sed -e 's/^collectd-//' -e 's/-/./g'`"	8	- VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null \| grep collectd \| sed -e 's/^collectd-//' -e 's/-/./g'`"




# $FreeBSD: head/net-mgmt/collectd5/Makefile 449798 2017-09-13 14:55:45Z des $

PORTNAME=	collectd
PORTVERSION=	5.8.0
PORTREVISION=	1
CATEGORIES=	net-mgmt
MASTER_SITES=	https://storage.googleapis.com/collectd-tarballs/
		http://collectd.org/files/
PKGNAMESUFFIX=	5

MAINTAINER=	ports@bsdserwis.com

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

OPTIONS_DEFINE=		CGI JAVA LOGGING GCRYPT LOGSTASH VIRT
OPTIONS_GROUP=		INPUT OUTPUT
OPTIONS_GROUP_OUTPUT=	KAFKA MONGODB NOTIFYDESKTOP NOTIFYEMAIL RIEMANN RRDTOOL \
			TSDB

			SIGROK SNMP STATSD TOKYOTYRANT VARNISH XML \
			XMMS ZOOKEEPER

OPTIONS_DEFAULT=	LOGGING GCRYPT PING

CGI_DESC=		Install collection.cgi (requires rrdtool)
CHRONY_DESC=		Enable chronyd plugin

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

		--disable-ceph \
		--disable-cgroups \
		--disable-fhcount \
		--without-java \
		--without-libaquaero5 \
		--without-libganglia \
		--without-libiptc \
		--without-libjvm \
		--without-liblvm2app \
		--without-libkstat \
		--without-libldap \

CURL_XML_IMPLIES=		CURL XML
CURL_XML_CONFIGURE_ENABLE=	ascent bind curl_xml

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}

KAFKA_LIB_DEPENDS=		librdkafka.so:net/librdkafka
KAFKA_CONFIGURE_ENABLE=		write_kafka

LOGGING_CONFIGURE_ENABLE=	debug

LOGSTASH_CONFIGURE_ENABLE=	log_logstash
LOGSTASH_IMPLIES=		JSON



PERL_USES=			perl5
PERL_CONFIGURE_ENABLE=		perl
PERL_CONFIGURE_DISABLE=		perl
PERL_CONFIGURE_WITH=		perl=${PERL} perl-bindings libperl

PGSQL_USES=			pgsql
PGSQL_CONFIGURE_ENABLE=		postgresql


post-patch:
	@${REINPLACE_CMD} 's/-Werror//' \
		${WRKSRC}/configure.ac 
		${WRKSRC}/src/libcollectdclient/Makefile.am
	@${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.pod
	@${REINPLACE_CMD} \
		-e 's;/etc/collection\.conf;${WWWDIR}/collection.conf;' \
		${WRKSRC}/contrib/collection.cgi

Lines 10-18 Link Here

(-)net-mgmt/collectd5.new/pkg-plist (-1 / +7 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	include/collectd/network_parse.h
		14	include/collectd/server.h
		15	include/collectd/types.h
13	lib/libcollectdclient.so	16	lib/libcollectdclient.so
14	lib/libcollectdclient.so.1	17	lib/libcollectdclient.so.1
15	lib/libcollectdclient.so.1.0.0	18	lib/libcollectdclient.so.1.1.0
16	lib/collectd/aggregation.so	19	lib/collectd/aggregation.so
17	%%CURL%%lib/collectd/apache.so	20	%%CURL%%lib/collectd/apache.so
18	lib/collectd/apcups.so	21	lib/collectd/apcups.so
Lines 34-39 Link Here
34	lib/collectd/filecount.so	37	lib/collectd/filecount.so
35	lib/collectd/interface.so	38	lib/collectd/interface.so
36	%%IPMI%%lib/collectd/ipmi.so	39	%%IPMI%%lib/collectd/ipmi.so
		40	%%JAVA%%lib/collectd/java.so
37	lib/collectd/load.so	41	lib/collectd/load.so
38	%%LOGSTASH%%lib/collectd/log_logstash.so	42	%%LOGSTASH%%lib/collectd/log_logstash.so
39	lib/collectd/logfile.so	43	lib/collectd/logfile.so
Lines 105-110 Link Here
105	%%TSDB%%lib/collectd/write_tsdb.so	109	%%TSDB%%lib/collectd/write_tsdb.so
106	%%XMMS%%lib/collectd/xmms.so	110	%%XMMS%%lib/collectd/xmms.so
107	lib/collectd/zfs_arc.so	111	lib/collectd/zfs_arc.so
		112	%%JAVA%%%%DATADIR%%/java/collectd-api.jar
		113	%%JAVA%%%%DATADIR%%/java/generic-jmx.jar
108	%%ZOOKEEPER%%lib/collectd/zookeeper.so	114	%%ZOOKEEPER%%lib/collectd/zookeeper.so
109	libdata/pkgconfig/libcollectdclient.pc	115	libdata/pkgconfig/libcollectdclient.pc
110	%%DATADIR%%/postgresql_default.conf	116	%%DATADIR%%/postgresql_default.conf

Return to bug 223789

Lines 1-95 Link Here

(-)net-mgmt/collectd5.new/files/patch-configure.ac (-95 lines)
1	--- configure.ac.orig 2016-09-11 08:10:25 UTC
2	+++ configure.ac
3	@@ -185,7 +185,7 @@ then
4	fi
5
6	# Where to install .pc files.
7	-pkgconfigdir="${libdir}/pkgconfig"
8	+pkgconfigdir="${prefix}/libdata/pkgconfig"
9	AC_SUBST(pkgconfigdir)
10
11	# Check for standards compliance mode
12	@@ -841,7 +841,7 @@ SAVE_CFLAGS="$CFLAGS"
13	# Emulate behavior of src/Makefile.am
14	if test "x$GCC" = "xyes"
15	then
16	- CFLAGS="$CFLAGS -Wall -Werror"
17	+ CFLAGS="$CFLAGS -Wall "
18	fi
19
20	AC_CACHE_CHECK([for strtok_r],
21	@@ -968,7 +968,7 @@ AC_CHECK_FUNCS(getutxent, [have_getutxen
22	if test "x$GCC" = "xyes"
23	then
24	SAVE_CFLAGS="$CFLAGS"
25	- CFLAGS="$CFLAGS -Wall -Wextra -Werror"
26	+ CFLAGS="$CFLAGS -Wall -Wextra "
27	fi
28
29	AC_CHECK_FUNCS(strptime, [have_strptime="yes"], [have_strptime="no"])
30	@@ -1757,6 +1757,7 @@ if test "x$with_kstat" = "xyes"
31	then
32	AC_CHECK_LIB(kstat, kstat_open, [with_kstat="yes"], [with_kstat="no (libkstat not found)"], [])
33	fi
34	+
35	if test "x$with_kstat" = "xyes"
36	then
37	AC_CHECK_LIB(devinfo, di_init, [with_devinfo="yes"], [with_devinfo="no (not found)"], [])
38	@@ -1766,6 +1767,8 @@ if test "x$with_kstat" = "xyes"
39	then
40	AC_DEFINE(HAVE_LIBKSTAT, 1,
41	[Define to 1 if you have the 'kstat' library (-lkstat)])
42	+ BUILD_WITH_LIBKSTAT_LIBS="-lkstat"
43	+ AC_SUBST(BUILD_WITH_LIBKSTAT_LIBS)
44	fi
45	AM_CONDITIONAL(BUILD_WITH_LIBKSTAT, test "x$with_kstat" = "xyes")
46	AM_CONDITIONAL(BUILD_WITH_LIBDEVINFO, test "x$with_devinfo" = "xyes")
47	@@ -3053,8 +3056,8 @@ AC_ARG_WITH(libmongoc, [AS_HELP_STRING([
48	with_libmongoc="no"
49	else
50	with_libmongoc="yes"
51	- LIBMONGOC_CPPFLAGS="$LIBMONGOC_CPPFLAGS -I$withval/include"
52	- LIBMONGOC_LDFLAGS="$LIBMONGOC_LDFLAGS -L$withval/lib"
53	+ LIBMONGOC_CPPFLAGS="$LIBMONGOC_CPPFLAGS -I$withval/include/libmongoc-1.0 -I$withval/include/libbson-1.0"
54	+ LIBMONGOC_LDFLAGS="$LIBMONGOC_LDFLAGS -L$withval/lib -lsasl2 -lssl -lcrypto -lmongoc-1.0 -lbson-1.0"
55	fi; fi
56	],
57	[with_libmongoc="yes"])
58	@@ -3071,7 +3074,7 @@ then
59	then
60	AC_MSG_NOTICE([libmongoc CPPFLAGS: $LIBMONGOC_CPPFLAGS])
61	fi
62	- AC_CHECK_HEADERS(mongo.h,
63	+ AC_CHECK_HEADERS(mongoc.h,
64	[with_libmongoc="yes"],
65	[with_libmongoc="no ('mongo.h' not found)"],
66	[#if HAVE_STDINT_H
67	@@ -3087,7 +3090,7 @@ then
68	then
69	AC_MSG_NOTICE([libmongoc LDFLAGS: $LIBMONGOC_LDFLAGS])
70	fi
71	- AC_CHECK_LIB(mongoc, mongo_run_command,
72	+ AC_CHECK_LIB(mongoc-1.0, mongoc_client_command,
73	[with_libmongoc="yes"],
74	[with_libmongoc="no (symbol 'mongo_run_command' not found)"])
75	fi
76	@@ -3873,7 +3876,7 @@ then
77	SAVE_LIBS="$LIBS"
78	# trigger an error if Perl_load_module*() uses __attribute__nonnull__(3)
79	# (see issues #41 and #42)
80	- CFLAGS="$CFLAGS $PERL_CFLAGS -Wall -Werror"
81	+ CFLAGS="$CFLAGS $PERL_CFLAGS -Wall "
82	LIBS="$LIBS $PERL_LIBS"
83
84	AC_CACHE_CHECK([for broken Perl_load_module()],
85	@@ -5249,8 +5252,8 @@ AC_ARG_WITH(libvarnish, [AS_HELP_STRING(
86	else if test -d "$with_libvarnish/lib"
87	then
88	AC_MSG_NOTICE([Not checking for libvarnish: Manually configured])
89	- with_libvarnish_cflags="-I$withval/include"
90	- with_libvarnish_libs="-L$withval/lib -lvarnishapi"
91	+ with_libvarnish_cflags="-I$withval/include/varnish"
92	+ with_libvarnish_libs="-L$withval/lib/varnish -lvarnishapi"
93	with_libvarnish="yes"
94	fi; fi; fi
95	],

Lines 1-10 Link Here

(-)net-mgmt/collectd5.new/files/patch-Makefile.am (-4 / +23 lines)
1	--- Makefile.am.orig 2016-09-11 08:10:25 UTC	1	--- Makefile.am.orig 2017-11-18 09:03:27 UTC
2	+++ Makefile.am	2	+++ Makefile.am
3	@@ -14,7 +14,6 @@ EXTRA_DIST = contrib version-gen.sh test	3	@@ -165,7 +165,7 @@ AM_CPPFLAGS = \
		4	-DPREFIX='"${prefix}"' \
		5	-DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \
		6	-DLOCALSTATEDIR='"${localstatedir}"' \
		7	- -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' \
		8	+ -DPKGLOCALSTATEDIR='"/var/db/${PACKAGE_NAME}"' \
		9	-DPLUGINDIR='"${pkglibdir}"' \
		10	-DPKGDATADIR='"${pkgdatadir}"'
		11
		12	@@ -1964,15 +1964,10 @@ endif
4		13
5	install-exec-hook:	14	install-exec-hook:
6	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run	15	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run
7	- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME)	16	- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME)
		17	+ $(mkinstalldirs) $(DESTDIR)/var/db/$(PACKAGE_NAME)
8	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log	18	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log
9		19	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
10	maintainer-clean-local:	20	- if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \
		21	- then \
		22	- $(INSTALL) -m 0640 $(srcdir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.pkg-orig; \
		23	- else \
		24	- $(INSTALL) -m 0640 $(srcdir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \
		25	- fi; \
		26	+ $(INSTALL) -m 0640 src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.sample
		27	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
		28	$(INSTALL) -m 0644 $(srcdir)/src/types.db $(DESTDIR)$(pkgdatadir)/types.db;
		29	$(INSTALL) -m 0644 $(srcdir)/src/postgresql_default.conf \

Line 0 Link Here

(-)net-mgmt/collectd5.new/files/patch-Makefile.in (+216 lines)
		1	--- Makefile.in.orig 2017-11-18 09:03:50 UTC
		2	+++ Makefile.in
		3	@@ -1,7 +1,7 @@
		4	-# Makefile.in generated by automake 1.14.1 from Makefile.am.
		5	+# Makefile.in generated by automake 1.15.1 from Makefile.am.
		6	# @configure_input@
		7
		8	-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
		9	+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
		10
		11	# This Makefile.in is free software; the Free Software Foundation
		12	# gives unlimited permission to copy and/or distribute it,
		13	@@ -18,7 +18,17 @@
		14
		15
		16	VPATH = @srcdir@
		17	-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
		18	+am__is_gnu_make = { \
		19	+ if test -z '$(MAKELEVEL)'; then \
		20	+ false; \
		21	+ elif test -n '$(MAKE_HOST)'; then \
		22	+ true; \
		23	+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
		24	+ true; \
		25	+ else \
		26	+ false; \
		27	+ fi; \
		28	+}
		29	am__make_running_with_option = \
		30	case $${target_option-} in \
		31	?) ;; \
		32	@@ -351,26 +361,6 @@ check_PROGRAMS = test_common$(EXEEXT) te
		33	@BUILD_PLUGIN_WRITE_PROMETHEUS_TRUE@am__append_237 = prometheus.pb-c.c prometheus.pb-c.h
		34	@HAVE_GRPC_CPP_TRUE@@HAVE_PROTOC3_TRUE@am__append_238 = collectd.grpc.pb.cc collectd.pb.cc types.pb.cc
		35	subdir = .
		36	-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
		37	- $(top_srcdir)/configure $(am__configure_deps) \
		38	- $(top_srcdir)/src/config.h.in \
		39	- $(top_srcdir)/src/libcollectdclient/collectd/lcc_features.h.in \
		40	- $(top_srcdir)/src/collectd.conf.in \
		41	- $(top_srcdir)/src/libcollectdclient/libcollectdclient.pc.in \
		42	- src/liboconfig/scanner.c src/liboconfig/parser.h \
		43	- src/liboconfig/parser.c $(top_srcdir)/build-aux/depcomp \
		44	- $(top_srcdir)/build-aux/ylwrap $(am__dist_noinst_JAVA_DIST) \
		45	- $(dist_man_MANS) $(pkginclude_HEADERS) \
		46	- $(top_srcdir)/build-aux/test-driver AUTHORS COPYING ChangeLog \
		47	- README build-aux/compile build-aux/config.guess \
		48	- build-aux/config.sub build-aux/depcomp build-aux/install-sh \
		49	- build-aux/missing build-aux/ylwrap build-aux/ltmain.sh \
		50	- $(top_srcdir)/build-aux/compile \
		51	- $(top_srcdir)/build-aux/config.guess \
		52	- $(top_srcdir)/build-aux/config.sub \
		53	- $(top_srcdir)/build-aux/install-sh \
		54	- $(top_srcdir)/build-aux/ltmain.sh \
		55	- $(top_srcdir)/build-aux/missing
		56	ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
		57	am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
		58	$(top_srcdir)/m4/ax_compiler_vendor.m4 \
		59	@@ -379,6 +369,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
		60	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
		61	am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
		62	$(ACLOCAL_M4)
		63	+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
		64	+ $(am__configure_deps) $(am__dist_noinst_JAVA_DIST) \
65	+ $(pkginclude_HEADERS) $(am__DIST_COMMON)
66	am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
67	configure.lineno config.status.lineno
68	mkinstalldirs = $(install_sh) -d
69	@@ -2673,6 +2666,25 @@ TEST_LOGS = $(am__test_logs2:.test.log=.
70	TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
71	TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
72	$(TEST_LOG_FLAGS)
73	+am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \
74	+ $(top_srcdir)/build-aux/compile \
75	+ $(top_srcdir)/build-aux/config.guess \
76	+ $(top_srcdir)/build-aux/config.sub \
77	+ $(top_srcdir)/build-aux/depcomp \
78	+ $(top_srcdir)/build-aux/install-sh \
79	+ $(top_srcdir)/build-aux/ltmain.sh \
80	+ $(top_srcdir)/build-aux/missing \
81	+ $(top_srcdir)/build-aux/test-driver \
82	+ $(top_srcdir)/build-aux/ylwrap \
83	+ $(top_srcdir)/src/collectd.conf.in \
84	+ $(top_srcdir)/src/config.h.in \
85	+ $(top_srcdir)/src/libcollectdclient/collectd/lcc_features.h.in \
86	+ $(top_srcdir)/src/libcollectdclient/libcollectdclient.pc.in \
87	+ AUTHORS COPYING ChangeLog INSTALL NEWS README \
88	+ build-aux/compile build-aux/config.guess build-aux/config.sub \
89	+ build-aux/depcomp build-aux/install-sh build-aux/ltmain.sh \
90	+ build-aux/missing build-aux/ylwrap src/liboconfig/parser.c \
91	+ src/liboconfig/parser.h src/liboconfig/scanner.c
92	DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
93	distdir = $(PACKAGE)-$(VERSION)
94	top_distdir = $(distdir)
95	@@ -2908,6 +2920,7 @@ LOAD_PLUGIN_NETWORK = @LOAD_PLUGIN_NETWO
96	LOAD_PLUGIN_RRDTOOL = @LOAD_PLUGIN_RRDTOOL@
97	LOAD_PLUGIN_SYSLOG = @LOAD_PLUGIN_SYSLOG@
98	LTLIBOBJS = @LTLIBOBJS@
99	+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
100	LUA_CFLAGS = @LUA_CFLAGS@
101	LUA_LIBS = @LUA_LIBS@
102	MAKEINFO = @MAKEINFO@
103	@@ -3183,7 +3196,7 @@ AM_CPPFLAGS = \
104	-DPREFIX='"${prefix}"' \
105	-DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \
106	-DLOCALSTATEDIR='"${localstatedir}"' \
107	- -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' \
108	+ -DPKGLOCALSTATEDIR='"/var/db/${PACKAGE_NAME}"' \
109	-DPLUGINDIR='"${pkglibdir}"' \
110	-DPKGDATADIR='"${pkgdatadir}"'
111
112	@@ -4172,7 +4185,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi
113	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
114	$(am__cd) $(top_srcdir) && \
115	$(AUTOMAKE) --foreign Makefile
116	-.PRECIOUS: Makefile
117	Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
118	@case '$?' in \
119	config.status) \
120	@@ -7114,7 +7126,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
121	if test -n "$$am__remaking_logs"; then \
122	echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
123	"recursion detected" >&2; \
124	- else \
125	+ elif test -n "$$redo_logs"; then \
126	am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
127	fi; \
128	if $(am__make_dryrun); then :; else \
129	@@ -7385,7 +7397,7 @@ distdir: $(DISTFILES)
130	! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
131	\|\| chmod -R a+r "$(distdir)"
132	dist-gzip: distdir
133	- tardir=$(distdir) && $(am__tar) \| GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
134	+ tardir=$(distdir) && $(am__tar) \| eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
135	$(am__post_remove_distdir)
136	dist-bzip2: distdir
137	tardir=$(distdir) && $(am__tar) \| BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
138	@@ -7400,17 +7412,17 @@ dist-xz: distdir
139	$(am__post_remove_distdir)
140
141	dist-tarZ: distdir
142	- @echo WARNING: "Support for shar distribution archives is" \
143	- "deprecated." >&2
144	+ @echo WARNING: "Support for distribution archives compressed with" \
145	+ "legacy program 'compress' is deprecated." >&2
146	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
147	tardir=$(distdir) && $(am__tar) \| compress -c >$(distdir).tar.Z
148	$(am__post_remove_distdir)
149
150	dist-shar: distdir
151	- @echo WARNING: "Support for distribution archives compressed with" \
152	- "legacy program 'compress' is deprecated." >&2
153	+ @echo WARNING: "Support for shar distribution archives is" \
154	+ "deprecated." >&2
155	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
156	- shar $(distdir) \| GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
157	+ shar $(distdir) \| eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
158	$(am__post_remove_distdir)
159
160	dist-zip: distdir
161	@@ -7428,7 +7440,7 @@ dist dist-all:
162	distcheck: dist
163	case '$(DIST_ARCHIVES)' in \
164	.tar.gz) \
165	- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz \| $(am__untar) ;;\
166	+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz \| $(am__untar) ;;\
167	.tar.bz2) \
168	bzip2 -dc $(distdir).tar.bz2 \| $(am__untar) ;;\
169	.tar.lz) \
170	@@ -7438,23 +7450,23 @@ distcheck: dist
171	.tar.Z) \
172	uncompress -c $(distdir).tar.Z \| $(am__untar) ;;\
173	.shar.gz) \
174	- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz \| unshar ;;\
175	+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz \| unshar ;;\
176	.zip) \
177	unzip $(distdir).zip ;;\
178	esac
179	chmod -R a-w $(distdir)
180	chmod u+w $(distdir)
181	- mkdir $(distdir)/_build $(distdir)/_inst
182	+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
183	chmod a-w $(distdir)
184	test -d $(distdir)/_build \|\| exit 0; \
185	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd \| sed -e 's,^[^:\\/]:[\\/],/,'` \
186	&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
187	&& am__cwd=`pwd` \
188	- && $(am__cd) $(distdir)/_build \
189	- && ../configure \
190	+ && $(am__cd) $(distdir)/_build/sub \
191	+ && ../../configure \
192	$(AM_DISTCHECK_CONFIGURE_FLAGS) \
193	$(DISTCHECK_CONFIGURE_FLAGS) \
194	- --srcdir=.. --prefix="$$dc_install_base" \
195	+ --srcdir=../.. --prefix="$$dc_install_base" \
196	&& $(MAKE) $(AM_MAKEFLAGS) \
197	&& $(MAKE) $(AM_MAKEFLAGS) dvi \
198	&& $(MAKE) $(AM_MAKEFLAGS) check \
199	@@ -7686,6 +7698,8 @@ uninstall-man: uninstall-man1 uninstall-
200	uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES \
201	uninstall-sbinPROGRAMS
202
203	+.PRECIOUS: Makefile
204	+
205
206	.pod.1:
207	$(AM_V_POD2MAN_C)pod2man --release=$(VERSION) --center=$(PACKAGE) $< \
208	@@ -7721,7 +7735,7 @@ uninstall-man: uninstall-man1 uninstall-
209
210	install-exec-hook:
211	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run
212	- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME)
213	+ $(mkinstalldirs) $(DESTDIR)/var/db/$(PACKAGE_NAME)
214	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log
215	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
216	if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \

Lines 1-21 Link Here

(-)net-mgmt/collectd5.new/files/patch-src__daemon__collectd.h (-21 lines)
1	--- src/daemon/collectd.h.orig 2017-01-23 07:53:57 UTC
2	+++ src/daemon/collectd.h
3	@@ -243,15 +243,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 "/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-18 Link Here

(-)net-mgmt/collectd5.new/files/patch-src__dns.c (-18 lines)
1	--- src/dns.c.orig 2017-01-23 07:53:57 UTC
2	+++ src/dns.c
3	@@ -198,6 +198,15 @@ static int dns_run_pcap_loop(void) {
4	pthread_sigmask(SIG_SETMASK, &sigmask, NULL);
5	}
6
7	+ /* Check for pcap_device, if needed */
8	+#ifdef __sparc64__
9	+ if (pcap_device == NULL)
10	+ {
11	+ ERROR ("dns plugin: Interface required");
12	+ return (NULL);
13	+ }
14	+#endif
15	+
16	/* Passing `pcap_device == NULL' is okay and the same as passign "any" */
17	DEBUG("dns plugin: Creating PCAP object..");
18	pcap_obj = pcap_open_live((pcap_device != NULL) ? pcap_device : "any",

Lines 1-107 Link Here

(-)net-mgmt/collectd5.new/files/patch-src__Makefile.am (-107 lines)
1	--- src/Makefile.am.orig 2016-09-11 08:10:25 UTC
2	+++ src/Makefile.am
3	@@ -10,7 +10,7 @@ AM_CPPFLAGS = -I$(srcdir)/daemon
4	AM_CPPFLAGS += -DPREFIX='"${prefix}"'
5	AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"'
6	AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"'
7	-AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"'
8	+AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/db/${PACKAGE_NAME}"'
9	if BUILD_FEATURE_DAEMON
10	AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
11	endif
12	@@ -274,7 +274,7 @@ cpu_la_CFLAGS = $(AM_CFLAGS)
13	cpu_la_LDFLAGS = $(PLUGIN_LDFLAGS)
14	cpu_la_LIBADD =
15	if BUILD_WITH_LIBKSTAT
16	-cpu_la_LIBADD += -lkstat
17	+cpu_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS)
18	endif
19	if BUILD_WITH_LIBDEVINFO
20	cpu_la_LIBADD += -ldevinfo
21	@@ -358,7 +358,7 @@ disk_la_CFLAGS = $(AM_CFLAGS)
22	disk_la_LDFLAGS = $(PLUGIN_LDFLAGS)
23	disk_la_LIBADD =
24	if BUILD_WITH_LIBKSTAT
25	-disk_la_LIBADD += -lkstat
26	+disk_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS)
27	endif
28	if BUILD_WITH_LIBDEVINFO
29	disk_la_LIBADD += -ldevinfo
30	@@ -381,6 +381,9 @@ endif
31	if BUILD_WITH_PERFSTAT
32	disk_la_LIBADD += -lperfstat
33	endif
34	+if BUILD_FREEBSD
35	+disk_la_LIBADD += -ldevstat -lgeom
36	+endif
37	endif
38
39	if BUILD_PLUGIN_DNS
40	@@ -481,7 +484,7 @@ interface_la_CFLAGS += $(BUILD_WITH_LIBS
41	interface_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
42	else
43	if BUILD_WITH_LIBKSTAT
44	-interface_la_LIBADD += -lkstat
45	+interface_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS)
46	endif
47	if BUILD_WITH_LIBDEVINFO
48	interface_la_LIBADD += -ldevinfo
49	@@ -669,7 +672,7 @@ memory_la_CFLAGS = $(AM_CFLAGS)
50	memory_la_LDFLAGS = $(PLUGIN_LDFLAGS)
51	memory_la_LIBADD =
52	if BUILD_WITH_LIBKSTAT
53	-memory_la_LIBADD += -lkstat
54	+memory_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS)
55	endif
56	if BUILD_WITH_LIBDEVINFO
57	memory_la_LIBADD += -ldevinfo
58	@@ -1034,7 +1037,7 @@ swap_la_CFLAGS = $(AM_CFLAGS)
59	swap_la_LDFLAGS = $(PLUGIN_LDFLAGS)
60	swap_la_LIBADD =
61	if BUILD_WITH_LIBKSTAT
62	-swap_la_LIBADD += -lkstat
63	+swap_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS)
64	endif
65	if BUILD_WITH_LIBDEVINFO
66	swap_la_LIBADD += -ldevinfo
67	@@ -1080,7 +1083,7 @@ if BUILD_PLUGIN_TAPE
68	pkglib_LTLIBRARIES += tape.la
69	tape_la_SOURCES = tape.c
70	tape_la_LDFLAGS = $(PLUGIN_LDFLAGS)
71	-tape_la_LIBADD = -lkstat -ldevinfo
72	+tape_la_LIBADD = $(BUILD_WITH_LIBKSTAT_LIBS) -ldevinfo
73	endif
74
75	if BUILD_PLUGIN_TARGET_NOTIFICATION
76	@@ -1184,7 +1187,7 @@ uptime_la_CFLAGS = $(AM_CFLAGS)
77	uptime_la_LDFLAGS = $(PLUGIN_LDFLAGS)
78	uptime_la_LIBADD =
79	if BUILD_WITH_LIBKSTAT
80	-uptime_la_LIBADD += -lkstat
81	+uptime_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS)
82	endif
83	if BUILD_WITH_PERFSTAT
84	uptime_la_LIBADD += -lperfstat
85	@@ -1340,7 +1343,7 @@ if BUILD_FREEBSD
86	zfs_arc_la_LIBADD = -lm
87	endif
88	if BUILD_SOLARIS
89	-zfs_arc_la_LIBADD = -lkstat
90	+zfs_arc_la_LIBADD = $(BUILD_WITH_LIBKSTAT_LIBS)
91	endif
92	endif
93
94	@@ -1433,12 +1436,7 @@ endif
95
96	install-exec-hook:
97	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
98	- if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \
99	- then \
100	- $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.pkg-orig; \
101	- else \
102	- $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \
103	- fi; \
104	+ $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.sample
105	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
106	$(INSTALL) -m 0644 $(srcdir)/types.db $(DESTDIR)$(pkgdatadir)/types.db;
107	$(INSTALL) -m 0644 $(srcdir)/postgresql_default.conf \

Lines 1-12 Link Here

(-)net-mgmt/collectd5.new/files/patch-src__modbus.c (-12 lines)
1	--- src/modbus.c.orig 2017-01-23 07:53:57 UTC
2	+++ src/modbus.c
3	@@ -26,6 +26,9 @@
4	#include "configfile.h"
5	#include "plugin.h"
6
7	+/* FreeBSD needs this */
8	+#include <sys/socket.h>
9	+
10	#include <modbus.h>
11	#include <netdb.h>
12	#include <sys/socket.h>

Lines 1-18 Link Here

(-)net-mgmt/collectd5.new/files/patch-src__tcpconns.c (-18 lines)
1	--- src/tcpconns.c.orig 2017-03-21 00:18:33.371554000 -0700
2	+++ src/tcpconns.c 2017-03-21 00:21:09.631089000 -0700
3	@@ -745,9 +745,15 @@
4	for (in_ptr = (struct xinpgen )(((char )in_orig) + in_orig->xig_len);
5	in_ptr->xig_len > sizeof(struct xinpgen);
6	in_ptr = (struct xinpgen )(((char )in_ptr) + in_ptr->xig_len)) {
7	+#if __FreeBSD_version >= 1200026
8	+ struct xtcpcb tp = (struct xtcpcb )in_ptr;
9	+ struct xinpcb *inp = &tp->xt_inp;
10	+ struct xsocket *so = &inp->xi_socket;
11	+#else
12	struct tcpcb tp = &((struct xtcpcb )in_ptr)->xt_tp;
13	struct inpcb inp = &((struct xtcpcb )in_ptr)->xt_inp;
14	struct xsocket so = &((struct xtcpcb )in_ptr)->xt_socket;
15	+#endif
16
17	/* Ignore non-TCP sockets */
18	if (so->xso_protocol != IPPROTO_TCP)

Lines 1-40 Link Here

(-)net-mgmt/collectd5.new/files/patch-src_config.h.in (-40 lines)
1	--- src/config.h.in.orig 2016-09-11 08:10:42 UTC
2	+++ src/config.h.in
3	@@ -587,8 +587,8 @@
4	/* Define to 1 if you have the <modbus.h> header file. */
5	#undef HAVE_MODBUS_H
6
7	-/* Define to 1 if you have the <mongo.h> header file. */
8	-#undef HAVE_MONGO_H
9	+/* Define to 1 if you have the <mongoc.h> header file. */
10	+#undef HAVE_MONGOC_H
11
12	/* Define to 1 if you have the <mosquitto.h> header file. */
13	#undef HAVE_MOSQUITTO_H
14	@@ -1617,13 +1617,15 @@
15	module search path. */
16	#undef LT_MODULE_PATH_VAR
17
18	-/* Define to the sub-directory in which libtool stores uninstalled libraries.
19	- */
20	+/* Define to the sub-directory where libtool stores uninstalled libraries. */
21	#undef LT_OBJDIR
22
23	/* Define to the shared library suffix, say, ".dylib". */
24	#undef LT_SHARED_EXT
25
26	+/* Define to the shared archive member specification, say "(shr.o)". */
27	+#undef LT_SHARED_LIB_MEMBER
28	+
29	/* Define if NAN is defined by default and can initialize static variables. */
30	#undef NAN_STATIC_DEFAULT
31
32	@@ -1715,7 +1717,7 @@
33	/* Define to empty if `const' does not conform to ANSI C. */
34	#undef const
35
36	-/* Define to a type to use for `error_t' if it is not otherwise available. */
37	+/* Define to a type to use for 'error_t' if it is not otherwise available. */
38	#undef error_t
39
40	/* Define to `int' if <sys/types.h> doesn't define. */

Lines 2-12 Link Here

(-)net-mgmt/collectd5.new/Makefile (-13 / +15 lines)
2	# $FreeBSD: head/net-mgmt/collectd5/Makefile 449798 2017-09-13 14:55:45Z des $	2	# $FreeBSD: head/net-mgmt/collectd5/Makefile 449798 2017-09-13 14:55:45Z des $
3		3
4	PORTNAME= collectd	4	PORTNAME= collectd
5	PORTVERSION= 5.7.2	5	PORTVERSION= 5.8.0
6	PORTREVISION= 1
7	CATEGORIES= net-mgmt	6	CATEGORIES= net-mgmt
8	MASTER_SITES= https://collectd.org/files/ \	7	MASTER_SITES= https://storage.googleapis.com/collectd-tarballs/
9	http://collectd.org/files/
10	PKGNAMESUFFIX= 5	8	PKGNAMESUFFIX= 5
11		9
12	MAINTAINER= ports@bsdserwis.com	10	MAINTAINER= ports@bsdserwis.com
Lines 18-24 Link Here
18	USES= autoreconf gmake libtool pkgconfig shebangfix tar:bzip2	16	USES= autoreconf gmake libtool pkgconfig shebangfix tar:bzip2
19	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
20		18
21	OPTIONS_DEFINE= CGI DEBUG GCRYPT LOGSTASH VIRT	19	OPTIONS_DEFINE= CGI JAVA LOGGING GCRYPT LOGSTASH VIRT
22	OPTIONS_GROUP= INPUT OUTPUT	20	OPTIONS_GROUP= INPUT OUTPUT
23	OPTIONS_GROUP_OUTPUT= KAFKA MONGODB NOTIFYDESKTOP NOTIFYEMAIL RIEMANN RRDTOOL \	21	OPTIONS_GROUP_OUTPUT= KAFKA MONGODB NOTIFYDESKTOP NOTIFYEMAIL RIEMANN RRDTOOL \
24	TSDB	22	TSDB
Lines 28-34 Link Here
28	SIGROK SNMP STATSD TOKYOTYRANT VARNISH XML \	26	SIGROK SNMP STATSD TOKYOTYRANT VARNISH XML \
29	XMMS ZOOKEEPER	27	XMMS ZOOKEEPER
30		28
31	OPTIONS_DEFAULT= DEBUG GCRYPT PING	29	OPTIONS_DEFAULT= LOGGING GCRYPT PING
32		30
33	CGI_DESC= Install collection.cgi (requires rrdtool)	31	CGI_DESC= Install collection.cgi (requires rrdtool)
34	CHRONY_DESC= Enable chronyd plugin	32	CHRONY_DESC= Enable chronyd plugin
Lines 40-45 Link Here
40	IPMI_DESC= Enable OpenIPMI plugin	38	IPMI_DESC= Enable OpenIPMI plugin
41	JSON_DESC= Enable JSON plugins	39	JSON_DESC= Enable JSON plugins
42	KAFKA_DESC= Enable write_kafka plugin	40	KAFKA_DESC= Enable write_kafka plugin
		41	LOGGING_DESC= Enable debug logging
43	LOGSTASH_DESC= Enable log_logstash plugin (requires json)	42	LOGSTASH_DESC= Enable log_logstash plugin (requires json)
44	MEMCACHEC_DESC= Enable memcachec plugin	43	MEMCACHEC_DESC= Enable memcachec plugin
45	MODBUS_DESC= Enable modbus plugin	44	MODBUS_DESC= Enable modbus plugin
Lines 90-100 Link Here
90	--disable-ceph \	89	--disable-ceph \
91	--disable-cgroups \	90	--disable-cgroups \
92	--disable-fhcount \	91	--disable-fhcount \
93	--without-java \
94	--without-libaquaero5 \	92	--without-libaquaero5 \
95	--without-libganglia \	93	--without-libganglia \
96	--without-libiptc \	94	--without-libiptc \
97	--without-libjvm \
98	--without-liblvm2app \	95	--without-liblvm2app \
99	--without-libkstat \	96	--without-libkstat \
100	--without-libldap \	97	--without-libldap \
Lines 127-133 Link Here
127	CURL_XML_IMPLIES= CURL XML	124	CURL_XML_IMPLIES= CURL XML
128	CURL_XML_CONFIGURE_ENABLE= ascent bind curl_xml	125	CURL_XML_CONFIGURE_ENABLE= ascent bind curl_xml
129		126
130	DEBUG_CONFIGURE_ENABLE= debug	127	JAVA_USE= java
		128	JAVA_CONFIGURE_ENABLE= java
		129	JAVA_CONFIGURE_WITH= java=${LOCALBASE} libjvm
131		130
132	DBI_LIB_DEPENDS= libdbi.so:databases/libdbi	131	DBI_LIB_DEPENDS= libdbi.so:databases/libdbi
133	DBI_CONFIGURE_WITH= libdbi=${LOCALBASE}	132	DBI_CONFIGURE_WITH= libdbi=${LOCALBASE}
Lines 148-153 Link Here
148	KAFKA_LIB_DEPENDS= librdkafka.so:net/librdkafka	147	KAFKA_LIB_DEPENDS= librdkafka.so:net/librdkafka
149	KAFKA_CONFIGURE_ENABLE= write_kafka	148	KAFKA_CONFIGURE_ENABLE= write_kafka
150		149
		150	LOGGING_CONFIGURE_ENABLE= debug
		151
151	LOGSTASH_CONFIGURE_ENABLE= log_logstash	152	LOGSTASH_CONFIGURE_ENABLE= log_logstash
152	LOGSTASH_IMPLIES= JSON	153	LOGSTASH_IMPLIES= JSON
153		154
Lines 199-205 Link Here
199		200
200	PERL_USES= perl5	201	PERL_USES= perl5
201	PERL_CONFIGURE_ENABLE= perl	202	PERL_CONFIGURE_ENABLE= perl
202	PERL_CONFIGURE_WITH= perl=${PERL} perl-bindings	203	PERL_CONFIGURE_DISABLE= perl
		204	PERL_CONFIGURE_WITH= perl=${PERL} perl-bindings libperl
203		205
204	PGSQL_USES= pgsql	206	PGSQL_USES= pgsql
205	PGSQL_CONFIGURE_ENABLE= postgresql	207	PGSQL_CONFIGURE_ENABLE= postgresql
Lines 338-351 Link Here
338		340
339	post-patch:	341	post-patch:
340	@${REINPLACE_CMD} 's/-Werror//' \	342	@${REINPLACE_CMD} 's/-Werror//' \
341	${WRKSRC}/configure.ac ${WRKSRC}/src/Makefile.am \	343	${WRKSRC}/configure.ac
342	${WRKSRC}/src/libcollectdclient/Makefile.am
343	@${REINPLACE_CMD} \	344	@${REINPLACE_CMD} \
344	-e 's;@prefix@/var/;/var/;' \	345	-e 's;@prefix@/var/;/var/;' \
345	-e 's;/var/lib/;/var/db/;' \	346	-e 's;/var/lib/;/var/db/;' \
346	-e 's;@localstatedir@/lib/;/var/db/;' \	347	-e 's;@localstatedir@/lib/;/var/db/;' \
347	${WRKSRC}/src/collectd.conf.in \	348	${WRKSRC}/src/collectd.conf.in \
348	${WRKSRC}/src/collectd.conf.5	349	${WRKSRC}/src/collectd.conf.5 \
		350	${WRKSRC}/src/collectd.conf.pod
349	@${REINPLACE_CMD} \	351	@${REINPLACE_CMD} \
350	-e 's;/etc/collection\.conf;${WWWDIR}/collection.conf;' \	352	-e 's;/etc/collection\.conf;${WWWDIR}/collection.conf;' \
351	${WRKSRC}/contrib/collection.cgi	353	${WRKSRC}/contrib/collection.cgi