From nobody Wed Oct 11 08:41:03 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 4S55p76KCHz4x6b6; Wed, 11 Oct 2023 08:41:03 +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 4S55p75ljbz3g37; Wed, 11 Oct 2023 08:41:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697013663; 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=rH3EH8OrcZNh9mYXzB/e/MO9amuWSaYczCxmnflyZY0=; b=kWZvncc9m329GXMMbGzH1uGC5qzSyzuJ/vPbJez2oWRhG0mMgtlX9/5i5YKsHaML0Hx9Rs qNIgdqvmzyVy3BbKDYNgIZ5a+6dCv7xvSVLVgTKaLdbxgDFahgh1K+syd3Zal+Oz06OW5E l/R25PiAtu9xM9O+XHXfsBLCIJt471BRF8ALIxWIOFDrxIyHr0Xqn7JWOw/SAmvkSdSau4 MtQtwAxA33YGuXC/fwpm0lYLcRFjixmHhAXgHA2JZhC8e5fUwd+ZBITUnknqAoK/1MsKF3 Hmivk/hDZNRV6Y7BSbYxEFU04yv/k7xq7xpPkpIIQO01fUscoKe9DuLochn62g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697013663; a=rsa-sha256; cv=none; b=Nk+k0KIFiysO9vNz+KP2zHGwTHzMtIBCFWNCMNZWeIErVUTKVKOZCFT2gmWnIZGREo8Z4t Q6PilLidcY1LDP1vLy1V1h2unhS+mLbaIR/NjXSPUok7aNC6ckege3YJ84Q0t6yvg/CuKZ tSSmwdCZwsGCRvG6or6rFOnNsXuV3K1qLxK+cF/7eTYta6VlYuZ67cWnbvujgzq6vr1cOq nd75ryl+q0bSh1tDPUqm7bcInSv4n5/UYkijJBCGSAJVu1GeAOZdAxqVyTVvuO+Ed+vbmq vWPwhLIeu6k1R1rxPS0aECX/+Z74n2ZhMXp5oso1aBGO8zI2fwu76xI0gvM2xQ== 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=1697013663; 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=rH3EH8OrcZNh9mYXzB/e/MO9amuWSaYczCxmnflyZY0=; b=t/6pB5P+L4oUFusburyDWYl68BqGCiXYplgRUXyVr59ovVucCi2vOoGsLWLr7cnGs6ZaUz OnouH3T4ugqp0U5xgqIgqqXhgQo0Eo+aWlYFF977h+rcAECE2hVGdSeWhcZbDPv0eh0MVx 0KyMZAbnUgHjedCye4XXCphob6+wf+Rs1BR9pL3c5WVHHLAFj9Ddg5nC93a/a99ungFS8l YOweWdd2SdoqXiuOK3Vud3JMS1JaH0hlod2tCzFKMTPvd8FtPGeaDyfLVVpUqrZAZXxTLp DSJKih7TIrmpF3nqnnMbBclqvwMO1+R7zssHTryLb9xSTQVEn0qH9gBoTeRS6g== 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 4S55p74pCXzZn; Wed, 11 Oct 2023 08:41:03 +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 39B8f37h018556; Wed, 11 Oct 2023 08:41:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39B8f3Fp018553; Wed, 11 Oct 2023 08:41:03 GMT (envelope-from git) Date: Wed, 11 Oct 2023 08:41:03 GMT Message-Id: <202310110841.39B8f3Fp018553@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: a19cc8636d02 - main - ports-mgmt/poudriere: Remove duplicate patch 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: a19cc8636d027bb5610c2c54487192a29335a748 Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=a19cc8636d027bb5610c2c54487192a29335a748 commit a19cc8636d027bb5610c2c54487192a29335a748 Author: Guido Falsi AuthorDate: 2023-10-11 08:39:36 +0000 Commit: Guido Falsi CommitDate: 2023-10-11 08:39:36 +0000 ports-mgmt/poudriere: Remove duplicate patch I committed this patch by mistake in f122949e7409b0c6c8118914283e497923687f42 --- .../patch-628d150d645d34deeab7882d7056c8f7c868159d | 37 ---------------------- 1 file changed, 37 deletions(-) diff --git a/ports-mgmt/poudriere/files/patch-628d150d645d34deeab7882d7056c8f7c868159d b/ports-mgmt/poudriere/files/patch-628d150d645d34deeab7882d7056c8f7c868159d deleted file mode 100644 index 335e4fb43e16..000000000000 --- a/ports-mgmt/poudriere/files/patch-628d150d645d34deeab7882d7056c8f7c868159d +++ /dev/null @@ -1,37 +0,0 @@ -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}