git: 0e73ed9372f0 - main - config: switch from dialog4ports to portconfig
Date: Tue, 10 Oct 2023 11:58:34 UTC
The branch main has been updated by bapt:
URL: https://cgit.FreeBSD.org/ports/commit/?id=0e73ed9372f074ba59d40b66b95c878a7f36702e
commit 0e73ed9372f074ba59d40b66b95c878a7f36702e
Author: Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2023-10-10 11:53:44 +0000
Commit: Baptiste Daroussin <bapt@FreeBSD.org>
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" <herbert@gojira.at>
---
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