diff --git a/databases/jrrd/Makefile b/databases/jrrd/Makefile
index cbc6b8211544..8a011493a5f0 100644
--- a/databases/jrrd/Makefile
+++ b/databases/jrrd/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	jrrd
 PORTVERSION=	1.1.4
+PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	SF/opennms/JRRD/stable-1.0
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java native interface (JNI) to RRDtool
 WWW=		https://www.opennms.org/index.php/Jrrd
 
 LIB_DEPENDS=	librrd.so:databases/rrdtool
 
 USES=		libtool
 USE_JAVA=	yes
 JAVA_VENDOR=	openjdk
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	JAVA_HOME=${JAVA_HOME}
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
 PLIST_FILES=	%%JAVAJARDIR%%/jrrd.jar \
 		lib/libjrrd.so
 
 pre-everything::
 	@${ECHO_MSG}	""
 	@${ECHO_MSG}	"Installation settings:"
 	@${ECHO_MSG}	"   Location of JDK:          ${JAVA_HOME}"
 	@${ECHO_MSG}	"   Location of Java port:    ${JAVA_PORT}"
 	@${ECHO_MSG}	""
 
 .include <bsd.port.mk>
diff --git a/databases/pecl-rrd/Makefile b/databases/pecl-rrd/Makefile
index 12999f75834f..8a2e103913c1 100644
--- a/databases/pecl-rrd/Makefile
+++ b/databases/pecl-rrd/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	rrd
 DISTVERSION=	2.0.3
+PORTREVISION=	1
 CATEGORIES=	databases pear
 
 MAINTAINER=	flo@FreeBSD.org
 COMMENT=	PHP bindings to rrd tool system
 WWW=		https://pecl.php.net/package/rrd
 
 LICENSE=	PHP301
 
 LIB_DEPENDS=	librrd.so:databases/rrdtool
 USES=		php:pecl localbase pkgconfig
 
 .include <bsd.port.mk>
diff --git a/databases/py-rrdtool/Makefile b/databases/py-rrdtool/Makefile
index 24570c694249..ea506d1bc223 100644
--- a/databases/py-rrdtool/Makefile
+++ b/databases/py-rrdtool/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	rrdtool
 DISTVERSION=	0.1.16
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX} # Bindings name is different from https://pypi.org/project/rrdtool/
 
 MAINTAINER=	darius@dons.net.au
 COMMENT=	Python interface to RRDTool, the graphing and logging utility
 WWW=		https://github.com/commx/python-rrdtool
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	librrd.so:databases/rrdtool
 
 USES=		python
 USE_PYTHON=	autoplist distutils
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/rrdtool*.so
 
 .include <bsd.port.mk>
diff --git a/databases/rrdman/Makefile b/databases/rrdman/Makefile
index e9e19aa2a351..c2fb3d6cac19 100644
--- a/databases/rrdman/Makefile
+++ b/databases/rrdman/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	rrdman
 PORTVERSION=	1.0.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	databases
 MASTER_SITES=	SF/rrfw/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Apply Holt-Winters prediction parameters to RRD data
 WWW=		https://rrfw.sourceforge.net/rrdman/
 
 BUILD_DEPENDS=	rrdtool:databases/rrdtool
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	YES
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 USES=		perl5
 PLIST_FILES=	bin/rrd_hwreapply share/man/man1/rrd_hwreapply.1.gz
 
 .include <bsd.port.mk>
