diff options
author | Baptiste Daroussin <bapt@FreeBSD.org> | 2023-10-11 08:26:31 +0000 |
---|---|---|
committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2023-10-11 08:31:29 +0000 |
commit | 6b2f71bfc6fb8ce1095a1341b6661714d217edfc (patch) | |
tree | 21809021b854581acb9cddac0a8338f5ca30a533 | |
parent | f122949e7409b0c6c8118914283e497923687f42 (diff) | |
download | ports-6b2f71bfc6fb8ce1095a1341b6661714d217edfc.tar.gz ports-6b2f71bfc6fb8ce1095a1341b6661714d217edfc.zip |
poudriere: fix typo and actually add forgotten patch
Reported by: madpilot
-rw-r--r-- | ports-mgmt/poudriere-devel/files/patch-portconfig | 28 | ||||
-rw-r--r-- | ports-mgmt/poudriere/files/patch-portconfig | 28 |
2 files changed, 56 insertions, 0 deletions
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} |