Index: head/net-mgmt/netdata/Makefile =================================================================== --- head/net-mgmt/netdata/Makefile (revision 533206) +++ head/net-mgmt/netdata/Makefile (revision 533207) @@ -1,111 +1,112 @@ # Created by: Mahdi Mokhtari # $FreeBSD$ PORTNAME= netdata -PORTVERSION= 1.20.0 -PORTREVISION= 3 +PORTVERSION= 1.21.1 DISTVERSIONPREFIX= v CATEGORIES= net-mgmt -MAINTAINER= mmokhi@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Scalable distributed realtime performance and health monitoring LICENSE= GPLv3 -LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid +LIB_DEPENDS= libjson-c.so:devel/json-c \ + libuuid.so:misc/e2fsprogs-libuuid \ + libuv.so:devel/libuv RUN_DEPENDS= bash:shells/bash \ curl:ftp/curl \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR} USES= autoreconf cpe pathfix pkgconfig:both python shebangfix ssl USE_GITHUB= yes SHEBANG_GLOB= * NETDATA_CACHE= /var/cache/${PORTNAME} NETDATA_LOG= /var/log/${PORTNAME} NETDATA_PERST= /var/db/${PORTNAME} GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-unit-tests CPPFLAGS+= -D_WANT_VMMETER INSTALL_TARGET= install-strip SUB_LIST= NETDATA_CACHE=${NETDATA_CACHE} \ NETDATA_LOG=${NETDATA_LOG} \ NETDATA_PERST=${NETDATA_PERST} PLIST_SUB= NETDATA_CACHE=${NETDATA_CACHE} \ NETDATA_LOG=${NETDATA_LOG} \ NETDATA_PERST=${NETDATA_PERST} USE_RC_SUBR= ${PORTNAME} SUB_FILES= ${PORTNAME}.conf.sample USERS= netdata GROUPS= netdata -OPTIONS_DEFINE= CUPS DBENGINE FREEIPMI GOPLUGIN JSON LTO +OPTIONS_DEFINE= CLOUD CUPS DBENGINE FREEIPMI GOPLUGIN LTO OPTIONS_SUB= YES -OPTIONS_DEFAULT= DBENGINE JSON +OPTIONS_DEFAULT= DBENGINE OPTIONS_DEFAULT_FreeBSD_12= LTO OPTIONS_DEFAULT_FreeBSD_13= LTO OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}} +CLOUD_DESC= Enable cloud functionality +CLOUD_CONFIGURE_OFF= --disable-cloud +CLOUD_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-web_gui_index.html \ + ${FILESDIR}/extra-patch-web_gui_main.js + CUPS_DESC= Enable support for cups CUPS_CONFIGURE_ENABLE= plugin-cups CUPS_LIB_DEPENDS= libcups.so:print/cups DBENGINE_DESC= Enable support for database engine DBENGINE_CONFIGURE_ENABLE= dbengine DBENGINE_LIB_DEPENDS= libJudy.so:devel/judy \ - liblz4.so:archivers/liblz4 \ - libuv.so:devel/libuv + liblz4.so:archivers/liblz4 FREEIPMI_DESC= Enable support for freeipmi FREEIPMI_CONFIGURE_ENABLE= plugin-freeipmi FREEIPMI_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipmi GOPLUGIN_DESC= Enable the go collector plugin GOPLUGIN_RUN_DEPENDS= ${LOCALBASE}/libexec/netdata/plugins.d/god.plugin:net-mgmt/netdata-go -JSON_DESC= Enable support for json -JSON_CONFIGURE_ENABLE= jsonc -JSON_LIB_DEPENDS= libjson-c.so:devel/json-c - LTO_DESC= Use Link-Time Optimization LTO_CONFIGURE_ENABLE= lto LTO_USES= compiler:c11 .include .if ${PORT_OPTIONS:MLTO} && ${OPSYS}_${OSREL:R} == FreeBSD_11 BROKEN= Link-Time Optimization breaks compilation on FreeBSD 11 .endif post-patch: @${REINPLACE_CMD} -e 's|%%NETDATA_CACHE%%|${NETDATA_CACHE}|g' \ ${PATCH_WRKSRC}/configure.ac @${REINPLACE_CMD} -e 's|%%NETDATA_LOG%%|${NETDATA_LOG}|g' \ ${PATCH_WRKSRC}/configure.ac @${REINPLACE_CMD} -e 's|%%NETDATA_PERST%%|${NETDATA_PERST}|g' \ ${PATCH_WRKSRC}/configure.ac @${REINPLACE_CMD} -e 's|%%ETCDIR%%|${ETCDIR}|g' \ ${PATCH_WRKSRC}/configure.ac @${REINPLACE_CMD} -e 's|%%PYTHON%%|${PYTHON_CMD}|g' \ ${PATCH_WRKSRC}/collectors/python.d.plugin/python.d.plugin.in post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKDIR}/netdata.conf.sample ${STAGEDIR}${ETCDIR}/netdata.conf.sample ${MKDIR} ${STAGEDIR}${NETDATA_CACHE} ${MKDIR} ${STAGEDIR}${NETDATA_LOG} ${MKDIR} ${STAGEDIR}${NETDATA_PERST} - (for file in ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*.conf \ + (for fi in ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*.conf \ ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*/*.conf; do \ - ${MV} $$file $$file".sample"; \ + ${MV} $$fi $$fi".sample"; \ done) .include Index: head/net-mgmt/netdata/distinfo =================================================================== --- head/net-mgmt/netdata/distinfo (revision 533206) +++ head/net-mgmt/netdata/distinfo (revision 533207) @@ -1,3 +1,3 @@ -TIMESTAMP = 1583350154 -SHA256 (netdata-netdata-v1.20.0_GH0.tar.gz) = c739e0fa8d6d7f433c0c7c8016b763e8f70519d67f0b5e7eca9ee5318f210d90 -SIZE (netdata-netdata-v1.20.0_GH0.tar.gz) = 3598521 +TIMESTAMP = 1587324548 +SHA256 (netdata-netdata-v1.21.1_GH0.tar.gz) = 60cdde3f1f8bd9035fef6a566053c0a7195d1714b5da6814473263e85382b4a8 +SIZE (netdata-netdata-v1.21.1_GH0.tar.gz) = 3748090 Index: head/net-mgmt/netdata/files/extra-patch-web_gui_index.html =================================================================== --- head/net-mgmt/netdata/files/extra-patch-web_gui_index.html (nonexistent) +++ head/net-mgmt/netdata/files/extra-patch-web_gui_index.html (revision 533207) @@ -0,0 +1,28 @@ +--- web/gui/index.html.orig 2020-04-13 16:02:25 UTC ++++ web/gui/index.html +@@ -90,7 +90,9 @@ + +