svn commit: r469997 - in head/sysutils: munin-common/files munin-node

[Mathieu Arnold]

Author: mat
Date: Tue May 15 07:37:48 2018
New Revision: 469997
URL: https://svnweb.freebsd.org/changeset/ports/469997

Log:
  On FreeBSD 10, sh handles ${foo:-} differently, and creates an empty
  argument, which ping does not like.
  
  PR:		228149
  Reported by:	Niels Bakker
  Sponsored by:	Absolight

Added:
  head/sysutils/munin-common/files/patch-plugins_node.d_ping__.in   (contents, props changed)
Modified:
  head/sysutils/munin-node/Makefile   (contents, props changed)

Added: head/sysutils/munin-common/files/patch-plugins_node.d_ping__.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/munin-common/files/patch-plugins_node.d_ping__.in	Tue May 15 07:37:48 2018	(r469997)
@@ -0,0 +1,11 @@
+Can be removed when 10.4 goes out of support.
+
+--- plugins/node.d/ping_.in.orig	2018-03-28 19:36:43 UTC
++++ plugins/node.d/ping_.in
+@@ -91,5 +91,5 @@ fi
+ 
+ 
+ # shellcheck disable=SC2086
+-"${ping:-$PING}" ${ping_args:-'-c 2'} "${host}" ${ping_args2:-} \
++"${ping:-$PING}" ${ping_args:-'-c 2'} "${host}" ${ping_args2:- } \
+ 	| perl -n -e 'print "ping.value ", $1 / 1000, "\n" if m at min/avg/max.*\s\d+(?:\.\d+)?/(\d+(?:\.\d+)?)/\d+(?:\.\d+)?@; print "packetloss.value $1\n" if /(\d+)% packet loss/;'

Modified: head/sysutils/munin-node/Makefile
==============================================================================
--- head/sysutils/munin-node/Makefile	Tue May 15 07:17:24 2018	(r469996)
+++ head/sysutils/munin-node/Makefile	Tue May 15 07:37:48 2018	(r469997)
@@ -3,6 +3,7 @@
 
 PORTNAME=	munin
 PORTVERSION=	${MUNIN_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MUNIN_SITES}
 PKGNAMESUFFIX=	-node