From owner-svn-ports-all@freebsd.org Mon Apr 27 23:07:03 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EC7682C9BEF; Mon, 27 Apr 2020 23:07:03 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49B0lq60HWz3M5n; Mon, 27 Apr 2020 23:07:03 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C8FC71A5F7; Mon, 27 Apr 2020 23:07:03 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03RN73sa050638; Mon, 27 Apr 2020 23:07:03 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03RN72a6050630; Mon, 27 Apr 2020 23:07:02 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <202004272307.03RN72a6050630@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Mon, 27 Apr 2020 23:07:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r533207 - in head/net-mgmt/netdata: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: in head/net-mgmt/netdata: . files X-SVN-Commit-Revision: 533207 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Apr 2020 23:07:04 -0000 Author: mandree Date: Mon Apr 27 23:07:02 2020 New Revision: 533207 URL: https://svnweb.freebsd.org/changeset/ports/533207 Log: net-mgmt/netdata: Update to 1.21.1 Update netdata to 1.21.1 Move cloud related changes to extra-patch Additional patch for cloud added Remove "Nodes" button when cloud support is disabled Source: https://git.progress-linux.org/distributions/engywuck-backports/packages/netdata/tree/debian/patches/debian/0011-remove-login.patch to extra-patch Tested on FreeBSD 13.0-CURRENT #0 r358620 (AMD64) Poudriere OK 12.1-RELEASE ---------------- Reset maintainer to ports@ after repeated maintainer timeout from mmokhi@. Over Daniel's submission, make libuv an unconditional requisite, and also json-c because netdata's configure.ac cannot disable it and might pick it up, leading to unregistered dependencies if json-c is available at compile time (in, for instance, portmaster or live systems). Remove the JSON option. PR: 245603 Submitted by: Daniel Engberg Approved by: maintainer timeout (mmokhi@, 15 days, resetting) Added: head/net-mgmt/netdata/files/extra-patch-web_gui_index.html (contents, props changed) head/net-mgmt/netdata/files/extra-patch-web_gui_main.js (contents, props changed) Modified: head/net-mgmt/netdata/Makefile head/net-mgmt/netdata/distinfo head/net-mgmt/netdata/files/patch-web_gui_index.html head/net-mgmt/netdata/pkg-plist Modified: head/net-mgmt/netdata/Makefile ============================================================================== --- head/net-mgmt/netdata/Makefile Mon Apr 27 22:20:40 2020 (r533206) +++ head/net-mgmt/netdata/Makefile Mon Apr 27 23:07:02 2020 (r533207) @@ -2,17 +2,18 @@ # $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 \ @@ -48,13 +49,18 @@ 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 @@ -62,8 +68,7 @@ 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 @@ -72,10 +77,6 @@ FREEIPMI_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipm 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 @@ -103,9 +104,9 @@ post-install: ${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 Modified: head/net-mgmt/netdata/distinfo ============================================================================== --- head/net-mgmt/netdata/distinfo Mon Apr 27 22:20:40 2020 (r533206) +++ head/net-mgmt/netdata/distinfo Mon Apr 27 23:07:02 2020 (r533207) @@ -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 Added: head/net-mgmt/netdata/files/extra-patch-web_gui_index.html ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/netdata/files/extra-patch-web_gui_index.html Mon Apr 27 23:07:02 2020 (r533207) @@ -0,0 +1,28 @@ +--- web/gui/index.html.orig 2020-04-13 16:02:25 UTC ++++ web/gui/index.html +@@ -90,7 +90,9 @@ + +