Thu Oct 13 15:17:29 2016 UTC ()
Update sysutils/collectd and subpackages to 5.6.1.

- Simplify patching somewhat by calling automake
- Temporarily disable the processes plugin patch for NetBSD, until
  its code is amended for collectd code changes.

Version 5.6.1
- Build system: Unnecessary linking of the Write Graphite plugin
  with libyajl has been removed.
- collectd: A bug in the FlushInterval option that caused a
  segmentation fault in the Write HTTP plugin has been fixed.
- Apache plugin: A syntax error has been fixed.
- cURL-JSON plugin: A segmentation fault that occurred when
  handling JSON with unexpected structure has been fixed.
- PostgreSQL plugin: Handling of NULL values in the query_plans
  and query_plans_by_table queries has been fixed.
- RRDCacheD plugin: Reconnection behavior has been added.
- VServer plugin: Use of a deprecated API (readdir_r()) has been
  fixed.
- Write Graphite plugin: Make default values configurable at
  compile time again.
- Write HTTP plugin: A bug has been fixed that lead to flush
  callbacks being registered twice.

Version 5.6.0
- Build system: An option to to avoid building the DF plugin
  against XFS has been added.
- Build system: Autoconf >=2.60, a C99-capable compiler and
  pkg-config are now required.
- Build system: Building with -Werror is now optional.
- Build system: Many compilation issues on non-Linux platforms
  have been fixed, leading to wider plugin support.
- Build system: The configuration summary now also ends up in
  config.log.
- collectd: All command-line options now override global options
  from the config file.
- collectd: A number of unit tests for commonly used functions
  have been added.
- collectd: Plugins start up and read timeouts are now logged.
- collectd: Support for a timeout has been added to FLUSH
  callbacks.
- collectd: The -T command line switch now reports more errors.
- collectd: The max size of value list elements
  (DATA_MAX_NAME_LEN) has been doubled and is now configurable at
  build time.
- Set target: The MetaData option has been added.
- AMQP plugin, Write_HTTP plugin, Write_Kafka plugin: Support for
  libyajl < 2 has been added.
- APC UPS plugin: Parsing of end markers has been fixed.
- APC UPS plugin: The PersistentConnection option has been added.
- ceph plugin, DNS plugin, Exec plugin, IPTables plugin, Ping
  plugin, turbostat plugin: When running unprivileged, these
  plugins will now warn about insuffiscient permissions or
  capabilities(7).
- Chrony plugin: This new plugin collects NTP data from the chrony
  NTP server.
- cpusleep plugin: This new plugin measures time spent by CPU in
  deep sleep mode.
- CPU plugin: The ReportNumCpu option has been added.
- cURL plugin, cURL-JSON plugin, cURL-XML plugin: The new
  Statistics reports various per-HTTP connection timers.
- DBI plugin: The Interval option has been added to Database
  blocks.
- Disk plugin: Support for FreeBSD has been added.
- Empty Counter match: Support for derives has been implemented.
- GenericJMX plugin: Support for TabularData and the PluginName
  option have been added.
- GPS plugin: This new plugin reports the number of sattelites
  seen by and precision of a GPS receiver.
- gRPC plugin: This new client and server plugin allows sending
  and receiving metrics using the gRPC protocol. Comparable to the
  UnixSock plugin, but using TCP and TLS.
- Interface plugin: Reporting dropped packets has been added.
- Interface plugin: The ReportInactive has been added, letting
  users skip inactive network interfaces.
- Interface plugin: The new, Solaris-only UniqueName option has
  been added.
- Lua plugin: This new language binding allows writing plugins
  using the Lua programming language.
- Memory plugin: Reporting of ARC memory on Solaris has been
  added.
- MQTT plugin: This new plugin sends metrics to and/or receives
  metrics from an MQTT broker.
- MySQL plugin: Connection to the database server can now be done
  over SSL.
- MySQL plugin: Monitoring slow queries has been added.
- MySQL plugin: mysql_bpool_pages-flushed has been renamed to
  mysql_bpool_counters-pages_flushed because the value is
  cumulative.
- MySQL plugin: Support for Galera statistics has been added.
- MySQL plugin: Support for InnoDB metrics was improved.
- MySQL plugin: The mysql_sort type has been split into 3
  different types.
- Network plugin: Decryption error logging has been improved.
- Notify Nagios plugin: This new plugin sends notifications to
  Nagios as a passive check result.
- NTPd plugin: The plugin now detects if the ntp daemon reports
  nanoseconds instead of microseconds.
- OpenLDAP plugin: Several connection-related improvements have
  been made.
- OpenLDAP plugin: Support for "simple authentication" has been
  added.
- Ping plugin: The Size option has been added, allowing the ICMP
  data payload size to be configured.
- PostgreSQL plugin, DBI plugin, Oracle plugin: The new
  PluginInstanceFrom option has been added.
- PowerDNS plugin: The recursor metrics have been updated to 3.7.3
  and missing rr types have been added.
- Processes plugin: Counting of context switches was added for
  Linux.
- Processes plugin: Improve reliability of thread counts on Linux.
- Python plugin: Minimal Python version requirement has been
  bumped to 2.6.
- Redis plugin: Several additional metrics are now collected.
- Sensors plugin: The UseLabels option has been added.
- SMART plugin: The new IgnoreSleepMode option has been added.
- SMART plugin: The new UseSerial option allows identifying
  devices in a stable way.
- SNMP plugin: The IpAddress can now be used for instances.
- StatsD plugin: Latency calculation histogram is now able to
  shrink automatically to optimal size.
- StatsD plugin: The CounterSum option has been added.
- UUID plugin: The plugin now also looks in in smbios system table
  and /sys/class/dmi.
- virt plugin: The PluginInstanceFormat option has been added.
- Write Graphite plugin: The ReconnectInterval option has been
  added.
- Write HTTP plugin: A KairosDB formatter has been added.
- Write HTTP plugin: Notifications are now handled by this plugin.
- Write HTTP plugin: The LogHttpError option has been added.
- Write HTTP plugin: The new Headers option allows setting custom
  HTTP headers in outgoing requests.
- Write Kafka plugin: Key handling has been made more
  comprehensive and reliable.
- Write Redis plugin: The Database, MaxSetSize, Prefix and
  StoreRates options have been added.
- Write Riemann plugin: The new BatchFlushTimeout and Timeout
  option have been added.
- Write Riemann plugin: This plugin now requires the
  riemann-c-client library, version 1.6.0+. This adds support for
  submitting values to Riemann over TLS.
- Write TSDB plugin, Write Sensu plugin, Write Riemann plugin,
  Write Graphite plugin, Write TSDB plugin: TCP keepalive is now
  enabled, helping graceful recovery from unclean network
  disconnections.
- XenCPU plugin: This new plugin collects XEN Hypervisor CPU
  stats.
- ZFS ARC plugin: Several new statistics have been added and a
  couple of obsolete ones removed.
- Zone plugin: This new plugin reads per-zone CPU usage on
  Solaris.

Version 5.5.2
- collectd: A division by zero has been fixed in the
  plugin_dispatch_multivalue() function.
- collectd: The address of the Free Software Foundation has been
  fixed in GPL license headers.
- Build system: Detection and handling of librrd 1.6 and later has
  been fixed.
- Apache plugin: A warning about a possible misconfiguration has
  been added.
- cURL, cURL-JSON and cURL-XML plugins: A memory leak when
  allocating more memory fails has been fixed.
- DF plugin: A build issue on DragonFlyBSD has been fixed.
- Ethstat plugin: Code to strip leading whitespace from device
  names. This works around an issue in the VMXNet3 driver.
- Exec plugin: A problem in the error handling of an fdopen()
  failure has been fixed.
- Modbus plugin: The debug output has been disabled by default. It
  is now only enabled when building with --enable-debug.
- Network plugin: A check for the initialization of secure memory
  has been added. Previously, failure to initialize this memory
  was ignored.
- Network plugin: A heap overflow has been fixed in the server
  code. This issue can be triggered remotely and is potentially
  exploitable.
- Perl plugin: Init callbacks have been changed to run essentially
  single-threaded to avoid race conditions by init functions which
  create additional threads.
- Processes plugin: A compilation error on systems without regex.h
  has been fixed.
- Processes plugin: A memory leak on Solaris has been fixed.
- Processes plugin: A warning about too long process names has
  been added.
- Redis plugin: A memory leak in an error handling code path has
  been fixed.
- Redis plugin: The data source type of the expired_keys metric
  has been corrected to DERIVE.
- SMART plugin: A build dependency on libudev has been added.
- StatsD plugin: A deadlock on plugin shutdown has been fixed.
- Write HTTP plugin: Freeing of memory holding HTTP headers during
  shutdown has been fixed.
- Write Sensu plugin: A segfault when the Tag was unset has been
  fixed.
- ZFS ARC plugin: The cache_operation-stolen metric has been
  removed for FreeBSD 10.2 and later.


(fhajny)
diff -r1.17 -r1.18 pkgsrc/sysutils/collectd/Makefile
diff -r1.11 -r1.12 pkgsrc/sysutils/collectd/Makefile.common
diff -r1.6 -r1.7 pkgsrc/sysutils/collectd/PLIST
diff -r1.27 -r1.28 pkgsrc/sysutils/collectd/distinfo
diff -r1.7 -r1.8 pkgsrc/sysutils/collectd/options.mk
diff -r1.2 -r1.3 pkgsrc/sysutils/collectd-amqp/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/collectd-curl/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/collectd-notify-email/Makefile
diff -r1.4 -r1.5 pkgsrc/sysutils/collectd-postgresql/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/collectd-riemann/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/collectd-snmp/Makefile
diff -r1.2 -r0 pkgsrc/sysutils/collectd/patches/patch-Makefile.in
diff -r1.11 -r0 pkgsrc/sysutils/collectd/patches/patch-configure
diff -r1.9 -r1.10 pkgsrc/sysutils/collectd/patches/patch-configure.ac
diff -r1.2 -r1.3 pkgsrc/sysutils/collectd/patches/patch-src_Makefile.am
diff -r1.2 -r1.3 pkgsrc/sysutils/collectd/patches/patch-src_irq.c
diff -r1.2 -r1.3 pkgsrc/sysutils/collectd/patches/patch-src_memory.c
diff -r1.2 -r1.3 pkgsrc/sysutils/collectd/patches/patch-src_swap.c
diff -r1.5 -r0 pkgsrc/sysutils/collectd/patches/patch-src_Makefile.in
diff -r1.1 -r0 pkgsrc/sysutils/collectd/patches/patch-src_collectd-tg.c
diff -r1.1 -r0 pkgsrc/sysutils/collectd/patches/patch-version-gen.sh
diff -r1.4 -r0 pkgsrc/sysutils/collectd/patches/patch-src_config.h.in
diff -r1.1 -r1.2 pkgsrc/sysutils/collectd/patches/patch-src_cpu.c
diff -r1.1 -r1.2 pkgsrc/sysutils/collectd/patches/patch-src_libcollectclient_network__buffer.c
diff -r0 -r1.1 pkgsrc/sysutils/collectd/patches/patch-src_daemon_Makefile.am
diff -r1.3 -r1.4 pkgsrc/sysutils/p5-collectd/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/py-collectd/Makefile

cvs diff -r1.17 -r1.18 pkgsrc/sysutils/collectd/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/collectd/Makefile 2016/07/09 06:38:58 1.17
+++ pkgsrc/sysutils/collectd/Makefile 2016/10/13 15:17:28 1.18
@@ -1,40 +1,41 @@ @@ -1,40 +1,41 @@
1# $NetBSD: Makefile,v 1.17 2016/07/09 06:38:58 wiz Exp $ 1# $NetBSD: Makefile,v 1.18 2016/10/13 15:17:28 fhajny Exp $
2 2
3PKGREVISION= 12 
4.include "../../sysutils/collectd/Makefile.common" 3.include "../../sysutils/collectd/Makefile.common"
5 4
6COMMENT= Statistics collection daemon base 5COMMENT= Statistics collection daemon base
7 6
8RCD_SCRIPTS= collectd 7RCD_SCRIPTS= collectd
9 8
10.include "../../mk/bsd.prefs.mk" 9.include "../../mk/bsd.prefs.mk"
11 10
12# Simple plugins that have no dependencies 11# Simple plugins that have no dependencies
13DEFAULT_PLUGINS+= aggregation apcups csv email exec filecount \ 12DEFAULT_PLUGINS+= aggregation apcups csv email exec filecount \
14 hddtemp logfile match_empty_counter match_hashed\ 13 hddtemp logfile match_empty_counter match_hashed\
15 match_regex match_timediff match_value mbmon \ 14 match_regex match_timediff match_value mbmon \
16 ntpd olsrd openvpn powerdns statsd table tail \ 15 ntpd olsrd openvpn powerdns statsd table tail \
17 tail_csv target_notification target_replace \ 16 tail_csv target_notification target_replace \
18 target_scale target_set target_v5upgrade \ 17 target_scale target_set target_v5upgrade \
19 teamspeak2 threshold unixsock uuid write_graphite 18 teamspeak2 threshold unixsock uuid write_graphite
20 19
21.for option in ${DEFAULT_PLUGINS} 20.for option in ${DEFAULT_PLUGINS}
22CONFIGURE_ARGS+= --enable-${option} 21CONFIGURE_ARGS+= --enable-${option}
23.endfor 22.endfor
24 23
25# Several libs not generated in time for linking collectd 24# Several libs not generated in time for linking collectd
26MAKE_JOBS_SAFE= no 25MAKE_JOBS_SAFE= no
27 26
 27INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples/collectd
 28
