5 files changed, 9 insertions, 103 deletions

diff --git a/net-mgmt/netdata/files/patch-configure.ac b/net-mgmt/netdata/files/patch-configure.ac
index e63cd799ee77..499f7a32a1cd 100644
--- a/net-mgmt/netdata/files/patch-configure.ac
+++ b/net-mgmt/netdata/files/patch-configure.ac
@@ -1,14 +1,5 @@
 --- configure.ac.orig	2017-01-22 19:49:22 UTC
 +++ configure.ac
-@@ -162,7 +162,7 @@ PKG_CHECK_MODULES(
- 	[UUID],
- 	[uuid],
- )
--test -z "${UUID_LIBS}" && AC_MSG_ERROR([libuuid required but not found. Try installing 'uuid-dev' or 'libuuid-devel'.])
-+test -z "${UUID_LIBS}" && AC_MSG_ERROR([libuuid required but not found. Try installing 'misc/e2fsprogs-libuuid'.])
- AC_DEFINE([NETDATA_WITH_UUID], [1], [uuid settings])
- OPTIONAL_UUID_CLFAGS="${UUID_CFLAGS}"
- OPTIONAL_UUID_LIBS="${UUID_LIBS}"
 @@ -214,14 +214,14 @@ fi
  
  AC_DEFINE_UNQUOTED([NETDATA_USER], ["${with_user}"], [use this user to drop privileged])
diff --git a/net-mgmt/netdata/files/patch-src_Makefile.am b/net-mgmt/netdata/files/patch-src_Makefile.am
deleted file mode 100644
index af5f92672d5a..000000000000
--- a/net-mgmt/netdata/files/patch-src_Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/Makefile.am.orig	2017-01-22 19:49:22 UTC
-+++ src/Makefile.am
-@@ -135,6 +135,12 @@ apps_plugin_SOURCES = \
- 	web_buffer.c web_buffer.h \
- 	$(NULL)
- 
-+if FREEBSD
-+apps_plugin_SOURCES += \
-+	plugin_freebsd.h \
-+	$(NULL)
-+endif
-+
- install-data-hook:
- 	if [ `id -u` == 0 ]; then \
- 		chown root '$(DESTDIR)$(pluginsdir)/apps.plugin' && \
diff --git a/net-mgmt/netdata/files/patch-src_freebsd__sysctl.c b/net-mgmt/netdata/files/patch-src_freebsd__sysctl.c
index b75202b457a5..bb7a63533945 100644
--- a/net-mgmt/netdata/files/patch-src_freebsd__sysctl.c
+++ b/net-mgmt/netdata/files/patch-src_freebsd__sysctl.c
@@ -1,26 +1,11 @@
---- src/freebsd_sysctl.c.orig	2017-01-22 19:49:22 UTC
+--- src/freebsd_sysctl.c.orig	2017-03-20 18:26:59 UTC
 +++ src/freebsd_sysctl.c
