Update to 2.0.42.

7 files changed, 16 insertions, 17 deletions

diff --git a/sysutils/munin-common/distinfo b/sysutils/munin-common/distinfo
index 365c8a995ffb..1eb4b35a3010 100644
--- a/sysutils/munin-common/distinfo
+++ b/sysutils/munin-common/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535967877
-SHA256 (munin-2.0.40.tar.gz) = e05c23ddada2a37ece2d6cd02202c88c981f31f64eba39392eb0d99a793dd28d
-SIZE (munin-2.0.40.tar.gz) = 2252288
+TIMESTAMP = 1537780253
+SHA256 (munin-2.0.42.tar.gz) = 0f1b72e5339944b53a01867cdd09d6b399bfe470ea3b16017914e00b4d4ed110
+SIZE (munin-2.0.42.tar.gz) = 2252959
diff --git a/sysutils/munin-common/files/patch-Makefile b/sysutils/munin-common/files/patch-Makefile
index 4fd291b64cf0..af88a5dd9a56 100644
--- a/sysutils/munin-common/files/patch-Makefile
+++ b/sysutils/munin-common/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig	2018-08-15 03:16:09 UTC
+--- Makefile.orig	2018-09-21 02:11:11 UTC
 +++ Makefile
 @@ -93,60 +93,47 @@ install: install-master-prime install-co
  
@@ -155,7 +155,7 @@
  
  
  install-common-prime: build-common install-common
-@@ -515,7 +496,7 @@ t/install:
+@@ -516,7 +497,7 @@ t/install:
  
  # This builds */Build from Build.PL
  %/Build: %/Build.PL
@@ -164,7 +164,7 @@
  
  build-%: %/Build
  	cd $* && $(PERL) Build
-@@ -531,6 +512,7 @@ install-%: %/Build
+@@ -532,6 +513,7 @@ install-%: %/Build
  		--install_path script=$(BINDIR) \
  		--install_path sbin=$(SBINDIR) \
  		--install_path bindoc=$(MANDIR)/man1 \
