diff options
| author | bouyer <bouyer@pkgsrc.org> | 2016-10-01 18:23:18 +0000 |
|---|---|---|
| committer | bouyer <bouyer@pkgsrc.org> | 2016-10-01 18:23:18 +0000 |
| commit | 5c646ca490fe2498424de8ddb8181462bda73d50 (patch) | |
| tree | 57606a68980ff94337e1ff145cd961a1ae103d34 /net | |
| parent | 0fbb56884249ea0af8d08396281c55cb027059f3 (diff) | |
| download | pkgsrc-5c646ca490fe2498424de8ddb8181462bda73d50.tar.gz | |
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.
Diffstat (limited to 'net')
| -rw-r--r-- | net/nagios-plugins/Makefile | 21 | ||||
| -rw-r--r-- | net/nagios-plugins/distinfo | 4 | ||||
| -rw-r--r-- | net/nagios-plugins/patches/patch-ad | 4 |
3 files changed, 24 insertions, 5 deletions
diff --git a/net/nagios-plugins/Makefile b/net/nagios-plugins/Makefile index 621b238785f..58cc28f8e01 100644 --- a/net/nagios-plugins/Makefile +++ b/net/nagios-plugins/Makefile @@ -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 @@ -60,6 +60,23 @@ DEPENDS+= {ssh{,6}-[0-9]*,openssh-[0-9]*}:../../security/openssh 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 diff --git a/net/nagios-plugins/distinfo b/net/nagios-plugins/distinfo index 22c4a2eeaa4..4e965eb2744 100644 --- a/net/nagios-plugins/distinfo +++ b/net/nagios-plugins/distinfo @@ -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 diff --git a/net/nagios-plugins/patches/patch-ad b/net/nagios-plugins/patches/patch-ad index 9686e540697..30eb864e8da 100644 --- a/net/nagios-plugins/patches/patch-ad +++ b/net/nagios-plugins/patches/patch-ad @@ -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 |