From nobody Tue Oct 10 07:15:01 2023 X-Original-To: dev-commits-ports-main@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 4S4RxK3bHKz4wHbF; Tue, 10 Oct 2023 07:15:01 +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 4S4RxK33Dvz4rYL; Tue, 10 Oct 2023 07:15:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696922101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YPCEd9qe34txNp6CGf8R3lJjUL2tTDKUBVOfw2haWbw=; b=IfCQTsojMNPOODGP49Bhd2QFMGaXQvTNGHCpDdForzuR6s5SSPrIWHJKLUo5xlEbGZEcoI WEbtMMOj06JVdKBce4t/gZX/YXFjopTDEYPj6ywwbMLv0jYjPnYdVOiefJHzLq+4LvZrQr N7W/M4mDpCpEczOA88t7EikDvWNX/3afbEtuUKBwa5iEXnT/2YlZ/kyuzk/RDOVJ4GGpev FCCAi/Q5Q+hjp+KyHuxtwZnfv0DO8OcAkiv2Xo8EUWI/+P2UnJUb8tIhPb8ERaKJvb68PQ 6VO6Ucj2jjWYh7JWjRQkPsnVCSrtcZVrCqUDA49+se/8Vyh0AkYtvfP93MukBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696922101; a=rsa-sha256; cv=none; b=FhX95PGSNoTzyXvUZramLgZHAE73Pw8CBmGs8CLiQ+PUYhX6u47xUpjf91UF6JNorfEUB+ loIqmJNvm6L0ysrC9EuU2Srw1vKUQQqhciIdJPfga5R9K/Wha7fa03V2uIV3qbHdCLb+6N GVmllgcZupRaIN7TcDxFUpgi5TpEdlk1kPDgvlzLjtQqhjp+MHKj1TMGfG7254BbaVl/P8 EVf1Sd28QAufZYUl1LimwAd0l3hidxM8uLppT/50Lj3ZrJk9rWp/Wqv6dVDky/4ItYKNZi 4NpN9xLjIWaf4bubKWJrkE0yK6Yw1C+Ut4xgQ05Kv3RhUziS1cNZpyrLbwY7WA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696922101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YPCEd9qe34txNp6CGf8R3lJjUL2tTDKUBVOfw2haWbw=; b=Bg89W3Kw7gWXkf0X3gqkzHKgfJA5tlX+8LaFulVD3ZX+hwDvQZdp5aaYD/W1sXoXzDn66Z OiRCokUNqYDZBN6YQQ/kSnlfr0KGtmkF7tGtcAcKo0AYKxT1bseuIxdtJGrlT04+z0iZEW n9M3KKC2+kYgssGPWYgC8IoGFDcOKicMtCVWOB+ApzD4V7JXIi+4CMPEMdIJHsylZKMpI3 XCTTOA1zErNlQ2m0Y7OENC+NU3u56m1dYD01exDggIHUGICJ0G9hv+Z5w4ECA4zuU8BmOL wm5auIFjpZ+WetP03bePzKU27W9tn78d/LBD+pEXckJ7AkySPV2WwnpCe4FTXA== 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 4S4RxK269dzVQm; Tue, 10 Oct 2023 07:15:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39A7F1Ir072057; Tue, 10 Oct 2023 07:15:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39A7F1te072054; Tue, 10 Oct 2023 07:15:01 GMT (envelope-from git) Date: Tue, 10 Oct 2023 07:15:01 GMT Message-Id: <202310100715.39A7F1te072054@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: 092b321f7a57 - main - dialog: fallback on bsddialog List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 092b321f7a57f033689c9b396cb001aa38cc5f43 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=092b321f7a57f033689c9b396cb001aa38cc5f43 commit 092b321f7a57f033689c9b396cb001aa38cc5f43 Author: Baptiste Daroussin AuthorDate: 2023-10-10 07:13:57 +0000 Commit: Baptiste Daroussin CommitDate: 2023-10-10 07:13:57 +0000 dialog: fallback on bsddialog dialog(1) is being replaced by bsddialog(1) in base, prepare the the ports tree to deal with it. --- Mk/bsd.commands.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Mk/bsd.commands.mk b/Mk/bsd.commands.mk index 27d9d3e2f47e..7addad889763 100644 --- a/Mk/bsd.commands.mk +++ b/Mk/bsd.commands.mk @@ -28,7 +28,11 @@ CP?= /bin/cp CPIO?= /usr/bin/cpio CUT?= /usr/bin/cut DC?= /usr/bin/dc +.if exists(/usr/bin/dialog) DIALOG?= /usr/bin/dialog +.else +DIALOG?= /usr/bin/bsddialog +.endif DIALOG4PORTS?= ${LOCALBASE}/bin/dialog4ports DIFF?= /usr/bin/diff DIRNAME?= /usr/bin/dirname