diff --git a/mail/opendkim-devel/Makefile b/mail/opendkim-devel/Makefile
index 9053f3e023aa..f12c4cfc0bfa 100644
--- a/mail/opendkim-devel/Makefile
+++ b/mail/opendkim-devel/Makefile
@@ -1,230 +1,230 @@
 PORTNAME=	opendkim
 DISTVERSIONPREFIX=	rel-opendkim-
 DISTVERSION=	2.11.0-Beta2-48
 DISTVERSIONSUFFIX=	-g551ab382
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail security
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	DKIM library and milter implementation
 WWW=		http://opendkim.org/
 
 LICENSE=	BSD3CLAUSE SENDMAIL
 LICENSE_COMB=	multi
 LICENSE_GROUPS_SENDMAIL=	FSF OSI
 LICENSE_NAME_SENDMAIL=	Sendmail Open Source License
 LICENSE_FILE_SENDMAIL=	${WRKSRC}/LICENSE.Sendmail
 LICENSE_PERMS_SENDMAIL=		dist-mirror dist-sell pkg-mirror pkg-sell \
 				auto-accept
 
 USES=		autoreconf cpe libtool perl5 pkgconfig shebangfix ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	trusteddomainproject
 GH_PROJECT=	OpenDKIM
 USE_LDCONFIG=	yes
 USE_PERL5=	run
 
 SHEBANG_FILES=	opendkim/opendkim-genkey* reprrd/opendkim-reprrdimport* \
 		reputation/opendkim-* stats/opendkim-*
 
 GNU_CONFIGURE=	yes
 
 MAKE_ARGS=	pkgconfigdir="${PREFIX}/libdata/pkgconfig"
 MAKE_ENV=	INSTALL_STRIP_FLAG=${STRIP}
 TEST_TARGET=	check
 
 CONFLICTS_INSTALL=	opendkim
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=			BDB_BASE CURL DOCS FILTER GNUTLS JANSSON LDNS \
 				LMDB LUA MEMCACHED OPENDBX OPENLDAP POPAUTH \
 				QUERY_CACHE SASL
 OPTIONS_DEFAULT=		FILTER LUA UNBOUND
 OPTIONS_GROUP=			DEVELOPER FFR
 OPTIONS_GROUP_DEVELOPER=	ALLSYMBOLS CODECOVERAGE DEBUG
 OPTIONS_GROUP_FFR=		ADSP_LISTS ATPS DB_HANDLE_POOLS DEFAULT_SENDER \
 				DIFFHEADERS IDENTITY_HEADER LDAP_CACHING \
 				LUA_ONLY_SIGNING POSTGRES_RECONNECT_HACK \
 				RATE_LIMIT RBL REPLACE_RULES REPRRD REPUTATION \
 				RESIGN SENDER_MACRO SOCKETDB STATS STATSEXT VBR
 OPTIONS_SINGLE=			RESOLV
 OPTIONS_SINGLE_RESOLV=		STOCK_RESOLVER UNBOUND
 NO_OPTIONS_SORT=	yes
 OPTIONS_SUB=			yes
 
 ADSP_LISTS_DESC=		ADSP filtering for lists (experimental)
 ALLSYMBOLS_DESC=		Export all internal symbols for better test coverage
 ATPS_DESC=			Authorized Third Party Sign check
 BDB_BASE_DESC=			Use Berkeley DB from base
 CODECOVERAGE_DESC=		Enable internal code-coverage/profiling
 CURL_DESC=			Use cURL for web queries
 DB_HANDLE_POOLS_DESC=		Database handle pools (experimental)
 DEBUG_DESC=			Build with debug symbols
 DEFAULT_SENDER_DESC=		Default sender address
 DEVELOPER_DESC=			Options useful for OpenDKIM development
 DIFFHEADERS_DESC=		Compare signed and verified headers (experimental)
 FFR_DESC=			Use features marked as For-Future-Releases
 FILTER_DESC=			OpenDKIM filter, requires libmilter/Sendmail
 GNUTLS_DESC=			Use GnuTLS instead of OpenSSL
 IDENTITY_HEADER_DESC=		Special header to set identity
 JANSSON_DESC=			Statistics and other output as JSON data
 LDAP_CACHING_DESC=		LDAP query piggybacking and caching
 LDNS_DESC=			Use LDNS library for DNS queries
 LMDB_DESC=			Use Lightning Memory-Mapped DB key-value store
 LUA_DESC=			Describe filter policy with lua
 LUA_ONLY_SIGNING_DESC=		Message signing by Lua only
 MEMCACHED_DESC=			Use memcached as a data set
 OPENDBX_DESC=			Store filter policies via OpenDBX
 OPENLDAP_DESC=			Store filter policies in LDAP
 POPAUTH_DESC=			Use POP authentication DB
 POSTGRES_RECONNECT_HACK_DESC=	PostgreSQL connection error detection bug hack
 QUERY_CACHE_DESC=		Cache DNS query results locally
 RATE_LIMIT_DESC=		DKIM based rate limiting support
 RBL_DESC=			Realtime Blacklist query support
 REPLACE_RULES_DESC=		String substition when signing
 REPRRD_DESC=			Support for collaborative reputation that uses rrdtool (experimental)
 REPUTATION_DESC=		Reputation check (experimental)
 RESIGN_DESC=			One-step resigning
 SASL_DESC=			Enable SASL authentication with LDAP
 SENDER_MACRO_DESC=		Macro to determine sender
 SOCKETDB_DESC=			Arbitrary socket data sets
 STATSEXT_DESC=			Localized stats extensions
 STATS_DESC=			Per-message and per-signature statistics
 STOCK_RESOLVER_DESC=		Use the stock resolver library
 UNBOUND_DESC=			Use unbound DNS library
 VBR_DESC=			Vouch-By-Reference support
 
 ADSP_LISTS_CONFIGURE_ENABLE=	adsp_lists
 
 ALLSYMBOLS_CONFIGURE_ENABLE=	allsymbols
 
 ATPS_CONFIGURE_ENABLE=	atps
 
 CODECOVERAGE_CONFIGURE_ENABLE=	codecoverage
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_WITH=	libcurl
 
 DB_HANDLE_POOLS_CONFIGURE_ENABLE=	db_handle_pools
 
 DEBUG_CONFIGURE_ENABLE=	debug
 
 DEFAULT_SENDER_CONFIGURE_ENABLE=	default_sender
 
 DIFFHEADERS_LIB_DEPENDS=	libtre.so:textproc/libtre
 DIFFHEADERS_CONFIGURE_ENABLE=	diffheaders
 DIFFHEADERS_CONFIGURE_WITH=	tre=${LOCALBASE}
 
 FILTER_USE=	RC_SUBR=milter-opendkim
 
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_OFF=	--with-openssl=${OPENSSLBASE}
 GNUTLS_CONFIGURE_WITH=	gnutls
 
 IDENTITY_HEADER_CONFIGURE_ENABLE=	identity_header
 
 JANSSON_LIB_DEPENDS=	libjansson.so:devel/jansson
 JANSSON_CONFIGURE_WITH=	libjansson
 
 LDAP_CACHING_USES=		ldap
 LDAP_CACHING_CONFIGURE_ENABLE=	ldap_caching
 
 LDNS_LIB_DEPENDS=	libldns.so:dns/ldns
 LDNS_CONFIGURE_WITH=	ldns
 
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
 LMDB_CONFIGURE_WITH=	lmdb
 
 LUA_USES=		lua
 LUA_CONFIGURE_WITH=	lua
 
 LUA_ONLY_SIGNING_IMPLIES=		LUA
 LUA_ONLY_SIGNING_CONFIGURE_ENABLE=	lua_only_signing
 
 MEMCACHED_LIB_DEPENDS=		libmemcached.so:databases/libmemcached
 MEMCACHED_CONFIGURE_WITH=	libmemcached
 
 OPENDBX_LIB_DEPENDS=	libopendbx.so:databases/opendbx
 OPENDBX_CONFIGURE_WITH=	odbx
 
 OPENLDAP_USES=			ldap
 OPENLDAP_CONFIGURE_WITH=	openldap
 
 POPAUTH_CONFIGURE_ENABLE=	popauth
 
 POSTGRES_RECONNECT_HACK_CONFIGURE_ENABLE=	postgresql_reconnect_hack
 
 QUERY_CACHE_CONFIGURE_ENABLE=	query_cache
 
 RATE_LIMIT_CONFIGURE_ENABLE=	rate_limit
 
 RBL_IMPLIES=		LUA
 RBL_CONFIGURE_ENABLE=	rbl
 
 REPLACE_RULES_CONFIGURE_ENABLE=	replace_rules
 
 REPRRD_LIB_DEPENDS=		librrd.so:databases/rrdtool
 REPRRD_CONFIGURE_ENABLE=	reprrd
 
 REPUTATION_IMPLIES=		CURL JANSSON
 REPUTATION_CONFIGURE_ENABLE=	reputation
 
 RESIGN_CONFIGURE_ENABLE=	resign
 
 SASL_IMPLIES=		OPENLDAP
 SASL_CONFIGURE_WITH=	sasl
 
 SENDER_MACRO_CONFIGURE_ENABLE=	sender_macro
 
 SOCKETDB_CONFIGURE_ENABLE=	socketdb
 
 STATSEXT_IMPLIES=		LUA STATS
 STATSEXT_CONFIGURE_ENABLE=	statsext
 
 STATS_CONFIGURE_ENABLE=	stats
 
 UNBOUND_LIB_DEPENDS=	libunbound.so:dns/unbound
 UNBOUND_CONFIGURE_WITH=	unbound
 
 VBR_CONFIGURE_ENABLE=	vbr
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFILTER}
 SUB_FILES=		pkg-message
 WITHOUT_MILTER_CFLAGS=	yes
 WITHOUT_MILTER_LDFLAGS=	yes
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 CONFIGURE_ARGS+=	--with-milter=${MILTERBASE}
 .endif
 
 .if ${PORT_OPTIONS:MPOPAUTH} || ${PORT_OPTIONS:MQUERY_CACHE} || \
 	${PORT_OPTIONS:MLDAP_CACHING} || ${PORT_OPTIONS:MREPUTATION} || \
 	${PORT_OPTIONS:MSTATS}
 . if ${PORT_OPTIONS:MBDB_BASE}
 CONFIGURE_ARGS+=	--with-db-lib=c
 . else
 CONFIGURE_ARGS+=	--with-db-incdir=${BDB_INCLUDE_DIR} \
 			--with-db-lib=${BDB_LIB_NAME} \
 			--with-db-libdir=${BDB_LIB_DIR}
 USES+=			bdb
 . endif
 .endif
 
 .if ${PORT_OPTIONS:MCODECOVERAGE}
 LDFLAGS+=	-lpthread
 .endif
 
 pre-configure:
 	${REINPLACE_CMD} -e '/PKG_CHECK_MODULES/s/lua5\.[0-9]/lua-${LUA_VER}/' \
 	    -e '/PKG_CHECK_MODULES/s/cyrussasl/libsasl2/'			 \
 	    ${WRKSRC}/configure.ac
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail
 	${INSTALL_DATA} ${WRKSRC}/opendkim/opendkim.conf.sample \
 	    ${STAGEDIR}${PREFIX}/etc/mail/
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
index 4b570d907cd4..1ffcc8139c07 100644
--- a/net-mgmt/collectd5/Makefile
+++ b/net-mgmt/collectd5/Makefile
@@ -1,359 +1,359 @@
 PORTNAME=	collectd
 PORTVERSION=	5.12.0
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://storage.googleapis.com/collectd-tarballs/
 PKGNAMESUFFIX=	5
 
 MAINTAINER=	ports@bsdserwis.com
 COMMENT=	Systems & network statistics collection daemon
 WWW=		https://www.collectd.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpfctl.so:net/libpfctl
 LDFLAGS+=	-lpfctl
 
 USES=		autoreconf cpe gmake libtool localbase:ldflags pkgconfig shebangfix tar:bzip2
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
 OPTIONS_DEFINE=		CGI GCRYPT JAVA LOGGING LOGSTASH VIRT
 OPTIONS_GROUP=		INPUT OUTPUT
 OPTIONS_GROUP_OUTPUT=	INFLUXDB KAFKA MONGODB NOTIFYDESKTOP NOTIFYEMAIL PROMETHEUS \
 			RIEMANN RRDTOOL TSDB
 OPTIONS_GROUP_INPUT=	CHRONY CURL CURL_JSON CURL_XML DBI IPMI JSON \
 			MEMCACHEC MODBUS MQTT MYSQL NUTUPS OLSRD ONEWIRE OPENLDAP \
 			PERL PGSQL PINBA PING PYTHON RABBITMQ REDIS SIGROK \
 			SLURM SNMP STATSD TOKYOTYRANT VARNISH XML ZOOKEEPER
 
 OPTIONS_DEFAULT=	GCRYPT LOGGING PING
 
 CGI_DESC=		Install collection.cgi (requires rrdtool)
 CHRONY_DESC=		Enable chronyd plugin
 CURL_DESC=		Enable curl-based plugins (apache, nginx, etc)
 CURL_JSON_DESC=		Enable curl_json plugin (implies curl and json)
 CURL_XML_DESC=		Enable ascent, bind, curl_xml plugins (implies curl and xml)
 DBI_DESC=		Enable dbi plugin
 GCRYPT_DESC=		Build with libgcrypt
 INFLUXDB_DESC=		Enable write_influxdb_udp plugin
 IPMI_DESC=		Enable OpenIPMI plugin
 JSON_DESC=		Enable JSON plugins
 KAFKA_DESC=		Enable write_kafka plugin
 LOGGING_DESC=		Enable debug logging
 LOGSTASH_DESC=		Enable log_logstash plugin (requires json)
 MEMCACHEC_DESC=		Enable memcachec plugin
 MODBUS_DESC=		Enable modbus plugin
 MONGODB_DESC=		Enable write_mongodb plugin
 MQTT_DESC=		Enable MQTT broker metrics
 MYSQL_DESC=		Enable mysql-based plugins
 NOTIFYDESKTOP_DESC=	Enable desktop notifications
 NOTIFYEMAIL_DESC=	Enable notifications via email
 NUTUPS_DESC=		Enable nut (ups) plugin (sysutils/nut must be configured with DEV option)
 OLSRD_DESC=		Enable olsrd plugin
 ONEWIRE_DESC=		Eanble onewire plugin (via owfs)
 OPENLDAP_DESC=		Enable OpenLDAP plugin
 PERL_DESC=		Enable libperl plugin and binding
 PGSQL_DESC=		Enable postgresql-based plugins
 PINBA_DESC=		Enable pinba plugin (via protobuf-c)
 PING_DESC=		Enable ping plugin
 PROMETHEUS_DESC=	Enable write prometheus plugin
 PYTHON_DESC=		Enable python-based plugins
 RABBITMQ_DESC=		Enable rabbitmq-based plugins
 REDIS_DESC=		Enable redis-based plugins
 RIEMANN_DESC=		Enable write_riemann plugin (via riemann-c-client)
 RRDTOOL_DESC=		Enable rrdtool plugin (also rrdcached plugin)
 SIGROK_DESC=		Enable sigrok plugin (BROKEN)
 SLURM_DESC=		Enable slurm plugin
 SNMP_DESC=		Enable SNMP plugin
 STATSD_DESC=		Enable statsd plugin
 TOKYOTYRANT_DESC=	Enable tokyotyrant plugin
 TSDB_DESC=		Enable write_tsdb plugin
 VARNISH_DESC=		Enable varnish 7.x cache statistics
 VIRT_DESC=		Enable libvirt plugin (requires XML)
 XML_DESC=		Enable XML plugins
 ZOOKEEPER_DESC=		Enable zookeeper plugin
 
 OPTIONS_SUB=	yes
 
 USE_RC_SUBR=	collectd collectdmon
 
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
 # NOTE: Plugins without dependencies are defined further down.
 CONFIGURE_ARGS=	--disable-all-plugins \
 		--disable-amqp \
 		--disable-ceph \
 		--disable-cgroups \
 		--disable-fhcount \
 		--disable-static \
 		--disable-turbostat \
 		--enable-disk \
 		--localstatedir=/var \
 		--without-libaquaero5 \
 		--without-libganglia \
 		--without-libiptc \
 		--without-libldap \
 		--without-libmnl \
 		--without-libnetapp \
 		--without-libowcapi \
 		--without-libsensors \
 		--without-mic \
 		--without-oracle
 
 CGI_USES=		perl5
 CGI_RUN_DEPENDS=	p5-CGI>=0:www/p5-CGI \
 			p5-HTML-Parser>=0:www/p5-HTML-Parser \
 			p5-URI>=0:net/p5-URI
 CGI_IMPLIES=		RRDTOOL
 
 CHRONY_CONFIGURE_ENABLE=	chrony
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_ENABLE=	apache curl nginx write_http
 CURL_CONFIGURE_WITH=	libcurl=${LOCALBASE}
 
 CURL_JSON_IMPLIES=		CURL JSON
 CURL_JSON_CONFIGURE_ENABLE=	curl_json
 
 CURL_XML_IMPLIES=		CURL XML
 CURL_XML_CONFIGURE_ENABLE=	ascent bind curl_xml
 
 JAVA_USE=		java
 JAVA_CONFIGURE_ENABLE=	java
 JAVA_CONFIGURE_WITH=	java=${LOCALBASE}
 
 DBI_LIB_DEPENDS=	libdbi.so:databases/libdbi
 DBI_CONFIGURE_ENABLE=	dbi
 DBI_CFLAGS=		-Wno-deprecated-declarations
 
 GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 			libgpg-error.so:security/libgpg-error
 GCRYPT_CONFIGURE_WITH=	libgcrypt=${LOCALBASE}/bin/libgcrypt-config
 
 INFLUXDB_CONFIGURE_ENABLE=	write_influxdb_udp
 
 IPMI_LIB_DEPENDS=	libOpenIPMI.so:sysutils/openipmi
 IPMI_CONFIGURE_ENABLE=	ipmi
 
 JSON_LIB_DEPENDS=	libyajl.so:devel/yajl
 JSON_CONFIGURE_WITH=	libyajl=${LOCALBASE}
 
 KAFKA_LIB_DEPENDS=	librdkafka.so:net/librdkafka
 KAFKA_CONFIGURE_ENABLE=	write_kafka
 
 LOGGING_CONFIGURE_ENABLE=	debug
 
 LOGSTASH_CONFIGURE_ENABLE=	log_logstash
 LOGSTASH_IMPLIES=		JSON
 
 MEMCACHEC_LIB_DEPENDS=		libmemcached.so:databases/libmemcached
 MEMCACHEC_CONFIGURE_ENABLE=	memcachec
 MEMCACHEC_CONFIGURE_WITH=	libmemcached=${LOCALBASE}
 
 MODBUS_LIB_DEPENDS=		libmodbus.so:comms/libmodbus
 MODBUS_CONFIGURE_ENABLE=	modbus
 MODBUS_CONFIGURE_WITH=		libmodbus=use_pkgconfig
 
 MONGODB_LIB_DEPENDS+=		libmongoc-1.0.so:devel/mongo-c-driver \
 				libbson-1.0.so:devel/libbson
 MONGODB_CONFIGURE_ENABLE=	write_mongodb
 MONGODB_CONFIGURE_WITH=		libmongoc
 
 MQTT_LIB_DEPENDS=	libmosquitto.so:net/mosquitto
 MQTT_CONFIGURE_ENABLE=	mqtt
 MQTT_CONFIGURE_WITH=	libmosquitto=${LOCALBASE}
 
 MYSQL_USES=		mysql ssl
 MYSQL_CONFIGURE_ENABLE=	mysql
 MYSQL_CONFIGURE_WITH=	libmysql=${LOCALBASE}
 
 NOTIFYDESKTOP_LIB_DEPENDS=	libnotify.so:devel/libnotify
 NOTIFYDESKTOP_CONFIGURE_ENABLE=	notify_desktop
 NOTIFYDESKTOP_USE=		GNOME=gdkpixbuf2
 NOTIFYDESKTOP_USES=		gettext-runtime gnome
 
 NOTIFYEMAIL_LIB_DEPENDS=	libesmtp.so:mail/libesmtp
 NOTIFYEMAIL_CONFIGURE_ENABLE=	notify_email
 NOTIFYEMAIL_CONFIGURE_WITH=	libesmtp=${LOCALBASE}
 
 NUTUPS_LIB_DEPENDS=		libupsclient.so:sysutils/nut
 NUTUPS_CONFIGURE_ENABLE=	nut
 NUTUPS_CONFIGURE_WITH=		libupsclient=${LOCALBASE}
 
 OLSRD_CONFIGURE_ENABLE=	olsrd
 
 ONEWIRE_LIB_DEPENDS=		libow.so:comms/owfs
 ONEWIRE_CONFIGURE_ENABLE=	onewire
 ONEWIRE_CONFIGURE_WITH=		libowcapi=${LOCALBASE}
 
 OPENLDAP_USES=			ldap
 OPENLDAP_CONFIGURE_ENABLE=	openldap
 OPENLDAP_CONFIGURE_WITH=	libldap=${LOCALBASE}
 
 PERL_USES=		perl5
 PERL_CONFIGURE_ENABLE=	perl
 PERL_CONFIGURE_WITH=	libperl=${LOCALBASE} perl-bindings
 
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ENABLE=	postgresql
 PGSQL_CONFIGURE_WITH=	libpq=${LOCALBASE}
 
 PINBA_LIB_DEPENDS=	libprotobuf-c.so:devel/protobuf-c
 PINBA_CONFIGURE_ENABLE=	pinba
 
 PING_LIB_DEPENDS=	liboping.so:net/liboping
 PING_CONFIGURE_ENABLE=	ping
 PING_CONFIGURE_WITH=	liboping=${LOCALBASE}
 
 PROMETHEUS_LIB_DEPENDS+=	libmicrohttpd.so:www/libmicrohttpd \
 				libprotobuf-c.so:devel/protobuf-c \
 				libprotoc.so:devel/protobuf
 PROMETHEUS_CONFIGURE_ENABLE=	write_prometheus
 
 PYTHON_USES=			python
 PYTHON_CONFIGURE_ENABLE=	python
 PYTHON_CONFIGURE_ENV=		PYTHON_CONFIG=${PYTHON_CMD}-config
 
 RABBITMQ_LIB_DEPENDS=		librabbitmq.so:net/rabbitmq-c
 RABBITMQ_CONFIGURE_WITH=	librabbitmq=${LOCALBASE}
 
 REDIS_LIB_DEPENDS=	libhiredis.so:databases/hiredis
 REDIS_CONFIGURE_ENABLE=	redis write_redis
 REDIS_CONFIGURE_WITH=	libhiredis=${LOCALBASE}
 
 RIEMANN_LIB_DEPENDS=		libltdl.so:devel/libltdl \
 				libriemann-client-gnutls.so:net-mgmt/riemann-c-client
 RIEMANN_CONFIGURE_ENABLE=	write_riemann
 
 RRDTOOL_LIB_DEPENDS=		librrd.so:databases/rrdtool
 RRDTOOL_CONFIGURE_ENABLE=	rrdcached rrdtool
 RRDTOOL_CONFIGURE_WITH=		librrd=${LOCALBASE}
 
 SIGROK_USE=			GNOME=glib20
 SIGROK_CFLAGS=			`pkg-config --cflags libsigrok`
 SIGROK_LIB_DEPENDS=		libsigrok.so:devel/libsigrok
 SIGROK_CONFIGURE_ENABLE=	sigrok
 SIGROK_USES=			gettext-runtime
 SIGROK_BROKEN=			working only with sigrok < 0.4
 
 SLURM_BROKEN=			Does not compile with slurm-wlm >= 21.x
 SLURM_LIB_DEPENDS=		libslurm.so:sysutils/slurm-wlm
 SLURM_CONFIGURE_ENABLE=		slurm
 SLURM_CONFIGURE_WITH=		libslurm=${LOCALBASE}
 
 SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 SNMP_CONFIGURE_ENABLE=	snmp
 SNMP_CONFIGURE_WITH=	libnetsnmp
 
 STATSD_CONFIGURE_ENABLE=	statsd
 
 TOKYOTYRANT_LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet \
 				libtokyotyrant.so:databases/tokyotyrant
 TOKYOTYRANT_CONFIGURE_ENABLE=	tokyotyrant
 TOKYOTYRANT_CONFIGURE_WITH=	libtokyotyrant=${LOCALBASE}
 
 TSDB_CONFIGURE_ENABLE=	write_tsdb
 
 VARNISH_LIB_DEPENDS=		libvarnishapi.so:www/varnish7
 VARNISH_CONFIGURE_ENABLE=	varnish
 
 VIRT_IMPLIES=		XML
 VIRT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 			libgpg-error.so:security/libgpg-error \
 			libvirt.so:devel/libvirt
 VIRT_CONFIGURE_ENABLE=	virt
 
 XML_CFLAGS=		`pkg-config --cflags libxml-2.0`
 XML_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 XML_CONFIGURE_WITH=	libxml2
 
 ZOOKEEPER_LIB_DEPENDS=		libzookeeper_mt.so:devel/libzookeeper
 ZOOKEEPER_CONFIGURE_ENABLE=	zookeeper
 
 # NOTE: Plugins without external dependencies
 CONFIGURE_ARGS+=	--enable-aggregation \
 			--enable-apcups \
 			--enable-contextswitch \
 			--enable-cpu \
 			--enable-csv \
 			--enable-df \
 			--enable-dns \
 			--enable-email \
 			--enable-exec \
 			--enable-filecount \
 			--enable-interface \
 			--enable-ipstats \
 			--enable-load \
 			--enable-logfile \
 			--enable-logparser \
 			--enable-match_empty_counter \
 			--enable-match_hashed \
 			--enable-match_regex \
 			--enable-match_timediff \
 			--enable-match_value \
 			--enable-mbmon \
 			--enable-memcached \
 			--enable-memory \
 			--enable-network \
 			--enable-ntpd \
 			--enable-openvpn \
 			--enable-pf \
 			--enable-powerdns \
 			--enable-processes \
 			--enable-statsd \
 			--enable-swap \
 			--enable-syslog \
 			--enable-table \
 			--enable-tail \
 			--enable-tail_csv \
 			--enable-target_notification \
 			--enable-target_replace \
 			--enable-target_scale \
 			--enable-target_set \
 			--enable-target_v5upgrade \
 			--enable-tcpconns \
 			--enable-teamspeak2 \
 			--enable-ted \
 			--enable-threshold \
 			--enable-unixsock \
 			--enable-uptime \
 			--enable-users \
 			--enable-uuid \
 			--enable-write_graphite \
 			--enable-write_log \
 			--enable-zfs_arc
 INSTALL_TARGET=		install-strip
 SHEBANG_FILES=		contrib/collection.cgi
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's;@prefix@/var/;/var/;' \
 		-e 's;/var/lib/;/var/db/;' \
 		-e 's;@localstatedir@/lib/;/var/db/;' \
 		${WRKSRC}/src/collectd.conf.in \
 		${WRKSRC}/src/collectd.conf.5 \
 		${WRKSRC}/src/collectd.conf.pod
 	@${REINPLACE_CMD} \
 		-e 's;/etc/collection\.conf;${WWWDIR}/collection.conf;' \
 		${WRKSRC}/contrib/collection.cgi
 	@${REINPLACE_CMD} \
 		-e 's;/opt/collectd/var/lib;/var/db;' \
 		-e 's;/opt/collectd/lib;${PREFIX}/lib;' \
 		${WRKSRC}/contrib/collection.conf
 
 post-install:
 	${MKDIR} ${STAGEDIR}/var/db/collectd
 
 post-install-CGI-on:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/collection.cgi ${STAGEDIR}${WWWDIR}/
 	${INSTALL_DATA} ${WRKSRC}/contrib/collection.conf \
 		${STAGEDIR}${WWWDIR}/collection.conf.sample
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/nfdump/Makefile b/net-mgmt/nfdump/Makefile
index da28666930cc..2811a43313de 100644
--- a/net-mgmt/nfdump/Makefile
+++ b/net-mgmt/nfdump/Makefile
@@ -1,93 +1,94 @@
 PORTNAME=	nfdump
 PORTVERSION=	1.7.4
