From nobody Mon Nov 8 13:37:07 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id CD893184BF50; Mon, 8 Nov 2021 13:37:07 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hnsbl5Rqpz3s7M; Mon, 8 Nov 2021 13:37:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9C82412765; Mon, 8 Nov 2021 13:37:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1A8Db7hO020966; Mon, 8 Nov 2021 13:37:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A8Db769020965; Mon, 8 Nov 2021 13:37:07 GMT (envelope-from git) Date: Mon, 8 Nov 2021 13:37:07 GMT Message-Id: <202111081337.1A8Db769020965@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 98b8e8b444dc - main - Mk/bsd.port.mk: configurable delay identify-install-conflicts List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 98b8e8b444dc2e7c37266205af6225034e20e560 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=98b8e8b444dc2e7c37266205af6225034e20e560 commit 98b8e8b444dc2e7c37266205af6225034e20e560 Author: Trond Endrestøl AuthorDate: 2021-11-08 13:34:57 +0000 Commit: Baptiste Daroussin CommitDate: 2021-11-08 13:36:58 +0000 Mk/bsd.port.mk: configurable delay identify-install-conflicts Instead of hardcoding the 10s delay for the conflicts warning, add a new variable CONFLICT_WARNING_WAIT the same way we have WARNING_WAIT and DEV_WARNING_WAIT PR: 248548 --- Mk/bsd.port.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 40144769d967..317b65f748e2 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -3359,6 +3359,7 @@ check-build-conflicts: .endif .if !target(identify-install-conflicts) +CONFLICT_WARNING_WAIT?= 10 identify-install-conflicts: .if ( defined(CONFLICTS) || defined(CONFLICTS_INSTALL) ) && !defined(DISABLE_CONFLICTS) @conflicts_with=$$( \ @@ -3377,7 +3378,7 @@ identify-install-conflicts: ${ECHO_MSG}; \ ${ECHO_MSG} " They install files into the same place."; \ ${ECHO_MSG} " You may want to stop build with Ctrl + C."; \ - sleep 10; \ + sleep ${CONFLICT_WARNING_WAIT}; \ fi .endif .endif