3 files changed, 29 insertions, 35 deletions

diff --git a/net-mgmt/netdata/Makefile b/net-mgmt/netdata/Makefile
index 7bcad46bad8b..ab7aae0d8952 100644
--- a/net-mgmt/netdata/Makefile
+++ b/net-mgmt/netdata/Makefile
@@ -3,8 +3,7 @@
 
 PORTNAME=	netdata
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.28.0
-PORTREVISION=	1
+DISTVERSION=	1.29.1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
 
@@ -23,63 +22,54 @@ RUN_DEPENDS=	bash:shells/bash \
 
 USES=		autoreconf cpe gmake pathfix pkgconfig:both python shebangfix \
 		ssl
+USE_RC_SUBR=	${PORTNAME}
 
 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
+CPPFLAGS+=	-D_WANT_VMMETER
 
+SUB_FILES=	${PORTNAME}.conf.sample
 SUB_LIST=	NETDATA_CACHE=${NETDATA_CACHE} \
 		NETDATA_LOG=${NETDATA_LOG} \
 		NETDATA_PERST=${NETDATA_PERST}
 
+USERS=		netdata
+GROUPS=		netdata
+
 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=		CLOUD CUPS DBENGINE FREEIPMI GOPLUGIN LTO
-OPTIONS_SUB=		YES
 OPTIONS_DEFAULT=	DBENGINE
 OPTIONS_DEFAULT_FreeBSD_12=	LTO
 OPTIONS_DEFAULT_FreeBSD_13=	LTO
 OPTIONS_DEFAULT_FreeBSD_14=	LTO
 OPTIONS_DEFAULT+=	${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}}
+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
+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_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
+CUPS_CONFIGURE_ENABLE=	plugin-cups
 DBENGINE_LIB_DEPENDS=		libJudy.so:devel/judy \
 				liblz4.so:archivers/liblz4
-
-FREEIPMI_DESC=			Enable support for freeipmi
-FREEIPMI_CONFIGURE_ENABLE=	plugin-freeipmi
+DBENGINE_CONFIGURE_ENABLE=	dbengine
 FREEIPMI_LIB_DEPENDS=		libfreeipmi.so:sysutils/freeipmi
-
-GOPLUGIN_DESC=		Enable the go collector plugin
+FREEIPMI_CONFIGURE_ENABLE=	plugin-freeipmi
 GOPLUGIN_RUN_DEPENDS=	${LOCALBASE}/libexec/netdata/plugins.d/god.plugin:net-mgmt/netdata-go
-
-LTO_CONFIGURE_ENABLE=	lto
 LTO_USES=		compiler:c11
+LTO_CONFIGURE_ENABLE=	lto
 
 .include <bsd.port.options.mk>
 .if ${PORT_OPTIONS:MLTO} && ${OPSYS}_${OSREL:R} == FreeBSD_11
@@ -90,6 +80,10 @@ BROKEN=		Link-Time Optimization breaks compilation on FreeBSD 11
 USE_GCC=	yes
 .endif
 
+NETDATA_CACHE=	/var/cache/${PORTNAME}
+NETDATA_LOG=	/var/log/${PORTNAME}
+NETDATA_PERST=	/var/db/${PORTNAME}
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%NETDATA_CACHE%%|${NETDATA_CACHE}|g' \
 	    ${PATCH_WRKSRC}/configure.ac
diff --git a/net-mgmt/netdata/distinfo b/net-mgmt/netdata/distinfo
index 0bd920e7c8e7..2167ba4af6af 100644
--- a/net-mgmt/netdata/distinfo
+++ b/net-mgmt/netdata/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1608455138
-SHA256 (netdata-v1.28.0.tar.gz) = 44801e240b1883a98d203156397cc8d9232492f3136891e61074e2e7facbf1a8
-SIZE (netdata-v1.28.0.tar.gz) = 6718808
+TIMESTAMP = 1612987143
+SHA256 (netdata-v1.29.1.tar.gz) = d993001ed91da771214ffb7adb99d6c8c8e7384a10c88fe54feb7f8f883d5b2d
+SIZE (netdata-v1.29.1.tar.gz) = 6731698
diff --git a/net-mgmt/netdata/pkg-plist b/net-mgmt/netdata/pkg-plist
index a175a9affef5..db77d8537672 100644
--- a/net-mgmt/netdata/pkg-plist
+++ b/net-mgmt/netdata/pkg-plist
@@ -1,5 +1,6 @@
 %%ETCDIR%%/.opt-out-from-anonymous-statistics
 %%ETCDIR%%/edit-config
+@sample(netdata,netdata,0640) %%ETCDIR%%/netdata.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/apps_groups.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/aws_kinesis.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d.conf.sample
@@ -312,8 +313,8 @@ libexec/netdata/python.d/uwsgi.chart.py
 libexec/netdata/python.d/varnish.chart.py
 libexec/netdata/python.d/w1sensor.chart.py
 libexec/netdata/python.d/web_log.chart.py
-sbin/netdata-claim.sh
 sbin/netdata
+sbin/netdata-claim.sh
 sbin/netdatacli
 @mode 4640
 @owner netdata
@@ -403,11 +404,11 @@ sbin/netdatacli
 %%DATADIR%%/web/lib/pako-1.0.6.min.js
 %%DATADIR%%/web/lib/perfect-scrollbar-0.6.15.min.js
 %%DATADIR%%/web/lib/tableExport-1.6.0.min.js
-%%DATADIR%%/web/old/index.html
 %%DATADIR%%/web/main.css
 %%DATADIR%%/web/main.js
 %%DATADIR%%/web/netdata-swagger.json
 %%DATADIR%%/web/netdata-swagger.yaml
+%%DATADIR%%/web/old/index.html
 %%DATADIR%%/web/refresh-badges.js
 %%DATADIR%%/web/robots.txt
 %%DATADIR%%/web/sitemap.xml
@@ -417,8 +418,6 @@ sbin/netdatacli
 @mode
 @owner
 @group
-@sample(netdata,netdata,0640) %%ETCDIR%%/netdata.conf.sample
-@dir(netdata,netdata,0750) %%ETCDIR%%
 @dir(netdata,netdata,0750) %%ETCDIR%%/charts.d
 @dir(netdata,netdata,0750) %%ETCDIR%%/custom-plugins.d
 @dir(netdata,netdata,0750) %%ETCDIR%%/go.d
@@ -427,8 +426,9 @@ sbin/netdatacli
 @dir(netdata,netdata,0750) %%ETCDIR%%/python.d
 @dir(netdata,netdata,0750) %%ETCDIR%%/ssl
 @dir(netdata,netdata,0750) %%ETCDIR%%/statsd.d
-@dir(netdata,netdata,0750) %%DATADIR%%
+@dir(netdata,netdata,0750) %%ETCDIR%%
 @dir(netdata,netdata,0750) %%DATADIR%%/web
+@dir(netdata,netdata,0750) %%DATADIR%%
 @dir(netdata,netdata,0750) %%NETDATA_CACHE%%
 @dir(netdata,netdata,0750) %%NETDATA_PERST%%
 @dir(netdata,netdata,0750) %%NETDATA_LOG%%