From nobody Wed Oct 11 08:53:57 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 4S56521zY0z4x7H8; Wed, 11 Oct 2023 08:53:58 +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 4S565166Slz4CXP; Wed, 11 Oct 2023 08:53:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697014437; 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=EQwAoSFZtjhoz0XNq6NO6AkEKrDce+CQVTfGrbmPTSE=; b=gYtDEUBoJmW9B7aHrWxUCyf/V1Hr6RBKYA0lbIBKLVkC2/uaRT1adeCDTSc84NvGH31dUN mzklRDtPndNyZYgsqF6nreMuUwizxAp7eztYJQ9/DiNe1CjceIWXUNPdJwsm10oP8EAI9Y mxCa2M46rccq5uN031QJ0ZFhPJ4hdp35C4CSe/bNZZVwjYx9blJ72Nyv/0KjxA8IKtinTr Q7o63VYQW8r/hDzAclII45MevKhYnKCtGsQty+V0qK8Uvij5alFjZrooS5o+sX6wLGlfLc CC8zt1e5Tr9COHT69k4jEU9LziewF5hSeUvM/6HaABlmWPtIaZ5dWi3HWhc8oA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697014437; a=rsa-sha256; cv=none; b=rvWXsH4/F2vdP4nf8cw97c/1OhiRYRYIgoNcyclp9aUH5517uGk1flJ0xGzch/iTijk7Na lUA20usZj9wDuaCR2djZbUetSnd8hXz2+5/WsBO0qeYZVzZD0lPxrDpCtJVcJn2gVYRYWG qsLEC2JUTSMs52tfiQeke5VPTeYurPsbvRmp5aL7Dy95e7GksFjr3f8YnK2MjUh+N/LVXD 9b8zVdlPjAhbbvoA2tgtyBAIDw7mtR2VFIi9e4wdGEHjUskpmnDHRxtQ9a+KfaBHCKlppq 7f1QhFEuAW//wS+K/k20Fvkw/qhp6/ea5Xy9Wt5KEaQEJ8NwqSo+0Bl3trcI6w== 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=1697014437; 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=EQwAoSFZtjhoz0XNq6NO6AkEKrDce+CQVTfGrbmPTSE=; b=sUajH+KYv0AaAOsrPKPwCevV6xZ3Qy2Rk9QpBl95Qp/iv/jnxw6kbZVklc1e1Ay+rj3PHS i7xGJl2AGvZlL6Hr9057uxfldQ+YV3W1LnUofEpOSHrfaQgnzfghmvy0KY6dA5yVwTvO5p 1zBfUymkL6J6HaC86TT9Ng3KoWZS1hVQaadX9tsO7IosjHnsmBLzKsE+wAU6Ri4k/zOB4P TWZ8/PNszviCay+s6NBHrMlUYYULfGEFdNp7Qhsh53yzUoXSM1PS34EUv5iqCDab7VSa8Z 2XQpZmiQu20NZdU/2HXjkTrsFPQrJW88wRrb0gGhEEg/R8pbR69UnaqPBx3OIQ== 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 4S56515Ck9zMd; Wed, 11 Oct 2023 08:53:57 +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 39B8rvp3036144; Wed, 11 Oct 2023 08:53:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39B8rvfo036141; Wed, 11 Oct 2023 08:53:57 GMT (envelope-from git) Date: Wed, 11 Oct 2023 08:53:57 GMT Message-Id: <202310110853.39B8rvfo036141@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: 2ab2d3769ef0 - main - ports-mgmt/poudriere-devel: Also adapt "testport" to accept portconfig 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: 2ab2d3769ef02ff757d53fdd00721d921abcd0dd Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ab2d3769ef02ff757d53fdd00721d921abcd0dd commit 2ab2d3769ef02ff757d53fdd00721d921abcd0dd Author: Guido Falsi AuthorDate: 2023-10-11 08:53:19 +0000 Commit: Guido Falsi CommitDate: 2023-10-11 08:53:19 +0000 ports-mgmt/poudriere-devel: Also adapt "testport" to accept portconfig Approved by: bapt Obtained from: https://github.com/freebsd/poudriere/commit/9c2a5dcc81d35b388a69ba711db77b5f20e261f3 --- ports-mgmt/poudriere-devel/Makefile | 2 +- ports-mgmt/poudriere-devel/files/patch-portconfig | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile index 8115d53cd85b..b32a47902b9c 100644 --- a/ports-mgmt/poudriere-devel/Makefile +++ b/ports-mgmt/poudriere-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= poudriere DISTVERSION= 3.3.99.20220831 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ diff --git a/ports-mgmt/poudriere-devel/files/patch-portconfig b/ports-mgmt/poudriere-devel/files/patch-portconfig index 723ffd38cf69..ef7d75cc1471 100644 --- a/ports-mgmt/poudriere-devel/files/patch-portconfig +++ b/ports-mgmt/poudriere-devel/files/patch-portconfig @@ -26,3 +26,18 @@ index 745c20d8..51a9aff9 100755 LOCALBASE=/nonexistent \ -C ${PORTSDIR}/${origin} \ ${RECURSE_COMMAND} +diff --git a/src/share/poudriere/testport.sh b/src/share/poudriere/testport.sh +index 07b788310..c684a3d27 100755 +--- src/share/poudriere/testport.sh ++++ src/share/poudriere/testport.sh +@@ -231,7 +231,9 @@ injail /usr/bin/make -C ${portdir} maintainer ECHO_CMD=true || \ + err 1 "Port is broken" + + if [ $CONFIGSTR -eq 1 ]; then +- command -v dialog4ports >/dev/null 2>&1 || err 1 "You must have ports-mgmt/dialog4ports installed on the host to use -c." ++ command -v portconfig >/dev/null 2>&1 || \ ++ command -v dialog4ports >/dev/null 2>&1 || \ ++ err 1 "You must have ports-mgmt/dialog4ports or ports-mgmt/portconfig installed on the host to use -c." + __MAKE_CONF=$(mktemp -t poudriere-make.conf) + setup_makeconf "${__MAKE_CONF}" "${JAILNAME}" "${PTNAME}" "${SETNAME}" + PORTSDIR=${portsdir} \