+PORTREVISION=	1
 DISTVERSIONPREFIX=v
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Command-line tools to collect and process NetFlow, sFlow and IPFIX data
 WWW=		https://github.com/phaag/nfdump
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/BSD-license.txt
 
 USES=		autoreconf compiler:c11 cpe libtool pkgconfig
 CPE_VENDOR=	nfdump_project
 USE_CSTD=	gnu89
 USE_GITHUB=	yes
 GH_ACCOUNT=	phaag
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
 INSTALL_TARGET=	install-strip
 PLIST_FILES=	bin/nfanon bin/nfcapd bin/nfdump bin/nfexpire bin/nfreplay \
 		lib/libnfdump-${PORTVERSION}.so lib/libnfdump.so \
 		lib/libnfdump.a \
 		share/man/man1/nfanon.1.gz share/man/man1/nfcapd.1.gz \
 		share/man/man1/nfdump.1.gz share/man/man1/nfexpire.1.gz \
 		share/man/man1/nfreplay.1.gz \
 		etc/nfdump.conf.sample
 PORTDOCS=	AUTHORS ChangeLog INSTALL NEWS README
 
 #flow-tools support
 OPTIONS_DEFINE=		DOCS FT2NFDUMP NFPROFILE FIXTIMEBUG READPCAP NFTRACK \
 			SFLOW NFPCAPD NSEL INFLUXDB GEODB
 OPTIONS_DEFAULT=	NFPROFILE NFPCAPD READPCAP NFTRACK NSEL SFLOW
 
 FIXTIMEBUG_DESC=	With fixing swap time bug of some v5
 FT2NFDUMP_DESC=		With Flow-tools to nfdump converter
 INFLUXDB_DESC=		Enable stats to InfluxDB
 NFPCAPD_DESC=		Build nfpcapd collector daemon also
 NFPROFILE_DESC=		With nfprofile (nfsen requires it)
 NFTRACK_DESC=		With PortTracker support
 NSEL_DESC=		Read and process ASA/NSEL/NEL event data
 READPCAP_DESC=		With pcap support
 SFLOW_DESC=		Build sflow collector daemon also
 GEODB_DESC=		Build geolookup for MaxMind GeoDB
 
 FIXTIMEBUG_CONFIGURE_ENABLE=	fixtimebug
 FT2NFDUMP_BUILD_DEPENDS=		flow-cat:net-mgmt/flow-tools
 FT2NFDUMP_LIB_DEPENDS=		libft.so:net-mgmt/flow-tools
 FT2NFDUMP_CONFIGURE_ON=	--enable-ftconv --with-ftpath=${LOCALBASE}
 FT2NFDUMP_PLIST_FILES=	bin/ft2nfdump share/man/man1/ft2nfdump.1.gz
 INFLUXDB_LIB_DEPENDS=		libcurl.so:ftp/curl
 INFLUXDB_CONFIGURE_ENABLE=	influxdb
 NFPCAPD_CONFIGURE_ENABLE=	nfpcapd
 NFPCAPD_PLIST_FILES=	bin/nfpcapd share/man/man1/nfpcapd.1.gz
 NFPROFILE_CONFIGURE_ENABLE=	nfprofile
 NFPROFILE_PLIST_FILES=	bin/nfprofile share/man/man1/nfprofile.1.gz
 NFTRACK_CONFIGURE_ENABLE=	nftrack
 NFTRACK_PLIST_FILES=	bin/nftrack
 NSEL_CONFIGURE_ENABLE=	nsel
 READPCAP_CONFIGURE_ENABLE=	readpcap
 SFLOW_CONFIGURE_ENABLE=	sflow
 SFLOW_PLIST_FILES=	bin/sfcapd share/man/man1/sfcapd.1.gz
 GEODB_PLIST_FILES=	bin/geolookup bin/updateGeoDB.sh share/man/man1/geolookup.1.gz
 GEODB_CONFIGURE_ENABLE=	maxmind
 
 .include <bsd.port.pre.mk>
 
 .if ${COMPILER_TYPE} == clang
 CPPFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
 .if ${PORT_OPTIONS:MNFPROFILE} || ${PORT_OPTIONS:MNFTRACK}
 CONFIGURE_ARGS+=	--with-rrdpath=${LOCALBASE}
 BUILD_DEPENDS+=	rrdtool:databases/rrdtool
 RUN_DEPENDS+=	rrdtool:databases/rrdtool
 .endif
 
 post-patch:
 	${REINPLACE_CMD} 's|-ggdb||' ${WRKSRC}/src/lib/Makefile.am
 	${REINPLACE_CMD} 's|-ggdb||' ${WRKSRC}/src/nfcapd/Makefile.am
 	${REINPLACE_CMD} 's|-ggdb||' ${WRKSRC}/src/test/Makefile.am
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/etc/nfdump.conf.dist ${STAGEDIR}${PREFIX}/etc/nfdump.conf.sample
 
 .include <bsd.port.post.mk>