diff --git a/sysutils/munin-common/files/patch-plugins_node.d_bind9__rndc.in b/sysutils/munin-common/files/patch-plugins_node.d_bind9__rndc.in
index 73813b7e92a6..2540dd9b0428 100644
--- a/sysutils/munin-common/files/patch-plugins_node.d_bind9__rndc.in
+++ b/sysutils/munin-common/files/patch-plugins_node.d_bind9__rndc.in
@@ -1,4 +1,4 @@
---- plugins/node.d/bind9_rndc.in.orig	2018-03-25 14:01:24 UTC
+--- plugins/node.d/bind9_rndc.in.orig	2018-09-21 02:11:11 UTC
 +++ plugins/node.d/bind9_rndc.in
 @@ -65,6 +65,7 @@ my $rndc = defined($ENV{rndc}) ? $ENV{rn
  my $rndc_options = defined($ENV{rndc_options}) ? $ENV{rndc_options} : '';
@@ -38,7 +38,7 @@
      while ($line ne '++ Name Server Statistics ++') {
 @@ -199,11 +193,11 @@ if (defined($ARGV[0]) and ($ARGV[0] eq '
      print "graph_vlabel queries / \${graph_period}\n";
-     print "graph_category BIND\n";
+     print "graph_category dns\n";
  
 -    for my $key (keys %IN) {
 +    for my $key (@IN_KEYS) {
diff --git a/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in b/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in
index 36ee11318ea5..35f8ca323051 100644
--- a/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in
+++ b/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in
@@ -1,4 +1,4 @@
---- plugins/node.d/multips_memory.in.orig	2018-07-24 11:34:38 UTC
+--- plugins/node.d/multips_memory.in.orig	2018-09-21 02:11:11 UTC
 +++ plugins/node.d/multips_memory.in
 @@ -137,7 +137,7 @@ fi
  for name in $names; do
@@ -6,6 +6,6 @@
  
 -	ps -eo "$monitor,comm" | gawk '
 +	ps -eo "$monitor,comm" | awk '
- BEGIN              { total = "U"; } # U = Unknown. 
+ BEGIN              { total = "U"; } # U = Unknown.
  /grep/             { next; }
  $2 ~ /^'"$name"'$/ { total = total + ($1*1024); }
diff --git a/sysutils/munin-common/files/patch-plugins_node.d_squeezebox__.in b/sysutils/munin-common/files/patch-plugins_node.d_squeezebox__.in
index 7779df0b42c6..9d8f65ea1ec7 100644
--- a/sysutils/munin-common/files/patch-plugins_node.d_squeezebox__.in
+++ b/sysutils/munin-common/files/patch-plugins_node.d_squeezebox__.in
@@ -1,6 +1,6 @@
---- plugins/node.d/squeezebox_.in.orig	2018-07-24 11:34:38 UTC
+--- plugins/node.d/squeezebox_.in.orig	2018-09-21 02:11:11 UTC
 +++ plugins/node.d/squeezebox_.in
-@@ -152,7 +152,7 @@ if [ "$CMD" = "years" ]; then
+@@ -153,7 +153,7 @@ if [ "$CMD" = "years" ]; then
  		printf "graph_order y"
                  echo "${years_array// / y}"
  
@@ -9,7 +9,7 @@
                          year=${arr1[$i]}
                          if [ "$year" = 0 ]; then
                                  echo "y0.label No year"
-@@ -167,7 +167,7 @@ if [ "$CMD" = "years" ]; then
+@@ -168,7 +168,7 @@ if [ "$CMD" = "years" ]; then
                  done
                  exit 0
          fi
@@ -18,7 +18,7 @@
                  year=${arr1[$i]}
                  printf "y%s.value " "$year"
                  printf "%b" "albums 0 0 year:${year}\\nexit\\n" | "$NC" "$HOST" "$PORT" | sed 's/%3A/:/g' | cut -d ':' -f 3
-@@ -178,7 +178,7 @@ elif [ "$CMD" = "signalstrength" ] || [ 
+@@ -180,7 +180,7 @@ elif [ "$CMD" = "signalstrength" ] || [ 
              echo "graph_category radio"
              COUNT=$(printf "%b" 'player count ?\nexit\n' | "$NC" "$HOST" "$PORT" | cut -d " " -f 3)
              (( COUNT-- ))
@@ -27,7 +27,7 @@
                  MAC=$(printf "%b" "player id $ID ?\\nexit\\n" | "$NC" "$HOST" "$PORT" | cut -d " " -f 4 | sed 's/%3A/:/g')
                  NAME=$(printf "%b" "player name $MAC ?\\nexit\\n" | "$NC" "$HOST" "$PORT" | cut -d " " -f 4 | sed 's/%20/ /g')
                  MAC2=${MAC//:/}
-@@ -189,7 +189,7 @@ elif [ "$CMD" = "signalstrength" ] || [ 
+@@ -191,7 +191,7 @@ elif [ "$CMD" = "signalstrength" ] || [ 
          fi
          COUNT=$(printf "%b" 'player count ?\nexit\n' | "$NC" "$HOST" "$PORT" | cut -d " " -f 3)
          (( COUNT-- ))
diff --git a/sysutils/munin-common/munin.mk b/sysutils/munin-common/munin.mk
index e647f853d404..358c056eb378 100644
--- a/sysutils/munin-common/munin.mk
+++ b/sysutils/munin-common/munin.mk
@@ -1,6 +1,6 @@
 LICENSE=	GPLv2
 
-MUNIN_VERSION=	2.0.40
+MUNIN_VERSION=	2.0.42
 MUNIN_SITES=	http://downloads.munin-monitoring.org/munin/stable/${MUNIN_VERSION}/
 DISTINFO_FILE=	${.CURDIR}/../../sysutils/munin-common/distinfo
 PATCHDIR=	${.CURDIR}/../../sysutils/munin-common/files
diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile
index 7570f115774e..b15526ddd539 100644
--- a/sysutils/munin-node/Makefile
+++ b/sysutils/munin-node/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	munin
 PORTVERSION=	${MUNIN_VERSION}
-PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MUNIN_SITES}
 PKGNAMESUFFIX=	-node