From owner-svn-ports-head@freebsd.org Wed Aug 26 14:24:14 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 47E183D62A7; Wed, 26 Aug 2020 14:24:14 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bc7Qk16pgz44Gf; Wed, 26 Aug 2020 14:24:14 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E39851454B; Wed, 26 Aug 2020 14:24:13 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07QEODFa087867; Wed, 26 Aug 2020 14:24:13 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07QEODex087864; Wed, 26 Aug 2020 14:24:13 GMT (envelope-from mat@FreeBSD.org) Message-Id: <202008261424.07QEODex087864@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Wed, 26 Aug 2020 14:24:13 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in head/net-mgmt: monitoring-plugins nagios-plugins X-SVN-Commit-Revision: 546287 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Aug 2020 14:24:14 -0000 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 + +.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 + +.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