28.include "options.mk" 29.include "options.mk"
29 30
30CONF_FILES+= share/examples/collectd/collectd.conf \ 31CONF_FILES+= share/examples/collectd/collectd.conf \
31 ${PKG_SYSCONFDIR}/collectd.conf 32 ${PKG_SYSCONFDIR}/collectd.conf
32 33
33BUILD_DEFS+= VARBASE 34BUILD_DEFS+= VARBASE
34 35
35OWN_DIRS+= ${VARBASE}/db/collectd 36OWN_DIRS+= ${VARBASE}/db/collectd
36 37
37COLLECTD_USER?= collectd 38COLLECTD_USER?= collectd
38COLLECTD_GROUP?= ${COLLECTD_USER} 39COLLECTD_GROUP?= ${COLLECTD_USER}
39PKG_USERS_VARS+= COLLECTD_USER 40PKG_USERS_VARS+= COLLECTD_USER
40PKG_GROUPS_VARS+= COLLECTD_GROUP 41PKG_GROUPS_VARS+= COLLECTD_GROUP

cvs diff -r1.11 -r1.12 pkgsrc/sysutils/collectd/Makefile.common (expand / switch to unified diff)

--- pkgsrc/sysutils/collectd/Makefile.common 2015/10/28 11:46:07 1.11
+++ pkgsrc/sysutils/collectd/Makefile.common 2016/10/13 15:17:28 1.12
@@ -1,42 +1,43 @@ @@ -1,42 +1,43 @@
1# $NetBSD: Makefile.common,v 1.11 2015/10/28 11:46:07 jperkin Exp $ 1# $NetBSD: Makefile.common,v 1.12 2016/10/13 15:17:28 fhajny Exp $
2# 2#
3# used by sysutils/collectd/Makefile 3# used by sysutils/collectd/Makefile
4# used by sysutils/collectd-amqp/Makefile 4# used by sysutils/collectd-amqp/Makefile
5# used by sysutils/collectd-curl/Makefile 5# used by sysutils/collectd-curl/Makefile
6# used by sysutils/collectd-dbi/Makefile 6# used by sysutils/collectd-dbi/Makefile
7# used by sysutils/collectd-dns/Makefile 7# used by sysutils/collectd-dns/Makefile
8# used by sysutils/collectd-memcached/Makefile 8# used by sysutils/collectd-memcached/Makefile
9# used by sysutils/collectd-mysql/Makefile 9# used by sysutils/collectd-mysql/Makefile
10# used by sysutils/collectd-network/Makefile 10# used by sysutils/collectd-network/Makefile
11# used by sysutils/collectd-notify-email/Makefile 11# used by sysutils/collectd-notify-email/Makefile
12# used by sysutils/collectd-postgresql/Makefile 12# used by sysutils/collectd-postgresql/Makefile
13# used by sysutils/collectd-riemann/Makefile 13# used by sysutils/collectd-riemann/Makefile
14# used by sysutils/collectd-rrdtool/Makefile 14# used by sysutils/collectd-rrdtool/Makefile
15# used by sysutils/collectd-snmp/Makefile 15# used by sysutils/collectd-snmp/Makefile
16# used by sysutils/p5-collectd/Makefile 16# used by sysutils/p5-collectd/Makefile
17# used by sysutils/py-collectd/Makefile 17# used by sysutils/py-collectd/Makefile
18 18
19DISTNAME= collectd-5.5.0 19DISTNAME= collectd-5.6.1
20MASTER_SITES= http://collectd.org/files/ 20MASTER_SITES= http://collectd.org/files/
21CATEGORIES= sysutils 21CATEGORIES= sysutils
 22EXTRACT_SUFX= .tar.bz2
22 23
23MAINTAINER= filip@joyent.com 24MAINTAINER= filip@joyent.com
24HOMEPAGE= http://collectd.org/ 25HOMEPAGE= http://collectd.org/
25LICENSE= gnu-gpl-v2 26LICENSE= gnu-gpl-v2
26 27
27GNU_CONFIGURE= yes 28GNU_CONFIGURE= yes
28USE_LIBTOOL= yes 29USE_LIBTOOL= yes
29USE_TOOLS+= pkg-config 30USE_TOOLS+= autoconf automake pkg-config
30USE_LANGUAGES= c c99 c++ 31USE_LANGUAGES= c c99 c++
31 32
32DISTINFO_FILE= ${.CURDIR}/../../sysutils/collectd/distinfo 33DISTINFO_FILE= ${.CURDIR}/../../sysutils/collectd/distinfo
33PATCHDIR= ${.CURDIR}/../../sysutils/collectd/patches 34PATCHDIR= ${.CURDIR}/../../sysutils/collectd/patches
34 35
35.if !empty(COLLECTD_PACKAGE) 36.if !empty(COLLECTD_PACKAGE)
36PKGNAME?= ${DISTNAME:S/collectd/collectd-${COLLECTD_PACKAGE}/} 37PKGNAME?= ${DISTNAME:S/collectd/collectd-${COLLECTD_PACKAGE}/}
37 38
38DEPENDS+= collectd>=${PKGVERSION_NOREV}:../../sysutils/collectd 39DEPENDS+= collectd>=${PKGVERSION_NOREV}:../../sysutils/collectd
39 40
40COLLECTD_PLUGINS?= ${COLLECTD_PACKAGE:S/-/_/} 41COLLECTD_PLUGINS?= ${COLLECTD_PACKAGE:S/-/_/}
41 42
42BUILD_DIRS= src 43BUILD_DIRS= src
@@ -59,24 +60,35 @@ DISABLED_LIBS= aquaero5 credis curl dbi @@ -59,24 +60,35 @@ DISABLED_LIBS= aquaero5 credis curl dbi
59 netsnmp notify oping owcapi pcap perl pq \ 60 netsnmp notify oping owcapi pcap perl pq \
60 rabbitmq routeros rrd sensors sigrok statgrab \ 61 rabbitmq routeros rrd sensors sigrok statgrab \
61 tokyotyrant upsclient varnish xml2 xmms yajl 62 tokyotyrant upsclient varnish xml2 xmms yajl
62CONFIGURE_ARGS+= --with-java=no --with-mic=no --with-oracle=no \ 63CONFIGURE_ARGS+= --with-java=no --with-mic=no --with-oracle=no \
63 --with-perl-bindings=no --with-python=no \ 64 --with-perl-bindings=no --with-python=no \
64 --disable-all-plugins 65 --disable-all-plugins
65.for lib in ${DISABLED_LIBS} 66.for lib in ${DISABLED_LIBS}
66CONFIGURE_ARGS+= --with-lib${lib}=no 67CONFIGURE_ARGS+= --with-lib${lib}=no
67.endfor 68.endfor
68CONFIGURE_ARGS+= --localstatedir=${VARBASE} 69CONFIGURE_ARGS+= --localstatedir=${VARBASE}
69CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib 70CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib
70CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include 71CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include
71 72
 73CONFIGURE_ARGS.NetBSD+= ac_cv_func_getfsstat=no
 74
