git: f122949e7409 - main - ports-mgmt/poudriere: Fix typo in option name

The branch main has been updated by madpilot:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f122949e7409b0c6c8118914283e497923687f42

commit f122949e7409b0c6c8118914283e497923687f42
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2023-10-11 08:29:11 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2023-10-11 08:29:11 +0000

    ports-mgmt/poudriere: Fix typo in option name
    
    Approved by:    Fixit blanket
---
 ports-mgmt/poudriere/Makefile                      |  2 +-
 .../patch-628d150d645d34deeab7882d7056c8f7c868159d | 37 ++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/ports-mgmt/poudriere/Makefile b/ports-mgmt/poudriere/Makefile
index 833bd0b353bf..2894302c41a2 100644
--- a/ports-mgmt/poudriere/Makefile
+++ b/ports-mgmt/poudriere/Makefile
@@ -20,7 +20,7 @@ GH_ACCOUNT=	freebsd
 GNU_CONFIGURE=	yes
 ETCDIR=		${PREFIX}/etc/poudriere.d
 
-OPTIONS_DEFINE=	BASH MANIFESTS PROTCONFIG EXAMPLES QEMU ZSH
+OPTIONS_DEFINE=	BASH MANIFESTS PORTCONFIG EXAMPLES QEMU ZSH
 OPTIONS_DEFAULT=BASH MANIFESTS PORTCONFIG ZSH
 OPTIONS_SUB=	yes
 
diff --git a/ports-mgmt/poudriere/files/patch-628d150d645d34deeab7882d7056c8f7c868159d b/ports-mgmt/poudriere/files/patch-628d150d645d34deeab7882d7056c8f7c868159d
new file mode 100644
index 000000000000..335e4fb43e16
--- /dev/null
+++ b/ports-mgmt/poudriere/files/patch-628d150d645d34deeab7882d7056c8f7c868159d
@@ -0,0 +1,37 @@
+From 628d150d645d34deeab7882d7056c8f7c868159d Mon Sep 17 00:00:00 2001
+From: Baptiste Daroussin <bapt@FreeBSD.org>
+Date: Wed, 11 Oct 2023 08:52:08 +0200
+Subject: [PATCH] options: support both dialog4ports and portconfig
+
+---
+ src/share/poudriere/options.sh | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/share/poudriere/options.sh b/src/share/poudriere/options.sh
+index 745c20d80..51a9aff97 100755
+--- src/share/poudriere/options.sh
++++ src/share/poudriere/options.sh
+@@ -155,7 +155,13 @@ fi
+ export PORTSDIR=`pget ${PTNAME} mnt`
+ [ -d "${PORTSDIR}/ports" ] && PORTSDIR="${PORTSDIR}/ports"
+ [ -z "${PORTSDIR}" ] && err 1 "No such ports tree: ${PTNAME}"
+-command -v dialog4ports >/dev/null 2>&1 || err 1 "You must have ports-mgmt/dialog4ports installed on the host to use this command."
++if command -v portconfig >/dev/null 2>&1; then
++	d4p=portconfig
++elif command -v dialog4ports >/dev/null 2>&1; then
++	d4p=dialog4ports
++else
++	err 1 "You must have ports-mgmt/dialog4ports or ports-mgmt/portconfig installed on the host to use this command."
++fi
+ 
+ read_packages_from_params "$@"
+ 
+@@ -205,7 +211,7 @@ for originspec in $(listed_ports show_moved); do
+ 		env ${flavor:+FLAVOR=${flavor}} \
+ 		make PORT_DBDIR=${PORT_DBDIR} \
+ 			PKG_BIN=`which pkg-static` \
+-			DIALOG4PORTS=`which dialog4ports` \
++			DIALOG4PORTS=`which $d4p` \
+ 			LOCALBASE=/nonexistent \
+ 			-C ${PORTSDIR}/${origin} \
+ 			${RECURSE_COMMAND}