svn commit: r533402 - branches/2020Q2/net-mgmt/netdata
Matthias Andree
mandree at FreeBSD.org
Wed Apr 29 23:15:52 UTC 2020
Author: mandree
Date: Wed Apr 29 23:15:51 2020
New Revision: 533402
URL: https://svnweb.freebsd.org/changeset/ports/533402
Log:
Partial MFH: r533207 (skipping upgrade)
net-mgmt/netdata (2020Q2): fix LIB_DEPENDS, reset maintainer
Fixes backported for non-default configurations:
- libuv is mandatory even if DBENGINE (default enabled) is disabled.
Move from DBENGINE_LIB_DEPENDS to LIB_DEPENDS to be
- libjson-c: enabled by default, but the disable option does not work
due to a configure.ac bug (so when libjson-c is available at build time,
it will be picked up in spite of --disable-jsonc, BTDT), and upstream
will make libjson-c make mandatory as only JSON parser.
https://github.com/netdata/netdata/issues/8841
So make it a hard LIB_DEPENDS requisite for consistency,
and remove the JSON option.
Bump PORTREVISION for the borderline situation where a non-cleanroom
build picked up libjson-c without recording it properly, or for the
benefit of non-default configurations, to trigger a rebuild.
Reset maintainer from mmokhi@ to ports@ to follow head/ while here
(repeated timeouts).
Approved by: ports-secteam@ (_DEPENDS blanket)
Modified:
branches/2020Q2/net-mgmt/netdata/Makefile
Modified: branches/2020Q2/net-mgmt/netdata/Makefile
==============================================================================
--- branches/2020Q2/net-mgmt/netdata/Makefile Wed Apr 29 22:50:08 2020 (r533401)
+++ branches/2020Q2/net-mgmt/netdata/Makefile Wed Apr 29 23:15:51 2020 (r533402)
@@ -3,16 +3,18 @@
PORTNAME= netdata
PORTVERSION= 1.20.0
-PORTREVISION= 1
+PORTREVISION= 2
DISTVERSIONPREFIX= v
CATEGORIES= net-mgmt
-MAINTAINER= mmokhi at FreeBSD.org
+MAINTAINER= ports at FreeBSD.org
COMMENT= Scalable distributed realtime performance and health monitoring
LICENSE= GPLv3
-LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid
+LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \
+ libuv.so:devel/libuv \
+ libjson-c.so:devel/json-c
RUN_DEPENDS= bash:shells/bash \
curl:ftp/curl \
@@ -48,9 +50,9 @@ SUB_FILES= ${PORTNAME}.conf.sample
USERS= netdata
GROUPS= netdata
-OPTIONS_DEFINE= CUPS DBENGINE FREEIPMI JSON LTO
+OPTIONS_DEFINE= CUPS DBENGINE FREEIPMI 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}}
@@ -62,16 +64,11 @@ 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
-
-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
More information about the svn-ports-branches
mailing list