From nobody Wed Oct 11 08:31:39 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 4S55bJ0zKdz4x5xL; Wed, 11 Oct 2023 08:31:40 +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 4S55bH6FkYz3fWv; Wed, 11 Oct 2023 08:31:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697013099; 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=O2wroLynVdMbXjn6xlfkUpamnTNamztv83IDeR7efxw=; b=YxzJ47GDU3lRtnP1CfUBV+fSGyAHrH1QmPfow/EFu9xH6o5GUOIkIw8rQmm0rveCXHDHN+ RRC17U0dPhApTJynJ3nEonBDbQMCMoxz4SPXlpMV4ewPkQoq1PpM8oFBE9WXvbcSo1yWwS OEuRd6u6lDiXZ//51iT7k99xIDjHAEW+iWQFXiLGvYNF+8vVvTaiaGjp9YYttKMYCRjcHu CaHnjbZ4oHYL/T3WTdm/JPrY4r86aoPal47Y2UewKWK6trU5JFTER4eakZCs2YTfcn73DK vmKfk77AwqpXOxY8nPmA4cEMiJDk6JVcZ2IqHQ04FjsyQKbBt8GecKv8kTQYgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697013099; a=rsa-sha256; cv=none; b=qxxbiBxtbLSsBPJIhl6y+dBQtrm2ye41F4Oe+35d1X1NwG7yf8VJv1mUHGMQf5v4FFN/S0 iX0EyIpVtZuSYkqTELyrQpumhcjbHfABacWQmmB7MZY9C7EZKD6owZPk/doVZkNNj5nFBa ys87+T+J0z5KEY/yiMFXHLOxjMgCO9A1Df85SqSGHQeSk50nZzziv/jmZ6BLkjPH+/4z7X 0/QHXIgggkQYqJHt8tb1TM/3Sle/xuRNgAKk3QrVHY7/ew1tKHn77h29FwCV7aYM4Q73e/ 5iNA5+QQfOaLkS85stSmZsNTG/xAnzKDmON8PawKaHgItpCJ5Tm/GPk79VUfeA== 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=1697013099; 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=O2wroLynVdMbXjn6xlfkUpamnTNamztv83IDeR7efxw=; b=NhnQ0jIR83F5xiKUa9Q5kkA6s7ArGC6cIp2uAUh8ztlMTmqXQqmN7NJRQ86vv9pnBO5LLe ogeA2k8PTNVapEd/PmhY2RrhO1nGSkNnH44PaOQs8ej3qYkCIoOMXSQF4xUDjYt2NzvEKK khtdaMVglIQpLkXpQPLBMMZzoVEScKqIFH8zZmljiT4/SuzOnSFR6Tvxiha+mBCttThIrj SmtfB/H8e8y8KhxNp1e+Kz1Mp662oD/yQg6KySgy4JmtEEnbzqFJSKXlg5kbpy5j6Oe4gM DiHZLXAS9RsgtqXcUprTB1yjv/u4tIinJ4S7PG6Pbt9zVvxo4PVkgYmtYp2P9g== 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 4S55bH5ML5zLN; Wed, 11 Oct 2023 08:31:39 +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 39B8VdCs000698; Wed, 11 Oct 2023 08:31:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39B8VdX1000695; Wed, 11 Oct 2023 08:31:39 GMT (envelope-from git) Date: Wed, 11 Oct 2023 08:31:39 GMT Message-Id: <202310110831.39B8VdX1000695@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: 6b2f71bfc6fb - main - poudriere: fix typo and actually add forgotten patch 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: 6b2f71bfc6fb8ce1095a1341b6661714d217edfc Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=6b2f71bfc6fb8ce1095a1341b6661714d217edfc commit 6b2f71bfc6fb8ce1095a1341b6661714d217edfc Author: Baptiste Daroussin AuthorDate: 2023-10-11 08:26:31 +0000 Commit: Baptiste Daroussin 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}