From nobody Wed Oct 11 08:29:47 2023 X-Original-To: dev-commits-ports-all@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 4S55Y73Y6Sz4x5xD; Wed, 11 Oct 2023 08:29:47 +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 4S55Y735nQz3fB2; Wed, 11 Oct 2023 08:29:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697012987; 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=6Br0hd+g0Lz6fGqX1ydZm0rMmNzJcvV/5YQBtwInl/0=; b=tc6LMs2gSppPDy3Im0aqSLXCOqO81WVyivQTEXkBaIyeowpc+1bgqhHjLdMZwWlb4VtntA qef9RtWy0xP+w+9u7QumwAZBLSjQlmapVjk49biFmfjqAb4AWfh6L0Sh5RVu/Q7sFenRp1 UZ4UvANIm5aHrPrmwckl0Cv4/hdO2oT5VbOi1tdJYzymm6smn924ioU/gurHjyS5/LOSar hHtqQXKhQykI9PYccJxwxV7g1C/akCw/EhY9gYz8B4w/8BsHXncKtihtOWObpC1Hdx7GEs 7X+TKEhYT7BWZvxXvkiNewtkOxAFWLaVCXwNC+ExMv0BUroiiBC63fTYHbMfPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697012987; a=rsa-sha256; cv=none; b=GfTUYaSIIbwSdLgG7Nt7Xc9cdwvGnicRLJrwvvHgzzIiN2VApESJpXTxgNKdUj61dv1KUK ZLHHB7S5UCkGiS+U5fvvf0SIKhIb/e8WNycpmdG2af7k1OidpOLGGjyRFU3xQlnFzz1Uym f8HF0MGALKQesr3UUvEEKMnwi257l6/JFLE1sseD7HGam+AnNAyjgtH2ywySzDE/09roda 9AMqzKM6rtKlfQXjsevMQmLmBYu19SPDDznEmikYcHV2sSLeoEltTxxCnFG2QK7PNe/VVd 6nbzu5UfJqJs2sH02Pi/HhjIFaRpirpDOVm08b11JIDTx1urlkDJLMIHnS5/dA== 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=1697012987; 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=6Br0hd+g0Lz6fGqX1ydZm0rMmNzJcvV/5YQBtwInl/0=; b=AkgQqzt6H9IMVGIUlvkz0brm1qmM8zmvs1MIf9ku1k4uE9H8oeWHPbSB2QwaKky1USo208 MMPHEgWES/4K8LWpGiskdRPAH++nlw3XYp/up2p2ydlXA82VNGZRGDfha5cgIj/mB2SGVX TjOOJVrPMi3eB056xfuymU/I2zj5mXdLcHN5Tf9RBJb0kebhTEIowOR9xxFJZsq0IVT341 mJCLY8cyrwLl+vOIkPFAL1INUj0NYfNmr6Lt4qrLcFDfO99pY1tLt5YJwRdGFBm60LE3jL 2ZFOQlZVJ1XNcaJD9UWL3L60ARTAxq4VhinTncxGssHEimq+sYiVgbfDfwl1XA== 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 4S55Y729Gcz1CgD; Wed, 11 Oct 2023 08:29:47 +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 39B8Tlnj087547; Wed, 11 Oct 2023 08:29:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39B8TlAl087545; Wed, 11 Oct 2023 08:29:47 GMT (envelope-from git) Date: Wed, 11 Oct 2023 08:29:47 GMT Message-Id: <202310110829.39B8TlAl087545@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: f122949e7409 - main - ports-mgmt/poudriere: Fix typo in option name List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f122949e7409b0c6c8118914283e497923687f42 Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=f122949e7409b0c6c8118914283e497923687f42 commit f122949e7409b0c6c8118914283e497923687f42 Author: Guido Falsi AuthorDate: 2023-10-11 08:29:11 +0000 Commit: Guido Falsi 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 +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}