Date: Tue, 27 Sep 2016 11:46:51 +1300 From: Pierre Guinoiseau <pierre@guinoiseau.eu> To: Joseph Mingrone <jrm@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r422778 - in head/net-mgmt/collectd5: . files Message-ID: <20160926224651.GB11220@kyleck.sig11.fr> In-Reply-To: <201609261451.u8QEpxBg008647@repo.freebsd.org> References: <201609261451.u8QEpxBg008647@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Pd0ReVV5GZGQvF3a
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
The disk plugin is missing on 10.3 as well after that change. I think it
should be that instead:
=2Eif ${OPSYS} =3D=3D FreeBSD && ${OSVERSION} < 1000000
PLIST_SUB+=3D DISK=3D"@comment "
=2Eelse
CONFIGURE_ARGS+=3D--enable-disk
PLIST_SUB+=3D DISK=3D""
=2Eendif
On 2016-09-26 14:51:59, Joseph Mingrone <jrm@FreeBSD.org> wrote:
> Author: jrm
> Date: Mon Sep 26 14:51:59 2016
> New Revision: 422778
> URL: https://svnweb.freebsd.org/changeset/ports/422778
>=20
> Log:
> Update net-mgmt/collectd5 to version 5.6.0
> =20
> - new port options CHRONY and MQTT
> - disable disk plugin on FreeBSD 9.x due to missing OS files
> - various patch changes
> =20
> PR: 212832
> Submitted by: ports@bsdserwis.com (maintainer)
> Reviewed by: swills (mentor)
> Approved by: swills (mentor)
> Differential Revision: https://reviews.freebsd.org/D8028
>=20
> Deleted:
> head/net-mgmt/collectd5/files/patch-src_disk.c
> head/net-mgmt/collectd5/files/patch-src_zfs__arc.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-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_config.h.in
> head/net-mgmt/collectd5/files/patch-src_write__mongodb.c
> head/net-mgmt/collectd5/files/patch-version-gen.sh
> head/net-mgmt/collectd5/pkg-plist
>=20
> Modified: head/net-mgmt/collectd5/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/net-mgmt/collectd5/Makefile Mon Sep 26 14:28:06 2016 (r422777)
> +++ head/net-mgmt/collectd5/Makefile Mon Sep 26 14:51:59 2016 (r422778)
> @@ -2,7 +2,7 @@
> # $FreeBSD$
> =20
> PORTNAME=3D collectd
> -PORTVERSION=3D 5.5.2
> +PORTVERSION=3D 5.6.0
> CATEGORIES=3D net-mgmt
> MASTER_SITES=3D https://collectd.org/files/ \
> http://collectd.org/files/
> @@ -25,13 +25,14 @@ OPTIONS_DEFINE=3D CGI DEBUG GCRYPT LOGSTA
> OPTIONS_GROUP=3D INPUT OUTPUT
> OPTIONS_GROUP_OUTPUT=3D KAFKA MONGODB NOTIFYDESKTOP NOTIFYEMAIL RIEMANN =
RRDTOOL \
> TSDB
> -OPTIONS_GROUP_INPUT=3D CURL CURL_JSON CURL_XML DBI IPMI JSON MEMCACHEC \
> - MODBUS MYSQL NUTUPS OLSRD ONEWIRE OPENLDAP \
> +OPTIONS_GROUP_INPUT=3D CHRONY CURL CURL_JSON CURL_XML DBI IPMI JSON \
> + MEMCACHEC MODBUS MQTT MYSQL NUTUPS OLSRD ONEWIRE OPENLDAP \
> PERL PGSQL PINBA PING PYTHON RABBITMQ REDIS ROUTEROS \
> SIGROK SNMP STATSD TOKYOTYRANT VARNISH XML \
> XMMS ZOOKEEPER
> =20
> CGI_DESC=3D Install collection.cgi (requires rrdtool)
> +CHRONY_DESC=3D Enable chronyd plugin
> CURL_DESC=3D Enable curl-based plugins (apache, nginx, etc)
> CURL_JSON_DESC=3D Enable curl_json plugin (implies curl and json)
> CURL_XML_DESC=3D Enable ascent, bind, curl_xml plugins (implies curl an=
d xml)
> @@ -45,6 +46,7 @@ LOGSTASH_DESC=3D Enable log_logstash plug
> MEMCACHEC_DESC=3D Enable memcachec plugin
> MODBUS_DESC=3D Enable modbus plugin
> MONGODB_DESC=3D Enable write_mongodb plugin (BROKEN)
> +MQTT_DESC=3D Enable MQTT broker metrics
> MYSQL_DESC=3D Enable mysql-based plugins
> NOTIFYDESKTOP_DESC=3D Enable desktop notifications
> NOTIFYEMAIL_DESC=3D Enable notifications via email
> @@ -115,6 +117,8 @@ CGI_RUN_DEPENDS=3D p5-URI>=3D0:net/p5-URI \
> p5-HTML-Parser>=3D0:www/p5-HTML-Parser
> CGI_IMPLIES=3D RRDTOOL
> =20
> +CHRONY_CONFIGURE_ENABLE=3D chrony
> +
> CURL_LIB_DEPENDS=3D libcurl.so:ftp/curl
> CURL_CONFIGURE_ENABLE=3D apache curl nginx write_http
> CURL_CONFIGURE_WITH=3D libcurl=3D${LOCALBASE}
> @@ -162,6 +166,10 @@ MONGODB_CONFIGURE_ENABLE=3D write_mongodb
> MONGODB_CONFIGURE_WITH=3D libmongoc=3D${LOCALBASE}
> MONGODB_BROKEN=3D fails to configure with write_mongodb option
> =20
> +MQTT_LIB_DEPENDS=3D libmosquitto.so:net/mosquitto
> +MQTT_CONFIGURE_ENABLE=3D mqtt
> +MQTT_CONFIGURE_WITH=3D libmosquitto=3D${LOCALBASE}
> +
> MYSQL_USE=3D mysql=3Dyes
> MYSQL_CONFIGURE_ENABLE=3D mysql
> MYSQL_CONFIGURE_WITH=3D libmysql=3D${LOCALBASE}
> @@ -272,7 +280,6 @@ CONFIGURE_ARGS+=3D--enable-aggregation \
> --enable-cpu \
> --enable-csv \
> --enable-df \
> - --enable-disk \
> --enable-dns \
> --enable-email \
> --enable-exec \
> @@ -317,6 +324,15 @@ CONFIGURE_ARGS+=3D--enable-aggregation \
> --enable-write_log \
> --enable-zfs_arc \
> =20
> +.include <bsd.port.options.mk>
> +
> +.if ${OPSYS} =3D=3D FreeBSD && ${OSVERSION} < 1000000
> +PLIST_SUB+=3D DISK=3D"@comment "
> +.else
> +CONFIGURE_ARGS+=3D--enable-disk
> +PLIST_SUB+=3D DISK=3D"@comment "
> +.endif
> +
> INSTALL_TARGET=3D install-strip
> SHEBANG_FILES=3D contrib/collection.cgi
> =20
>=20
> Modified: head/net-mgmt/collectd5/distinfo
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/net-mgmt/collectd5/distinfo Mon Sep 26 14:28:06 2016 (r422777)
> +++ head/net-mgmt/collectd5/distinfo Mon Sep 26 14:51:59 2016 (r422778)
> @@ -1,3 +1,3 @@
> -TIMESTAMP =3D 1469564676
> -SHA256 (collectd-5.5.2.tar.bz2) =3D 017f3a4062187e594d8ab6af685655fb82a8=
a942dc574668e68242bdb8ba820f
> -SIZE (collectd-5.5.2.tar.bz2) =3D 1800476
> +TIMESTAMP =3D 1474290609
> +SHA256 (collectd-5.6.0.tar.bz2) =3D f0ffbbd91fac3682bd324a74b9b4c9eabe78=
1394b303b5cfd457c4cfbe748623
> +SIZE (collectd-5.6.0.tar.bz2) =3D 1818470
>=20
> Modified: head/net-mgmt/collectd5/files/patch-Makefile.am
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/net-mgmt/collectd5/files/patch-Makefile.am Mon Sep 26 14:28:06 2=
016 (r422777)
> +++ head/net-mgmt/collectd5/files/patch-Makefile.am Mon Sep 26 14:51:59 2=
016 (r422778)
> @@ -1,6 +1,6 @@
> ---- Makefile.am.orig 2016-01-22 08:33:25 UTC
> +--- Makefile.am.orig 2016-09-11 08:10:25 UTC
> +++ Makefile.am
> -@@ -14,7 +14,6 @@ EXTRA_DIST =3D contrib version-gen.sh
> +@@ -14,7 +14,6 @@ EXTRA_DIST =3D contrib version-gen.sh test
> =20
> install-exec-hook:
> $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run
>=20
> Modified: head/net-mgmt/collectd5/files/patch-configure.ac
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/net-mgmt/collectd5/files/patch-configure.ac Mon Sep 26 14:28:06 =
2016 (r422777)
> +++ head/net-mgmt/collectd5/files/patch-configure.ac Mon Sep 26 14:51:59 =
2016 (r422778)
> @@ -1,6 +1,6 @@
> ---- configure.ac.orig 2016-01-22 09:51:17 UTC
> +--- configure.ac.orig 2016-09-11 08:10:25 UTC
> +++ configure.ac
> -@@ -155,7 +155,7 @@ then
> +@@ -185,7 +185,7 @@ then
> fi
> =20
> # Where to install .pc files.
> @@ -9,7 +9,7 @@
> AC_SUBST(pkgconfigdir)
> =20
> # Check for standards compliance mode
> -@@ -715,7 +715,7 @@ SAVE_CFLAGS=3D"$CFLAGS"
> +@@ -841,7 +841,7 @@ SAVE_CFLAGS=3D"$CFLAGS"
> # Emulate behavior of src/Makefile.am
> if test "x$GCC" =3D "xyes"
> then
> @@ -18,7 +18,7 @@
> fi
> =20
> AC_CACHE_CHECK([for strtok_r],
> -@@ -844,7 +844,7 @@ AC_CHECK_FUNCS(getutxent, [have_getutxen
> +@@ -968,7 +968,7 @@ AC_CHECK_FUNCS(getutxent, [have_getutxen
> if test "x$GCC" =3D "xyes"
> then
> SAVE_CFLAGS=3D"$CFLAGS"
> @@ -27,7 +27,7 @@
> fi
> =20
> AC_CHECK_FUNCS(strptime, [have_strptime=3D"yes"], [have_strptime=3D"no"=
])
> -@@ -1571,6 +1571,7 @@ if test "x$with_kstat" =3D "xyes"
> +@@ -1757,6 +1757,7 @@ if test "x$with_kstat" =3D "xyes"
> then
> AC_CHECK_LIB(kstat, kstat_open, [with_kstat=3D"yes"], [with_kstat=3D"n=
o (libkstat not found)"], [])
> fi
> @@ -35,7 +35,7 @@
> if test "x$with_kstat" =3D "xyes"
> then
> AC_CHECK_LIB(devinfo, di_init, [with_devinfo=3D"yes"], [with_devinfo=
=3D"no (not found)"], [])
> -@@ -1580,6 +1581,8 @@ if test "x$with_kstat" =3D "xyes"
> +@@ -1766,6 +1767,8 @@ if test "x$with_kstat" =3D "xyes"
> then
> AC_DEFINE(HAVE_LIBKSTAT, 1,
> [Define to 1 if you have the 'kstat' library (-lkstat)])
> @@ -44,7 +44,7 @@
> fi
> AM_CONDITIONAL(BUILD_WITH_LIBKSTAT, test "x$with_kstat" =3D "xyes")
> AM_CONDITIONAL(BUILD_WITH_LIBDEVINFO, test "x$with_devinfo" =3D "xyes")
> -@@ -2624,8 +2627,8 @@ AC_ARG_WITH(libmongoc, [AS_HELP_STRING([
> +@@ -3053,8 +3056,8 @@ AC_ARG_WITH(libmongoc, [AS_HELP_STRING([
> with_libmongoc=3D"no"
> else
> with_libmongoc=3D"yes"
> @@ -55,7 +55,7 @@
> fi; fi
> ],
> [with_libmongoc=3D"yes"])
> -@@ -2642,7 +2645,7 @@ then
> +@@ -3071,7 +3074,7 @@ then
> then
> AC_MSG_NOTICE([libmongoc CPPFLAGS: $LIBMONGOC_CPPFLAGS])
> fi
> @@ -64,7 +64,7 @@
> [with_libmongoc=3D"yes"],
> [with_libmongoc=3D"no ('mongo.h' not found)"],
> [#if HAVE_STDINT_H
> -@@ -2658,7 +2661,7 @@ then
> +@@ -3087,7 +3090,7 @@ then
> then
> AC_MSG_NOTICE([libmongoc LDFLAGS: $LIBMONGOC_LDFLAGS])
> fi
> @@ -73,7 +73,7 @@
> [with_libmongoc=3D"yes"],
> [with_libmongoc=3D"no (symbol 'mongo_run_command' not found)"])
> fi
> -@@ -3415,7 +3418,7 @@ then
> +@@ -3873,7 +3876,7 @@ then
> SAVE_LIBS=3D"$LIBS"
> # trigger an error if Perl_load_module*() uses __attribute__nonnull__(=
3)
> # (see issues #41 and #42)
> @@ -82,43 +82,7 @@
> LIBS=3D"$LIBS $PERL_LIBS"
> =20
> AC_CACHE_CHECK([for broken Perl_load_module()],
> -@@ -3645,7 +3648,7 @@ fi
> - if test "x$with_python" =3D "xyes"
> - then
> - AC_MSG_CHECKING([for Python CPPFLAGS])
> -- python_include_path=3D`echo "import distutils.sysconfig;import sys;sys=
=2Estdout.write(distutils.sysconfig.get_python_inc())" | "$with_python_prog=
" 2>&1`
> -+ python_include_path=3D`echo "import distutils.sysconfig;import sys;sys=
=2Estdout.write(distutils.sysconfig.get_python_inc())" | "$with_python_prog=
" 2>/dev/null`
> - python_config_status=3D$?
> -=20
> - if test "$python_config_status" -ne 0 || test "x$python_include_path" =
=3D "x"
> -@@ -3668,7 +3671,7 @@ fi
> - if test "x$with_python" =3D "xyes"
> - then
> - AC_MSG_CHECKING([for Python LDFLAGS])
> -- python_library_path=3D`echo "import distutils.sysconfig;import sys;sys=
=2Estdout.write(distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__=
(0))" | "$with_python_prog" 2>&1`
> -+ python_library_path=3D`echo "import distutils.sysconfig;import sys;sys=
=2Estdout.write(distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__=
(0))" | "$with_python_prog" 2>/dev/null`
> - python_config_status=3D$?
> -=20
> - if test "$python_config_status" -ne 0 || test "x$python_library_path" =
=3D "x"
> -@@ -3683,7 +3686,7 @@ fi
> - if test "x$with_python" =3D "xyes"
> - then
> - AC_MSG_CHECKING([for Python LIBS])
> -- python_library_flags=3D`echo "import distutils.sysconfig;import sys;sy=
s.stdout.write(distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getite=
m__(0))" | "$with_python_prog" 2>&1`
> -+ python_library_flags=3D`echo "import distutils.sysconfig;import sys;sy=
s.stdout.write(distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getite=
m__(0))" | "$with_python_prog" 2>/dev/null`
> - python_config_status=3D$?
> -=20
> - if test "$python_config_status" -ne 0 || test "x$python_library_flags"=
=3D "x"
> -@@ -3698,7 +3701,7 @@ fi
> - if test "x$with_python" =3D "xyes"
> - then
> - LDFLAGS=3D"-L$python_library_path $LDFLAGS"
> -- LIBS=3D"$python_library_flags $LIBS"
> -+ LIBS=3D"$python_library_flags $LIBS -lm -lpthread -lutil"
> -=20
> - AC_CHECK_FUNC(PyObject_CallFunction,
> - [with_python=3D"yes"],
> -@@ -4761,8 +4764,8 @@ AC_ARG_WITH(libvarnish, [AS_HELP_STRING(
> +@@ -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])
> @@ -129,11 +93,3 @@
> with_libvarnish=3D"yes"
> fi; fi; fi
> ],
> -@@ -5334,6 +5337,7 @@ fi
> -=20
> - if test "x$ac_system" =3D "xFreeBSD"
> - then
> -+ plugin_disk=3D"yes"
> - plugin_zfs_arc=3D"yes"
> - fi
> -=20
>=20
> Modified: head/net-mgmt/collectd5/files/patch-src__Makefile.am
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/net-mgmt/collectd5/files/patch-src__Makefile.am Mon Sep 26 14:28=
:06 2016 (r422777)
> +++ head/net-mgmt/collectd5/files/patch-src__Makefile.am Mon Sep 26 14:51=
:59 2016 (r422778)
> @@ -1,14 +1,6 @@
> ---- src/Makefile.am.orig 2016-01-22 09:51:17 UTC
> +--- src/Makefile.am.orig 2016-09-11 08:10:25 UTC
> +++ src/Makefile.am
> -@@ -7,14 +7,14 @@ SUBDIRS +=3D daemon
> - PLUGIN_LDFLAGS =3D -module -avoid-version -export-symbols-regex '\<modu=
le_register\>'
> -=20
> - if COMPILER_IS_GCC
> --AM_CFLAGS =3D -Wall -Werror
> -+AM_CFLAGS =3D -Wall=20
> - endif
> -=20
> - AM_CPPFLAGS =3D -I$(srcdir)/daemon
> +@@ -10,7 +10,7 @@ AM_CPPFLAGS =3D -I$(srcdir)/daemon
> AM_CPPFLAGS +=3D -DPREFIX=3D'"${prefix}"'
> AM_CPPFLAGS +=3D -DCONFIGFILE=3D'"${sysconfdir}/${PACKAGE_NAME}.conf"'
> AM_CPPFLAGS +=3D -DLOCALSTATEDIR=3D'"${localstatedir}"'
> @@ -17,7 +9,7 @@
> if BUILD_FEATURE_DAEMON
> AM_CPPFLAGS +=3D -DPIDFILE=3D'"${localstatedir}/run/${PACKAGE_NAME}.pid=
"'
> endif
> -@@ -218,7 +218,7 @@ cpu_la_CFLAGS =3D $(AM_CFLAGS)
> +@@ -274,7 +274,7 @@ cpu_la_CFLAGS =3D $(AM_CFLAGS)
> cpu_la_LDFLAGS =3D $(PLUGIN_LDFLAGS)
> cpu_la_LIBADD =3D
> if BUILD_WITH_LIBKSTAT
> @@ -26,7 +18,7 @@
> endif
> if BUILD_WITH_LIBDEVINFO
> cpu_la_LIBADD +=3D -ldevinfo
> -@@ -301,7 +301,7 @@ disk_la_CFLAGS =3D $(AM_CFLAGS)
> +@@ -358,7 +358,7 @@ disk_la_CFLAGS =3D $(AM_CFLAGS)
> disk_la_LDFLAGS =3D $(PLUGIN_LDFLAGS)
> disk_la_LIBADD =3D
> if BUILD_WITH_LIBKSTAT
> @@ -35,7 +27,7 @@
> endif
> if BUILD_WITH_LIBDEVINFO
> disk_la_LIBADD +=3D -ldevinfo
> -@@ -319,6 +319,9 @@ endif
> +@@ -381,6 +381,9 @@ endif
> if BUILD_WITH_PERFSTAT
> disk_la_LIBADD +=3D -lperfstat
> endif
> @@ -45,7 +37,7 @@
> endif
> =20
> if BUILD_PLUGIN_DNS
> -@@ -405,7 +408,7 @@ interface_la_CFLAGS +=3D $(BUILD_WITH_LIBS
> +@@ -481,7 +484,7 @@ interface_la_CFLAGS +=3D $(BUILD_WITH_LIBS
> interface_la_LIBADD +=3D $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
> else
> if BUILD_WITH_LIBKSTAT
> @@ -54,7 +46,7 @@
> endif
> if BUILD_WITH_LIBDEVINFO
> interface_la_LIBADD +=3D -ldevinfo
> -@@ -584,7 +587,7 @@ memory_la_CFLAGS =3D $(AM_CFLAGS)
> +@@ -669,7 +672,7 @@ memory_la_CFLAGS =3D $(AM_CFLAGS)
> memory_la_LDFLAGS =3D $(PLUGIN_LDFLAGS)
> memory_la_LIBADD =3D
> if BUILD_WITH_LIBKSTAT
> @@ -63,7 +55,7 @@
> endif
> if BUILD_WITH_LIBDEVINFO
> memory_la_LIBADD +=3D -ldevinfo
> -@@ -951,7 +954,7 @@ swap_la_CFLAGS =3D $(AM_CFLAGS)
> +@@ -1034,7 +1037,7 @@ swap_la_CFLAGS =3D $(AM_CFLAGS)
> swap_la_LDFLAGS =3D $(PLUGIN_LDFLAGS)
> swap_la_LIBADD =3D
> if BUILD_WITH_LIBKSTAT
> @@ -72,7 +64,7 @@
> endif
> if BUILD_WITH_LIBDEVINFO
> swap_la_LIBADD +=3D -ldevinfo
> -@@ -997,7 +1000,7 @@ if BUILD_PLUGIN_TAPE
> +@@ -1080,7 +1083,7 @@ if BUILD_PLUGIN_TAPE
> pkglib_LTLIBRARIES +=3D tape.la
> tape_la_SOURCES =3D tape.c
> tape_la_LDFLAGS =3D $(PLUGIN_LDFLAGS)
> @@ -81,7 +73,7 @@
> endif
> =20
> if BUILD_PLUGIN_TARGET_NOTIFICATION
> -@@ -1102,7 +1105,7 @@ uptime_la_CFLAGS =3D $(AM_CFLAGS)
> +@@ -1184,7 +1187,7 @@ uptime_la_CFLAGS =3D $(AM_CFLAGS)
> uptime_la_LDFLAGS =3D $(PLUGIN_LDFLAGS)
> uptime_la_LIBADD =3D
> if BUILD_WITH_LIBKSTAT
> @@ -90,16 +82,16 @@
> endif
> if BUILD_WITH_PERFSTAT
> uptime_la_LIBADD +=3D -lperfstat
> -@@ -1260,7 +1263,7 @@ if BUILD_LINUX
> - # zfs_arc requires no library on linux
> - else
> - # solaris
> +@@ -1340,7 +1343,7 @@ if BUILD_FREEBSD
> + zfs_arc_la_LIBADD =3D -lm
> + endif
> + if BUILD_SOLARIS
> -zfs_arc_la_LIBADD =3D -lkstat
> +zfs_arc_la_LIBADD =3D $(BUILD_WITH_LIBKSTAT_LIBS)
> endif
> endif
> - endif
> -@@ -1354,12 +1357,7 @@ endif
> +=20
> +@@ -1433,12 +1436,7 @@ endif
> =20
> install-exec-hook:
> $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
>=20
> Modified: head/net-mgmt/collectd5/files/patch-src__daemon__Makefile.am
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/net-mgmt/collectd5/files/patch-src__daemon__Makefile.am Mon Sep =
26 14:28:06 2016 (r422777)
> +++ head/net-mgmt/collectd5/files/patch-src__daemon__Makefile.am Mon Sep =
26 14:51:59 2016 (r422778)
> @@ -1,6 +1,6 @@
> ---- src/daemon/Makefile.am.orig 2016-01-22 09:51:17 UTC
> +--- src/daemon/Makefile.am.orig 2016-09-11 08:10:25 UTC
> +++ src/daemon/Makefile.am
> -@@ -6,7 +6,7 @@ AM_CPPFLAGS =3D -I$(top_srcdir)/src
> +@@ -2,7 +2,7 @@ AM_CPPFLAGS =3D -I$(top_srcdir)/src
> AM_CPPFLAGS +=3D -DPREFIX=3D'"${prefix}"'
> AM_CPPFLAGS +=3D -DCONFIGFILE=3D'"${sysconfdir}/${PACKAGE_NAME}.conf"'
> AM_CPPFLAGS +=3D -DLOCALSTATEDIR=3D'"${localstatedir}"'
>=20
> Modified: head/net-mgmt/collectd5/files/patch-src__daemon__collectd.h
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/net-mgmt/collectd5/files/patch-src__daemon__collectd.h Mon Sep 2=
6 14:28:06 2016 (r422777)
> +++ head/net-mgmt/collectd5/files/patch-src__daemon__collectd.h Mon Sep 2=
6 14:51:59 2016 (r422778)
> @@ -1,21 +1,21 @@
> ---- src/daemon/collectd.h.orig 2016-01-22 09:51:17 UTC
> +--- src/daemon/collectd.h.orig 2016-09-11 08:10:25 UTC
> +++ src/daemon/collectd.h
> -@@ -240,15 +240,15 @@ typedef int _Bool;
> +@@ -243,15 +243,15 @@ typedef int _Bool;
> #endif
> =20
> #ifndef LOCALSTATEDIR
> --#define LOCALSTATEDIR PREFIX "/var"
> -+#define LOCALSTATEDIR "/var"
> +-# define LOCALSTATEDIR PREFIX "/var"
> ++# define LOCALSTATEDIR "/var"
> #endif
> =20
> #ifndef PKGLOCALSTATEDIR
> --#define PKGLOCALSTATEDIR PREFIX "/var/lib/" PACKAGE_NAME
> -+#define PKGLOCALSTATEDIR PREFIX "/var/db/" PACKAGE_NAME
> +-# define PKGLOCALSTATEDIR PREFIX "/var/lib/" PACKAGE_NAME
> ++# define PKGLOCALSTATEDIR PREFIX "/var/db/" PACKAGE_NAME
> #endif
> =20
> #ifndef PIDFILE
> --#define PIDFILE PREFIX "/var/run/" PACKAGE_NAME ".pid"
> -+#define PIDFILE "/var/run/" PACKAGE_NAME ".pid"
> +-# define PIDFILE PREFIX "/var/run/" PACKAGE_NAME ".pid"
> ++# define PIDFILE "/var/run/" PACKAGE_NAME ".pid"
> #endif
> =20
> #ifndef PLUGINDIR
>=20
> Modified: head/net-mgmt/collectd5/files/patch-src__dns.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/net-mgmt/collectd5/files/patch-src__dns.c Mon Sep 26 14:28:06 20=
16 (r422777)
> +++ head/net-mgmt/collectd5/files/patch-src__dns.c Mon Sep 26 14:51:59 20=
16 (r422778)
> @@ -1,6 +1,6 @@
> ---- src/dns.c.orig 2016-01-22 09:51:17 UTC
> +--- src/dns.c.orig 2016-09-11 08:10:25 UTC
> +++ src/dns.c
> -@@ -223,6 +223,15 @@ static int dns_run_pcap_loop (void)
> +@@ -225,6 +225,15 @@ static int dns_run_pcap_loop (void)
> pthread_sigmask (SIG_SETMASK, &sigmask, NULL);
> }
> =20
>=20
> Modified: head/net-mgmt/collectd5/files/patch-src__modbus.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/net-mgmt/collectd5/files/patch-src__modbus.c Mon Sep 26 14:28:06=
2016 (r422777)
> +++ head/net-mgmt/collectd5/files/patch-src__modbus.c Mon Sep 26 14:51:59=
2016 (r422778)
> @@ -1,8 +1,8 @@
> ---- src/modbus.c.orig 2016-01-22 09:51:17 UTC
> +--- src/modbus.c.orig 2016-09-11 08:10:25 UTC
> +++ src/modbus.c
> @@ -25,6 +25,9 @@
> + #include "common.h"
> #include "plugin.h"
> - #include "configfile.h"
> =20
> +/* FreeBSD needs this */
> +#include <sys/socket.h>=20
>=20
> Modified: head/net-mgmt/collectd5/files/patch-src_config.h.in
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/net-mgmt/collectd5/files/patch-src_config.h.in Mon Sep 26 14:28:=
06 2016 (r422777)
> +++ head/net-mgmt/collectd5/files/patch-src_config.h.in Mon Sep 26 14:51:=
59 2016 (r422778)
> @@ -1,6 +1,6 @@
> ---- src/config.h.in.orig 2016-01-22 09:56:33 UTC
> +--- src/config.h.in.orig 2016-09-11 08:10:42 UTC
> +++ src/config.h.in
> -@@ -562,8 +562,8 @@
> +@@ -587,8 +587,8 @@
> /* Define to 1 if you have the <modbus.h> header file. */
> #undef HAVE_MODBUS_H
> =20
> @@ -9,9 +9,9 @@
> +/* Define to 1 if you have the <mongoc.h> header file. */
> +#undef HAVE_MONGOC_H
> =20
> - /* Define to 1 if you have the <mysql.h> header file. */
> - #undef HAVE_MYSQL_H
> -@@ -1541,13 +1541,15 @@
> + /* 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
> =20
> @@ -29,7 +29,7 @@
> /* Define if NAN is defined by default and can initialize static variab=
les. */
> #undef NAN_STATIC_DEFAULT
> =20
> -@@ -1644,7 +1646,7 @@
> +@@ -1715,7 +1717,7 @@
> /* Define to empty if `const' does not conform to ANSI C. */
> #undef const
> =20
>=20
> Modified: head/net-mgmt/collectd5/files/patch-src_write__mongodb.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/net-mgmt/collectd5/files/patch-src_write__mongodb.c Mon Sep 26 1=
4:28:06 2016 (r422777)
> +++ head/net-mgmt/collectd5/files/patch-src_write__mongodb.c Mon Sep 26 1=
4:51:59 2016 (r422778)
> @@ -1,6 +1,6 @@
> ---- src/write_mongodb.c.orig 2015-12-01 15:28:11 UTC
> +--- src/write_mongodb.c.orig 2016-09-11 08:10:25 UTC
> +++ src/write_mongodb.c
> -@@ -41,7 +41,7 @@
> +@@ -39,7 +39,7 @@
> #else
> # define MONGO_USE_LONG_LONG_INT 1
> #endif
>=20
> Modified: head/net-mgmt/collectd5/files/patch-version-gen.sh
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/net-mgmt/collectd5/files/patch-version-gen.sh Mon Sep 26 14:28:0=
6 2016 (r422777)
> +++ head/net-mgmt/collectd5/files/patch-version-gen.sh Mon Sep 26 14:51:5=
9 2016 (r422778)
> @@ -1,17 +1,17 @@
> ---- version-gen.sh.orig 2016-08-05 21:19:57 UTC
> +--- version-gen.sh.orig 2016-09-11 08:10:25 UTC
> +++ version-gen.sh
> -@@ -1,13 +1,3 @@
> +@@ -1,13 +1,2 @@
> #!/bin/sh
> -=20
> --DEFAULT_VERSION=3D"5.5.2.git"
> -
> --VERSION=3D"`git describe 2> /dev/null | grep collectd | sed -e 's/^coll=
ectd-//'`"
> +-DEFAULT_VERSION=3D"5.6.0.git"
> +-
> +-if [ -d .git ]; then
> +- VERSION=3D"`git describe --dirty=3D+ --abbrev=3D7 2> /dev/null | grep =
collectd | sed -e 's/^collectd-//' -e 's/-/./g'`"
> +-fi
> -
> -if test -z "$VERSION"; then
> - VERSION=3D"$DEFAULT_VERSION"
> -fi
> -
> --VERSION=3D"`echo \"$VERSION\" | sed -e 's/-/./g'`"
> --
> -printf "%s" "$VERSION"
> -+echo -n '5.5.2.git'
> ++echo -n '5.6.0.git'
>=20
> Modified: head/net-mgmt/collectd5/pkg-plist
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/net-mgmt/collectd5/pkg-plist Mon Sep 26 14:28:06 2016 (r422777)
> +++ head/net-mgmt/collectd5/pkg-plist Mon Sep 26 14:51:59 2016 (r422778)
> @@ -18,6 +18,7 @@ lib/collectd/aggregation.so
> lib/collectd/apcups.so
> %%CURL_XML%%lib/collectd/ascent.so
> %%CURL_XML%%lib/collectd/bind.so
> +%%CHRONY%%lib/collectd/chrony.so
> lib/collectd/contextswitch.so
> lib/collectd/cpu.so
> lib/collectd/csv.so
> @@ -26,7 +27,7 @@ lib/collectd/csv.so
> %%CURL_XML%%lib/collectd/curl_xml.so
> %%DBI%%lib/collectd/dbi.so
> lib/collectd/df.so
> -lib/collectd/disk.so
> +%%DISK%%lib/collectd/disk.so
> lib/collectd/dns.so
> lib/collectd/email.so
> lib/collectd/exec.so
> @@ -46,6 +47,7 @@ lib/collectd/mbmon.so
> lib/collectd/memcached.so
> lib/collectd/memory.so
> %%MODBUS%%lib/collectd/modbus.so
> +%%MQTT%%lib/collectd/mqtt.so
> %%MYSQL%%lib/collectd/mysql.so
> lib/collectd/network.so
> %%CURL%%lib/collectd/nginx.so
> @@ -119,6 +121,7 @@ man/man1/collectdmon.1.gz
> man/man5/collectd-email.5.gz
> man/man5/collectd-exec.5.gz
> man/man5/collectd-java.5.gz
> +man/man5/collectd-lua.5.gz
> man/man5/collectd-perl.5.gz
> man/man5/collectd-python.5.gz
> man/man5/collectd-snmp.5.gz
> _______________________________________________
> svn-ports-all@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-ports-all
> To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
--=20
Pierre Guinoiseau <pierre@guinoiseau.eu>
https://segmentationfau.lt/ | +PierreGuinoiseau | @peikk00
--Pd0ReVV5GZGQvF3a
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABCgAGBQJX6aVaAAoJEFBNg+ogrffPkdkP/j/tYYvuQilN7mnzo2NSCv2M
tRJCwwcf+trCB3X1acwGNUri1FtmEC/+w1a4UFxnu2X880FH2UCnUGO1XFNPz1MQ
BSJx2NNgGvOL/na8o9Mgcg9nAhVjUn7Lm8jTEGzHgdgkx3ixYJE1QK4FsVlBdGaI
48fPl0WgT5qgciKLJ5hO2jZDrl9le3aKlba7+Xi636n1IQjKh2KHRJReQMDoPn2+
cCHpbW808J0lT/Y5+jIN0vgYHeQOBjcC+xhwWCvkRa0e1SqIuTBu3RGs3D749FYp
OnTO/yo9SLI1gI8ayrm9kVmfcbf45ouEo7sk/rMnMy6bcr+1+dm763i4u/tMXGjE
mg94FyjcWrlMFMx9MxkKY0gO45q9eWr8Rhci61QscRbnZi/IiBHswN4jQllOOcYQ
F/o5MSta32Vl8mkc3Cot7xW6pqiZlA6lTuzpA+fX7iUVXhrgpdyQ2+2FEvErVbZ2
mHmimxzkJtTzRGgqxRabCfpSQmjWM3ANv8qinD0xTk/fF31X9wmP6P5odv8tR9Mx
Un1n9sEPA4Tab5yAqoQjNKjxrywZStoh0CE69r2MfxYRegOo5SGPF2+q2Cy+JIyb
8wwLbUOxaPOh/sT5C8ZdEryg5a2e2V/LxIUv1MbcHP+K+4Lrbx297XVreum9FLZg
KUoGyAZLlLFdKrd0n4fs
=UQbN
-----END PGP SIGNATURE-----
--Pd0ReVV5GZGQvF3a--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20160926224651.GB11220>