diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2020-08-26 14:24:13 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2020-08-26 14:24:13 +0000 |
| commit | d222c7fad1e6ee132385b409de5beae9ce8ae674 (patch) | |
| tree | b9aeb471db6e2c2b7ae60046be1b0ad84824f68e /net-mgmt | |
| parent | - Update to 3.7.9(security update) (diff) | |
Fix ping6 after base r351423.
PR: 246209
Submitted by: brd
Notes
Notes:
svn path=/head/; revision=546287
Diffstat (limited to 'net-mgmt')
| -rw-r--r-- | net-mgmt/monitoring-plugins/Makefile | 10 | ||||
| -rw-r--r-- | net-mgmt/nagios-plugins/Makefile | 9 |
2 files changed, 16 insertions, 3 deletions
diff --git a/net-mgmt/monitoring-plugins/Makefile b/net-mgmt/monitoring-plugins/Makefile index 3f3b8daf5a33..09f542ff5476 100644 --- a/net-mgmt/monitoring-plugins/Makefile +++ b/net-mgmt/monitoring-plugins/Makefile @@ -3,7 +3,7 @@ PORTNAME= monitoring-plugins PORTVERSION= 2.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net-mgmt MASTER_SITES= https://www.monitoring-plugins.org/download/ LOCAL/mat/${PORTNAME} @@ -65,7 +65,7 @@ CONFIGURE_ARGS+=ac_cv_path_PATH_TO_QMAIL_QSTAT=/var/qmail/bin/qmail-qstat \ ac_cv_path_PATH_TO_PING=/sbin/ping \ ac_cv_path_PATH_TO_PING6=/sbin/ping6 \ --with-ping-command="/sbin/ping -n -t %d -c %d %s" \ - --with-ping6-command="/sbin/ping6 -n -X %d -c %d %s" \ + --with-ping6-command="${_PING6_CMD}" \ ac_cv_path_PATH_TO_SUDO=${LOCALBASE}/bin/sudo \ ac_cv_path_PATH_TO_SMBCLIENT=${LOCALBASE}/bin/smbclient @@ -120,6 +120,12 @@ SSH_PORTABLE_CONFIGURE_ON= --with-ssh-command=${LOCALBASE}/bin/ssh .include <bsd.port.options.mk> +.if ${OSVERSION} < 1300041 +_PING6_CMD= /sbin/ping6 -n -X %d -c %d %s +.else +_PING6_CMD= /sbin/ping6 -n -t %d -c %d %s +.endif + .if ${PORT_OPTIONS:MDNS_BASE} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-dig-to-drill.diff CONFIGURE_ARGS+=--with-dig-command=/usr/bin/drill \ diff --git a/net-mgmt/nagios-plugins/Makefile b/net-mgmt/nagios-plugins/Makefile index ad1af7909e4d..a182a827b1e6 100644 --- a/net-mgmt/nagios-plugins/Makefile +++ b/net-mgmt/nagios-plugins/Makefile @@ -3,6 +3,7 @@ PORTNAME= nagios-plugins DISTVERSION= 2.3.3 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= https://www.nagios-plugins.org/download/ \ @@ -33,7 +34,7 @@ CONFIGURE_ARGS+= --datadir=${PREFIX}/share \ # Also, force some commands with their expected paths so that they don't get # disabled. CONFIGURE_ARGS+= --with-ping-command="/sbin/ping -n -t %d -c %d %s" \ - --with-ping6-command="/sbin/ping6 -n -X %d -c %d %s" \ + --with-ping6-command="${_PING6_CMD}" \ ac_cv_path_PATH_TO_PING6=/sbin/ping6 \ ac_cv_path_PATH_TO_PING=/sbin/ping \ ac_cv_path_PATH_TO_QMAIL_QSTAT=/var/qmail/bin/qmail-qstat \ @@ -124,6 +125,12 @@ NAGIOSCGIURL?= ${NAGIOSHTMURL}/cgi-bin .include <bsd.port.options.mk> +.if ${OSVERSION} < 1300041 +_PING6_CMD= /sbin/ping6 -n -X %d -c %d %s +.else +_PING6_CMD= /sbin/ping6 -n -t %d -c %d %s +.endif + .if ${PORT_OPTIONS:MDNS_BASE} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-dig-to-drill.diff CONFIGURE_ARGS+= --with-dig-command=/usr/bin/drill \ |