Index: head/sysutils/munin-common/distinfo
===================================================================
--- head/sysutils/munin-common/distinfo	(revision 529913)
+++ head/sysutils/munin-common/distinfo	(revision 529914)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1583926528
-SHA256 (munin-2.0.57.tar.gz) = b51ca4fd73c3ceb232c17ef4d8ba96ae2d39482df6532109ae2baaf2da0eb297
-SIZE (munin-2.0.57.tar.gz) = 2266092
+TIMESTAMP = 1585594593
+SHA256 (munin-2.0.59.tar.gz) = 89121257444577467ad73f87490eeb79740188d82d0dcfb2a2b0b3dd15131bcd
+SIZE (munin-2.0.59.tar.gz) = 2267792
Index: head/sysutils/munin-common/files/patch-Makefile
===================================================================
--- head/sysutils/munin-common/files/patch-Makefile	(revision 529913)
+++ head/sysutils/munin-common/files/patch-Makefile	(revision 529914)
@@ -1,175 +1,175 @@
 Install things at the correct places.
 
---- Makefile.orig	2019-11-20 19:39:52 UTC
+--- Makefile.orig	2020-03-24 12:31:00 UTC
 +++ Makefile
-@@ -95,96 +95,77 @@ install: install-master-prime install-common-prime ins
+@@ -94,96 +94,77 @@ install: install-master-prime install-common-prime ins
  
  install-pre: $(MAKEFILES)
  	@$(CHECKUSER)
 -	mkdir -p $(LOGDIR)
 -	mkdir -p $(STATEDIR)
 -	mkdir -p $(SPOOLDIR)
 -	mkdir -p $(CONFDIR)
 -	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
 +	mkdir -p $(DESTDIR)$(CONFDIR)
  
  install-master-prime: $(INFILES_MASTER) install-pre install-master
 -	mkdir -p $(CONFDIR)/templates
 -	mkdir -p $(CONFDIR)/static
 -	mkdir -p $(CONFDIR)/templates/partial
 -	mkdir -p $(CONFDIR)/munin-conf.d
 -	mkdir -p $(LIBDIR)
 -	mkdir -p $(BINDIR)
 -	mkdir -p $(PERLLIB)
 -	mkdir -p $(PERLLIB)/Munin/Master
 -	mkdir -p $(HTMLDIR)
 -	mkdir -p $(DBDIR)
 -	mkdir -p $(DBDIR)/cgi-tmp
 -	mkdir -p $(CGIDIR)
 +	mkdir -p $(DESTDIR)$(CONFDIR)/templates
 +	mkdir -p $(DESTDIR)$(CONFDIR)/static
 +	mkdir -p $(DESTDIR)$(CONFDIR)/templates/partial
 +	mkdir -p $(DESTDIR)$(CONFDIR)/munin-conf.d
 +	mkdir -p $(DESTDIR)$(LIBDIR)
 +	mkdir -p $(DESTDIR)$(BINDIR)
 +	mkdir -p $(DESTDIR)$(HTMLDIR)
 +	mkdir -p $(DESTDIR)$(DBDIR)/cgi-tmp
 +	mkdir -p $(DESTDIR)$(CGIDIR)
  
 -	$(CHOWN) $(USER) $(HTMLDIR) $(DBDIR)
 -	$(CHMOD) 0755 $(DBDIR)
 -
 -	$(CHOWN) $(CGIUSER) $(DBDIR)/cgi-tmp
 -	$(CHMOD) 0755 $(DBDIR)/cgi-tmp
 -
  	for p in master/www/*.tmpl ;  do \
 -		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
 +		$(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/ ; \
  	done
  
  	for p in master/static/* ; do \
 -		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/static/ ; \
 +		$(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/static/ ; \
  	done
  
  	for p in master/www/partial/*.tmpl; do \
 -		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/partial/ ; \
 +		$(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/partial/ ; \
  	done
  
 -	$(INSTALL) -m 0644 master/DejaVuSansMono.ttf $(LIBDIR)/
 -	$(INSTALL) -m 0644 master/DejaVuSans.ttf $(LIBDIR)/
 +	$(INSTALL) -m 0644 master/DejaVuSansMono.ttf $(DESTDIR)$(LIBDIR)/
 +	$(INSTALL) -m 0644 master/DejaVuSans.ttf $(DESTDIR)$(LIBDIR)/
  
 -	test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess
 -	test -f "$(CONFDIR)/munin.conf"  || $(INSTALL) -m 0644 build/master/munin.conf $(CONFDIR)/
 +	$(INSTALL) -m 0644 build/master/www/munin-htaccess $(DESTDIR)$(HTMLDIR)/.htaccess
 +	$(INSTALL) -m 0644 build/master/munin.conf $(DESTDIR)$(CONFDIR)/
  
 -	$(INSTALL) -m 0755 build/master/_bin/munin-cron $(BINDIR)/
 -	$(INSTALL) -m 0755 build/master/_bin/munin-check $(BINDIR)/
 -	$(INSTALL) -m 0755 build/master/_bin/munin-update $(LIBDIR)/
 -	$(INSTALL) -m 0755 build/master/_bin/munin-html $(LIBDIR)/
 -	$(INSTALL) -m 0755 build/master/_bin/munin-graph $(LIBDIR)/
 -	$(INSTALL) -m 0755 build/master/_bin/munin-limits $(LIBDIR)/
 -	$(INSTALL) -m 0755 build/master/_bin/munin-datafile2storable $(LIBDIR)/
 -	$(INSTALL) -m 0755 build/master/_bin/munin-storable2datafile $(LIBDIR)/
 -	$(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(CGIDIR)/munin-cgi-graph
 -	$(INSTALL) -m 0755 build/master/_bin/munin-cgi-html $(CGIDIR)/munin-cgi-html
 +	$(INSTALL) -m 0755 build/master/_bin/munin-cron $(DESTDIR)$(BINDIR)/
 +	$(INSTALL) -m 0755 build/master/_bin/munin-check $(DESTDIR)$(BINDIR)/
 +	$(INSTALL) -m 0755 build/master/_bin/munin-update $(DESTDIR)$(LIBDIR)/
 +	$(INSTALL) -m 0755 build/master/_bin/munin-html $(DESTDIR)$(LIBDIR)/
 +	$(INSTALL) -m 0755 build/master/_bin/munin-graph $(DESTDIR)$(LIBDIR)/
 +	$(INSTALL) -m 0755 build/master/_bin/munin-limits $(DESTDIR)$(LIBDIR)/
 +	$(INSTALL) -m 0755 build/master/_bin/munin-datafile2storable $(DESTDIR)$(LIBDIR)/
 +	$(INSTALL) -m 0755 build/master/_bin/munin-storable2datafile $(DESTDIR)$(LIBDIR)/
 +	$(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(DESTDIR)$(CGIDIR)/munin-cgi-graph
 +	$(INSTALL) -m 0755 build/master/_bin/munin-cgi-html $(DESTDIR)$(CGIDIR)/munin-cgi-html
  
  install-node-plugins: install-plugins-prime
  
  install-plugins-prime: install-plugins build $(PLUGINS) $(MAKEFILES)
  	@$(CHECKGROUP)
  
 -	mkdir -p $(CONFDIR)/plugins
 -	mkdir -p $(CONFDIR)/plugin-conf.d
 -	mkdir -p $(LIBDIR)/plugins
 -	mkdir -p $(PLUGSTATE)
 +	mkdir -p $(DESTDIR)$(CONFDIR)/plugins
 +	mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d
 +	mkdir -p $(DESTDIR)$(LIBDIR)/plugins
 +	mkdir -p $(DESTDIR)$(PLUGSTATE)
  
 -	$(CHOWN) root:root $(PLUGSTATE)
 -	$(CHMOD) 0755 $(PLUGSTATE)
 -	$(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
 -
  	@# Process the OS specific plugins at the end. Otherwise they would be overridden by the
  	@# generic ones.
  	for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \
  		if test -f "$$p"; then \
  			echo Installing $$p; \
 -			$(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/; \
 +			$(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/;     \
  		fi \
  	done
 -	@# Some HP-UX plugins need *.adv support files in LIBDIR
 -	if [ "$(OSTYPE)" = "hp-ux" ]; then mv $(LIBDIR)/plugins/*.adv $(LIBDIR); fi
 -	$(INSTALL) -m 0644 build/plugins/plugins.history $(LIBDIR)/plugins/
 -	$(INSTALL) -m 0644 build/plugins/plugin.sh $(LIBDIR)/plugins/
 +	$(INSTALL) -m 0644 build/plugins/plugins.history $(DESTDIR)$(LIBDIR)/plugins/
 +	$(INSTALL) -m 0644 build/plugins/plugin.sh $(DESTDIR)$(LIBDIR)/plugins/
  
  install-plugins-java: build-plugins-java
 -	mkdir -p $(JAVALIBDIR)
 -	$(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(JAVALIBDIR)/
 -	mkdir -p $(LIBDIR)/plugins
 +	mkdir -p $(DESTDIR)$(JAVALIBDIR)
 +	$(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(DESTDIR)$(JAVALIBDIR)/
 +	mkdir -p $(DESTDIR)$(LIBDIR)/plugins
  	for p in build/plugins/node.d.java/*; do \
  		if test -f "$$p"; then \
  			echo Installing $$p; \
 -			$(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/; \
 +			$(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/;     \
  		fi \
  	done
  
-@@ -195,14 +176,14 @@ install-plugins-java: build-plugins-java
+@@ -194,14 +175,14 @@ install-plugins-java: build-plugins-java
  install-async-prime: install-async
  
  install-async:
 -	mkdir -p $(LIBDIR)
 -	$(INSTALL) -m 0755 build/node/_bin/munin-async $(LIBDIR)/
 -	$(INSTALL) -m 0755 build/node/_bin/munin-asyncd $(LIBDIR)/
 +	mkdir -p $(DESTDIR)$(LIBDIR)
 +	$(INSTALL) -m 0755 build/node/_bin/munin-async $(DESTDIR)$(LIBDIR)/
 +	$(INSTALL) -m 0755 build/node/_bin/munin-asyncd $(DESTDIR)$(LIBDIR)/
  
  install-node-prime: install-node-pre install-node
  
  install-node-pre: build/node/munin-node.conf install-pre
 -	test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/
 +	test -f "$(DESTDIR)$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(DESTDIR)$(CONFDIR)/
  
  
  install-common-prime: build-common install-common
-@@ -519,7 +500,7 @@ t/install:
+@@ -518,7 +499,7 @@ t/install:
  
  # This builds */Build from Build.PL
  %/Build: %/Build.PL
 -	cd $* && $(PERL) -I. Build.PL
 +	cd $* && $(PERL) -I. Build.PL --config perl=$(PERL)
  
  build-%: %/Build
  	cd $* && $(PERL) Build
