Page MenuHomeFreeBSD
Files F159344097

D9444.id24899.diff
No OneTemporary
Actions

D9444.id24899.diff
View Options

Index: head/net-mgmt/collectd5/Makefile
===================================================================
--- head/net-mgmt/collectd5/Makefile
+++ head/net-mgmt/collectd5/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= collectd
-PORTVERSION= 5.7.0
+PORTVERSION= 5.7.1
CATEGORIES= net-mgmt
MASTER_SITES= https://collectd.org/files/ \
http://collectd.org/files/
@@ -14,10 +14,6 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-# Only autoreconf stage and sigrok plugin need GLIB:
-BUILD_DEPENDS= ${LOCALBASE}/share/aclocal/glib-2.0.m4:devel/glib20
-LIB_DEPENDS= libltdl.so:devel/libltdl
-
USES= autoreconf gmake libtool pkgconfig shebangfix tar:bzip2
GNU_CONFIGURE= yes
@@ -113,7 +109,6 @@
CGI_RUN_DEPENDS= p5-URI>=0:net/p5-URI \
p5-CGI>=0:www/p5-CGI \
- p5-Data-Dumper>=0:devel/p5-Data-Dumper \
p5-HTML-Parser>=0:www/p5-HTML-Parser
CGI_IMPLIES= RRDTOOL
@@ -136,7 +131,8 @@
DBI_CONFIGURE_ENABLE= dbi
DBI_CFLAGS= -Wno-deprecated-declarations
-GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt
+GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \
+ libgpg-error.so:security/libgpg-error
GCRYPT_CONFIGURE_WITH= -with-libgcrypt=${LOCALBASE}
GCRYPT_LIBS= -lgcrypt
@@ -170,13 +166,15 @@
MQTT_CONFIGURE_ENABLE= mqtt
MQTT_CONFIGURE_WITH= libmosquitto=${LOCALBASE}
-MYSQL_USE= mysql=yes
+MYSQL_USES= mysql ssl
MYSQL_CONFIGURE_ENABLE= mysql
MYSQL_CONFIGURE_WITH= libmysql=${LOCALBASE}
NOTIFYDESKTOP_LIB_DEPENDS= libnotify.so:devel/libnotify
NOTIFYDESKTOP_CONFIGURE_ENABLE= notify_desktop
NOTIFYDESKTOP_CONFIGURE_WITH= libnotify=${LOCALBASE}
+NOTIFYDESKTOP_USE= GNOME=gdkpixbuf2
+NOTIFYDESKTOP_USES= gettext-runtime
NOTIFYEMAIL_LIB_DEPENDS= libesmtp.so:mail/libesmtp
NOTIFYEMAIL_CONFIGURE_ENABLE= notify_email
@@ -223,10 +221,13 @@
REDIS_CONFIGURE_ENABLE= redis write_redis
REDIS_CONFIGURE_WITH= libhiredis=${LOCALBASE}
-RIEMANN_LIB_DEPENDS= libriemann-client.so:net-mgmt/riemann-c-client
+RIEMANN_LIB_DEPENDS= libriemann-client.so:net-mgmt/riemann-c-client \
+ libltdl.so:devel/libltdl
RIEMANN_CONFIGURE_ENABLE= write_riemann
-ROUTEROS_LIB_DEPENDS= librouteros.so:net/librouteros
+ROUTEROS_LIB_DEPENDS= librouteros.so:net/librouteros \
+ libgcrypt.so:security/libgcrypt \
+ libgpg-error.so:security/libgpg-error
ROUTEROS_CONFIGURE_ENABLE= routeros
ROUTEROS_CONFIGURE_WITH= librouteros=${LOCALBASE}
@@ -239,6 +240,7 @@
SIGROK_LIB_DEPENDS= libsigrok.so:devel/libsigrok
SIGROK_CONFIGURE_ENABLE= sigrok
SIGROK_CONFIGURE_WITH= libsigrok
+SIGROK_USES= gettext-runtime
SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp
SNMP_CONFIGURE_ENABLE= snmp
@@ -246,7 +248,8 @@
STATSD_CONFIGURE_ENABLE= statsd
-TOKYOTYRANT_LIB_DEPENDS= libtokyotyrant.so:databases/tokyotyrant
+TOKYOTYRANT_LIB_DEPENDS= libtokyotyrant.so:databases/tokyotyrant \
+ libtokyocabinet.so:databases/tokyocabinet
TOKYOTYRANT_CONFIGURE_ENABLE= tokyotyrant
TOKYOTYRANT_CONFIGURE_WITH= libtokyotyrant=${LOCALBASE}
@@ -257,7 +260,9 @@
VARNISH_CONFIGURE_WITH= libvarnish=${LOCALBASE}
VIRT_IMPLIES= XML
-VIRT_LIB_DEPENDS= libvirt.so:devel/libvirt
+VIRT_LIB_DEPENDS= libvirt.so:devel/libvirt \
+ libgcrypt.so:security/libgcrypt \
+ libgpg-error.so:security/libgpg-error
VIRT_CONFIGURE_ENABLE= virt
VIRT_CONFIGURE_WITH= virt=${LOCALBASE}
@@ -268,6 +273,7 @@
XMMS_LIB_DEPENDS= libxmms.so:multimedia/xmms
XMMS_CONFIGURE_ENABLE= xmms
XMMS_CONFIGURE_WITH= libxmms=${LOCALBASE}
+XMMS_USE= XORG=x11,xext,xi
ZOOKEEPER_LIB_DEPENDS= libzookeeper_mt.so:devel/libzookeeper
ZOOKEEPER_CONFIGURE_ENABLE= zookeeper
Index: head/net-mgmt/collectd5/distinfo
===================================================================
--- head/net-mgmt/collectd5/distinfo
+++ head/net-mgmt/collectd5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483447838
-SHA256 (collectd-5.7.0.tar.bz2) = 25a05fbdc6baad571554342bbac6141928bf95a47fc60ee3b32e46d0c89ef2b2
-SIZE (collectd-5.7.0.tar.bz2) = 1861882
+TIMESTAMP = 1486153351
+SHA256 (collectd-5.7.1.tar.bz2) = 7edd3643c0842215553b2421d5456f4e9a8a58b07e216b40a7e8e91026d8e501
+SIZE (collectd-5.7.1.tar.bz2) = 1797725
Index: head/net-mgmt/collectd5/files/patch-src__daemon__collectd.h
===================================================================
--- head/net-mgmt/collectd5/files/patch-src__daemon__collectd.h
+++ head/net-mgmt/collectd5/files/patch-src__daemon__collectd.h
@@ -1,6 +1,6 @@
---- src/daemon/collectd.h.orig 2016-12-12 03:03:36.704279144 -0500
-+++ src/daemon/collectd.h 2017-01-03 07:53:41.101884000 -0500
-@@ -243,15 +243,15 @@
+--- src/daemon/collectd.h.orig 2017-01-23 07:53:57 UTC
++++ src/daemon/collectd.h
+@@ -243,15 +243,15 @@ typedef int _Bool;
#endif
#ifndef LOCALSTATEDIR
Index: head/net-mgmt/collectd5/files/patch-src__dns.c
===================================================================
--- head/net-mgmt/collectd5/files/patch-src__dns.c
+++ head/net-mgmt/collectd5/files/patch-src__dns.c
@@ -1,6 +1,6 @@
---- src/dns.c.orig 2016-12-12 03:03:36.708279115 -0500
-+++ src/dns.c 2017-01-03 08:10:33.137711000 -0500
-@@ -198,6 +198,15 @@
+--- src/dns.c.orig 2017-01-23 07:53:57 UTC
++++ src/dns.c
+@@ -198,6 +198,15 @@ static int dns_run_pcap_loop(void) {
pthread_sigmask(SIG_SETMASK, &sigmask, NULL);
}
Index: head/net-mgmt/collectd5/files/patch-src__modbus.c
===================================================================
--- head/net-mgmt/collectd5/files/patch-src__modbus.c
+++ head/net-mgmt/collectd5/files/patch-src__modbus.c
@@ -1,5 +1,5 @@
---- src/modbus.c.orig 2016-12-12 03:03:36.712279086 -0500
-+++ src/modbus.c 2017-01-03 08:12:39.318883000 -0500
+--- src/modbus.c.orig 2017-01-23 07:53:57 UTC
++++ src/modbus.c
@@ -26,6 +26,9 @@
#include "configfile.h"
#include "plugin.h"
Index: head/net-mgmt/collectd5/files/patch-src_zfs__arc.c
===================================================================
--- head/net-mgmt/collectd5/files/patch-src_zfs__arc.c
+++ head/net-mgmt/collectd5/files/patch-src_zfs__arc.c
@@ -1,6 +1,6 @@
---- src/zfs_arc.c.orig 2016-12-12 03:03:36.728278972 -0500
-+++ src/zfs_arc.c 2017-01-03 08:15:23.751003000 -0500
-@@ -286,8 +286,6 @@
+--- src/zfs_arc.c.orig 2017-01-23 07:53:57 UTC
++++ src/zfs_arc.c
+@@ -286,8 +286,6 @@ static int za_read(void) {
za_read_derive(ksp, "prefetch_metadata_hits", "cache_result",
"prefetch_metadata-hit");
za_read_derive(ksp, "demand_data_misses", "cache_result", "demand_data-miss");
Index: head/net-mgmt/collectd5/files/patch-version-gen.sh
===================================================================
--- head/net-mgmt/collectd5/files/patch-version-gen.sh
+++ head/net-mgmt/collectd5/files/patch-version-gen.sh
@@ -1,17 +1,13 @@
---- version-gen.sh.orig 2017-01-03 08:18:24.963614000 -0500
-+++ version-gen.sh 2017-01-03 08:19:07.743161000 -0500
-@@ -1,13 +1,2 @@
- #!/bin/sh
--
--DEFAULT_VERSION="5.7.0.git"
--
+--- version-gen.sh.orig 2017-02-03 20:46:49 UTC
++++ version-gen.sh
+@@ -2,10 +2,6 @@
+
+ DEFAULT_VERSION="5.7.1.git"
+
-if [ -d .git ]; then
- VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null | grep collectd | sed -e 's/^collectd-//' -e 's/-/./g'`"
-fi
-
--if test -z "$VERSION"; then
-- VERSION="$DEFAULT_VERSION"
--fi
--
--printf "%s" "$VERSION"
-+echo -n '5.7.0.git'
+ if test -z "$VERSION"; then
+ VERSION="$DEFAULT_VERSION"
+ fi

File Metadata

Mime Type
text/plain
Expires
Sun, Jun 14, 2:21 AM (8 h, 45 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33939040
Default Alt Text
D9444.id24899.diff (7 KB)

Event Timeline