diff --git a/net-mgmt/netdata/Makefile b/net-mgmt/netdata/Makefile index 163ec8920e4c..0c31e16465d6 100644 --- a/net-mgmt/netdata/Makefile +++ b/net-mgmt/netdata/Makefile @@ -2,14 +2,19 @@ PORTNAME= netdata DISTVERSIONPREFIX= v -DISTVERSION= 1.29.2 +DISTVERSION= 1.31.0 CATEGORIES= net-mgmt MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ +# Pull in patch to fix interrupt graphs - Upstream PR #11159 +PATCH_SITES= https://github.com/netdata/netdata/pull/ +PATCHFILES= 11159.patch:-p1 + MAINTAINER= ports@FreeBSD.org COMMENT= Scalable distributed realtime performance and health monitoring LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libjson-c.so:devel/json-c \ libuuid.so:misc/e2fsprogs-libuuid \ @@ -53,23 +58,22 @@ OPTIONS_SUB= YES CLOUD_DESC= Enable cloud functionality CUPS_DESC= Enable support for cups -DBENGINE_DESC= Enable support for database engine -FREEIPMI_DESC= Enable support for freeipmi +DBENGINE_DESC= Enable support for database engine +FREEIPMI_DESC= Enable support for freeipmi GOPLUGIN_DESC= Enable the go collector plugin -CLOUD_CONFIGURE_OFF= --disable-cloud -CLOUD_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-web_gui_index.html \ - ${FILESDIR}/extra-patch-web_gui_main.js -CUPS_LIB_DEPENDS= libcups.so:print/cups -CUPS_CONFIGURE_ENABLE= plugin-cups +CLOUD_CONFIGURE_ON= --with-aclk-ng +CLOUD_CONFIGURE_OFF= --disable-cloud +CUPS_LIB_DEPENDS= libcups.so:print/cups +CUPS_CONFIGURE_ENABLE= plugin-cups DBENGINE_LIB_DEPENDS= libJudy.so:devel/judy \ liblz4.so:archivers/liblz4 DBENGINE_CONFIGURE_ENABLE= dbengine FREEIPMI_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipmi FREEIPMI_CONFIGURE_ENABLE= plugin-freeipmi -GOPLUGIN_RUN_DEPENDS= ${LOCALBASE}/libexec/netdata/plugins.d/god.plugin:net-mgmt/netdata-go -LTO_USES= compiler:c11 -LTO_CONFIGURE_ENABLE= lto +GOPLUGIN_RUN_DEPENDS= ${LOCALBASE}/libexec/netdata/plugins.d/god.plugin:net-mgmt/netdata-go +LTO_USES= compiler:c11 +LTO_CONFIGURE_ENABLE= lto .include .if ${PORT_OPTIONS:MLTO} && ${OPSYS}_${OSREL:R} == FreeBSD_11 @@ -85,6 +89,8 @@ NETDATA_LOG= /var/log/${PORTNAME} NETDATA_PERST= /var/db/${PORTNAME} post-patch: + @${REINPLACE_CMD} -e 's|%%DISTVERSION%%|${DISTVERSION}|g' \ + ${PATCH_WRKSRC}/configure.ac @${REINPLACE_CMD} -e 's|%%NETDATA_CACHE%%|${NETDATA_CACHE}|g' \ ${PATCH_WRKSRC}/configure.ac @${REINPLACE_CMD} -e 's|%%NETDATA_LOG%%|${NETDATA_LOG}|g' \ @@ -105,7 +111,7 @@ post-install: ${MKDIR} ${STAGEDIR}${NETDATA_PERST} (for fi in ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*.conf \ ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*/*.conf \ - ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*.txt ; do \ + ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*/*.txt ; do \ ${MV} $$fi $$fi".sample"; \ done) diff --git a/net-mgmt/netdata/distinfo b/net-mgmt/netdata/distinfo index c01848f7d642..5675fdfd3116 100644 --- a/net-mgmt/netdata/distinfo +++ b/net-mgmt/netdata/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1613694033 -SHA256 (netdata-v1.29.2.tar.gz) = 3419a2b54cd29946900e88fa96f8235b6db50bafa615a35c0035887e8a3f5074 -SIZE (netdata-v1.29.2.tar.gz) = 6736119 +TIMESTAMP = 1621444394 +SHA256 (netdata-v1.31.0.tar.gz) = ca68f725224e8bbec041b493891376fbf41aedb47c4ac06161c2eda990089c9f +SIZE (netdata-v1.31.0.tar.gz) = 12528280 +SHA256 (11159.patch) = 4a053753a06ea90c7fe0f58f26241fef2134a9784723366ae9819d0f5a172d99 +SIZE (11159.patch) = 5085 diff --git a/net-mgmt/netdata/files/extra-patch-web_gui_index.html b/net-mgmt/netdata/files/extra-patch-web_gui_index.html deleted file mode 100644 index 18aa0dbb61ff..000000000000 --- a/net-mgmt/netdata/files/extra-patch-web_gui_index.html +++ /dev/null @@ -1,28 +0,0 @@ ---- web/gui/index.html.orig 2020-04-13 16:02:25 UTC -+++ web/gui/index.html -@@ -90,7 +90,9 @@ - -