diff -udprN /usr/ports/sysutils/munin-common/files/patch-Makefile ./files/patch-Makefile
--- /usr/ports/sysutils/munin-common/files/patch-Makefile	2019-03-04 12:17:39.000000000 +0000
+++ ./files/patch-Makefile	2019-05-13 08:14:31.661874000 +0000
@@ -1,6 +1,15 @@
---- Makefile.orig	2019-02-28 14:43:36 UTC
+--- Makefile.orig	2019-05-09 03:45:43 UTC
 +++ Makefile
-@@ -95,60 +95,47 @@ install: install-master-prime install-common-prime ins
+@@ -34,7 +34,7 @@ PODMAN8          := build/master/doc/mun
+ PODMAN5          := build/master/doc/munin.conf node/doc/munin-node.conf
+ PYTHON_LINT_CALL ?= python3 -m flake8
+ CONFVAR_SUBSTITUTION_FILES = \
+-	master/blib/libdoc/Munin\:\:Master\:\:HTMLOld.3pm \
++	master/blib/libdoc/Munin\:\:Master\:\:HTMLOld.3 \
+ 	master/blib/lib/Munin/Master/HTMLOld.pm \
+ 	node/blib/sbin/munin-node-configure \
+ 	node/blib/sbin/munin-node \
+@@ -95,60 +95,47 @@ install: install-master-prime install-co
  
  install-pre: $(MAKEFILES)
  	@$(CHECKUSER)
@@ -24,6 +33,12 @@
 -	mkdir -p $(DBDIR)
 -	mkdir -p $(DBDIR)/cgi-tmp
 -	mkdir -p $(CGIDIR)
+-
+-	$(CHOWN) $(USER) $(HTMLDIR) $(DBDIR)
+-	$(CHMOD) 0755 $(DBDIR)
+-
+-	$(CHOWN) $(CGIUSER) $(DBDIR)/cgi-tmp
+-	$(CHMOD) 0755 $(DBDIR)/cgi-tmp
 +	mkdir -p $(DESTDIR)$(CONFDIR)/templates
 +	mkdir -p $(DESTDIR)$(CONFDIR)/static
 +	mkdir -p $(DESTDIR)$(CONFDIR)/templates/partial
@@ -34,12 +49,6 @@
 +	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/ ; \
@@ -88,7 +97,7 @@
  
  # Not ready to be installed yet
  # $(INSTALL) -m 0755 build/master/_bin/munin-gather $(LIBDIR)/
-@@ -158,36 +145,30 @@ install-node-plugins: install-plugins-prime
+@@ -158,36 +145,30 @@ install-node-plugins: install-plugins-pr
  install-plugins-prime: install-plugins build $(PLUGINS) $(MAKEFILES)
  	@$(CHECKGROUP)
  
@@ -96,15 +105,15 @@
 -	mkdir -p $(CONFDIR)/plugin-conf.d
 -	mkdir -p $(LIBDIR)/plugins
 -	mkdir -p $(PLUGSTATE)
