CVS commit: pkgsrc/net/nagios-plugins

["Manuel Bouyer" <bouyer%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bouyer
Date:           Sat Oct  1 18:23:18 UTC 2016

Modified Files:
        pkgsrc/net/nagios-plugins: Makefile distinfo
        pkgsrc/net/nagios-plugins/patches: patch-ad

Log Message:
>From Edgar Fu�:
Make sure the configure script finds the ping or ping6 command on NetBSD, don't
rely on /sbin being in $path of the builder.
Not sure if similar change is needed for other $OPSYS.

Add a comment to patch-ad explaining why some plugins are disabled here.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/net/nagios-plugins/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/net/nagios-plugins/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/nagios-plugins/patches/patch-ad

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/nagios-plugins/Makefile
diff -u pkgsrc/net/nagios-plugins/Makefile:1.43 pkgsrc/net/nagios-plugins/Makefile:1.44
--- pkgsrc/net/nagios-plugins/Makefile:1.43     Sat Jul  9 06:38:43 2016
+++ pkgsrc/net/nagios-plugins/Makefile  Sat Oct  1 18:23:18 2016
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2016/07/09 06:38:43 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2016/10/01 18:23:18 bouyer Exp $
 #
 
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    net sysutils
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -60,6 +60,23 @@ DEPENDS+=    {ssh{,6}-[0-9]*,openssh-[0-9]*
 DEPENDS+=      bind-[0-9]*:../../net/bind910
 .endif
 
+.if ${OPSYS} == "NetBSD"
+PING_CMD=      /sbin/ping -n -w %d -c %d %s
+# The configure logic can't deal with IPv4 ping accepting a timeout (-w option) but IPv6 ping lacking it.
+# So stuff the timeout into the -p (pad) option of ping6.
+PING6_CMD=     /sbin/ping6 -n -p %d -c %d %s
+.else
+PING_CMD=      # empty
+PING6_CMD=     # empty
+.endif
+
+.if !empty(PING_CMD)
+CONFIGURE_ARGS+=       --with-ping-command="${PING_CMD}"
+.endif
+.if !empty(PING6_CMD)
+CONFIGURE_ARGS+=       --with-ping6-command="${PING6_CMD}"
+.endif
+
 post-install:
        ${CHMOD} -x ${DESTDIR}${PREFIX}/libexec/nagios/utils.pm
 

Index: pkgsrc/net/nagios-plugins/distinfo
diff -u pkgsrc/net/nagios-plugins/distinfo:1.19 pkgsrc/net/nagios-plugins/distinfo:1.20
--- pkgsrc/net/nagios-plugins/distinfo:1.19     Tue Feb  9 10:13:17 2016
+++ pkgsrc/net/nagios-plugins/distinfo  Sat Oct  1 18:23:18 2016
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.19 2016/02/09 10:13:17 bouyer Exp $
+$NetBSD: distinfo,v 1.20 2016/10/01 18:23:18 bouyer Exp $
 
 SHA1 (nagios-plugins-2.0.3.tar.gz) = 29b6183ab9d796299dc17c395eef493415d1e9d6
 RMD160 (nagios-plugins-2.0.3.tar.gz) = b682b126c78df51f64d9cb8599d2f9dfd411d5f4
 SHA512 (nagios-plugins-2.0.3.tar.gz) = 2753e6f3fc7433a5583fee01e63a65b9ea74155964f2b6e6bf3458e56cb29ea5dbd020f83816044a717b66d6548d203b3a082fba0faedcd629c7a8457bc19b36
 Size (nagios-plugins-2.0.3.tar.gz) = 2659772 bytes
-SHA1 (patch-ad) = 7dc748ce7815f3f90212815a9fe9a9a7db961617
+SHA1 (patch-ad) = 04115d0c41419fccfc2735745dc349f81061fff9
 SHA1 (patch-af) = 8fd2e50ca63f014f88195552884913c7383cb6a1
 SHA1 (patch-ah) = f884e80c1e09fefd5e37f087d95d3b76b9d44ab6
 SHA1 (patch-ai) = 645ebd4ac16a71bd5944fe3850c809cb45bf6a4c

Index: pkgsrc/net/nagios-plugins/patches/patch-ad
diff -u pkgsrc/net/nagios-plugins/patches/patch-ad:1.5 pkgsrc/net/nagios-plugins/patches/patch-ad:1.6
--- pkgsrc/net/nagios-plugins/patches/patch-ad:1.5      Fri Apr  3 17:50:27 2015
+++ pkgsrc/net/nagios-plugins/patches/patch-ad  Sat Oct  1 18:23:18 2016
@@ -1,4 +1,6 @@
-$NetBSD: patch-ad,v 1.5 2015/04/03 17:50:27 rodent Exp $
+$NetBSD: patch-ad,v 1.6 2016/10/01 18:23:18 bouyer Exp $
+Exclude plugins that would require extra dependancies.
+Some can be found in specific nagios plugin packages.
 
 --- plugins-scripts/Makefile.in.orig   2014-06-26 16:17:33.000000000 +0000
 +++ plugins-scripts/Makefile.in