-@@ -828,7 +828,11 @@ int do_freebsd_sysctl(int update_every, 
-         if (unlikely(GETSYSCTL("vm.stats.vm.v_active_count",    vmmeter_data.v_active_count) ||
-                      GETSYSCTL("vm.stats.vm.v_inactive_count",  vmmeter_data.v_inactive_count) ||
-                      GETSYSCTL("vm.stats.vm.v_wire_count",      vmmeter_data.v_wire_count) ||
-+#if (__FreeBSD__ >= 12) && (__FreeBSD_version >= 1200016)
-+                     0 ||
-+#else
-                      GETSYSCTL("vm.stats.vm.v_cache_count",     vmmeter_data.v_cache_count) ||
+@@ -1,3 +1,8 @@
++#if __FreeBSD__ < 11 || __FreeBSD_version < 1100000
++#define _IFI_OQDROPS
++#define _IN_NET_RTSOCK_C
 +#endif
-                      GETSYSCTL("vfs.bufspace",                  vfs_bufspace_count) ||
-                      GETSYSCTL("vm.stats.vm.v_free_count",      vmmeter_data.v_free_count))) {
-             do_ram = 0;
-@@ -850,7 +854,11 @@ int do_freebsd_sysctl(int update_every, 
-             rrddim_set(st, "active",    vmmeter_data.v_active_count);
-             rrddim_set(st, "inactive",  vmmeter_data.v_inactive_count);
-             rrddim_set(st, "wired",     vmmeter_data.v_wire_count);
-+#if (__FreeBSD__ >= 12) && (__FreeBSD_version >= 1200016)
-+            rrddim_set(st, "cache",     0);
-+#else
-             rrddim_set(st, "cache",     vmmeter_data.v_cache_count);
-+#endif
-             rrddim_set(st, "buffers",   vfs_bufspace_count);
-             rrddim_set(st, "free",      vmmeter_data.v_free_count);
-             rrdset_done(st);
++
+ #include "common.h"
+ 
+ #include <sys/vmmeter.h>
diff --git a/net-mgmt/netdata/files/patch-src_plugin__freebsd.c b/net-mgmt/netdata/files/patch-src_plugin__freebsd.c
deleted file mode 100644
index 15a9a2ac72da..000000000000
--- a/net-mgmt/netdata/files/patch-src_plugin__freebsd.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/plugin_freebsd.c.orig	2017-01-22 19:49:22 UTC
-+++ src/plugin_freebsd.c
-@@ -1,6 +1,6 @@
- #include "common.h"
- 
--void *freebsd_main(void *ptr) {
-+extern void *freebsd_main(void *ptr) {
-     struct netdata_static_thread *static_thread = (struct netdata_static_thread *)ptr;
- 
-     info("FREEBSD Plugin thread created with task id %d", gettid());
-@@ -63,17 +63,3 @@ void *freebsd_main(void *ptr) {
-     return NULL;
- }
- 
--int getsysctl(const char *name, void *ptr, size_t len)
--{
--    size_t nlen = len;
--
--    if (unlikely(sysctlbyname(name, ptr, &nlen, NULL, 0) == -1)) {
--        error("FREEBSD: sysctl(%s...) failed: %s", name, strerror(errno));
--        return 1;
--    }
--    if (unlikely(nlen != len)) {
--        error("FREEBSD: sysctl(%s...) expected %lu, got %lu", name, (unsigned long)len, (unsigned long)nlen);
--        return 1;
--    }
--    return 0;
--}
diff --git a/net-mgmt/netdata/files/patch-src_plugin__freebsd.h b/net-mgmt/netdata/files/patch-src_plugin__freebsd.h
deleted file mode 100644
index add7a19b16fd..000000000000
--- a/net-mgmt/netdata/files/patch-src_plugin__freebsd.h
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/plugin_freebsd.h.orig	2017-01-22 19:49:22 UTC
-+++ src/plugin_freebsd.h
-@@ -6,9 +6,22 @@
- #define GETSYSCTL(name, var) getsysctl(name, &(var), sizeof(var))
- 
- void *freebsd_main(void *ptr);
-+extern int do_freebsd_sysctl(int update_every, usec_t dt);
- 
--int getsysctl(const char *name, void *ptr, size_t len);
-+static inline
-+int getsysctl(const char *name, void *ptr, size_t len)
-+{
-+    size_t nlen = len;
- 
--extern int do_freebsd_sysctl(int update_every, usec_t dt);
-+    if (unlikely(sysctlbyname(name, ptr, &nlen, NULL, 0) == -1)) {
-+        error("FREEBSD: sysctl(%s...) failed: %s", name, strerror(errno));
-+        return 1;
-+    }
-+    if (unlikely(nlen != len)) {
-+        error("FREEBSD: sysctl(%s...) expected %lu, got %lu", name, (unsigned long)len, (unsigned long)nlen);
-+        return 1;
-+    }
-+    return 0;
-+}
- 
- #endif /* NETDATA_PLUGIN_FREEBSD_H */