-@@ -535,6 +516,7 @@ install-%: %/Build
+@@ -534,6 +515,7 @@ install-%: %/Build
  		--install_path script=$(BINDIR) \
  		--install_path sbin=$(SBINDIR) \
  		--install_path bindoc=$(MANDIR)/man1 \
 +		--destdir=$(DESTDIR) \
  		--install_path libdoc=$(MANDIR)/man3
  
  test-%: %/Build
Index: head/sysutils/munin-common/files/patch-node_lib_Munin_Node_Server.pm
===================================================================
--- head/sysutils/munin-common/files/patch-node_lib_Munin_Node_Server.pm	(revision 529913)
+++ head/sysutils/munin-common/files/patch-node_lib_Munin_Node_Server.pm	(revision 529914)
@@ -1,14 +1,14 @@
 Backporting: https://github.com/munin-monitoring/munin/commit/8ff5d5a9ec8b7ffd99dce61fee42defe7bda3b29
 See also: http://munin-monitoring.org/ticket/1451
 
---- node/lib/Munin/Node/Server.pm.orig	2020-03-09 01:59:44 UTC
+--- node/lib/Munin/Node/Server.pm.orig	2020-03-24 12:31:00 UTC
 +++ node/lib/Munin/Node/Server.pm
-@@ -343,7 +343,7 @@ sub _print_service {
+@@ -341,7 +341,7 @@ sub _print_service {
  sub _list_services {
      my ($session, $node) = @_;
  
 -    $node ||= $config->{fqdn};
 +    $node ||= lc($config->{fqdn});
  
      if (exists $nodes{$node}) {
          my @services = @{$nodes{$node}};
Index: head/sysutils/munin-common/files/patch-node_sbin_munin-node
===================================================================
--- head/sysutils/munin-common/files/patch-node_sbin_munin-node	(revision 529913)
+++ head/sysutils/munin-common/files/patch-node_sbin_munin-node	(revision 529914)
@@ -1,16 +1,16 @@
 plugins run in taint mode because the uid is changed, so the path must not
 contain writable directories.
 
---- node/sbin/munin-node.orig	2020-03-09 01:59:44 UTC
+--- node/sbin/munin-node.orig	2020-03-24 12:31:00 UTC
 +++ node/sbin/munin-node
-@@ -55,6 +55,10 @@ sub main
+@@ -53,6 +53,10 @@ sub main
          $ENV{$key} = $1;
      }
  
 +    # plugins run in taint mode because the uid is changed, so the path
 +    # must not contain writable directories.
 +    $ENV{PATH}='/bin:/sbin:/usr/bin:/usr/sbin:%%PREFIX%%/bin:%%PREFIX%%/sbin';
 +
      parse_args();
  
      my $config = Munin::Node::Config->instance();
Index: head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_df.in
===================================================================
--- head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_df.in	(revision 529913)
+++ head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_df.in	(revision 529914)
@@ -1,13 +1,13 @@
 Ignore autofs too.
 
---- plugins/node.d.freebsd/df.in.orig	2018-06-29 00:50:01 UTC
+--- plugins/node.d.freebsd/df.in.orig	2020-03-24 12:31:00 UTC
 +++ plugins/node.d.freebsd/df.in
-@@ -24,7 +24,7 @@ if [ "$1" = "autoconf" ]; then
+@@ -22,7 +22,7 @@ if [ "$1" = "autoconf" ]; then
  	exit 0
  fi
  
 -EXCLUDEDFS="-t noprocfs,devfs,fdescfs,linprocfs,linsysfs,sysfs,nfs,nullfs,cd9660"
 +EXCLUDEDFS="-t noprocfs,devfs,fdescfs,linprocfs,linsysfs,sysfs,nfs,nullfs,cd9660,autofs"
  
  if [ $(uname -s) = "GNU/kFreeBSD" ]; then
  	# Debian ships df from GNU coreutils
Index: head/sysutils/munin-common/files/patch-plugins_node.d_ipmi__.in
===================================================================
--- head/sysutils/munin-common/files/patch-plugins_node.d_ipmi__.in	(revision 529913)
+++ head/sysutils/munin-common/files/patch-plugins_node.d_ipmi__.in	(revision 529914)
@@ -1,13 +1,13 @@
 awk works just fine here.
 
---- plugins/node.d/ipmi_.in.orig	2017-01-18 20:25:20 UTC
+--- plugins/node.d/ipmi_.in.orig	2020-03-24 12:31:00 UTC
 +++ plugins/node.d/ipmi_.in
-@@ -73,7 +73,7 @@ export CONFIG MEASURE
+@@ -76,7 +76,7 @@ export CONFIG MEASURE
  
  #### Work is done in this awk script
  
 -ipmitool sensor | gawk -F'|' '
 +ipmitool sensor | awk -F'|' '
  BEGIN {
      FANS = "";
      TEMPS = "";
Index: head/sysutils/munin-common/munin.mk
===================================================================
--- head/sysutils/munin-common/munin.mk	(revision 529913)
+++ head/sysutils/munin-common/munin.mk	(revision 529914)
@@ -1,38 +1,38 @@
 LICENSE=	GPLv2
 
-MUNIN_VERSION=	2.0.57
+MUNIN_VERSION=	2.0.59
 MUNIN_SITES=	http://downloads.munin-monitoring.org/munin/stable/${MUNIN_VERSION}/
 DISTINFO_FILE=	${.CURDIR}/../../sysutils/munin-common/distinfo
 PATCHDIR=	${.CURDIR}/../../sysutils/munin-common/files
 
 PORTSCOUT=	limitw:1,even
 
 DBDIR?=		/var/${PORTNAME}
 DBDIRNODE?=	/var/${PORTNAME}
 LOGDIR?=	/var/log/${PORTNAME}
 STATEDIR?=	/var/run/${PORTNAME}
 SPOOLDIR?=	/var/spool/${PORTNAME}
 MUNIN_DIRS=	BINDIR=${PREFIX}/bin \
 		CGIDIR=${PREFIX}/www/cgi-bin \
 		CONFDIR=${ETCDIR} \
 		DBDIR=${DBDIR} \
 		DBDIRNODE=${DBDIRNODE} \
 		DOCDIR=${DOCSDIR} \
 		HTMLDIR=${WWWDIR} \
 		LIBDIR=${DATADIR} \
 		LOGDIR=${LOGDIR} \
 		MANDIR=${MANPREFIX}/man \
 		SBINDIR=${PREFIX}/sbin \
 		STATEDIR=${STATEDIR} \
 		SPOOLDIR=${SPOOLDIR}
 MAKE_ARGS=	${MUNIN_DIRS} \
 		BASH=${LOCALBASE}/bin/bash \
 		PERL=${PERL} PERLLIB=${PREFIX}/${SITE_PERL_REL}
 USERS=		munin
 GROUPS=		munin
 PLIST_SUB=	${MUNIN_DIRS} USER=${USERS} GROUP=${GROUPS}
 SUB_LIST=	${MUNIN_DIRS} USER=${USERS} GROUP=${GROUPS}
 
 CPE_VENDOR=	munin-monitoring
 
 MAKE_JOBS_UNSAFE=	Try to use things before making thems.