From nobody Tue Oct 10 11:58:34 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 4S4ZDW0cWwz4wfYd; Tue, 10 Oct 2023 11:58:35 +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 4S4ZDW09SHz3dVR; Tue, 10 Oct 2023 11:58:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696939115; 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=0irpyugayzjTNSHSqztUA4shJushL67JZ+5aAYx1tW0=; b=C6PUEMtIo5DqCewOK/3Gxui+p3F/6b+Rw7IcPKEC+2Km5b7UUm/Yg2tsSqVc0/uK1CPPTj qpnAdFr+q66aqYWdeFArZ0LJxqFoKKASn1fmu1XUOopGpzsPGaHc11pk08HOhAjJfzFuf2 QRoRB4POnx+F5hAxghoEcwXtXpbyApUvtaMTJMMPCrqumTditIqpI2N85Mml8SdJ74ea1x 2rriCZVx3jya51RqOFAUrHaznMv4j2VkCFPBi/N+c8XEJ8focbnITDakhzAdW2GtXZ5Bvr t2JR3kZX1og+DqZHzNnhD2ovI1R0zOknKs6kLNntrW4CiwhMQiLc8pmVpJIsqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696939115; a=rsa-sha256; cv=none; b=eLMAfsQyShsEZK225eAYXS85fsXRNioix7wlSkt59a2/CzL1cwujjP2zHdgdbWAC0hUYUN i+lz6+71pRCTjvWxjq86VthoXSKjrEl/+dHMat3TUe5VpPL1bhwHnBWyOpdD3pMxwpEpUO hB+6Ouhx2fndVV2oDRAtPFBJunag+6Tcz7+i8I8QBXYN8LKA3Xc3Pb9OrLsVnA1PVeSaZF 5QAxDI6DpO4FsOv+Hq2NAC0waSBfvFjOwvGppDCCKRG0Zns4J/0JLrCda0cHKcXaMV7A9Y tKQAo1O4MzZJRJZZt/kB/wW1ya8cKXanSLgK9amo9Pm9srWB1MzI5QPFfAtqPw== 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=1696939115; 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=0irpyugayzjTNSHSqztUA4shJushL67JZ+5aAYx1tW0=; b=vcJqfkktZ/bQDQha9hOH6cE98FJoCyQ52bztG1WYSChpUIdQd6kpU5Q4G5WuXAKEYKYjVv 4m/79ElZl0bLAyiuAEbfBhvJx0mKXNuNP4mU7FpsCYZ5W4ECNNbZ4/vrV/yCuRsA4xSfHF 2S+ulBK1tykCcSIrHybDhqWdLSxOHq7w1/gts1RC385EHonwjzJjazHCUzpFrOfwegelib v97mQ1pNsOcjx8M/oBKW6QE0JDqk+m2VH2+f8W+lgP+Gn52+SSsEGjb5wR/UUEvzzOcTDy r3ha2clVgl6xN3vtG5XQSMoiGssUskj+g17sQsubmOk1zoN+C7BKZ/J128ytgQ== 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 4S4ZDV6F37zdPc; Tue, 10 Oct 2023 11:58:34 +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 39ABwY5i037815; Tue, 10 Oct 2023 11:58:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39ABwYv1037813; Tue, 10 Oct 2023 11:58:34 GMT (envelope-from git) Date: Tue, 10 Oct 2023 11:58:34 GMT Message-Id: <202310101158.39ABwYv1037813@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: 0e73ed9372f0 - main - config: switch from dialog4ports to portconfig 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: 0e73ed9372f074ba59d40b66b95c878a7f36702e Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=0e73ed9372f074ba59d40b66b95c878a7f36702e commit 0e73ed9372f074ba59d40b66b95c878a7f36702e Author: Baptiste Daroussin AuthorDate: 2023-10-10 11:53:44 +0000 Commit: Baptiste Daroussin CommitDate: 2023-10-10 11:58:31 +0000 config: switch from dialog4ports to portconfig dialog4ports is using libdialog which is being decommissioned from base replaced by bsddialog. We cannot switch to depending on devel/cdialog because it build depends on too many things, on the other hand the author of bsddialog made portconfig as a drop-in replacement for dialog4ports, it only build depends on devel/bsddialog (we use the version in port to be sure to have the right version on all supported versions of the ports tree) Reported by: Herbert J. Skuhra" --- Mk/Scripts/dialog4ports.sh | 4 ++-- Mk/bsd.commands.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Mk/Scripts/dialog4ports.sh b/Mk/Scripts/dialog4ports.sh index e229d7d4bdc1..de62a91b583f 100644 --- a/Mk/Scripts/dialog4ports.sh +++ b/Mk/Scripts/dialog4ports.sh @@ -10,8 +10,8 @@ if [ -z "${DIALOG4PORTS}" -o -z "${PORTSDIR}" -o -z "${MAKE}" ]; then exit 1 fi -: ${DIALOGPORT:=ports-mgmt/dialog4ports} -: ${DIALOGNAME:=dialog4ports} +: ${DIALOGPORT:=ports-mgmt/portconfig} +: ${DIALOGNAME:=portconfig} OPTIONSFILE="$1" diff --git a/Mk/bsd.commands.mk b/Mk/bsd.commands.mk index 7addad889763..636f2f2f481e 100644 --- a/Mk/bsd.commands.mk +++ b/Mk/bsd.commands.mk @@ -33,7 +33,7 @@ DIALOG?= /usr/bin/dialog .else DIALOG?= /usr/bin/bsddialog .endif -DIALOG4PORTS?= ${LOCALBASE}/bin/dialog4ports +DIALOG4PORTS?= ${LOCALBASE}/bin/portconfig DIFF?= /usr/bin/diff DIRNAME?= /usr/bin/dirname EGREP?= /usr/bin/egrep