1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-20 00:21:35 +00:00

Fix ping6 after base r351423.

PR:		246209
Submitted by:	brd
This commit is contained in:
Mathieu Arnold 2020-08-26 14:24:13 +00:00
parent 4adf293574
commit d222c7fad1
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=546287
2 changed files with 16 additions and 3 deletions

View File

@ -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 \

View File

@ -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 \