+-
+-	$(CHOWN) root:root $(PLUGSTATE)
+-	$(CHMOD) 0755 $(PLUGSTATE)
+-	$(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
 +	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 \
diff -udprN /usr/ports/sysutils/munin-common/files/patch-plugins_node.d_amavis ./files/patch-plugins_node.d_amavis
--- /usr/ports/sysutils/munin-common/files/patch-plugins_node.d_amavis	1970-01-01 00:00:00.000000000 +0000
+++ ./files/patch-plugins_node.d_amavis	2019-05-14 08:34:20.568424000 +0000
@@ -0,0 +1,11 @@
+--- plugins/node.d/amavis.in.orig	2019-05-09 03:45:43 UTC
++++ plugins/node.d/amavis.in
+@@ -119,7 +119,7 @@ spams=U
+ 
+ TEMP_FILE=$(@@MKTEMP@@ munin-amavis.XXXXXX)
+ 
+-if [ -n "$TEMP_FILE" ] && [ -f "$TEMP_FILE" ]; then
++if [ -z "$TEMP_FILE" ] || [ -f "$TEMP_FILE" ]; then
+ 	if [ "$ARGS" != 0 ]; then
+ 	    "$LOGTAIL" -f "${AMAVIS_LOG}" -o "${STATEFILE}" | grep 'amavis\[.*\]:' > "${TEMP_FILE}"
+ 	else
diff -udprN /usr/ports/sysutils/munin-common/files/patch-plugins_node.d_mbmon_.in ./files/patch-plugins_node.d_mbmon_.in
--- /usr/ports/sysutils/munin-common/files/patch-plugins_node.d_mbmon_.in	1970-01-01 00:00:00.000000000 +0000
+++ ./files/patch-plugins_node.d_mbmon_.in	2019-05-14 08:32:25.409894000 +0000
@@ -0,0 +1,56 @@
+--- plugins/node.d/mbmon_.in.orig	2019-05-09 03:45:43 UTC
++++ plugins/node.d/mbmon_.in
+@@ -18,13 +18,23 @@
+ # purpose.
+ #
+ 
++# Needs following minimal configuration in plugin-conf.d/munin-node:
++#   [mbmon_*]
++#   env.mbmonpath /usr/local/bin/mbmon
++#   env.mbmonargs -I -pit87
++#
++# Parameters
++#       mbmonpath     - Specify path to smartctl program
++#       mbmonargs     - Added argument passed to mbmon with '-c 1 -r '+mbmonargs
++#
++# If it is not automatically recognized, the individual parameters are appended.
++
+ #%# family=contrib
+ #%# capabilities=autoconf suggest
+ 
+ what=$(basename "$0" | sed 's/^mbmon_//g')
+-mbmon=${mbmon:-$(which mbmon)}
++mbmon="${mbmonpath:-$(which mbmon)} -c1 -r ${mbmonargs}"
+ 
+-
+ if [ "$1" = "suggest" ]; then
+ 	echo 'TEMP'
+ 	echo 'FAN'
+@@ -43,8 +53,6 @@
+ 	exit 0
+ fi
+ 
+-
+-
+ if [ "$1" = "config" ]; then
+ case $what in
+ 	TEMP)
+@@ -88,15 +96,15 @@
+ 
+ case $what in
+ 	TEMP)
+-		$mbmon -c 1 -r | sed -e "s/ *: */.value /"  |grep TEMP
++		$mbmon | sed -e "s/ *: */.value /" | grep TEMP
+ 		exit 0
+ 		;;
+ 	Voltage)
+-		$mbmon -c 1 -r | sed -e "s/ *: */.value /"  |grep V
++		$mbmon | sed -e "s/ *: */.value /" | grep V
+ 		exit 0
+ 		;;
+ 	FAN)
+-		$mbmon -c 1 -r | sed -e "s/ *: */.value /"  |grep FAN
++		$mbmon | sed -e "s/ *: */.value /" | grep FAN
+ 		exit 0
+ 		;;
+ esac
diff -udprN /usr/ports/sysutils/munin-common/files/patch-test-mktemp ./files/patch-test-mktemp
--- /usr/ports/sysutils/munin-common/files/patch-test-mktemp	1970-01-01 00:00:00.000000000 +0000
+++ ./files/patch-test-mktemp	2019-05-14 08:39:40.461627000 +0000
@@ -0,0 +1,20 @@
+--- test-mktemp.orig	2019-05-09 03:45:43 UTC
++++ test-mktemp
+@@ -37,7 +37,7 @@
+ 
+ 
+ testfun () {
+-	TEMP_FILE=`eval $MKTEMP 2>/dev/null`
++	TEMP_FILE=`eval $MKTEMP $1 2>/dev/null`
+ 	STATUS=$?
+ 	if [ $STATUS = 0 -a -n "$TEMP_FILE" -a -f "$TEMP_FILE" ]; then
+ 		rm -f $TEMP_FILE
+@@ -53,7 +53,7 @@
+ testfun temp.XXXXXX
+ 
+ # FreeBSD way
+-MKTEMP="mktemp -t /tmp"
++MKTEMP="mktemp -t $1"
+ testfun temp.XXXXXX
+ 
+ # Plain mktemp
diff -udprN /usr/ports/sysutils/munin-common/Makefile ./Makefile
--- /usr/ports/sysutils/munin-common/Makefile	2018-08-06 12:20:47.000000000 +0000
+++ ./Makefile	2019-05-14 04:57:33.657294000 +0000
@@ -3,6 +3,7 @@
 
 PORTNAME=	munin
 PORTVERSION=	${MUNIN_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MUNIN_SITES}
 PKGNAMESUFFIX=	-common