git: 6b2f71bfc6fb - main - poudriere: fix typo and actually add forgotten patch

The branch main has been updated by bapt:

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

commit 6b2f71bfc6fb8ce1095a1341b6661714d217edfc
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2023-10-11 08:26:31 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2023-10-11 08:31:29 +0000

    poudriere: fix typo and actually add forgotten patch
    
    Reported by:    madpilot
---
 ports-mgmt/poudriere-devel/files/patch-portconfig | 28 +++++++++++++++++++++++
 ports-mgmt/poudriere/files/patch-portconfig       | 28 +++++++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/ports-mgmt/poudriere-devel/files/patch-portconfig b/ports-mgmt/poudriere-devel/files/patch-portconfig
new file mode 100644
index 000000000000..723ffd38cf69
--- /dev/null
+++ b/ports-mgmt/poudriere-devel/files/patch-portconfig
@@ -0,0 +1,28 @@
+diff --git src/share/poudriere/options.sh src/share/poudriere/options.sh
+index 745c20d8..51a9aff9 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}
diff --git a/ports-mgmt/poudriere/files/patch-portconfig b/ports-mgmt/poudriere/files/patch-portconfig
new file mode 100644
index 000000000000..723ffd38cf69
--- /dev/null
+++ b/ports-mgmt/poudriere/files/patch-portconfig
@@ -0,0 +1,28 @@
+diff --git src/share/poudriere/options.sh src/share/poudriere/options.sh
+index 745c20d8..51a9aff9 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}