diff options
| author | novel <novel@FreeBSD.org> | 2011-12-14 00:57:26 +0800 |
|---|---|---|
| committer | novel <novel@FreeBSD.org> | 2011-12-14 00:57:26 +0800 |
| commit | 46f084560a9f25534bc4a91de7194796c31fa3a2 (patch) | |
| tree | d5d57e5aa6c74138a88c8f419abd69f986665c8f /net-mgmt/collectd | |
| parent | 58cb04f716aa1a53b8a69858c957b9edcdce9ee5 (diff) | |
| download | freebsd-ports-gnome-46f084560a9f25534bc4a91de7194796c31fa3a2.tar.gz freebsd-ports-gnome-46f084560a9f25534bc4a91de7194796c31fa3a2.tar.zst freebsd-ports-gnome-46f084560a9f25534bc4a91de7194796c31fa3a2.zip | |
- Update to 4.10.4
- Add RRDCACHED knob
PR: 163191
Submitted by: Krzysztof Stryjek (maintainer)
Feature safe: yes
Diffstat (limited to 'net-mgmt/collectd')
| -rw-r--r-- | net-mgmt/collectd/Makefile | 18 | ||||
| -rw-r--r-- | net-mgmt/collectd/distinfo | 4 | ||||
| -rw-r--r-- | net-mgmt/collectd/files/patch-src__meta_data.c | 10 | ||||
| -rw-r--r-- | net-mgmt/collectd/pkg-plist | 2 |
4 files changed, 17 insertions, 17 deletions
diff --git a/net-mgmt/collectd/Makefile b/net-mgmt/collectd/Makefile index 62c7b5b2a72b..aa21f60449d1 100644 --- a/net-mgmt/collectd/Makefile +++ b/net-mgmt/collectd/Makefile @@ -6,8 +6,7 @@ # PORTNAME= collectd -PORTVERSION= 4.10.3 -PORTREVISION= 4 +PORTVERSION= 4.10.4 CATEGORIES= net-mgmt MASTER_SITES= http://collectd.org/files/ @@ -41,7 +40,8 @@ OPTIONS= CGI "Install collection.cgi (requires RRDTOOL)" Off \ PING "Input: Network latency (liboping)" On \ SNMP "Input: SNMP" On \ XMMS "Input: XMMS" Off \ - RRDTOOL "Output: RRDTool" On + RRDTOOL "Output: RRDTool" On \ + RRDCACHED "Output: RRDTool Cached (require RRDTOOL)" On MAN1= collectd.1 collectd-nagios.1 collectdmon.1 MAN5= collectd.conf.5 collectd-email.5 collectd-exec.5 \ @@ -111,7 +111,6 @@ CONFIGURE_ARGS= --localstatedir=/var \ --disable-python \ --disable-protocols \ --disable-routeros \ - --disable-rrdcached \ --disable-sensors \ --disable-serial \ --disable-table \ @@ -130,7 +129,8 @@ CONFIGURE_ARGS= --localstatedir=/var \ --disable-wireless \ --disable-write_http \ --disable-zfs_arc \ - --without-perl-bindings + --without-perl-bindings \ + --disable-static .if defined(WITH_DEBUG) CONFIGURE_ARGS+=--enable-debug @@ -322,6 +322,14 @@ CONFIGURE_ARGS+=--disable-rrdtool PLIST_SUB+= RRD="@comment " .endif +.if defined(WITH_RRDCACHED) && defined(WITH_RRDTOOL) +CONFIGURE_ARGS+=--enable-rrdcached +PLIST_SUB+= RRDCACHED="" +.else +CONFIGURE_ARGS+=--disable--rrdcached +PLIST_SUB+= RRDCACHED="@comment " +.endif + .if defined(WITH_SNMP) LIB_DEPENDS+= netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp CONFIGURE_ARGS+=--enable-snmp diff --git a/net-mgmt/collectd/distinfo b/net-mgmt/collectd/distinfo index 7d330eacfb21..b6d38f063627 100644 --- a/net-mgmt/collectd/distinfo +++ b/net-mgmt/collectd/distinfo @@ -1,2 +1,2 @@ -SHA256 (collectd-4.10.3.tar.gz) = 69797d19f1782b243d8737072171611ebb16f972dc0021402df66905b8746033 -SIZE (collectd-4.10.3.tar.gz) = 1743443 +SHA256 (collectd-4.10.4.tar.gz) = ee63dfbd519dd4cae3b682e7379c5e01ac3a615d48ec5871b6ab4921ec0a9b12 +SIZE (collectd-4.10.4.tar.gz) = 1632601 diff --git a/net-mgmt/collectd/files/patch-src__meta_data.c b/net-mgmt/collectd/files/patch-src__meta_data.c deleted file mode 100644 index c90d50e452aa..000000000000 --- a/net-mgmt/collectd/files/patch-src__meta_data.c +++ /dev/null @@ -1,10 +0,0 @@ ---- ./src/meta_data.c.orig 2011-05-30 06:58:07.055492500 -0400 -+++ ./src/meta_data.c 2011-05-30 06:59:10.383490225 -0400 -@@ -215,6 +215,7 @@ - return; - - md_entry_free (md->head); -+ pthread_mutex_destroy(&md->lock); - free (md); - } /* }}} void meta_data_destroy */ - diff --git a/net-mgmt/collectd/pkg-plist b/net-mgmt/collectd/pkg-plist index 28264480642c..36ef0c55a41e 100644 --- a/net-mgmt/collectd/pkg-plist +++ b/net-mgmt/collectd/pkg-plist @@ -77,6 +77,8 @@ lib/collectd/processes.so lib/collectd/processes.la %%RRD%%lib/collectd/rrdtool.la %%RRD%%lib/collectd/rrdtool.so +%%RRDCACHED%%lib/collectd/rrdcached.la +%%RRDCACHED%%lib/collectd/rrdcached.so %%SNMP%%lib/collectd/snmp.la %%SNMP%%lib/collectd/snmp.so lib/collectd/swap.la |