72CPPFLAGS.SunOS+= -DSOLARIS2=${OS_VERSION:C/5.//} 75CPPFLAGS.SunOS+= -DSOLARIS2=${OS_VERSION:C/5.//}
73 76
74.include "../../mk/compiler.mk" 77.include "../../mk/compiler.mk"
75# XXX: proper clang version check when we have support for it. 78# XXX: proper clang version check when we have support for it.
76.if !empty(PKGSRC_COMPILER:Mclang) && ${OPSYS} != "Darwin" 79.if !empty(PKGSRC_COMPILER:Mclang) && ${OPSYS} != "Darwin"
77CFLAGS+= -Wno-error=tautological-pointer-compare \ 80CFLAGS+= -Wno-error=tautological-pointer-compare \
78 -Wno-error=pointer-bool-conversion 81 -Wno-error=pointer-bool-conversion
79.endif 82.endif
80 83
 84SUBST_CLASSES+= ver
 85SUBST_MESSAGE.ver= Fixing canonical version number
 86SUBST_STAGE.ver= pre-configure
 87SUBST_FILES.ver= configure.ac
 88SUBST_SED.ver= -e 's,m4_esyscmd(./version-gen.sh),${PKGVERSION_NOREV},'
 89
 90pre-configure:
 91 cd ${WRKSRC} && autoreconf
 92
81.include "../../devel/libltdl/buildlink3.mk" 93.include "../../devel/libltdl/buildlink3.mk"
82.include "../../mk/pthread.buildlink3.mk" 94.include "../../mk/pthread.buildlink3.mk"

cvs diff -r1.6 -r1.7 pkgsrc/sysutils/collectd/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/collectd/PLIST 2015/09/12 19:04:56 1.6
+++ pkgsrc/sysutils/collectd/PLIST 2016/10/13 15:17:28 1.7
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1@comment $NetBSD: PLIST,v 1.6 2015/09/12 19:04:56 he Exp $ 1@comment $NetBSD: PLIST,v 1.7 2016/10/13 15:17:28 fhajny Exp $
2bin/collectd-nagios 2bin/collectd-nagios
3bin/collectd-tg 3bin/collectd-tg
4bin/collectdctl 4bin/collectdctl
5include/collectd/client.h 5include/collectd/client.h
6include/collectd/lcc_features.h 6include/collectd/lcc_features.h
7include/collectd/network.h 7include/collectd/network.h
8include/collectd/network_buffer.h 8include/collectd/network_buffer.h
9lib/collectd/aggregation.la 9lib/collectd/aggregation.la
10lib/collectd/apcups.la 10lib/collectd/apcups.la
11${PLIST.apple-sensors}lib/collectd/apple_sensors.la 11${PLIST.apple-sensors}lib/collectd/apple_sensors.la
12${PLIST.battery}lib/collectd/battery.la 12${PLIST.battery}lib/collectd/battery.la
13${PLIST.contextswitch}lib/collectd/contextswitch.la 13${PLIST.contextswitch}lib/collectd/contextswitch.la
14${PLIST.cpu}lib/collectd/cpu.la 14${PLIST.cpu}lib/collectd/cpu.la
15lib/collectd/csv.la 15lib/collectd/csv.la
16${PLIST.entropy}lib/collectd/entropy.la 
17${PLIST.df}lib/collectd/df.la 16${PLIST.df}lib/collectd/df.la
18${PLIST.disk}lib/collectd/disk.la 17${PLIST.disk}lib/collectd/disk.la
19lib/collectd/email.la 18lib/collectd/email.la
 19${PLIST.entropy}lib/collectd/entropy.la
20lib/collectd/exec.la 20lib/collectd/exec.la
21lib/collectd/filecount.la 21lib/collectd/filecount.la
22lib/collectd/hddtemp.la 22lib/collectd/hddtemp.la
23${PLIST.interface}lib/collectd/interface.la 23${PLIST.interface}lib/collectd/interface.la
24${PLIST.irq}lib/collectd/irq.la 24${PLIST.irq}lib/collectd/irq.la
25${PLIST.load}lib/collectd/load.la 25${PLIST.load}lib/collectd/load.la
26lib/collectd/logfile.la 26lib/collectd/logfile.la
27lib/collectd/match_empty_counter.la 27lib/collectd/match_empty_counter.la
28lib/collectd/match_hashed.la 28lib/collectd/match_hashed.la
29lib/collectd/match_regex.la 29lib/collectd/match_regex.la
30lib/collectd/match_timediff.la 30lib/collectd/match_timediff.la
31lib/collectd/match_value.la 31lib/collectd/match_value.la
32lib/collectd/mbmon.la 32lib/collectd/mbmon.la
@@ -40,44 +40,46 @@ ${PLIST.pf}lib/collectd/pf.la @@ -40,44 +40,46 @@ ${PLIST.pf}lib/collectd/pf.la
40lib/collectd/powerdns.la 40lib/collectd/powerdns.la
41${PLIST.processes}lib/collectd/processes.la 41${PLIST.processes}lib/collectd/processes.la
42lib/collectd/statsd.la 42lib/collectd/statsd.la
43${PLIST.swap}lib/collectd/swap.la 43${PLIST.swap}lib/collectd/swap.la
44${PLIST.syslog}lib/collectd/syslog.la 44${PLIST.syslog}lib/collectd/syslog.la
45lib/collectd/table.la 45lib/collectd/table.la
46lib/collectd/tail.la 46lib/collectd/tail.la
47lib/collectd/tail_csv.la 47lib/collectd/tail_csv.la
48lib/collectd/target_notification.la 48lib/collectd/target_notification.la
49lib/collectd/target_replace.la 49lib/collectd/target_replace.la
50lib/collectd/target_scale.la 50lib/collectd/target_scale.la
51lib/collectd/target_set.la 51lib/collectd/target_set.la
52lib/collectd/target_v5upgrade.la 52lib/collectd/target_v5upgrade.la
53lib/collectd/teamspeak2.la 
54${PLIST.tcpconns}lib/collectd/tcpconns.la 53${PLIST.tcpconns}lib/collectd/tcpconns.la
 54lib/collectd/teamspeak2.la
55lib/collectd/threshold.la 55lib/collectd/threshold.la
56lib/collectd/unixsock.la 56lib/collectd/unixsock.la
57${PLIST.uptime}lib/collectd/uptime.la 57${PLIST.uptime}lib/collectd/uptime.la
58${PLIST.users}lib/collectd/users.la 58${PLIST.users}lib/collectd/users.la
59lib/collectd/uuid.la 59lib/collectd/uuid.la
60lib/collectd/write_graphite.la 60lib/collectd/write_graphite.la
61${PLIST.zfs-arc}lib/collectd/zfs_arc.la 61${PLIST.zfs-arc}lib/collectd/zfs_arc.la
 62${PLIST.zone}lib/collectd/zone.la
62lib/libcollectdclient.la 63lib/libcollectdclient.la
63lib/pkgconfig/libcollectdclient.pc 64lib/pkgconfig/libcollectdclient.pc
64man/man1/collectd-nagios.1 65man/man1/collectd-nagios.1
65man/man1/collectd-tg.1 66man/man1/collectd-tg.1
66man/man1/collectd.1 67man/man1/collectd.1
67man/man1/collectdctl.1 68man/man1/collectdctl.1
68man/man1/collectdmon.1 69man/man1/collectdmon.1
69man/man5/collectd-email.5 70man/man5/collectd-email.5
70man/man5/collectd-exec.5 71man/man5/collectd-exec.5
71man/man5/collectd-java.5 72man/man5/collectd-java.5
 73man/man5/collectd-lua.5
72man/man5/collectd-perl.5 74man/man5/collectd-perl.5
73man/man5/collectd-python.5 75man/man5/collectd-python.5
74man/man5/collectd-snmp.5 76man/man5/collectd-snmp.5
75man/man5/collectd-threshold.5 77man/man5/collectd-threshold.5
76man/man5/collectd-unixsock.5 78man/man5/collectd-unixsock.5
77man/man5/collectd.conf.5 79man/man5/collectd.conf.5
78man/man5/types.db.5 80man/man5/types.db.5
79sbin/collectd 81sbin/collectd
80sbin/collectdmon 82sbin/collectdmon
81share/collectd/postgresql_default.conf 83share/collectd/postgresql_default.conf
82share/collectd/types.db 84share/collectd/types.db
83share/examples/collectd/collectd.conf 85share/examples/collectd/collectd.conf

cvs diff -r1.27 -r1.28 pkgsrc/sysutils/collectd/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/collectd/distinfo 2016/02/03 15:10:43 1.27
+++ pkgsrc/sysutils/collectd/distinfo 2016/10/13 15:17:28 1.28
@@ -1,28 +1,23 @@ @@ -1,28 +1,23 @@
1$NetBSD: distinfo,v 1.27 2016/02/03 15:10:43 he Exp $ 1$NetBSD: distinfo,v 1.28 2016/10/13 15:17:28 fhajny Exp $
2 2
3SHA1 (collectd-5.5.0.tar.gz) = d24e284c1eae20c5e75b846c8b2612ab65bd5565 3SHA1 (collectd-5.6.1.tar.bz2) = 20b773928743b346e0962fc1dc37167390a16d80
4RMD160 (collectd-5.5.0.tar.gz) = 2197758942a5fe56e4eabda3786f09d4138e943a 4RMD160 (collectd-5.6.1.tar.bz2) = 5247f6b4a0936ac9715189e16afe6f65bee94788
5SHA512 (collectd-5.5.0.tar.gz) = b7ab9db91bf8c0eadbf9893421c019239acf85d2d84a5adb834582ed218a7dd03f750b7279dc4b1bb0030a8b9d3302bea9ae9f201c913128e1896cbd1349b5a9 5SHA512 (collectd-5.6.1.tar.bz2) = da25f1a9cbaf47533f5a4d2f5f78b966317d4f21865c5a714954ad9d7d02b4798a3e0471ce52199dc80e01dc2808376cb10a7e19c402aafc984bf595f09951a6
6Size (collectd-5.5.0.tar.gz) = 2244454 bytes 6Size (collectd-5.6.1.tar.bz2) = 1903962 bytes
7SHA1 (patch-Makefile.am) = ed45b75293a4ea2dd577d04eeb3b9017b8f47319 7SHA1 (patch-Makefile.am) = ed45b75293a4ea2dd577d04eeb3b9017b8f47319
8SHA1 (patch-Makefile.in) = a7cf69ca29c526be643af0ef85544e3a2dc80a77 8SHA1 (patch-configure.ac) = f450d6b00e5c7c37214b4d90ca057c515ed08fa1
9SHA1 (patch-configure) = f4bf389b98f03152347f0d1c6fba34e948e81625 9SHA1 (patch-src_Makefile.am) = 1d5cc2f58ce776df04feab2afc937f12ee7b0765
10SHA1 (patch-configure.ac) = 8313b139c3b23f10e26a42a976e97b09ad72e656 
11SHA1 (patch-src_Makefile.am) = 45930ca400c6c67927020c9a264d3d5adc30ca46 
12SHA1 (patch-src_Makefile.in) = 46bea4aa9a045e56478ff96730245134ddb0b362 
13SHA1 (patch-src_collectd-tg.c) = f9f41dfb0b1b55a62202128a165d5c9943faf5bc 
14SHA1 (patch-src_collectd.conf.in) = f0b35085cf0ddfd766e140b145177ab1f1326f5f 10SHA1 (patch-src_collectd.conf.in) = f0b35085cf0ddfd766e140b145177ab1f1326f5f
15SHA1 (patch-src_config.h.in) = be17db23b6ee7a90ba57e73f073ed5be11c369c5 11SHA1 (patch-src_cpu.c) = 32af60d7e49edf9d16481b705bc1ea429c90c82b
16SHA1 (patch-src_cpu.c) = 55b5cfc69bf0df279d1a12003eb6a8e681155e18 12SHA1 (patch-src_daemon_Makefile.am) = e38d465faf8bdd750fd9cb7f0bd9f041fcc8f83c
17SHA1 (patch-src_df.c) = 7e75dfbc72ecad48eb0eb7427a19329daf6b9a60 13SHA1 (patch-src_df.c) = 7e75dfbc72ecad48eb0eb7427a19329daf6b9a60
18SHA1 (patch-src_disk.c) = 159862e8ca1e841e3c4013c03ba03f059fdbbab5 14SHA1 (patch-src_disk.c) = 159862e8ca1e841e3c4013c03ba03f059fdbbab5
19SHA1 (patch-src_entropy.c) = 4fa683654936f57fb7366faebb93d572af08db9c 15SHA1 (patch-src_entropy.c) = 4fa683654936f57fb7366faebb93d572af08db9c
20SHA1 (patch-src_irq.c) = 8d5c516fea31bf2ab9736c32540be3223dea15d9 16SHA1 (patch-src_irq.c) = 6e414b6fd664e784edd5aa9f907c8cfa80a0cd48
21SHA1 (patch-src_libcollectclient_network__buffer.c) = e07d403d299613fa0885a0e7285849eb85510253 17SHA1 (patch-src_libcollectclient_network__buffer.c) = 76c94284b4078259985b70168342ac306b4505b7
22SHA1 (patch-src_memory.c) = f48d50245176426e26af7fa1b1f4ff6fbf0b1d95 18SHA1 (patch-src_memory.c) = b15225915ff23beed0b75c45be2eb3940d3717fd
23SHA1 (patch-src_netstat__udp.c) = 30cb12d25f56c60959658dbd181783212e00cc61 19SHA1 (patch-src_netstat__udp.c) = 30cb12d25f56c60959658dbd181783212e00cc61
24SHA1 (patch-src_processes.c) = e00d2edf6b4e6bfe3663e34fffb05f40652affe5 20SHA1 (patch-src_processes.c) = e00d2edf6b4e6bfe3663e34fffb05f40652affe5
25SHA1 (patch-src_swap.c) = e7602eb83eed6b90752b8293b9666b94bdd42493 21SHA1 (patch-src_swap.c) = 304a25324099495fb875127221ed5fc95173a164
26SHA1 (patch-src_tcpconns.c) = 712af1b821d62217283df884dd283d5b1218ab7c 22SHA1 (patch-src_tcpconns.c) = 712af1b821d62217283df884dd283d5b1218ab7c
27SHA1 (patch-src_utils__dns.c) = c3782dc9127f42da30e3142b853aa2cb2259af94 23SHA1 (patch-src_utils__dns.c) = c3782dc9127f42da30e3142b853aa2cb2259af94
28SHA1 (patch-version-gen.sh) = 07d830019e22ac651514b75acf299b1f50c4632d 

cvs diff -r1.7 -r1.8 pkgsrc/sysutils/collectd/options.mk (expand / switch to unified diff)

--- pkgsrc/sysutils/collectd/options.mk 2016/02/26 10:24:11 1.7
+++ pkgsrc/sysutils/collectd/options.mk 2016/10/13 15:17:28 1.8
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1# $NetBSD: options.mk,v 1.7 2016/02/26 10:24:11 jperkin Exp $ 1# $NetBSD: options.mk,v 1.8 2016/10/13 15:17:28 fhajny Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.collectd 3PKG_OPTIONS_VAR= PKG_OPTIONS.collectd
4PKG_SUPPORTED_OPTIONS= cpu df interface load memory syslog uptime 4PKG_SUPPORTED_OPTIONS= cpu df interface load memory syslog uptime
5PKG_SUGGESTED_OPTIONS+= cpu df interface load memory syslog uptime 5PKG_SUGGESTED_OPTIONS+= cpu df interface load memory syslog uptime
6 6
7PKG_SUPPORTED_OPTIONS.NetBSD+= contextswitch disk entropy irq pf netstat_udp 7PKG_SUPPORTED_OPTIONS.NetBSD+= contextswitch disk entropy irq pf netstat_udp
8PKG_SUPPORTED_OPTIONS.NetBSD+= processes swap tcpconns users 8PKG_SUPPORTED_OPTIONS.NetBSD+= swap tcpconns users
9PKG_SUGGESTED_OPTIONS.NetBSD+= contextswitch disk entropy irq pf netstat_udp 9PKG_SUGGESTED_OPTIONS.NetBSD+= contextswitch disk entropy irq pf netstat_udp
10PKG_SUGGESTED_OPTIONS.NetBSD+= processes swap tcpconns users 10PKG_SUGGESTED_OPTIONS.NetBSD+= swap tcpconns users
11 11
12PKG_SUPPORTED_OPTIONS.FreeBSD+= contextswitch pf processes swap tcpconns zfs-arc 12PKG_SUPPORTED_OPTIONS.FreeBSD+= contextswitch pf processes swap tcpconns zfs-arc
13PKG_SUGGESTED_OPTIONS.FreeBSD+= contextswitch pf processes swap tcpconns zfs-arc 13PKG_SUGGESTED_OPTIONS.FreeBSD+= contextswitch pf processes swap tcpconns zfs-arc
14 14
15PKG_SUPPORTED_OPTIONS.Darwin+= apple-sensors battery contextswitch disk 15PKG_SUPPORTED_OPTIONS.Darwin+= apple-sensors battery contextswitch disk
16PKG_SUPPORTED_OPTIONS.Darwin+= processes swap tcpconns users 16PKG_SUPPORTED_OPTIONS.Darwin+= processes swap tcpconns users
17PKG_SUGGESTED_OPTIONS.Darwin+= apple-sensors battery contextswitch disk 17PKG_SUGGESTED_OPTIONS.Darwin+= apple-sensors battery contextswitch disk
18PKG_SUGGESTED_OPTIONS.Darwin+= processes swap tcpconns users 18PKG_SUGGESTED_OPTIONS.Darwin+= processes swap tcpconns users
19 19
20PKG_SUPPORTED_OPTIONS.SunOS+= disk nfs swap users zfs-arc 20PKG_SUPPORTED_OPTIONS.SunOS+= disk nfs swap users zfs-arc zone
21PKG_SUGGESTED_OPTIONS.SunOS+= disk nfs swap users zfs-arc 21PKG_SUGGESTED_OPTIONS.SunOS+= disk nfs swap users zfs-arc zone
22 22
23.include "../../mk/bsd.options.mk" 23.include "../../mk/bsd.options.mk"
24 24
25PLIST_VARS+= apple-sensors battery contextswitch cpu entropy \ 25PLIST_VARS+= apple-sensors battery contextswitch cpu entropy \
26 df disk \ 26 df disk \
27 interface irq load netstat_udp \ 27 interface irq load netstat_udp \
28 memory nfs pf processes swap \ 28 memory nfs pf processes swap \
29 syslog tcpconns uptime users zfs-arc 29 syslog tcpconns uptime users zfs-arc zone
30 30
31.for option in ${PLIST_VARS} 31.for option in ${PLIST_VARS}
32. if !empty(PKG_OPTIONS:M${option}) 32. if !empty(PKG_OPTIONS:M${option})
33CONFIGURE_ARGS+= --enable-${option:S/-/_/} 33CONFIGURE_ARGS+= --enable-${option:S/-/_/}
34PLIST.${option}= yes 34PLIST.${option}= yes
35. endif 35. endif
36.endfor 36.endfor

cvs diff -r1.2 -r1.3 pkgsrc/sysutils/collectd-amqp/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/collectd-amqp/Makefile 2016/03/05 11:29:28 1.2
+++ pkgsrc/sysutils/collectd-amqp/Makefile 2016/10/13 15:17:28 1.3
@@ -1,13 +1,12 @@ @@ -1,13 +1,12 @@
1# $NetBSD: Makefile,v 1.2 2016/03/05 11:29:28 jperkin Exp $ 1# $NetBSD: Makefile,v 1.3 2016/10/13 15:17:28 fhajny Exp $
2 2
3COLLECTD_PACKAGE= amqp 3COLLECTD_PACKAGE= amqp
4 4
5COMMENT= Statistics collection daemon - amqp plugin 5COMMENT= Statistics collection daemon - amqp plugin
6PKGREVISION= 1 
7 6
8.include "../../sysutils/collectd/Makefile.common" 7.include "../../sysutils/collectd/Makefile.common"
9 8
10CONFIGURE_ARGS+= --with-librabbitmq=${BUILDLINK_PREFIX.rabbitmq-c} 9CONFIGURE_ARGS+= --with-librabbitmq=${BUILDLINK_PREFIX.rabbitmq-c}
11 10
12.include "../../net/rabbitmq-c/buildlink3.mk" 11.include "../../net/rabbitmq-c/buildlink3.mk"
13.include "../../mk/bsd.pkg.mk" 12.include "../../mk/bsd.pkg.mk"

cvs diff -r1.3 -r1.4 pkgsrc/sysutils/collectd-curl/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/collectd-curl/Makefile 2016/10/07 18:26:10 1.3
+++ pkgsrc/sysutils/collectd-curl/Makefile 2016/10/13 15:17:28 1.4
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.3 2016/10/07 18:26:10 adam Exp $ 1# $NetBSD: Makefile,v 1.4 2016/10/13 15:17:28 fhajny Exp $
2 2
3COLLECTD_PACKAGE= curl 3COLLECTD_PACKAGE= curl
4COLLECTD_PLUGINS= curl curl_json curl_xml apache bind nginx write_http 4COLLECTD_PLUGINS= curl curl_json curl_xml apache bind nginx write_http
5 5
6COMMENT= Statistics collection daemon - curl-based plugins 6COMMENT= Statistics collection daemon - curl-based plugins
7PKGREVISION= 2 
8 7
9.include "../../sysutils/collectd/Makefile.common" 8.include "../../sysutils/collectd/Makefile.common"
10 9
11CONFIGURE_ARGS+= --with-libcurl=${BUILDLINK_PREFIX.curl} 10CONFIGURE_ARGS+= --with-libcurl=${BUILDLINK_PREFIX.curl}
12CONFIGURE_ARGS+= --with-libyajl=${BUILDLINK_PREFIX.yajl} 11CONFIGURE_ARGS+= --with-libyajl=${BUILDLINK_PREFIX.yajl}
13CONFIGURE_ARGS+= --with-libxml2=${BUILDLINK_PREFIX.libxml2} 12CONFIGURE_ARGS+= --with-libxml2=${BUILDLINK_PREFIX.libxml2}
14 13
15.include "../../devel/yajl/buildlink3.mk" 14.include "../../devel/yajl/buildlink3.mk"
16.include "../../textproc/libxml2/buildlink3.mk" 15.include "../../textproc/libxml2/buildlink3.mk"
17.include "../../www/curl/buildlink3.mk" 16.include "../../www/curl/buildlink3.mk"
18 17
19.include "../../mk/bsd.pkg.mk" 18.include "../../mk/bsd.pkg.mk"

cvs diff -r1.2 -r1.3 pkgsrc/sysutils/collectd-notify-email/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/collectd-notify-email/Makefile 2016/03/05 11:29:29 1.2
+++ pkgsrc/sysutils/collectd-notify-email/Makefile 2016/10/13 15:17:28 1.3
@@ -1,13 +1,12 @@ @@ -1,13 +1,12 @@
1# $NetBSD: Makefile,v 1.2 2016/03/05 11:29:29 jperkin Exp $ 1# $NetBSD: Makefile,v 1.3 2016/10/13 15:17:28 fhajny Exp $
2 2
3COLLECTD_PACKAGE= notify-email 3COLLECTD_PACKAGE= notify-email
4 4
5COMMENT= Statistics collection daemon - notify_email plugin 5COMMENT= Statistics collection daemon - notify_email plugin
6PKGREVISION= 1 
7 6
8.include "../../sysutils/collectd/Makefile.common" 7.include "../../sysutils/collectd/Makefile.common"
9 8
10CONFIGURE_ARGS+= --with-libesmtp=${BUILDLINK_PREFIX.libesmtp} 9CONFIGURE_ARGS+= --with-libesmtp=${BUILDLINK_PREFIX.libesmtp}
11 10
12.include "../../mail/libesmtp/buildlink3.mk" 11.include "../../mail/libesmtp/buildlink3.mk"
13.include "../../mk/bsd.pkg.mk" 12.include "../../mk/bsd.pkg.mk"

cvs diff -r1.4 -r1.5 pkgsrc/sysutils/collectd-postgresql/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/collectd-postgresql/Makefile 2016/10/09 21:42:03 1.4
+++ pkgsrc/sysutils/collectd-postgresql/Makefile 2016/10/13 15:17:28 1.5
@@ -1,14 +1,13 @@ @@ -1,14 +1,13 @@
1# $NetBSD: Makefile,v 1.4 2016/10/09 21:42:03 wiz Exp $ 1# $NetBSD: Makefile,v 1.5 2016/10/13 15:17:28 fhajny Exp $
2 2
3COLLECTD_PACKAGE= postgresql 3COLLECTD_PACKAGE= postgresql
4 4
5PKGNAME= ${DISTNAME:S/collectd/collectd-${COLLECTD_PACKAGE}${PGSQL_VERSION}/} 5PKGNAME= ${DISTNAME:S/collectd/collectd-${COLLECTD_PACKAGE}${PGSQL_VERSION}/}
6PKGREVISION= 1 
7COMMENT= Statistics collection daemon - postgresql plugin 6COMMENT= Statistics collection daemon - postgresql plugin
8 7
9.include "../../sysutils/collectd/Makefile.common" 8.include "../../sysutils/collectd/Makefile.common"
10 9
11CONFIGURE_ARGS+= --with-libpq=${PGSQL_PREFIX} 10CONFIGURE_ARGS+= --with-libpq=${PGSQL_PREFIX}
12 11
13.include "../../mk/pgsql.buildlink3.mk" 12.include "../../mk/pgsql.buildlink3.mk"
14.include "../../mk/bsd.pkg.mk" 13.include "../../mk/bsd.pkg.mk"

cvs diff -r1.1 -r1.2 pkgsrc/sysutils/collectd-riemann/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/collectd-riemann/Makefile 2015/10/28 11:44:52 1.1
+++ pkgsrc/sysutils/collectd-riemann/Makefile 2016/10/13 15:17:28 1.2
@@ -1,14 +1,12 @@ @@ -1,14 +1,12 @@
1# $NetBSD: Makefile,v 1.1 2015/10/28 11:44:52 jperkin Exp $ 1# $NetBSD: Makefile,v 1.2 2016/10/13 15:17:28 fhajny Exp $
2 2
3COLLECTD_PACKAGE= riemann 3COLLECTD_PACKAGE= riemann
4COLLECTD_PLUGINS= write_riemann 4COLLECTD_PLUGINS= write_riemann
5 5
6COMMENT= Statistics collection daemon - riemann plugin 6COMMENT= Statistics collection daemon - riemann plugin
7 7
8.include "../../sysutils/collectd/Makefile.common" 8.include "../../sysutils/collectd/Makefile.common"
9 9
10# Work around incorrect dependencies in src/Makefile 
11BUILD_TARGET= riemann.pb-c.lo write_riemann.la 
12 
13.include "../../devel/protobuf-c/buildlink3.mk" 10.include "../../devel/protobuf-c/buildlink3.mk"
 11.include "../../sysutils/riemann-client/buildlink3.mk"
14.include "../../mk/bsd.pkg.mk" 12.include "../../mk/bsd.pkg.mk"

cvs diff -r1.2 -r1.3 pkgsrc/sysutils/collectd-snmp/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/collectd-snmp/Makefile 2016/03/05 11:29:29 1.2
+++ pkgsrc/sysutils/collectd-snmp/Makefile 2016/10/13 15:17:29 1.3
@@ -1,13 +1,12 @@ @@ -1,13 +1,12 @@
1# $NetBSD: Makefile,v 1.2 2016/03/05 11:29:29 jperkin Exp $ 1# $NetBSD: Makefile,v 1.3 2016/10/13 15:17:29 fhajny Exp $
2 2
3COLLECTD_PACKAGE= snmp 3COLLECTD_PACKAGE= snmp
4 4
5COMMENT= Statistics collection daemon - snmp plugin 5COMMENT= Statistics collection daemon - snmp plugin
6PKGREVISION= 1 
7 6
8.include "../../sysutils/collectd/Makefile.common" 7.include "../../sysutils/collectd/Makefile.common"
9 8
10CONFIGURE_ARGS+= --with-libnetsnmp=${BUILDLINK_PREFIX.net-snmp}/bin/net-snmp-config 9CONFIGURE_ARGS+= --with-libnetsnmp=${BUILDLINK_PREFIX.net-snmp}/bin/net-snmp-config
11 10
12.include "../../net/net-snmp/buildlink3.mk" 11.include "../../net/net-snmp/buildlink3.mk"
13.include "../../mk/bsd.pkg.mk" 12.include "../../mk/bsd.pkg.mk"

File Deleted: pkgsrc/sysutils/collectd/patches/Attic/patch-Makefile.in

File Deleted: pkgsrc/sysutils/collectd/patches/Attic/patch-configure

cvs diff -r1.9 -r1.10 pkgsrc/sysutils/collectd/patches/Attic/patch-configure.ac (expand / switch to unified diff)

--- pkgsrc/sysutils/collectd/patches/Attic/patch-configure.ac 2016/02/03 13:10:27 1.9
+++ pkgsrc/sysutils/collectd/patches/Attic/patch-configure.ac 2016/10/13 15:17:28 1.10
@@ -1,135 +1,48 @@ @@ -1,135 +1,48 @@
1$NetBSD: patch-configure.ac,v 1.9 2016/02/03 13:10:27 he Exp $ 1$NetBSD: patch-configure.ac,v 1.10 2016/10/13 15:17:28 fhajny Exp $
2 2
3Add KERNEL_NETBSD, add entry and disk plugins for NetBSD, 3Add KERNEL_NETBSD, add entry and disk plugins for NetBSD,
4and also do swap for "have_swapctl_three_args" (as for NetBSD). 4and also do swap for "have_swapctl_three_args" (as for NetBSD).
5Also, the start of process support, but that's not yet finished. 5Also, the start of process support, but that's not yet finished.
6 6
7--- configure.ac.orig 2015-05-27 07:51:35.000000000 +0000 7--- configure.ac.orig 2016-09-11 08:10:25.243038749 +0000
8+++ configure.ac 8+++ configure.ac
9@@ -77,6 +77,10 @@ case $host_os in 9@@ -147,6 +147,7 @@ AM_CONDITIONAL([BUILD_DARWIN], [test "x$
10 AC_DEFINE([KERNEL_OPENBSD], 1, [True if program is to be compiled for an OpenBSD kernel]) 10 AM_CONDITIONAL([BUILD_FREEBSD], [test "x$ac_system" = "xFreeBSD"])
11 ac_system="OpenBSD" 11 AM_CONDITIONAL([BUILD_LINUX], [test "x$ac_system" = "xLinux"])
12 ;; 12 AM_CONDITIONAL([BUILD_OPENBSD], [test "x$ac_system" = "xOpenBSD"])
13+ *netbsd*) 13+AM_CONDITIONAL([BUILD_NETBSD], [test "x$ac_system" = "xNetBSD"])
14+ AC_DEFINE([KERNEL_NETBSD], 1, [True if program is to be compiled for a NetBSD kernel]) 14 AM_CONDITIONAL([BUILD_SOLARIS], [test "x$ac_system" = "xSolaris"])
15+ ac_system="NetBSD" 
16+ ;; 
17 *aix*) 
18 AC_DEFINE([KERNEL_AIX], 1, [True if program is to be compiled for a AIX kernel]) 
19 ac_system="AIX" 
20@@ -151,6 +155,18 @@ AC_HEADER_STDBOOL 
21  15
22 AC_CHECK_HEADERS(stdio.h errno.h math.h stdarg.h syslog.h fcntl.h signal.h assert.h sys/types.h sys/socket.h sys/select.h poll.h netdb.h arpa/inet.h sys/resource.h sys/param.h kstat.h regex.h sys/ioctl.h endian.h sys/isa_defs.h fnmatch.h libgen.h) 16 if test "x$ac_system" = "xLinux"
23  17@@ -5717,6 +5718,7 @@ plugin_load="no"
24+# For entropy plugin on newer NetBSD 
25+AC_CHECK_HEADERS(sys/rndio.h, [], [], 
26+[#if HAVE_SYS_TYPES_H 
27+# include <sys/types.h> 
28+#endif 
29+#if HAVE_SYS_IOCTL_H 
30+# include <sys/ioctl.h> 
31+#endif 
32+#if HAVE_SYS_PARAM_H 
33+# include <sys/param.h> 
34+#endif 
35+]) 
36 # For ping library 
37 AC_CHECK_HEADERS(netinet/in_systm.h, [], [], 
38 [#if HAVE_STDINT_H 
39@@ -329,6 +345,22 @@ then 
40 else 
41 AC_MSG_RESULT([no]) 
42 fi 
43+AC_MSG_CHECKING([for sysctl kern.cp_time]) 
44+if test -x /sbin/sysctl 
45+then 
46+ /sbin/sysctl kern.cp_time 2>/dev/null 
47+ if test $? -eq 0 
48+ then 
49+ AC_MSG_RESULT([yes]) 
50+ AC_DEFINE(HAVE_SYSCTL_KERN_CP_TIME, 1, 
51+ [Define if sysctl supports kern.cp_time]) 
52+ else 
53+ AC_MSG_RESULT([no]) 
54+ fi 
55+else 
56+ AC_MSG_RESULT([no]) 
57+fi 
58+ 
59  
60 # For hddtemp module 
61 AC_CHECK_HEADERS(linux/major.h) 
62@@ -1363,6 +1395,21 @@ AC_CHECK_MEMBERS([struct kinfo_proc.p_pi 
63 #include <kvm.h> 
64 ]) 
65  
66+AC_CHECK_MEMBERS([struct kinfo_proc2.p_pid, struct kinfo_proc2.p_uru_maxrss], 
67+ [ 
68+ AC_DEFINE(HAVE_STRUCT_KINFO_PROC2_NETBSD, 1, 
69+ [Define if struct kinfo_proc2 exists in the NetBSD variant.]) 
70+ have_struct_kinfo_proc2_netbsd="yes" 
71+ ], 
72+ [ 
73+ have_struct_kinfo_proc2_netbsd="no" 
74+ ], 
75+ [ 
76+#include <sys/param.h> 
77+#include <sys/sysctl.h> 
78+#include <kvm.h> 
79+ ]) 
80+ 
81 AC_CHECK_MEMBERS([struct udphdr.uh_dport, struct udphdr.uh_sport], [], [], 
82 [#define _BSD_SOURCE 
83 #define _DEFAULT_SOURCE 
84@@ -5175,6 +5222,7 @@ plugin_load="no" 
85 plugin_log_logstash="no" 18 plugin_log_logstash="no"
86 plugin_memory="no" 19 plugin_memory="no"
87 plugin_multimeter="no" 20 plugin_multimeter="no"
88+plugin_netstat_udp="no" 21+plugin_netstat_udp="no"
89 plugin_nfs="no" 22 plugin_nfs="no"
90 plugin_numa="no" 23 plugin_numa="no"
91 plugin_perl="no" 24 plugin_perl="no"
92@@ -5244,6 +5292,15 @@ then 25@@ -5803,6 +5805,7 @@ then
93 plugin_tcpconns="yes" 26 plugin_entropy="yes"
 27 plugin_irq="yes"
 28 plugin_processes="yes"
 29+ plugin_netstat_udp="yes"
94 fi 30 fi
95  31
96+if test "x$ac_system" = "xNetBSD" 
97+then 
98+ plugin_entropy="yes" 
99+ plugin_irq="yes" 
100+ plugin_processes="yes" 
101+ plugin_disk="yes" 
102+ plugin_netstat_udp="yes" 
103+fi 
104+ 
105 # Mac OS X devices 32 # Mac OS X devices
106 if test "x$with_libiokit" = "xyes" 33@@ -6194,6 +6197,7 @@ AC_PLUGIN([multimeter], [$plugi
107 then 34 AC_PLUGIN([mysql], [$with_libmysql], [MySQL statistics])
108@@ -5482,6 +5539,11 @@ then 35 AC_PLUGIN([netapp], [$with_libnetapp], [NetApp plugin])
109 plugin_swap="yes" 36 AC_PLUGIN([netlink], [$with_libmnl], [Enhanced Linux network statistics])
110 fi 37+AC_PLUGIN([netstat_udp], [$plugin_netstat_udp], [UDP network statistics])
111  38 AC_PLUGIN([network], [yes], [Network communication plugin])
112+if test "x$have_swapctl" = "xyes" && test "x$c_cv_have_swapctl_three_args" = "xyes" 39 AC_PLUGIN([nfs], [$plugin_nfs], [NFS statistics])
113+then 40 AC_PLUGIN([nginx], [$with_libcurl], [nginx statistics])
114+ plugin_swap="yes" 41@@ -6624,6 +6628,7 @@ AC_MSG_RESULT([ multimeter . . . . .
115+fi 42 AC_MSG_RESULT([ mysql . . . . . . . . $enable_mysql])
116+ 43 AC_MSG_RESULT([ netapp . . . . . . . $enable_netapp])
117 if test "x$with_kvm_openfiles$with_kvm_nlist" = "xyesyes" 44 AC_MSG_RESULT([ netlink . . . . . . . $enable_netlink])
118 then 45+AC_MSG_RESULT([ netstat_udp . . . . . $enable_netstat_udp])
119 plugin_tcpconns="yes" 46 AC_MSG_RESULT([ network . . . . . . . $enable_network])
120@@ -5585,6 +5647,7 @@ AC_PLUGIN([multimeter], [$plugin_multim 47 AC_MSG_RESULT([ nfs . . . . . . . . . $enable_nfs])
121 AC_PLUGIN([mysql], [$with_libmysql], [MySQL statistics]) 48 AC_MSG_RESULT([ nginx . . . . . . . . $enable_nginx])
122 AC_PLUGIN([netapp], [$with_libnetapp], [NetApp plugin]) 
123 AC_PLUGIN([netlink], [$with_libmnl], [Enhanced Linux network statistics]) 
124+AC_PLUGIN([netstat_udp], [$plugin_netstat_udp], [UDP network statistics]) 
125 AC_PLUGIN([network], [yes], [Network communication plugin]) 
126 AC_PLUGIN([nfs], [$plugin_nfs], [NFS statistics]) 
127 AC_PLUGIN([nginx], [$with_libcurl], [nginx statistics]) 
128@@ -5963,6 +6026,7 @@ Configuration: 
129 mysql . . . . . . . . $enable_mysql 
130 netapp . . . . . . . $enable_netapp 
131 netlink . . . . . . . $enable_netlink 
132+ netstat_udp . . . . . $enable_netstat_udp 
133 network . . . . . . . $enable_network 
134 nfs . . . . . . . . . $enable_nfs 
135 nginx . . . . . . . . $enable_nginx 

cvs diff -r1.2 -r1.3 pkgsrc/sysutils/collectd/patches/Attic/patch-src_Makefile.am (expand / switch to unified diff)

--- pkgsrc/sysutils/collectd/patches/Attic/patch-src_Makefile.am 2015/09/12 19:04:56 1.2
+++ pkgsrc/sysutils/collectd/patches/Attic/patch-src_Makefile.am 2016/10/13 15:17:28 1.3
@@ -1,61 +1,28 @@ @@ -1,61 +1,28 @@
1$NetBSD: patch-src_Makefile.am,v 1.2 2015/09/12 19:04:56 he Exp $ 1$NetBSD: patch-src_Makefile.am,v 1.3 2016/10/13 15:17:28 fhajny Exp $
2 2
3Install config file in example directory. 3Install config file in example directory.
4 4
5--- src/Makefile.am.orig 2015-05-26 19:38:14.000000000 +0000 5--- src/Makefile.am.orig 2016-09-11 08:10:25.251038738 +0000
6+++ src/Makefile.am 6+++ src/Makefile.am
7@@ -14,13 +14,15 @@ AM_CPPFLAGS = -I$(srcdir)/daemon 7@@ -10,7 +10,7 @@ AM_CPPFLAGS = -I$(srcdir)/daemon
8 AM_CPPFLAGS += -DPREFIX='"${prefix}"' 8 AM_CPPFLAGS += -DPREFIX='"${prefix}"'
9 AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' 9 AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"'
10 AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"' 10 AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"'
11-AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' 11-AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"'
12+AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/db/${PACKAGE_NAME}"' 12+AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/db/${PACKAGE_NAME}"'
13 if BUILD_FEATURE_DAEMON 13 if BUILD_FEATURE_DAEMON
14 AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"' 14 AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
15 endif 15 endif
16 AM_CPPFLAGS += -DPLUGINDIR='"${pkglibdir}"' 16@@ -737,6 +737,12 @@ netlink_la_CFLAGS = $(AM_CFLAGS) $(BUILD
17 AM_CPPFLAGS += -DPKGDATADIR='"${pkgdatadir}"' 
18  
19+egdir = @exec_prefix@/share/examples/@PACKAGE@ 
20+ 
21 AUTOMAKE_OPTIONS = subdir-objects 
22  
23 noinst_LTLIBRARIES = libmount.la liblookup.la 
24@@ -657,6 +659,12 @@ netlink_la_CFLAGS = $(AM_CFLAGS) $(BUILD 
25 netlink_la_LIBADD = $(BUILD_WITH_LIBMNL_LIBS) 17 netlink_la_LIBADD = $(BUILD_WITH_LIBMNL_LIBS)
26 endif 18 endif
27  19
28+if BUILD_PLUGIN_NETSTAT_UDP 20+if BUILD_PLUGIN_NETSTAT_UDP
29+pkglib_LTLIBRARIES += netstat_udp.la 21+pkglib_LTLIBRARIES += netstat_udp.la
30+netstat_udp_la_SOURCES = netstat_udp.c 22+netstat_udp_la_SOURCES = netstat_udp.c
31+netstat_udp_la_LDFLAGS = $(PLUGIN_LDFLAGS) 23+netstat_udp_la_LDFLAGS = $(PLUGIN_LDFLAGS)
32+endif 24+endif
33+ 25+
34 if BUILD_PLUGIN_NETWORK 26 if BUILD_PLUGIN_NETWORK
35 pkglib_LTLIBRARIES += network.la 27 pkglib_LTLIBRARIES += network.la
36 network_la_SOURCES = network.c network.h \ 28 network_la_SOURCES = network.c network.h \
37@@ -1363,13 +1371,8 @@ riemann.pb-c.c riemann.pb-c.h: riemann.p 
38 endif 
39  
40 install-exec-hook: 
41- $(mkinstalldirs) $(DESTDIR)$(sysconfdir) 
42- if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \ 
43- then \ 
44- $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.pkg-orig; \ 
45- else \ 
46- $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \ 
47- fi; \ 
48+ $(mkinstalldirs) $(DESTDIR)$(egdir) 
49+ $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(egdir)/collectd.conf 
50 $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) 
51 $(INSTALL) -m 0644 $(srcdir)/types.db $(DESTDIR)$(pkgdatadir)/types.db; 
52 $(INSTALL) -m 0644 $(srcdir)/postgresql_default.conf \ 
53@@ -1377,7 +1380,7 @@ install-exec-hook: 
54  
55 uninstall-hook: 
56 rm -f $(DESTDIR)$(pkgdatadir)/types.db; 
57- rm -f $(DESTDIR)$(sysconfdir)/collectd.conf 
58+ rm -f $(DESTDIR)$(egdir)/collectd.conf 
59 rm -f $(DESTDIR)$(pkgdatadir)/postgresql_default.conf; 
60  
61 check_PROGRAMS = test_utils_mount test_utils_vl_lookup 

cvs diff -r1.2 -r1.3 pkgsrc/sysutils/collectd/patches/Attic/patch-src_irq.c (expand / switch to unified diff)

--- pkgsrc/sysutils/collectd/patches/Attic/patch-src_irq.c 2016/02/03 15:10:43 1.2
+++ pkgsrc/sysutils/collectd/patches/Attic/patch-src_irq.c 2016/10/13 15:17:28 1.3
@@ -1,52 +1,50 @@ @@ -1,52 +1,50 @@
1$NetBSD: patch-src_irq.c,v 1.2 2016/02/03 15:10:43 he Exp $ 1$NetBSD: patch-src_irq.c,v 1.3 2016/10/13 15:17:28 fhajny Exp $
2 2
3Provide a port to NetBSD. 3Provide a port to NetBSD.
4 4
5--- src/irq.c.orig 2014-09-05 08:57:01.000000000 +0000 5--- src/irq.c.orig 2016-09-11 08:10:25.263038721 +0000
6+++ src/irq.c 6+++ src/irq.c
7@@ -27,10 +27,22 @@ 7@@ -27,10 +27,20 @@
8 #include "configfile.h" 8 #include "plugin.h"
9 #include "utils_ignorelist.h" 9 #include "utils_ignorelist.h"
10  10
11-#if !KERNEL_LINUX 11-#if !KERNEL_LINUX
12+#if !KERNEL_LINUX && !KERNEL_NETBSD 12+#if !KERNEL_LINUX && !KERNEL_NETBSD
13 # error "No applicable input method." 13 # error "No applicable input method."
14 #endif 14 #endif
15  15
16+#if KERNEL_NETBSD 16+#if KERNEL_NETBSD
17+ 17+
18+#include <sys/param.h> 18+#include <sys/param.h>
19+#include <sys/types.h> 19+#include <sys/types.h>
20+#include <sys/sysctl.h> 20+#include <sys/sysctl.h>
21+#include <sys/evcnt.h> 21+#include <sys/evcnt.h>
22+#include <malloc.h> 22+#include <malloc.h>
23+ 23+
24+#endif /* KERNEL_NETBSD */ 24+#endif /* KERNEL_NETBSD */
25+ 25+
26+ 
27+ 
28 /* 26 /*
29 * (Module-)Global variables 27 * (Module-)Global variables
30 */ 28 */
31@@ -90,6 +102,7 @@ static void irq_submit (const char *irq_ 29@@ -90,6 +100,7 @@ static void irq_submit (const char *irq_
32 plugin_dispatch_values (&vl); 30 plugin_dispatch_values (&vl);
33 } /* void irq_submit */ 31 } /* void irq_submit */
34  32
35+#if KERNEL_LINUX 33+#if KERNEL_LINUX
36 static int irq_read (void) 34 static int irq_read (void)
37 { 35 {
38 FILE *fh; 36 FILE *fh;
39@@ -183,6 +196,64 @@ static int irq_read (void) 37@@ -188,6 +199,64 @@ static int irq_read (void)
40  38
41 return (0); 39 return (0);
42 } /* int irq_read */ 40 } /* int irq_read */
43+#endif /* KERNEL_LINUX */ 41+#endif /* KERNEL_LINUX */
44+ 42+
45+#if KERNEL_NETBSD 43+#if KERNEL_NETBSD
46+static int 44+static int
47+irq_read (void) 45+irq_read (void)
48+{ 46+{
49+ const int mib[4] = { 47+ const int mib[4] = {
50+ CTL_KERN, 48+ CTL_KERN,
51+ KERN_EVCNT, 49+ KERN_EVCNT,
52+ EVCNT_TYPE_INTR, 50+ EVCNT_TYPE_INTR,

cvs diff -r1.2 -r1.3 pkgsrc/sysutils/collectd/patches/Attic/patch-src_memory.c (expand / switch to unified diff)

--- pkgsrc/sysutils/collectd/patches/Attic/patch-src_memory.c 2015/08/16 08:01:58 1.2
+++ pkgsrc/sysutils/collectd/patches/Attic/patch-src_memory.c 2016/10/13 15:17:28 1.3
@@ -1,86 +1,86 @@ @@ -1,86 +1,86 @@
1$NetBSD: patch-src_memory.c,v 1.2 2015/08/16 08:01:58 he Exp $ 1$NetBSD: patch-src_memory.c,v 1.3 2016/10/13 15:17:28 fhajny Exp $
2 2
3Add a port for NetBSD using VM_UVMEXP2, and preferring 3Add a port for NetBSD using VM_UVMEXP2, and preferring
4sysctl over sysctlbyname. 4sysctl over sysctlbyname.
5 5
6--- src/memory.c.orig 2015-03-10 14:14:45.000000000 +0000 6--- src/memory.c.orig 2016-09-11 08:10:25.267038716 +0000
7+++ src/memory.c 7+++ src/memory.c
8@@ -65,6 +65,10 @@ static mach_port_t port_host; 8@@ -66,6 +66,10 @@ static mach_port_t port_host;
9 static vm_size_t pagesize; 9 static vm_size_t pagesize;
10 /* #endif HAVE_HOST_STATISTICS */ 10 /* #endif HAVE_HOST_STATISTICS */
11  11
12+#elif HAVE_SYSCTL 12+#elif HAVE_SYSCTL
13+static int pagesize; 13+static int pagesize;
14+/* #endif HAVE_SYSCTL */ 14+/* #endif HAVE_SYSCTL */
15+ 15+
16 #elif HAVE_SYSCTLBYNAME 16 #elif HAVE_SYSCTLBYNAME
17 /* no global variables */ 17 /* no global variables */
18 /* #endif HAVE_SYSCTLBYNAME */ 18 /* #endif HAVE_SYSCTLBYNAME */
19@@ -78,10 +82,6 @@ static int pagesize; 19@@ -80,10 +84,6 @@ static kstat_t *ksp;
20 static kstat_t *ksp; 20 static kstat_t *ksz;
21 /* #endif HAVE_LIBKSTAT */ 21 /* #endif HAVE_LIBKSTAT */
22  22
23-#elif HAVE_SYSCTL 23-#elif HAVE_SYSCTL
24-static int pagesize; 24-static int pagesize;
25-/* #endif HAVE_SYSCTL */ 25-/* #endif HAVE_SYSCTL */
26- 26-
27 #elif HAVE_LIBSTATGRAB 27 #elif HAVE_LIBSTATGRAB
28 /* no global variables */ 28 /* no global variables */
29 /* endif HAVE_LIBSTATGRAB */ 29 /* endif HAVE_LIBSTATGRAB */
30@@ -92,6 +92,10 @@ static int pagesize; 30@@ -94,6 +94,10 @@ static int pagesize;
31 # error "No applicable input method." 31 # error "No applicable input method."
32 #endif 32 #endif
33  33
34+#if KERNEL_NETBSD 34+#if KERNEL_NETBSD
35+# include <uvm/uvm_extern.h> 35+# include <uvm/uvm_extern.h>
36+#endif 36+#endif
37+ 37+
38 static _Bool values_absolute = 1; 38 static _Bool values_absolute = 1;
39 static _Bool values_percentage = 0; 39 static _Bool values_percentage = 0;
40  40
41@@ -121,6 +125,15 @@ static int memory_init (void) 41@@ -121,6 +125,15 @@ static int memory_init (void)
42 host_page_size (port_host, &pagesize); 42 host_page_size (port_host, &pagesize);
43 /* #endif HAVE_HOST_STATISTICS */ 43 /* #endif HAVE_HOST_STATISTICS */
44  44
45+#elif HAVE_SYSCTL 45+#elif HAVE_SYSCTL
46+ pagesize = getpagesize (); 46+ pagesize = getpagesize ();
47+ if (pagesize <= 0) 47+ if (pagesize <= 0)
48+ { 48+ {
49+ ERROR ("memory plugin: Invalid pagesize: %i", pagesize); 49+ ERROR ("memory plugin: Invalid pagesize: %i", pagesize);
50+ return (-1); 50+ return (-1);
51+ } 51+ }
52+/* #endif HAVE_SYSCTL */ 52+/* #endif HAVE_SYSCTL */
53+ 53+
54 #elif HAVE_SYSCTLBYNAME 54 #elif HAVE_SYSCTLBYNAME
55 /* no init stuff */ 55 /* no init stuff */
56 /* #endif HAVE_SYSCTLBYNAME */ 56 /* #endif HAVE_SYSCTLBYNAME */
57@@ -139,15 +152,6 @@ static int memory_init (void) 57@@ -145,15 +158,6 @@ static int memory_init (void)
58 } 58
59 /* #endif HAVE_LIBKSTAT */ 59 /* #endif HAVE_LIBKSTAT */
60  60
61-#elif HAVE_SYSCTL 61-#elif HAVE_SYSCTL
62- pagesize = getpagesize (); 62- pagesize = getpagesize ();
63- if (pagesize <= 0) 63- if (pagesize <= 0)
64- { 64- {
65- ERROR ("memory plugin: Invalid pagesize: %i", pagesize); 65- ERROR ("memory plugin: Invalid pagesize: %i", pagesize);
66- return (-1); 66- return (-1);
67- } 67- }
68-/* #endif HAVE_SYSCTL */ 68-/* #endif HAVE_SYSCTL */
69- 69-
70 #elif HAVE_LIBSTATGRAB 70 #elif HAVE_LIBSTATGRAB
71 /* no init stuff */ 71 /* no init stuff */
72 /* #endif HAVE_LIBSTATGRAB */ 72 /* #endif HAVE_LIBSTATGRAB */
73@@ -221,6 +225,46 @@ static int memory_read_internal (value_l 73@@ -227,6 +231,46 @@ static int memory_read_internal (value_l
74 /* #endif HAVE_HOST_STATISTICS */ 74 /* #endif HAVE_HOST_STATISTICS */
75  75
76 #elif HAVE_SYSCTLBYNAME 76 #elif HAVE_SYSCTLBYNAME
77+ 77+
78+#if HAVE_SYSCTL && defined(KERNEL_NETBSD) 78+#if HAVE_SYSCTL && defined(KERNEL_NETBSD)
79+ int mib[] = {CTL_VM, VM_UVMEXP2}; 79+ int mib[] = {CTL_VM, VM_UVMEXP2};
80+ struct uvmexp_sysctl uvmexp; 80+ struct uvmexp_sysctl uvmexp;
81+ gauge_t mem_active; 81+ gauge_t mem_active;
82+ gauge_t mem_inactive; 82+ gauge_t mem_inactive;
83+ gauge_t mem_free; 83+ gauge_t mem_free;
84+ gauge_t mem_wired; 84+ gauge_t mem_wired;
85+ gauge_t mem_kernel; 85+ gauge_t mem_kernel;
86+ size_t size; 86+ size_t size;
@@ -107,22 +107,22 @@ sysctl over sysctlbyname. @@ -107,22 +107,22 @@ sysctl over sysctlbyname.
107+ 107+
108+ MEMORY_SUBMIT ("active", mem_active, 108+ MEMORY_SUBMIT ("active", mem_active,
109+ "inactive", mem_inactive, 109+ "inactive", mem_inactive,
110+ "free", mem_free, 110+ "free", mem_free,
111+ "wired", mem_wired, 111+ "wired", mem_wired,
112+ "kernel", mem_kernel); 112+ "kernel", mem_kernel);
113+/* #endif HAVE_SYSCTL && defined(KERNEL_NETBSD) */ 113+/* #endif HAVE_SYSCTL && defined(KERNEL_NETBSD) */
114+ 114+
115+#else /* Other HAVE_SYSCTLBYNAME providers */ 115+#else /* Other HAVE_SYSCTLBYNAME providers */
116+ 116+
117 /* 117 /*
118 * vm.stats.vm.v_page_size: 4096 118 * vm.stats.vm.v_page_size: 4096
119 * vm.stats.vm.v_page_count: 246178 119 * vm.stats.vm.v_page_count: 246178
120@@ -272,6 +316,8 @@ static int memory_read_internal (value_l 120@@ -276,6 +320,8 @@ static int memory_read_internal (value_l
121 "active", (gauge_t) sysctl_vals[4], 121 "active", (gauge_t) sysctl_vals[4],
122 "inactive", (gauge_t) sysctl_vals[5], 122 "inactive", (gauge_t) sysctl_vals[5],
123 "cache", (gauge_t) sysctl_vals[6]); 123 "cache", (gauge_t) sysctl_vals[6]);
124+ 124+
125+#endif /* HAVE_SYSCTL && KERNEL_NETBSD */ 125+#endif /* HAVE_SYSCTL && KERNEL_NETBSD */
126 /* #endif HAVE_SYSCTLBYNAME */ 126 /* #endif HAVE_SYSCTLBYNAME */
127  127
128 #elif KERNEL_LINUX 128 #elif KERNEL_LINUX

cvs diff -r1.2 -r1.3 pkgsrc/sysutils/collectd/patches/Attic/patch-src_swap.c (expand / switch to unified diff)

--- pkgsrc/sysutils/collectd/patches/Attic/patch-src_swap.c 2015/08/11 14:15:00 1.2
+++ pkgsrc/sysutils/collectd/patches/Attic/patch-src_swap.c 2016/10/13 15:17:28 1.3
@@ -1,62 +1,62 @@ @@ -1,62 +1,62 @@
1$NetBSD: patch-src_swap.c,v 1.2 2015/08/11 14:15:00 he Exp $ 1$NetBSD: patch-src_swap.c,v 1.3 2016/10/13 15:17:28 fhajny Exp $
2 2
3Extend support for NetBSD, and add per-swap-device 3Extend support for NetBSD, and add per-swap-device
4reporting for HAVE_SWAPCTL_THREE_ARGS. 4reporting for HAVE_SWAPCTL_THREE_ARGS.
5 5
6--- src/swap.c.orig 2015-05-20 12:04:47.000000000 +0000 6--- src/swap.c.orig 2016-09-11 08:10:25.271038709 +0000
7+++ src/swap.c 7+++ src/swap.c
8@@ -76,9 +76,12 @@ static _Bool report_bytes = 0; 8@@ -77,9 +77,12 @@ static _Bool report_bytes = 0;
9 static _Bool report_by_device = 0; 9 static _Bool report_by_device = 0;
10 /* #endif KERNEL_LINUX */ 10 /* #endif KERNEL_LINUX */
11  11
12-#elif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS 12-#elif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS
13+#elif HAVE_SWAPCTL && (HAVE_SWAPCTL_TWO_ARGS || HAVE_SWAPCTL_THREE_ARGS) 13+#elif HAVE_SWAPCTL && (HAVE_SWAPCTL_TWO_ARGS || HAVE_SWAPCTL_THREE_ARGS)
14 # define SWAP_HAVE_REPORT_BY_DEVICE 1 14 # define SWAP_HAVE_REPORT_BY_DEVICE 1
15 static derive_t pagesize; 15 static derive_t pagesize;
16+#if KERNEL_NETBSD 16+#if KERNEL_NETBSD
17+static _Bool report_bytes = 0; 17+static _Bool report_bytes = 0;
18+#endif 18+#endif
19 static _Bool report_by_device = 0; 19 static _Bool report_by_device = 0;
20 /* #endif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS */ 20 /* #endif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS */
21  21
22@@ -114,7 +117,7 @@ static int swap_config (oconfig_item_t * 22@@ -117,7 +120,7 @@ static int swap_config (oconfig_item_t *
23 { 23 {
24 oconfig_item_t *child = ci->children + i; 24 oconfig_item_t *child = ci->children + i;
25 if (strcasecmp ("ReportBytes", child->key) == 0) 25 if (strcasecmp ("ReportBytes", child->key) == 0)
26-#if KERNEL_LINUX 26-#if KERNEL_LINUX
27+#if KERNEL_LINUX || KERNEL_NETBSD 27+#if KERNEL_LINUX || KERNEL_NETBSD
28 cf_util_get_boolean (child, &report_bytes); 28 cf_util_get_boolean (child, &report_bytes);
29 #else 29 #else
30 WARNING ("swap plugin: The \"ReportBytes\" option " 30 WARNING ("swap plugin: The \"ReportBytes\" option "
31@@ -147,7 +150,7 @@ static int swap_init (void) /* {{{ */ 31@@ -150,7 +153,7 @@ static int swap_init (void) /* {{{ */
32 pagesize = (derive_t) sysconf (_SC_PAGESIZE); 32 pagesize = (derive_t) sysconf (_SC_PAGESIZE);
33 /* #endif KERNEL_LINUX */ 33 /* #endif KERNEL_LINUX */
34  34
35-#elif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS 35-#elif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS
36+#elif HAVE_SWAPCTL && (HAVE_SWAPCTL_TWO_ARGS || HAVE_SWAPCTL_THREE_ARGS) 36+#elif HAVE_SWAPCTL && (HAVE_SWAPCTL_TWO_ARGS || HAVE_SWAPCTL_THREE_ARGS)
37 /* getpagesize(3C) tells me this does not fail.. */ 37 /* getpagesize(3C) tells me this does not fail.. */
38 pagesize = (derive_t) getpagesize (); 38 pagesize = (derive_t) getpagesize ();
39 /* #endif HAVE_SWAPCTL */ 39 /* #endif HAVE_SWAPCTL */
40@@ -213,7 +216,7 @@ static void swap_submit_usage (char cons 40@@ -216,7 +219,7 @@ static void swap_submit_usage (char cons
41 other_name, other_value, NULL); 41 other_name, other_value, NULL);
42 } /* }}} void swap_submit_usage */ 42 } /* }}} void swap_submit_usage */
43  43
44-#if KERNEL_LINUX || HAVE_PERFSTAT 44-#if KERNEL_LINUX || HAVE_PERFSTAT
45+#if KERNEL_LINUX || HAVE_PERFSTAT || KERNEL_NETBSD 45+#if KERNEL_LINUX || HAVE_PERFSTAT || KERNEL_NETBSD
46 __attribute__((nonnull(1))) 46 __attribute__((nonnull(1)))
47 static void swap_submit_derive (char const *type_instance, /* {{{ */ 47 static void swap_submit_derive (char const *type_instance, /* {{{ */
48 derive_t value) 48 derive_t value)
49@@ -614,6 +617,43 @@ static int swap_read (void) /* {{{ */ 49@@ -618,6 +621,43 @@ static int swap_read (void) /* {{{ */
50 /* #endif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS */ 50 /* #endif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS */
51  51
52 #elif HAVE_SWAPCTL && HAVE_SWAPCTL_THREE_ARGS 52 #elif HAVE_SWAPCTL && HAVE_SWAPCTL_THREE_ARGS
53+#if KERNEL_NETBSD 53+#if KERNEL_NETBSD
54+#include <uvm/uvm_extern.h> 54+#include <uvm/uvm_extern.h>
55+ 55+
56+static int 56+static int
57+swap_read_io (void) /* {{{ */ 57+swap_read_io (void) /* {{{ */
58+{ 58+{
59+ static int uvmexp_mib[] = { CTL_VM, VM_UVMEXP2 }; 59+ static int uvmexp_mib[] = { CTL_VM, VM_UVMEXP2 };
60+ struct uvmexp_sysctl uvmexp; 60+ struct uvmexp_sysctl uvmexp;
61+ size_t ssize; 61+ size_t ssize;
62+ derive_t swap_in, swap_out; 62+ derive_t swap_in, swap_out;
@@ -80,71 +80,66 @@ reporting for HAVE_SWAPCTL_THREE_ARGS. @@ -80,71 +80,66 @@ reporting for HAVE_SWAPCTL_THREE_ARGS.
80+ swap_out = swap_out * pagesize; 80+ swap_out = swap_out * pagesize;
81+ } 81+ }
82+ 82+
83+ swap_submit_derive ("in", swap_in); 83+ swap_submit_derive ("in", swap_in);
84+ swap_submit_derive ("out", swap_out); 84+ swap_submit_derive ("out", swap_out);
85+ 85+
86+ return (0); 86+ return (0);
87+} /* }}} */ 87+} /* }}} */
88+#endif 88+#endif
89+ 89+
90 static int swap_read (void) /* {{{ */ 90 static int swap_read (void) /* {{{ */
91 { 91 {
92 struct swapent *swap_entries; 92 struct swapent *swap_entries;
93@@ -660,23 +700,53 @@ static int swap_read (void) /* {{{ */ 93@@ -663,12 +703,33 @@ static int swap_read (void) /* {{{ */
94 * swap_entries[i].se_path */ 94 * swap_entries[i].se_path */
95 for (i = 0; i < swap_num; i++) 95 for (int i = 0; i < swap_num; i++)
96 { 96 {
97+ char path[PATH_MAX]; 97+ char path[PATH_MAX];
98+ gauge_t this_used; 98+ gauge_t this_used;
99+ gauge_t this_total; 99+ gauge_t this_total;
100+  100+
101 if ((swap_entries[i].se_flags & SWF_ENABLE) == 0) 101 if ((swap_entries[i].se_flags & SWF_ENABLE) == 0)
102 continue; 102 continue;
103  103
104- used += ((gauge_t) swap_entries[i].se_inuse) * C_SWAP_BLOCK_SIZE; 104- used += ((gauge_t) swap_entries[i].se_inuse) * C_SWAP_BLOCK_SIZE;
105- total += ((gauge_t) swap_entries[i].se_nblks) * C_SWAP_BLOCK_SIZE; 105- total += ((gauge_t) swap_entries[i].se_nblks) * C_SWAP_BLOCK_SIZE;
106- } 106- }
107+ this_used = ((gauge_t) swap_entries[i].se_inuse) 107+ this_used = ((gauge_t) swap_entries[i].se_inuse)
108+ * C_SWAP_BLOCK_SIZE; 108+ * C_SWAP_BLOCK_SIZE;
109+ this_total = ((gauge_t) swap_entries[i].se_nblks) 109+ this_total = ((gauge_t) swap_entries[i].se_nblks)
110+ * C_SWAP_BLOCK_SIZE; 110+ * C_SWAP_BLOCK_SIZE;
111+  111+
112+  112+
113+ /* Shortcut for the "combined" setting (default) */ 113+ /* Shortcut for the "combined" setting (default) */
114+ if (!report_by_device) 114+ if (!report_by_device)
115+ { 115+ {
116+ used += this_used; 116+ used += this_used;
117+ total += this_total; 117+ total += this_total;
118+ continue; 118+ continue;
119+ } 119+ }
120+ 120+
121+ sstrncpy (path, swap_entries[i].se_path, sizeof (path)); 121+ sstrncpy (path, swap_entries[i].se_path, sizeof (path));
122+ escape_slashes (path, sizeof (path)); 122+ escape_slashes (path, sizeof (path));
123+ 123+
124+ swap_submit_usage (path, this_used, this_total - this_used, 124+ swap_submit_usage (path, this_used, this_total - this_used,
125+ NULL, NAN); 125+ NULL, NAN);
126+ } /* for (swap_num) */ 126+ } /* for (swap_num) */
127+ 
128  127
129 if (total < used) 128 if (total < used)
130 { 129 {
131 ERROR ("swap plugin: Total swap space (%g) is less than used swap space (%g).", 130@@ -679,8 +740,15 @@ static int swap_read (void) /* {{{ */
132 total, used); 
133+ sfree (swap_entries); 
134 return (-1); 
135 } 131 }
136  132
137- swap_submit_usage (NULL, used, total - used, NULL, NAN); 133 swap_submit_usage (NULL, used, total - used, NULL, NAN);
138+ /* If the "separate" option was specified (report_by_device == 1), all 134+ /* If the "separate" option was specified (report_by_device == 1), all
139+ * values have already been dispatched from within the loop. */ 135+ * values have already been dispatched from within the loop. */
140+ if (!report_by_device) 136+ if (!report_by_device)
141+ swap_submit_usage (NULL, used, total - used, NULL, NAN); 137+ swap_submit_usage (NULL, used, total - used, NULL, NAN);
142  138
143 sfree (swap_entries); 139 sfree (swap_entries);
144+ 
145+#if KERNEL_NETBSD 140+#if KERNEL_NETBSD
146+ swap_read_io (); 141+ swap_read_io ();
147+#endif 142+#endif
148 return (0); 143 return (0);
149 } /* }}} int swap_read */ 144 } /* }}} int swap_read */
150 /* #endif HAVE_SWAPCTL && HAVE_SWAPCTL_THREE_ARGS */ 145 /* #endif HAVE_SWAPCTL && HAVE_SWAPCTL_THREE_ARGS */

File Deleted: pkgsrc/sysutils/collectd/patches/Attic/patch-src_Makefile.in

File Deleted: pkgsrc/sysutils/collectd/patches/Attic/patch-src_collectd-tg.c

File Deleted: pkgsrc/sysutils/collectd/patches/Attic/patch-version-gen.sh

File Deleted: pkgsrc/sysutils/collectd/patches/Attic/patch-src_config.h.in

cvs diff -r1.1 -r1.2 pkgsrc/sysutils/collectd/patches/Attic/patch-src_cpu.c (expand / switch to unified diff)

--- pkgsrc/sysutils/collectd/patches/Attic/patch-src_cpu.c 2015/08/26 12:19:27 1.1
+++ pkgsrc/sysutils/collectd/patches/Attic/patch-src_cpu.c 2016/10/13 15:17:28 1.2
@@ -1,50 +1,50 @@ @@ -1,50 +1,50 @@
1$NetBSD: patch-src_cpu.c,v 1.1 2015/08/26 12:19:27 he Exp $ 1$NetBSD: patch-src_cpu.c,v 1.2 2016/10/13 15:17:28 fhajny Exp $
2 2
3Port this too to NetBSD. 3Port this too to NetBSD.
4 4
5--- src/cpu.c.orig 2015-03-10 14:14:45.000000000 +0000 5--- src/cpu.c.orig 2016-09-11 08:10:25.255038733 +0000
6+++ src/cpu.c 6+++ src/cpu.c
7@@ -79,7 +79,9 @@ 7@@ -80,7 +80,9 @@
8  8
9 #if HAVE_SYSCTL 9 #if HAVE_SYSCTL
10 # if defined(CTL_HW) && defined(HW_NCPU) \ 10 # if defined(CTL_HW) && defined(HW_NCPU) \
11- && defined(CTL_KERN) && defined(KERN_CPTIME) && defined(CPUSTATES) 11- && defined(CTL_KERN) && defined(KERN_CPTIME) && defined(CPUSTATES)
12+ && defined(CTL_KERN) \ 12+ && defined(CTL_KERN) \
13+ && (defined(KERN_CPTIME) || defined(KERN_CP_TIME)) \ 13+ && (defined(KERN_CPTIME) || defined(KERN_CP_TIME)) \
14+ && defined(CPUSTATES) 14+ && defined(CPUSTATES)
15 # define CAN_USE_SYSCTL 1 15 # define CAN_USE_SYSCTL 1
16 # else 16 # else
17 # define CAN_USE_SYSCTL 0 17 # define CAN_USE_SYSCTL 0
18@@ -676,6 +678,24 @@ static int cpu_read (void) 18@@ -696,6 +698,24 @@ static int cpu_read (void)
19  19
20 memset (cpuinfo, 0, sizeof (cpuinfo)); 20 memset (cpuinfo, 0, sizeof (cpuinfo));
21  21
22+#if defined(KERN_CP_TIME) && defined(KERNEL_NETBSD) 22+#if defined(KERN_CP_TIME) && defined(KERNEL_NETBSD)
23+ { 23+ {
24+ int mib[] = {CTL_KERN, KERN_CP_TIME}; 24+ int mib[] = {CTL_KERN, KERN_CP_TIME};
25+ 25+
26+ cpuinfo_size = sizeof(cpuinfo[0]) * numcpu * CPUSTATES; 26+ cpuinfo_size = sizeof(cpuinfo[0]) * numcpu * CPUSTATES;
27+ status = sysctl(mib, 2, cpuinfo, &cpuinfo_size, NULL, 0); 27+ status = sysctl(mib, 2, cpuinfo, &cpuinfo_size, NULL, 0);
28+ if (status == -1) { 28+ if (status == -1) {
29+ char errbuf[1024]; 29+ char errbuf[1024];
30+ 30+
31+ ERROR ("cpu plugin: sysctl failed: %s.", 31+ ERROR ("cpu plugin: sysctl failed: %s.",
32+ sstrerror (errno, errbuf, sizeof (errbuf))); 32+ sstrerror (errno, errbuf, sizeof (errbuf)));
33+ return -1; 33+ return -1;
34+ } 34+ }
35+ if (cpuinfo_size == (sizeof(cpuinfo[0]) * CPUSTATES)) { 35+ if (cpuinfo_size == (sizeof(cpuinfo[0]) * CPUSTATES)) {
36+ numcpu = 1; 36+ numcpu = 1;
37+ } 37+ }
38+ } 38+ }
39+#else /* defined(KERN_CP_TIME) && defined(KERNEL_NETBSD) */ 39+#else /* defined(KERN_CP_TIME) && defined(KERNEL_NETBSD) */
40 #if defined(KERN_CPTIME2) 40 #if defined(KERN_CPTIME2)
41 if (numcpu > 1) { 41 if (numcpu > 1) {
42 for (i = 0; i < numcpu; i++) { 42 for (int i = 0; i < numcpu; i++) {
43@@ -715,6 +735,7 @@ static int cpu_read (void) 43@@ -735,6 +755,7 @@ static int cpu_read (void)
44 cpuinfo[0][i] = cpuinfo_tmp[i]; 44 cpuinfo[0][i] = cpuinfo_tmp[i];
45 } 45 }
46 } 46 }
47+#endif /* defined(KERN_CP_TIME) && defined(KERNEL_NETBSD) */ 47+#endif /* defined(KERN_CP_TIME) && defined(KERNEL_NETBSD) */
48  48
49 for (i = 0; i < numcpu; i++) { 49 for (int i = 0; i < numcpu; i++) {
50 cpu_stage (i, COLLECTD_CPU_STATE_USER, (derive_t) cpuinfo[i][CP_USER], now); 50 cpu_stage (i, COLLECTD_CPU_STATE_USER, (derive_t) cpuinfo[i][CP_USER], now);

cvs diff -r1.1 -r1.2 pkgsrc/sysutils/collectd/patches/Attic/patch-src_libcollectclient_network__buffer.c (expand / switch to unified diff)

--- pkgsrc/sysutils/collectd/patches/Attic/patch-src_libcollectclient_network__buffer.c 2014/02/17 11:21:55 1.1
+++ pkgsrc/sysutils/collectd/patches/Attic/patch-src_libcollectclient_network__buffer.c 2016/10/13 15:17:28 1.2
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: patch-src_libcollectclient_network__buffer.c,v 1.1 2014/02/17 11:21:55 fhajny Exp $ 1$NetBSD: patch-src_libcollectclient_network__buffer.c,v 1.2 2016/10/13 15:17:28 fhajny Exp $
2 2
3Need the workaround on at least SunOS too. 3Need the workaround on at least SunOS too.
4--- src/libcollectdclient/network_buffer.c.orig 2014-01-26 08:09:14.868392118 +0000 4--- src/libcollectdclient/network_buffer.c.orig 2016-09-11 08:10:25.263038721 +0000
5+++ src/libcollectdclient/network_buffer.c 5+++ src/libcollectdclient/network_buffer.c
6@@ -37,7 +37,7 @@ 6@@ -36,7 +36,7 @@
 7 #include <pthread.h>
7  8
8 #if HAVE_LIBGCRYPT 9 #if HAVE_LIBGCRYPT
9 # include <pthread.h> 
10-# if defined __APPLE__ 10-# if defined __APPLE__
11+# if defined(__APPLE__) || defined(__sun) 11+# if defined __APPLE__ || defined(__sun)
12 /* default xcode compiler throws warnings even when deprecated functionality 12 /* default xcode compiler throws warnings even when deprecated functionality
13 * is not used. -Werror breaks the build because of erroneous warnings. 13 * is not used. -Werror breaks the build because of erroneous warnings.
14 * http://stackoverflow.com/questions/10556299/compiler-warnings-with-libgcrypt-v1-5-0/12830209#12830209 14 * http://stackoverflow.com/questions/10556299/compiler-warnings-with-libgcrypt-v1-5-0/12830209#12830209
15@@ -50,7 +50,7 @@ 15@@ -49,7 +49,7 @@
16 */ 16 */
17 # define GCRYPT_NO_DEPRECATED 17 # define GCRYPT_NO_DEPRECATED
18 # include <gcrypt.h> 18 # include <gcrypt.h>
19-# if defined __APPLE__ 19-# if defined __APPLE__
20+# if defined(__APPLE__) || defined(__sun) 20+# if defined(__APPLE__) || defined(__sun)
21 /* Re enable deprecation warnings */ 21 /* Re enable deprecation warnings */
22 # pragma GCC diagnostic warning "-Wdeprecated-declarations" 22 # pragma GCC diagnostic warning "-Wdeprecated-declarations"
23 # endif 23 # endif

File Added: pkgsrc/sysutils/collectd/patches/Attic/patch-src_daemon_Makefile.am
$NetBSD: patch-src_daemon_Makefile.am,v 1.1 2016/10/13 15:17:28 fhajny Exp $

Use other data directory.

--- src/daemon/Makefile.am.orig	2016-10-07 06:49:37.631866621 +0000
+++ src/daemon/Makefile.am
@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src
 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

cvs diff -r1.3 -r1.4 pkgsrc/sysutils/p5-collectd/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/p5-collectd/Makefile 2016/06/08 19:24:27 1.3
+++ pkgsrc/sysutils/p5-collectd/Makefile 2016/10/13 15:17:29 1.4
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.3 2016/06/08 19:24:27 wiz Exp $ 1# $NetBSD: Makefile,v 1.4 2016/10/13 15:17:29 fhajny Exp $
2 2
3PKGNAME= p5-${DISTNAME} 3PKGNAME= p5-${DISTNAME}
4PKGREVISION= 2 
5COLLECTD_PACKAGE= perl 4COLLECTD_PACKAGE= perl
6 5
7COMMENT= Statistics collection daemon - perl plugin 6COMMENT= Statistics collection daemon - perl plugin
8 7
9.include "../../sysutils/collectd/Makefile.common" 8.include "../../sysutils/collectd/Makefile.common"
10 9
11USE_TOOLS+= perl 10USE_TOOLS+= perl
12 11
13PERL5_CONFIGURE= no 12PERL5_CONFIGURE= no
14PERL5_PACKLIST+= auto/Collectd/.packlist 13PERL5_PACKLIST+= auto/Collectd/.packlist
15 14
16CONFIGURE_ARGS+= --with-libperl=${BUILDLINK_PREFIX.perl} 15CONFIGURE_ARGS+= --with-libperl=${BUILDLINK_PREFIX.perl}
17CONFIGURE_ARGS+= --with-perl-bindings=${MAKE_PARAMS:Q} 16CONFIGURE_ARGS+= --with-perl-bindings=${MAKE_PARAMS:Q}

cvs diff -r1.1 -r1.2 pkgsrc/sysutils/py-collectd/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/py-collectd/Makefile 2015/04/14 11:27:30 1.1
+++ pkgsrc/sysutils/py-collectd/Makefile 2016/10/13 15:17:29 1.2
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1# $NetBSD: Makefile,v 1.1 2015/04/14 11:27:30 fhajny Exp $ 1# $NetBSD: Makefile,v 1.2 2016/10/13 15:17:29 fhajny Exp $
2 2
3PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 3PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
4COLLECTD_PACKAGE= python 4COLLECTD_PACKAGE= python
5 5
6COMMENT= Statistics collection daemon - python plugin 6COMMENT= Statistics collection daemon - python plugin
7 7
8.include "../../sysutils/collectd/Makefile.common" 8.include "../../sysutils/collectd/Makefile.common"
9 9
10CONFIGURE_ARGS+= --with-python=${PYTHONBIN} 10CONFIGURE_ARGS+= --enable-python
 11CONFIGURE_ENV+= PYTHON_CONFIG=${PREFIX}/bin/python${PYVERSSUFFIX}-config
11 12
12.include "../../lang/python/application.mk" 13.include "../../lang/python/application.mk"
13.include "../../mk/bsd.pkg.mk" 14.include "../../mk/bsd.pkg.mk"