Date: Wed, 26 Aug 2020 14:24:13 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546287 - in head/net-mgmt: monitoring-plugins nagios-plugins Message-ID: <202008261424.07QEODex087864@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Wed Aug 26 14:24:13 2020 New Revision: 546287 URL: https://svnweb.freebsd.org/changeset/ports/546287 Log: Fix ping6 after base r351423. PR: 246209 Submitted by: brd Modified: head/net-mgmt/monitoring-plugins/Makefile (contents, props changed) head/net-mgmt/nagios-plugins/Makefile (contents, props changed) Modified: head/net-mgmt/monitoring-plugins/Makefile ============================================================================== --- head/net-mgmt/monitoring-plugins/Makefile Wed Aug 26 14:20:19 2020 (r546286) +++ head/net-mgmt/monitoring-plugins/Makefile Wed Aug 26 14:24:13 2020 (r546287) @@ -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/qm 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 @@ -119,6 +119,12 @@ SSH_PORTABLE_RUN_DEPENDS:= ${SSH_PORTABLE_BUILD_DEPEND 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 Modified: head/net-mgmt/nagios-plugins/Makefile ============================================================================== --- head/net-mgmt/nagios-plugins/Makefile Wed Aug 26 14:20:19 2020 (r546286) +++ head/net-mgmt/nagios-plugins/Makefile Wed Aug 26 14:24:13 2020 (r546287) @@ -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 \ @@ -123,6 +124,12 @@ NAGIOSHTMURL?= /nagios 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008261424.07QEODex087864>