diff --git a/net-mgmt/pnp/Makefile b/net-mgmt/pnp/Makefile
index 864f05331f55..f6f96987eb96 100644
--- a/net-mgmt/pnp/Makefile
+++ b/net-mgmt/pnp/Makefile
@@ -1,103 +1,103 @@
 PORTNAME=	pnp
 PORTVERSION=	0.6.26
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/pnp4nagios/PNP-0.6
 DISTNAME=	pnp4nagios-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER?=	joneum@FreeBSD.org
 COMMENT?=	Nagios / Icinga performance data collector and grapher
 WWW=		https://www.pnp4nagios.org/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/rrdtool:databases/rrdtool
 RUN_DEPENDS?=	${LOCALBASE}/bin/rrdtool:databases/rrdtool \
 		nagios:net-mgmt/nagios
 
 MAKE_JOBS_UNSAFE=	yes
 USES=		dos2unix perl5 php php:web
 
 OPTIONS_DEFINE=	PDF EXAMPLES
 OPTIONS_DEFAULT=	PDF
 PDF_DESC=	Use built-in fpdf library to produce PDF views
 
 PDF_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-disable-pdf
 
 .include <bsd.port.options.mk>
 
 USE_PHP=	gd iconv session simplexml sockets xml zlib
 
 USE_RC_SUBR=	npcd
 
 DOS2UNIX_REGEX=	'.*\.\(php\|js\|txt\)$$'
 
 NAGIOSDIR?=	/var/spool/nagios
 NAGIOSHTMURL?=	/nagios
 NAGIOSUSER?=	nagios
 NAGIOSGROUP?=	nagios
 PNP_STATE=	${NAGIOSDIR}/pnp
 PNP_RRDS=	${PNP_STATE}/rrd
 PNP_SPOOL=	${PNP_STATE}/perfspool
 PNP_URL?=	${NAGIOSHTMURL}/pnp
 FPDF_DIR?=	share/fpdf
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	\
 	--sysconfdir=${ETCDIR} \
 	--datarootdir=${WWWDIR} \
 	--datadir=${WWWDIR} \
 	--localstatedir=/var/log \
 	--with-rrdtool=${LOCALBASE}/bin/rrdtool \
 	--with-perfdata-dir=${PNP_RRDS} \
 	--with-perfdata-spool-dir=${PNP_SPOOL} \
 	--with-nagios-user=${NAGIOSUSER} \
 	--with-nagios-group=${NAGIOSGROUP}
 # Get rid of INSTALL_OPTS that are set by configure --
 # we want the things to be installed with root:wheel and
 # NAGIOSUSER:NAGIOSGROUP are going to the configuration files.
 MAKE_ARGS=	INSTALL_OPTS=
 INSTALL_TARGET=	install install-config
 
 PLIST_SUB+=	NAGIOSDIR=${NAGIOSDIR} \
 		NAGIOSUSER=${NAGIOSUSER} \
 		NAGIOSGROUP=${NAGIOSGROUP} \
 		WWWOWN=${WWWOWN} \
 		WWWGRP=${WWWGRP}
 
 SUB_FILES=	pkg-message
 SUB_LIST=	PNP_RRDS=${PNP_RRDS} \
 		PNP_URL=${PNP_URL} \
 		NAGIOSUSER=${NAGIOSUSER} \
 		NAGIOSGROUP=${NAGIOSGROUP}
 
 SAMPLE_CONFIGS=	lighttpd.pnp4nagios.conf nginx.pnp4nagios.conf httpd.conf
 
 .if ${PORT_OPTIONS:MPDF}
 PNP_USE_FPDF=	1
 .else
 PNP_USE_FPDF=	0
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} \
   -e's|^\$$conf\['\''use_fpdf'\''\] = [[:digit:]];|$$conf['\''use_fpdf'\''] = ${PNP_USE_FPDF};|' \
   -e's|^\$$conf\['\''nagios_base'\''\] = "/nagios/cgi-bin";|$$conf\['\''nagios_base'\''\] = "${NAGIOSHTMURL}/cgi-bin";|' \
   -e's|/usr/local/check_mk/|/usr/local/share/check_mk/|g' \
   -e's|/usr/local/nagios/var/rw/live|/${NAGIOSDIR}/rw/live|' \
   "${WRKSRC}/sample-config/pnp/config.php.in"
 .for f in ${SAMPLE_CONFIGS}
 	@${REINPLACE_CMD} -e 's|@BASE_URL@|${PNP_URL}|g' -e 's|@datarootdir@|${WWWDIR}|g' \
   -e 's|/usr/local/nagios/etc|${PREFIX}/etc/${NAGIOSUSER}|' -e 's|Nagios|${NAGIOSUSER}|' \
   "${WRKSRC}/sample-config/${f}.in"
 .endfor
 	@${LN} -fs ../en_US/dwnld.html ${WRKSRC}/share/pnp/documents/de_DE/dwnld.html
 	${REINPLACE_CMD} -e 's|$${prefix}/man|$${prefix}/share/man|' ${WRKSRC}/configure
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for f in ${SAMPLE_CONFIGS}
 	${INSTALL_DATA} ${WRKSRC}/sample-config/${f} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/rrdbot/Makefile b/net-mgmt/rrdbot/Makefile
index 15dec0c7fc29..1bc2c828698c 100644
--- a/net-mgmt/rrdbot/Makefile
+++ b/net-mgmt/rrdbot/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	rrdbot
 PORTVERSION=	0.9.7.d20200312
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Threaded SNMP polling daemon which stores data in RRDs
 WWW=		https://github.com/REANNZ/rrdbot/
 
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	librrd.so:databases/rrdtool
 
 USES=		autoreconf
 USE_GITHUB=	YES
 GH_ACCOUNT=	REANNZ
 GH_TAGNAME=	396ca60
 USE_RC_SUBR=	rrdbot
 
 GNU_CONFIGURE=			yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=			--datarootdir=${PREFIX}/share/rrdbot \
 				--includedir=${LOCALBASE}/include \
 				--libdir=${LOCALBASE}/lib
 
 SUB_FILES=	pkg-message
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
 .if defined(WITHOUT_IPV6)
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/smokeping/Makefile b/net-mgmt/smokeping/Makefile
index d59273de8337..90549e2e3e4e 100644
--- a/net-mgmt/smokeping/Makefile
+++ b/net-mgmt/smokeping/Makefile
@@ -1,95 +1,95 @@
 PORTNAME=	smokeping
 PORTVERSION=	2.8.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	https://oss.oetiker.ch/smokeping/pub/
 
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Latency logging and graphing system
 WWW=		https://oss.oetiker.ch/smokeping/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	curl>=0:ftp/curl \
 		p5-CGI-Fast>=0:www/p5-CGI-Fast \
 		p5-CGI-Session>=0:www/p5-CGI-Session \
 		p5-CGI>=0:www/p5-CGI \
 		p5-Config-Grammar>=0:devel/p5-Config-Grammar \
 		p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
 		p5-FCGI>=0:www/p5-FCGI \
 		p5-IO-Pty-Easy>=0:devel/p5-IO-Pty-Easy \
 		p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
 		p5-libwww>=0:www/p5-libwww \
 		p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
 		p5-Net-DNS>=0:dns/p5-Net-DNS \
 		p5-Net-OpenSSH>=0:net/p5-Net-OpenSSH \
 		p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \
 		p5-Net-Telnet>=0:net/p5-Net-Telnet \
 		p5-OrePAN2>=0:devel/p5-OrePAN2 \
 		p5-perl-ldap>=0:net/p5-perl-ldap \
 		p5-SNMP_Session>=0:net-mgmt/p5-SNMP_Session \
 		p5-Socket6>=0:net/p5-Socket6
 LIB_DEPENDS=	librrd.so:databases/rrdtool
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		autoreconf cpe gmake perl5
 USE_RC_SUBR=	smokeping
 
 GNU_CONFIGURE=			yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS+=		--libdir=${PREFIX}/smokeping/lib \
 				--localstatedir="${PREFIX}/var" \
 				--sysconfdir=${ETCDIR} \
 				--with-htdocs-dir=${PREFIX}/smokeping/htdocs
 CONFIGURE_ENV+=			PERL5LIB=${PREFIX}/smokeping/lib \
 				PERL=${PERL}
 
 CONFLICTS_INSTALL=	nfsping
 
 NO_ARCH=	yes
 SUB_FILES=	pkg-deinstall pkg-message
 SUB_LIST=	GROUPS=${GROUPS} \
 		USERS=${USERS}
 
 HTDOCSDIR=	${PREFIX}/smokeping/htdocs
 
 USERS=		smokeping
 GROUPS=		smokeping
 
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 OPTIONS_DEFINE=		DNS ECHOPING EXAMPLES FPING RADIUS TELNET
 OPTIONS_DEFAULT=	FPING
 
 DNS_DESC=	Support for AnotherDNS probes
 ECHOPING_DESC=	Support for EchoPing probes
 FPING_DESC=	Support for fping probes
 RADIUS_DESC=	Support for Radius probes
 TELNET_DESC=	Support for TelnetIOSPing probes
 
 DNS_RUN_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS
 ECHOPING_RUN_DEPENDS=	${LOCALBASE}/bin/echoping:net/echoping
 FPING_RUN_DEPENDS=	${LOCALBASE}/sbin/fping:net/fping
 RADIUS_RUN_DEPENDS=	p5-Authen-Radius>=0:security/p5-Authen-Radius
 TELNET_RUN_DEPENDS=	p5-Net-Telnet>=0:net/p5-Net-Telnet
 
 # We will take these from CPAN instead
 post-extract:
 	cd ${WRKSRC}/lib ; ${RM} BER.pm SNMP_util.pm SNMP_Session.pm
 
 post-patch:
 	${REINPLACE_CMD} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${WRKSRC}/doc/Makefile.am \
 		${WRKSRC}/bin/smokeping \
 		${WRKSRC}/bin/smokeping_cgi \
 		${WRKSRC}/bin/tSmoke
 	@for a in ${WRKSRC}/etc/*.dist; do \
 		${MV} $$a $${a%.dist}.sample; \
 	done
 	${MV} ${WRKSRC}/etc/config.dist.in ${WRKSRC}/etc/config.sample.in
 
 post-install:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/smokeping/htdocs/img
 	${MKDIR} ${STAGEDIR}/${PREFIX}/var/smokeping
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/snmp4nagios/Makefile b/net-mgmt/snmp4nagios/Makefile
index 0d14ed077810..86cb9ce38105 100644
--- a/net-mgmt/snmp4nagios/Makefile
+++ b/net-mgmt/snmp4nagios/Makefile
@@ -1,49 +1,49 @@
 PORTNAME=	SNMP4Nagios
 PORTVERSION=	0.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}/${PORTVERSION} \
 		ZI
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Vendor specific SNMP plugins for Nagios
 WWW=		https://snmp4nagios.sourceforge.net/
 
 BUILD_DEPENDS=	snmpcheck:net-mgmt/net-snmp
 RUN_DEPENDS=	snmpcheck:net-mgmt/net-snmp
 
 GNU_CONFIGURE=	yes
 
 NAGIOSWWWDIR?=	www/nagios
 NAGIOSDIR?=	/var/spool/nagios
 
 OPTIONS_DEFINE=	RRDTOOL
 RRDTOOL_DESC=	Build with rrdtool support
 
 .include <bsd.port.options.mk>
 
 CONFIGURE_ARGS=	--sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \
 		--bindir=${PREFIX}/libexec/nagios \
 		--libexecdir=${PREFIX}/libexec/nagios \
 		--datadir=${PREFIX}/share \
 		--sysconfdir=${PREFIX}/etc/nagios \
 		--localstatedir=${NAGIOSDIR} \
 		--with-rrddir=${NAGIOSDIR}/snmp4nagios/rrd \
 		--with-pngdir=${NAGIOSDIR}/snmp4nagios/png \
 		--prefix=${PREFIX}
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MRRDTOOL}
 LIB_DEPENDS+=	librrd.so:databases/rrdtool
 CONFIGURE_ARGS+=--with-rrd
 PLIST_SUB+=	RRD=""
 .else
 CONFIGURE_ARGS+=--with-rrd=no
 PLIST_SUB+=	RRD="@comment "
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/net-mgmt/torrus/Makefile b/net-mgmt/torrus/Makefile
index a181fe778821..bdd8423eee3c 100644
--- a/net-mgmt/torrus/Makefile
+++ b/net-mgmt/torrus/Makefile
@@ -1,63 +1,63 @@
 PORTNAME=	torrus
 PORTVERSION=	2.09
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/torrus/torrus/
 
 MAINTAINER=	corsmith@gmail.com
 COMMENT=	Data Series Processing Framework - think mrtg with xml configs
 WWW=		http://torrus.org
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	rrdtool>=0:databases/rrdtool \
 		p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
 		p5-BerkeleyDB>=0:databases/p5-BerkeleyDB \
 		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
 		p5-Proc-Daemon>=0:devel/p5-Proc-Daemon \
 		p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \
 		p5-URI>=0:net/p5-URI \
 		p5-TimeDate>=0:devel/p5-TimeDate \
 		p5-Apache-Session>=0:www/p5-Apache-Session \
 		p5-FCGI>=0:www/p5-FCGI \
 		p5-JSON>0:converters/p5-JSON
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GNOME=	libxml2
 USES=		gnome perl5
 USE_PERL5=	run
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 NO_ARCH=	yes
 
 USERS=		torrus
 GROUPS=		torrus
 PLIST_SUB=	TORRUS_USER=${USERS}
 USE_RC_SUBR=	torrus_collector torrus_monitor
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		var_user=${USERS} var_group=${USERS} \
 		torrus_user=${USERS} \
 		defrrddir=/var/torrus/collector_rrd \
 		pkghome=${DATADIR} \
 		pkgbindir=${PREFIX}/libexec/torrus \
 		pkgdocdir=${DOCSDIR} \
 		exmpdir=${EXAMPLESDIR} \
 		perllibdir=${PREFIX}/${SITE_PERL_REL} \
 		scriptsdir=${PREFIX}/libexec/torrus/scripts \
 		--enable-pkgonly
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/torrus/session_data/store
 	@${MKDIR} ${STAGEDIR}/var/torrus/session_data/lock
 	@${MKDIR} ${STAGEDIR}/var/torrus/session_data
 	@${MKDIR} ${STAGEDIR}/var/torrus/reports
 	@${MKDIR} ${STAGEDIR}/var/torrus/db
 	@${MKDIR} ${STAGEDIR}/var/torrus/collector_rrd
 	@${MKDIR} ${STAGEDIR}/var/torrus/cache
 	@${MKDIR} ${STAGEDIR}/var/torrus
 	@${MKDIR} ${STAGEDIR}/var/run/torrus
 	@${MKDIR} ${STAGEDIR}/var/log/torrus
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile
index be421792cfaf..80f496c9bb02 100644
--- a/net-mgmt/xymon-server/Makefile
+++ b/net-mgmt/xymon-server/Makefile
@@ -1,110 +1,110 @@
 PORTNAME=	xymon
 PORTVERSION=	4.3.30
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	SF/xymon/Xymon/${PORTVERSION}
 PKGNAMESUFFIX=	-server${PKGNAMESUFFIX2}
 DIST_SUBDIR=	repacked
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	System for monitoring servers and networks
 WWW=		http://xymon.sourceforge.net/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	rrdtool:databases/rrdtool
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libpcre.so:devel/pcre \
 		libcares.so:dns/c-ares
 RUN_DEPENDS=	rrdtool:databases/rrdtool \
 		fping:net/fping \
 		mtr:net/mtr-nox11
 
 USERS=		xymon
 GROUPS=		xymon
 
 # Options
 XYMONUSER?=	xymon
 XYMONHOSTNAME?=	xymon.example.com
 XYMONHOSTIP?=	127.0.0.1
 
 USES=		compiler:c11 cpe gmake shebangfix ssl
 SHEBANG_FILES=	${WRKSRC}/xymond/xymonreports.sh.DIST ${WRKSRC}/build/upgrade430.sh
 MAKE_JOBS_UNSAFE=	yes
 CONFIGURE_ENV=	MAKE=gmake
 MAKE_ENV+=	XYMONUSER="${XYMONUSER}"
 MAKE_ENV+=	XYMONHOSTNAME="${XYMONHOSTNAME}"
 MAKE_ENV+=	XYMONHOSTIP="${XYMONHOSTIP}"
 MAKE_ENV+=	INSTALLROOT="${STAGEDIR}"
 MAKE_ENV+=	MANPREFIX="${STAGEDIR}${PREFIX}/share"
 MAKE_ARGS+=	PKGBUILD="true"
 USE_RC_SUBR=	xymon-server
 SUB_LIST+=	XYMONUSER="${XYMONUSER}"
 PLIST_SUB+=	XYMONUSER="${XYMONUSER}"
 
 CONFIG_FILES=	cgioptions.cfg client-local.cfg \
 		columndoc.csv graphs.cfg protocols.cfg \
 		tasks.cfg xymonserver.cfg xymon-apache.conf
 FIXME1=		alerts.cfg hosts.cfg xymon-apache-open xymon-apache-secure
 FIXME2=		analysis.cfg combo.cfg holidays.cfg rrddefinitions.cfg \
 		snmpmibs.cfg xymonmenu.cfg xymonserver-migration.cfg
 
 OPTIONS_DEFINE=DEBUG LDAP NETSNMP
 NETSNMP_DESC=Enable Net-SNMP support
 
 LDAP_USES=	ldap
 LDAP_MAKE_ENV=	WITH_LDAP=1
 NETSNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 NETSNMP_MAKE_ENV=	WITH_NETSNMP=1
 
 post-patch:
 	${REINPLACE_CMD} -e 's|web-build client|web-build|' ${WRKSRC}/build/Makefile.rules
 	${REINPLACE_CMD} -e 's|install-docs install-client|install-docs|' ${WRKSRC}/build/Makefile.rules
 	${REINPLACE_CMD} -e 's|$$(INSTALLETCDIR)/protocols.cfg|$$(INSTALLETCDIR)/protocols.cfg.DIST|' ${WRKSRC}/xymonnet/Makefile
 	${REINPLACE_CMD} -e 's|TRACEROUTE="traceroute"|TRACEROUTE="mtr"|' ${WRKSRC}/xymond/etcfiles/xymonserver.cfg.DIST
 	${REINPLACE_CMD} -e 's|TRACEROUTEOPTS="-n -q 2 -w 2 -m 15"|TRACEROUTEOPTS="-n -c 2 -w 2 -m 15 --report"|' ${WRKSRC}/xymond/etcfiles/xymonserver.cfg.DIST
 	${RM} ${WRKSRC}/docs/manpages/man1/xymonping.1.html
 	${RM} ${WRKSRC}/xymonnet/xymonping.1
 	${REINPLACE_CMD} -e 's|@CGIDIR@|${WWWDIR}/server/cgi-bin|g' \
 	-e 's|@SECURECGIDIR@|${WWWDIR}/server/cgi-secure|g' \
 	-e 's|@INSTALLETCDIR@|${WWWDIR}/server/etc|g' \
 	-e 's|@INSTALLWWWDIR@|${WWWDIR}/server/www|g' \
 	-e 's|@SECUREXYMONCGIURL@|/cgi-secure|g' \
 	-e 's|@XYMONCGIURL@|/cgi-bin|g' \
 	-e 's|@XYMONHOSTURL@|/xymon|g' ${WRKSRC}/xymond/etcfiles/xymon-apache-*.DIST
 
 # Configure script is interactive
 do-configure:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}/
 
 post-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}/data
 	${MKDIR} ${STAGEDIR}${WWWDIR}/data/acks
 	${MKDIR} ${STAGEDIR}${WWWDIR}/data/data
 	${MKDIR} ${STAGEDIR}${WWWDIR}/data/disabled
 	${MKDIR} ${STAGEDIR}${WWWDIR}/data/hist
 	${MKDIR} ${STAGEDIR}${WWWDIR}/data/histlogs
 	${MKDIR} ${STAGEDIR}${WWWDIR}/data/hostdata
 	${MKDIR} ${STAGEDIR}${WWWDIR}/data/logs
 	${MKDIR} ${STAGEDIR}${WWWDIR}/data/rrd
 	${MKDIR} ${STAGEDIR}${WWWDIR}/server/download
 	${MKDIR} ${STAGEDIR}${WWWDIR}/server/tmp
 	${MKDIR} ${STAGEDIR}${WWWDIR}/server/www/html
 	${MKDIR} ${STAGEDIR}${WWWDIR}/server/www/notes
 	${MKDIR} ${STAGEDIR}${WWWDIR}/server/www/rep
 	${MKDIR} ${STAGEDIR}${WWWDIR}/server/www/snap
 	${MKDIR} ${STAGEDIR}${WWWDIR}/server/www/wml
 	${LN} -s ${LOCALBASE}/sbin/fping ${STAGEDIR}${WWWDIR}/server/bin/xymonping
 	${INSTALL_SCRIPT} ${WRKSRC}/build/upgrade430.sh ${STAGEDIR}${WWWDIR}/server/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/build/renamevars ${STAGEDIR}${WWWDIR}/server/bin/
 .for i in ${FIXME1}
 	${INSTALL_DATA} ${WRKSRC}/xymond/etcfiles/${i}.DIST ${STAGEDIR}${WWWDIR}/server/etc/${i}.sample
 .endfor
 .for i in ${FIXME2}
 	${INSTALL_DATA} ${WRKSRC}/xymond/etcfiles/${i} ${STAGEDIR}${WWWDIR}/server/etc/${i}.sample
 .endfor
 .for i in ${CONFIG_FILES}
 	${MV} ${STAGEDIR}${WWWDIR}/server/etc/${i}.DIST ${STAGEDIR}${WWWDIR}/server/etc/${i}.sample
 .endfor
 
 .include <bsd.port.mk>
diff --git a/net/ndpi/Makefile b/net/ndpi/Makefile
index 65c5d93c6408..f2c83a9aa510 100644
--- a/net/ndpi/Makefile
+++ b/net/ndpi/Makefile
@@ -1,52 +1,53 @@
 PORTNAME=	ndpi
 PORTVERSION=	4.8.d20240223
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	NTOP-maintained superset of the popular OpenDPI library
 WWW=		https://www.ntop.org/products/deep-packet-inspection/ndpi/
 
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	librrd.so:databases/rrdtool \
 		libjson-c.so:devel/json-c \
 		libgcrypt.so:security/libgcrypt \
 		libgpg-error.so:security/libgpg-error
 
 USES=		autoreconf compiler:c++11-lang cpe libtool localbase:ldflags pathfix \
 		pkgconfig
 CPE_VENDOR=	ntop
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS=	--with-pic --with-local-libgcrypt
 CPPFLAGS=	-I${LOCALBASE}/include/json-c
 LIBS=		-ljson-c
 MAKE_ENV=	EXAMPLESDIR="${EXAMPLESDIR_REL}"
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ntop
 GH_PROJECT=	nDPI
 GH_TAGNAME=	467c27c
 
 PLIST_SUB=	MAJOR_VER=${PORTVERSION:R:R} VER=${PORTVERSION:R}
 
 post-configure:
 	@${REINPLACE_CMD} -e 's/#define PACKAGE/#define NDPI_PACKAGE/g' \
 		-e 's/#define VERSION/#define NDPI_VERSION/g' \
 			${WRKSRC}/configure
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libndpi.so.${PORTVERSION:R}.0
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ndpiReader
 	${RM} ${STAGEDIR}${PREFIX}/lib/libndpi.so \
 		${STAGEDIR}${PREFIX}/lib/libndpi.so.${PORTVERSION:R:R}
 	${RLN} ${STAGEDIR}${PREFIX}/lib/libndpi.so.${PORTVERSION:R}.0 \
 		${STAGEDIR}${PREFIX}/lib/libndpi.so
 	${RLN} ${STAGEDIR}${PREFIX}/lib/libndpi.so.${PORTVERSION:R}.0 \
 		${STAGEDIR}${PREFIX}/lib/libndpi.so.${PORTVERSION:R:R}
 
 .include <bsd.port.mk>
diff --git a/net/ntopng/Makefile b/net/ntopng/Makefile
index 45d7ac0c5df6..9db55a40b9d0 100644
--- a/net/ntopng/Makefile
+++ b/net/ntopng/Makefile
@@ -1,70 +1,71 @@
 PORTNAME=	ntopng
 PORTVERSION=	6.0.d20240620
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Network monitoring tool with command line and web interfaces
 WWW=		https://www.ntop.org/products/traffic-analysis/ntop/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	librrd.so:databases/rrdtool \
 		libzmq.so:net/libzmq4 \
 		libcurl.so:ftp/curl \
 		libndpi.so:net/ndpi \
 		libjson-c.so:devel/json-c \
 		libsodium.so:security/libsodium \
 		libmaxminddb.so:net/libmaxminddb \
 		libexpat.so:textproc/expat2 \
 		libzstd.so:archivers/zstd \
 		libgcrypt.so:security/libgcrypt \
 		libgpg-error.so:security/libgpg-error \
 		libhiredis.so:databases/hiredis
 BUILD_DEPENDS=	bash:shells/bash
 
 USES=		autoreconf compiler:c++11-lang cpe gmake libtool localbase \
 		lua:54 mysql pathfix pkgconfig shebangfix sqlite ssl
 
 SUB_FILES=	ntopng-geoip2update.sh pkg-deinstall pkg-message
 SHEBANG_FILES=	httpdocs/misc/ntopng-add-user.sh \
 		httpdocs/misc/ntopng-utils-manage-config.in
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ndpi-includes=${LOCALBASE}/include/ndpi
 
 USERS=		ntopng
 GROUPS=		ntopng
 PLIST_SUB=	NTOPNGUSER="${USERS}" NTOPNGROUP="${GROUPS}"
 
 USE_GITHUB=	yes
 GH_TUPLE=	ntop:ntopng-dist:1dcd0a1:dist/httpdocs/dist
 GH_ACCOUNT=	ntop
 GH_TAGNAME=	1719c39c
 
 CPE_VENDOR=	ntop
 
 OPTIONS_DEFINE=	NLS
 
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 
 USE_RC_SUBR=	ntopng
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		-e 's|%%SSL_INC%%|${OPENSSLINC}|g' \
 		-e 's|%%SSL_LIB%%|${OPENSSLLIB}|g' \
 			${WRKSRC}/Makefile.in \
 			${WRKSRC}/configure.ac.in
 	cd ${WRKSRC} && ${SH} autogen.sh
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ntopng
 	${MKDIR} ${STAGEDIR}/var/db/ntopng
 	${INSTALL_SCRIPT} ${WRKDIR}/ntopng-geoip2update.sh ${STAGEDIR}${PREFIX}/bin
 	${RM} ${STAGEDIR}${DATADIR}/httpdocs/misc/ntopng-utils-manage-updates \
 		${STAGEDIR}${DATADIR}/httpdocs/misc/ntopng-utils-manage-updates.in
 
 .include <bsd.port.mk>
diff --git a/sysutils/ganglia-monitor-core/Makefile b/sysutils/ganglia-monitor-core/Makefile
index 30f1d143ddaa..3ce24da5bf67 100644
--- a/sysutils/ganglia-monitor-core/Makefile
+++ b/sysutils/ganglia-monitor-core/Makefile
@@ -1,104 +1,104 @@
 PORTNAME=	monitor-core
 PORTVERSION=	3.7.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils net
 MASTER_SITES=	SF/ganglia/ganglia%20monitoring%20core/${PORTVERSION}
 PKGNAMEPREFIX=	ganglia-
 .if defined(CLUSTER)
 PKGNAMESUFFIX=	-${CLUSTER}
 .endif
 DISTNAME=	ganglia-${PORTVERSION}
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Ganglia cluster monitor, monitoring daemon
 WWW=		http://ganglia.info/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libapr-1.so:devel/apr1 \
 		libconfuse.so:devel/libconfuse \
 		libpcre.so:devel/pcre \
 		libexpat.so:textproc/expat2
 
 USES=		libtool localbase:ldflags pkgconfig
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	gmond
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--enable-setuid=ganglia --enable-setgid=ganglia \
 		--disable-python
 CONFIGURE_ENV=	GANGLIA_ACK_SYSCONFDIR=1
 
 INSTALL_TARGET=	install-strip
 
 SUB_FILES+=	pkg-message
 
 USERS=		ganglia
 GROUPS=		ganglia
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 OPTIONS_DEFINE=	GMETAD
 OPTIONS_DEFAULT=	GMETAD
 OPTIONS_SUB=	yes
 
 GMETAD_DESC=	include gmetad
 
 GMETAD_LIB_DEPENDS=	librrd.so:databases/rrdtool
 GMETAD_CONFIGURE_ON=	--with-gmetad
 GMETAD_SUB_LIST=	GMETAD=""
 GMETAD_SUB_LIST_OFF=	GMETAD="\#"
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
 .if ${PORT_OPTIONS:MGMETAD}
 USE_RC_SUBR+=	gmetad
 .endif
 
 CONF_DIR=	${PREFIX}/etc
 
 MODULES=	modcpu.so \
 		moddisk.so \
 		modload.so \
 		modmem.so \
 		modmulticpu.so \
 		modnet.so \
 		modproc.so \
 		modsys.so
 
 # gmond.conf.5 and gmond.conf.html can be generated from conf.pod, but
 # doing so requires perl installed in the build stage.
 pre-configure:
 	@${REINPLACE_CMD} \
 		-e "s|/etc/ganglia/\(gm[a-z]*d.conf\)|${PREFIX}/etc/\1|g" \
 		${WRKSRC}/README \
 		${WRKSRC}/mans/gmetad.1 \
 		${WRKSRC}/mans/gmond.1
 	@${REINPLACE_CMD} -e "s|nobody|ganglia|g" \
 		${WRKSRC}/gmetad/gmetad.conf.in \
 		${WRKSRC}/gmond/conf.pod \
 		${WRKSRC}/gmond/gmond.conf.5 \
 		${WRKSRC}/gmond/gmond.conf.html
 
 post-build:
 	@${WRKSRC}/gmond/gmond -t > ${WRKDIR}/gmond.conf
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/gmond.conf \
 		${STAGEDIR}${PREFIX}/etc/gmond.conf.sample
 	${MKDIR} ${STAGEDIR}/var/db/ganglia/rrds
 	@${CHMOD} -R a+rX ${STAGEDIR}/var/db/ganglia
 
 post-install-GMETAD-on:
 	${INSTALL_SCRIPT} ${FILESDIR}/gmetasnap.sh \
 		${STAGEDIR}${PREFIX}/sbin/gmetasnap
 	${INSTALL_DATA} ${WRKSRC}/gmetad/gmetad.conf \
 		${STAGEDIR}${PREFIX}/etc/gmetad.conf.sample
 
 .include <bsd.port.mk>
diff --git a/sysutils/monitorix/Makefile b/sysutils/monitorix/Makefile
index fe4b04714226..73f1179962b3 100644
--- a/sysutils/monitorix/Makefile
+++ b/sysutils/monitorix/Makefile
@@ -1,116 +1,116 @@
 PORTNAME=	monitorix
 PORTVERSION=	3.14.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.monitorix.org/ \
 		http://www.monitorix.org/old_versions/ \
 		http://www.bayofrum.net/dist/${PORTNAME}/
 
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Web based monitoring system
 WWW=		https://www.monitorix.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	librrd.so:databases/rrdtool
 RUN_DEPENDS=	p5-ParallelUserAgent>=0:www/p5-ParallelUserAgent \
 		p5-CGI>=0:www/p5-CGI \
 		p5-libwww>=0:www/p5-libwww \
 		p5-MIME-Lite>=0:mail/p5-MIME-Lite \
 		p5-XML-Simple>=0:textproc/p5-XML-Simple \
 		p5-DBI>=0:databases/p5-DBI \
 		p5-HTTP-Server-Simple>=0:www/p5-HTTP-Server-Simple \
 		p5-Config-General>=0:devel/p5-Config-General
 
 USES=		cpe perl5
 CPE_VENDOR=	fibranet
 USE_PERL5=	run
 NO_ARCH=	yes
 NO_BUILD=	yes
 USE_RC_SUBR=	${PORTNAME}
 
 DBDIR?=		/var/db/${PORTNAME}
 CGIDIR?=	www/cgi-bin
 CGIPATH?=	/cgi-bin
 WWW_OWNER?=	${WWWOWN}
 WWW_GROUP?=	${WWWGRP}
 REPORT_LANG=	ca de en it pl
 WWWROOT=	${WWWDIR:S,/${PORTNAME}$,,}
 
 SUB_FILES=	pkg-message
 SUB_LIST=	PERL=${PERL} \
 		DBDIR=${DBDIR}
 
 PLIST_SUB+=	CGIDIR=${CGIDIR} \
 		WWW_OWNER=${WWW_OWNER} \
 		WWW_GROUP=${WWW_GROUP} \
 		DBDIR=${DBDIR}
 
 WWW_FILES=	logo_top.png \
 		logo_bot.png \
 		monitorixico.png
 
 PORTDOCS=	*
 PORTDATA=	*.pm
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "You may set following options:"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "DBDIR=${DBDIR}	Where do you put RRD databases?"
 	@${ECHO_MSG} "CGIDIR=${CGIDIR}	Where do you put cgi?"
 	@${ECHO_MSG} "CGIPATH=${CGIPATH}	What is the relative URL for cgi files?"
 	@${ECHO_MSG} "WWWDIR=${WWWDIR}	Where do you put httpd's document root?"
 	@${ECHO_MSG} ""
 
 post-patch:
 # Let's set our own paths.
 # No iptables, so we'll disable PORT_GRAPH
 	@${REINPLACE_CMD} '\,^use lib,s,/usr/lib/monitorix,${DATADIR},' \
 		${WRKSRC}/${PORTNAME} \
 		${WRKSRC}/${PORTNAME}.cgi
 	@${REINPLACE_CMD} \
 		-e '\|user *= *nobody|s|nobody|www|' \
 		-e '\|group *= *nobody|s|nobody|www|' \
 		-e 's|^\(base_dir *= *\).*|\1${WWWDIR}/|' \
 		-e 's|^\(base_lib *= *\).*|\1${DBDIR}/|' \
 		-e 's|^\(base_cgi *= *\).*|\1${CGIPATH}/|' \
 		-e 's|^\(secure_log[[:space:]]*= *\).*|\1/var/log/auth.log|' \
 		-e "s|/var/lib/milter-greylist/db/|/var/milter-greylist/|" \
 		-e 's|^\([[:space:]]*port[^=]*=[^y]*\)y|\1n|' \
 		-e 's|^\([[:space:]]*cmd[^=]*=[^s]*\)ss|\1netstat|' \
 			${WRKSRC}/monitorix.conf
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/monitorix ${STAGEDIR}${PREFIX}/bin/
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/lib/* ${STAGEDIR}${DATADIR}/
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${STAGEDIR}${WWWDIR} && ${MKDIR} usage imgs)
 	${INSTALL_DATA} ${WWW_FILES:S,^,${WRKSRC}/,} ${STAGEDIR}${WWWDIR}/
 	${MKDIR} ${STAGEDIR}${PREFIX}/${CGIDIR}
 	${LN} -sf ${PREFIX}/${CGIDIR} ${STAGEDIR}${WWWDIR}/cgi
 	${INSTALL_SCRIPT} ${WRKSRC}/monitorix.cgi \
 		${STAGEDIR}${PREFIX}/${CGIDIR}/
 .for s in 5 8
 	${INSTALL_MAN} ${WRKSRC}/man/man$s/* ${STAGEDIR}${PREFIX}/share/man/man$s/
 .endfor
 	${MKDIR} ${STAGEDIR}${WWWDIR}/reports
 .for l in ${REPORT_LANG}
 	${INSTALL_DATA} ${WRKSRC}/reports/${l}.html \
 		${STAGEDIR}${WWWDIR}/reports/$l.html.sample
 .endfor
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in docs/*[^t] README README.BSD README.nginx Changes
 	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/monitorix.conf \
 		${STAGEDIR}${PREFIX}/etc/monitorix.conf.sample
 	${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/sysutils/munin-master/Makefile b/sysutils/munin-master/Makefile
index 899288a390aa..e1bd260858d1 100644
--- a/sysutils/munin-master/Makefile
+++ b/sysutils/munin-master/Makefile
@@ -1,65 +1,65 @@
 PORTNAME=	munin
 PORTVERSION=	${MUNIN_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils perl5
 PKGNAMESUFFIX=	-master
 
 MAINTAINER=	flo@FreeBSD.org
 COMMENT=	Collector part of Munin
 WWW=		https://munin-monitoring.org/
 
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	munin-common>=${MUNIN_VERSION}:sysutils/munin-common \
 		p5-CGI>=0:www/p5-CGI \
 		p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \
 		p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
 		p5-HTML-Template>=0:www/p5-HTML-Template \
 		p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6 \
 		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
 		p5-Module-Build>=0:devel/p5-Module-Build \
 		p5-Net-SSLeay>=0:security/p5-Net-SSLeay \
 		p5-Params-Validate>=0:devel/p5-Params-Validate \
 		rrdtool>=0:databases/rrdtool
 RUN_DEPENDS=	munin-common>=${MUNIN_VERSION}:sysutils/munin-common \
 		p5-CGI-Fast>=0:www/p5-CGI-Fast \
 		p5-CGI>=0:www/p5-CGI \
 		p5-Date-Manip>=0:devel/p5-Date-Manip \
 		p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \
 		p5-FCGI>=0:www/p5-FCGI \
 		p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
 		p5-HTML-Template>=0:www/p5-HTML-Template \
 		p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6 \
 		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
 		p5-Net-SSLeay>=0:security/p5-Net-SSLeay \
 		p5-Params-Validate>=0:devel/p5-Params-Validate \
 		p5-URI>=0:net/p5-URI \
 		rrdtool>=0:databases/rrdtool
 
 USES=		cpe gmake perl5
 
 .include "${.CURDIR}/../munin-common/munin.mk"
 
 ALL_TARGET=	infiles build-master build-man
 INSTALL_TARGET=	install-master-prime
 
 NO_ARCH=	yes
 
 PORTSCOUT=	ignore:1
 
 SUB_FILES=	pkg-message
 PLIST_SUB+=	WWWGRP=${WWWGRP} \
 		WWWOWN=${WWWOWN}
 
 post-install:
 	(cd ${WRKSRC}/build/doc; \
 		${INSTALL_MAN} munin.conf.5 ${STAGEDIR}${PREFIX}/share/man/man5; \
 		${INSTALL_MAN} munin-cron.8 munin-graph.8 munin-html.8 munin-limits.8 munin-update.8 ${STAGEDIR}${PREFIX}/share/man/man8; \
 	)
 	(cd ${STAGEDIR}${ETCDIR}; for i in `find . -type f`; do ${MV} $$i $$i.sample; done)
 	${MV} ${STAGEDIR}${WWWDIR}/.htaccess ${STAGEDIR}${WWWDIR}/.htaccess.sample
 	${INSTALL_DATA} ${FILESDIR}/newsyslog ${STAGEDIR}${ETCDIR}/munin-master.newsyslog
 	${MKDIR} ${STAGEDIR}${LOCALBASE}/etc/cron.d
 	${INSTALL_DATA} ${FILESDIR}/cron ${STAGEDIR}${ETCDIR}/munin-master.cron
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-mqttwarn/Makefile b/sysutils/py-mqttwarn/Makefile
index 5c8159370b95..bcb1c69b5ada 100644
--- a/sysutils/py-mqttwarn/Makefile
+++ b/sysutils/py-mqttwarn/Makefile
@@ -1,99 +1,100 @@
 PORTNAME=	mqttwarn
 DISTVERSION=	0.35.0
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dvl@FreeBSD.org
 COMMENT=	Subscribe to MQTT topics and notify pluggable services
 WWW=		https://github.com/jpmens/mqttwarn
 
 LICENSE=	EPL
 
 # based on setup.py : tests_require=extras['test'],
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}versioningit>=0:devel/py-versioningit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
 
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}attrs>=19.3.0:devel/py-attrs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docopt>=0.6.2:devel/py-docopt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}funcy>0:devel/py-funcy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}paho-mqtt>=1.4.0:net/py-paho-mqtt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.13.0:devel/py-six@${PY_FLAVOR}
 
 USES=		python shebangfix
 
 USE_PYTHON=	autoplist concurrent pep517
 SHEBANG_REGEX=	'.*\.py$$'
 
 NO_ARCH=	yes
 
 # Most of what is in setup.py under extras is supported.
 # The following were omitted because their dependencies are not found in the
 # FreeBSD port tree: AMQP APPRISE ASTERISK FBCHAT IOHUB NMA NSCA OSXNOTIFY PASTEBINPUB PROWL PUSHBULLET
 #                    SLACK TOOTPASTE XIVELY XMPP
 OPTIONS_DEFINE=	APNS CELERY DNSUPDATE DOCS EXAMPLES GSS2 MYSQL POSTGRES REDISPUB \
 		RRDTOOL SERIAL SSH TWILIO TWITTER WEBSOCKET
 
 USERS=		mqttwarn
 GROUPS=		mqttwarn
 
 SUB_FILES=	mqttwarn pkg-message
 
 APNS_DESC=	Apple Push Notifications
 CELERY_DESC=	Asynchronous task queue/job queue
 DNSUPDATE_DESC=	DNS updates
 GSS2_DESC=	Google Docs Spreadsheet 2
 MYSQL_DESC=	MySQL plugin
 POSTGRES_DESC=	PostgreSQL Plugin
 REDISPUB_DESC=	Publishes to a Redis channel
 RRDTOOL_DESC=	Updates a round robin database created by rrdtool
 SERIAL_DESC=	Serial port
 SSH_DESC=	ssh plugin
 TWILIO_DESC=	Use Twilio API to send messages
 TWITTER_DESC=	Notifications to Twitter accounts
 WEBSOCKET_DESC=	Websocket
 
 APNS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}apns2>=2.0.1:devel/py-apns2@${PY_FLAVOR}
 CELERY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}celery>0:devel/py-celery@${PY_FLAVOR}
 DNSUPDATE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>=1.15.0:dns/py-dnspython@${PY_FLAVOR}
 GSS2_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gspread>=2.1.10:net/py-gspread@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}oauth2client>=4.1.2:security/py-oauth2client@${PY_FLAVOR}
 MYSQL_USES=		mysql
 POSTGRES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.7.4:databases/py-psycopg2@${PY_FLAVOR}
 REDISPUB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>=2.10.6:databases/py-redis@${PY_FLAVOR}
 RRDTOOL_LIB_DEPENDS=	librrd.so:databases/rrdtool
 RRDTOOL_RUN_DEPENDS=	rrdtool>0.1.12:databases/rrdtool
 SERIAL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyserial>3.40:comms/py-pyserial@${PY_FLAVOR}
 SSH_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>2.4.1:security/py-paramiko@${PY_FLAVOR}
 TWILIO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twilio>6.11.0:devel/py-twilio@${PY_FLAVOR}
 TWITTER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-twitter>=3.4.1:net/py-python-twitter@${PY_FLAVOR}
 WEBSOCKET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}websocket-client>=0.47.0:www/py-websocket-client@${PY_FLAVOR}
 
 post-patch:
 	@${RM} ${WRKSRC}/tests/bad_funcs.py
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -o addopts=
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/mqttwarn ${STAGEDIR}${PREFIX}/etc/rc.d
 	@${ECHO_CMD} "etc/rc.d/mqttwarn" >> ${TMPPLIST}
 
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/mqttwarn/examples/basic/mqttwarn.ini ${STAGEDIR}${ETCDIR}/mqttwarn.ini.sample
 	@${ECHO_CMD} "@dir ${ETCDIR}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@sample(mqttwarn,mqttwarn,0640) ${ETCDIR}/mqttwarn.ini.sample" >> ${TMPPLIST}
 
 	${MKDIR} ${STAGEDIR}/var/run/mqttwarn
 	@${ECHO_CMD} "@dir /var/run/mqttwarn" >> ${TMPPLIST}
 
 	${MKDIR} ${STAGEDIR}/var/log/mqttwarn
 	@${ECHO_CMD} "@dir(mqttwarn,mqttwarn,) /var/log/mqttwarn" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/sysutils/slurm-wlm/Makefile b/sysutils/slurm-wlm/Makefile
index 45bd2a4cd455..bb1dfa5e9f01 100644
--- a/sysutils/slurm-wlm/Makefile
+++ b/sysutils/slurm-wlm/Makefile
@@ -1,168 +1,168 @@
 PORTNAME=	slurm
 DISTVERSION=	23.11.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	https://download.schedmd.com/slurm/
 PKGNAMESUFFIX=	-wlm
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Simple Linux Utility for Resource Management
 WWW=		https://slurm.schedmd.com/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 NOT_FOR_ARCHS=		armv6 armv7 i386 mips powerpc powerpcspe
 NOT_FOR_ARCHS_REASON=	32-bit support is deprecated
 
 LIB_DEPENDS=	libjson-c.so:devel/json-c \
 		libsysinfo.so:devel/libsysinfo \
 		libmunge.so:security/munge \
 		liblz4.so:archivers/liblz4 \
 		libze_loader.so:devel/level-zero \
 		libhttp_parser.so:www/http-parser \
 		libunwind.so:devel/libunwind \
 		librdkafka.so:net/librdkafka \
 		libyaml.so:textproc/libyaml \
 		libdbus-1.so:devel/dbus \
 		libcheck.so:devel/check \
 		libtbb.so:devel/onetbb \
 		libjwt.so:www/libjwt
 
 USES=		compiler:c11 cpe gmake gnome libtool localbase lua mysql:client	\
 		perl5 pkgconfig python:build readline shebangfix ssl tar:bz2
 USE_PERL5=	build
 CPE_VENDOR=	schedmd
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	slurmctld slurmd
 
 USERS=		slurm
 GROUPS=		${USERS}
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 PLIST_SUB=	PORTVERSION="${DISTVERSION}" VER="${DISTVERSION:R}"
 SHEBANG_FILES=	doc/html/shtml2html.py doc/man/man2html.py
 PORTDOCS=	*
 
 OPTIONS_DEFINE=		CURL DOCS GUI HDF5 HWLOC IPMI RRD
 OPTIONS_DEFAULT=	HDF5 HWLOC
 OPTIONS_SUB=		yes
 
 CURL_DESC=	Require cURL for elasticsearch plugins
 GUI_DESC=	Build sview GUI config tool
 HDF5_DESC=	Job profiling using HDF5
 HWLOC_DESC=	Portable hardware locality
 IPMI_DESC=	IPMI energy consumption accounting
 RRD_DESC=	RRD external sensor data collection
 
 DOCS_BUILD_DEPENDS=	man2html:textproc/man2html
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_WITH=	libcurl
 
 GUI_USE=		GNOME=cairo,gdkpixbuf2,glib20,gtk20,pango
 GUI_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2 \
 			libharfbuzz.so:print/harfbuzz
 GUI_USES=		gettext
 GUI_CONFIGURE_ENABLE=	glibtest gtktest x11
 
 HDF5_LIB_DEPENDS=	libhdf5_cpp.so:science/hdf5 \
 			libsz.so:science/libaec
 HDF5_CONFIGURE_WITH=	hdf5
 HDF5_CONFIGURE_ENV=	H5CC=${LOCALBASE}/bin/h5cc
 
 HWLOC_LIB_DEPENDS=	libhwloc.so.15:devel/hwloc2
 HWLOC_CONFIGURE_WITH=	hwloc
 
 IPMI_LIB_DEPENDS=	libfreeipmi.so:sysutils/freeipmi
 IPMI_CONFIGURE_WITH=	freeipmi
 
 RRD_LIB_DEPENDS=	librrd.so:databases/rrdtool
 RRD_CONFIGURE_WITH=	rrdtool
 
 # FreeBSD Infiniband support is still experimental
 # slurmrestd does not build on FreeBSD
 CONFIGURE_ARGS=	--disable-slurmrestd --with-mysql_config=${LOCALBASE}/bin \
 		--docdir=${DOCSDIR} --htmldir=${DOCSDIR}
 
 CFLAGS+=	-I${WRKSRC}/slurm -I${LOCALBASE}/include	\
 		-I${LOCALBASE}/include/level_zero		\
 		-I${LOCALBASE}/include/librdkafka		\
 		-fcommon -D__BSD_VISIBLE=1
 LDFLAGS+=	-L${LOCALBASE}/lib -lsysinfo -lprocstat -fcommon
 
 PROC2FIX=	common/callerid.c common/fd.c common/fetch_config.c	\
 		interfaces/proctrack.c	\
 		plugins/acct_gather_energy/rapl/acct_gather_energy_rapl.c	\
 		plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c	\
 		plugins/burst_buffer/common/burst_buffer_common.c	\
 		plugins/cgroup/v1/xcgroup.c plugins/cgroup/v2/cgroup_v2.c	\
 		plugins/gpu/nvml/gpu_nvml.c	\
 		plugins/job_container/tmpfs/job_container_tmpfs.c	\
 		plugins/jobacct_gather/cgroup/jobacct_gather_cgroup.c	\
 		plugins/jobacct_gather/common/common_jag.c	\
 		plugins/jobacct_gather/linux/jobacct_gather_linux.c	\
 		plugins/node_features/knl_generic/node_features_knl_generic.c	\
 		plugins/proctrack/cgroup/proctrack_cgroup.c	\
 		plugins/proctrack/cray_aries/proctrack_cray_aries.c	\
 		plugins/proctrack/linuxproc/kill_tree.c	\
 		plugins/proctrack/pgid/proctrack_pgid.c	\
 		plugins/switch/cray_aries/scaling.c	\
 		plugins/task/affinity/affinity.c slurmd/common/set_oomadj.c	\
 		slurmd/common/xcpuinfo.c slurmd/slurmstepd/pdebug.c	\
 		slurmd/slurmstepd/req.c
 
 LLD2FIX=	api plugins/openapi sacctmgr sackd scontrol scrontab scrun	\
 		slurmctld slurmd/slurmd squeue
 
 .include <bsd.port.options.mk>
 
 # Hack around nonfunctional --disable-gtktest flag
 pre-configure-GUI-off:
 	${REINPLACE_CMD} -e 's|min_gtk_version=.*|min_gtk_version=2000.0.0|' \
 		${WRKSRC}/configure
 
 # SLURM's configure enables interactive jobs if pty.h exists.  Replacing
 # #include <pty.h> with appropriate headers will therefore not work, so instead
 # add a pty.h for the build.
 pre-configure:
 	${CP} ${FILESDIR}/pty.h ${WRKSRC}/slurm
 	${REINPLACE_CMD} -e 's|sched_setaffinity|cpuset_setaffinity|g' \
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/configure
 .for src in ${PROC2FIX}
 	${REINPLACE_CMD} -e 's|"/proc|"/compat/linux/proc|g' \
 		-e 's|(/proc)|(/compat/linux/proc)|g' \
 		${WRKSRC}/src/${src}
 .endfor
 	@if ${WHICH} sbatch > /dev/null; then \
 		${ECHO_CMD} "********************************************"; \
 		${ECHO_CMD} "Build may fail while slurm-wlm is installed."; \
 		${ECHO_CMD} "Deinstall slurm-wlm and run make again."; \
 		${ECHO_CMD} "********************************************"; \
 		false; \
 	fi
 .if ${ARCH} == powerpc64le
 	${FIND} ${LLD2FIX:C|^|${WRKSRC}/src/|} -name Makefile.in | ${XARGS}	\
 		${REINPLACE_CMD} -e 's|-r -o|-r -m elf64lppc -o|'
 .elif ${ARCH} == powerpc64
 	${FIND} ${LLD2FIX:C|^|${WRKSRC}/src/|} -name Makefile.in | ${XARGS}	\
 		${REINPLACE_CMD} -e 's|-r -o|-r -m elf64ppc -o|'
 .elif ${ARCH} == aarch64
 	${FIND} ${LLD2FIX:C|^|${WRKSRC}/src/|} -name Makefile.in | ${XARGS}	\
 		${REINPLACE_CMD} -e 's|-r -o|-r -m aarch64elf -o|'
 .else
 	${FIND} ${LLD2FIX:C|^|${WRKSRC}/src/|} -name Makefile.in | ${XARGS}	\
 		${REINPLACE_CMD} -e 's|-r -o|-r -m elf_${ARCH} -o|'
 .endif
 	${FIND} ${WRKSRC} -name Makefile.in | ${XARGS}	\
 		${REINPLACE_CMD} -e 's|htmldir = \$${datadir.*$$|htmldir = @htmldir@|'
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/etc/slurm.conf.example \
 		${STAGEDIR}${PREFIX}/etc/slurm.conf.sample
 
 .include <bsd.port.mk>
diff --git a/sysutils/symon/Makefile b/sysutils/symon/Makefile
index 9b28315a1d9f..974a53e3e4e7 100644
--- a/sysutils/symon/Makefile
+++ b/sysutils/symon/Makefile
@@ -1,69 +1,69 @@
 PORTNAME=	symon
 PORTVERSION=	2.88
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	https://wpd.home.xs4all.nl/symon/philes/ \
 		LOCAL/uqs
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Performance and information monitoring tool
 WWW=		https://wpd.home.xs4all.nl/symon/
 
 SUB_FILES=	pkg-message
 
 USES=		groff perl5 shebangfix
 SHEBANG_FILES=	client/getsymonitem.pl
 USE_PERL5=	build
 MAKE_JOBS_UNSAFE=	yes
 CFLAGS+=	-D_WANT_SEMUN
 
 USERS=		_symon
 GROUPS=		_symon
 
 # Synonym for WITHOUT_SYMUX
 .if defined(WITHOUT_RRD)
 WITHOUT_SYMUX=	yes
 .endif
 
 .if !defined(WITHOUT_SYMUX)
 LIB_DEPENDS+=	librrd.so:databases/rrdtool
 .endif
 
 .if defined(WITHOUT_SYMUX) && defined(WITHOUT_SYMON)
 IGNORE=	you have defined both WITHOUT_SYMUX or WITHOUT_RRD *and* WITHOUT_SYMON
 .endif
 
 SUBDIR=		lib
 .if !defined(WITHOUT_SYMON)
 SUBDIR+=	symon
 PLIST_SUB+=	SYMON=""
 USE_RC_SUBR+=	symon
 .else
 PLIST_SUB+=	SYMON="@comment "
 .endif
 .if !defined(WITHOUT_SYMUX)
 SUBDIR+=	symux
 PLIST_SUB+=	SYMUX=""
 USE_RC_SUBR+=	symux
 .else
 PLIST_SUB+=	SYMUX="@comment "
 .endif
 SUBDIR+=	client
 
 MAKE_ARGS+=	SUBDIR="${SUBDIR}" RRDDIR="${LOCALBASE}" LORDER=echo TSORT=cat \
 		SYSCONFDIR="${PREFIX}/etc" PREFIX="${STAGEDIR}/${PREFIX}" \
 		MANDIR="share/man"
 
 .include <bsd.port.pre.mk>
 
 post-extract:
 	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
 
 post-patch:
 # We need to teach symon about mbstat changes/removal in r253351 and r253361.
 	@${RM} ${WRKSRC}/platform/FreeBSD/sm_mbuf.c
 .if ${OPSYS} == FreeBSD
 	@${REINPLACE_CMD} 's|altq/|net/&|' ${WRKSRC}/platform/FreeBSD/sm_pfq.c
 .endif
 
 .include <bsd.port.post.mk>