From nobody Wed Oct 11 08:53:56 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 4S565066Mdz4x75r; Wed, 11 Oct 2023 08:53:56 +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 4S56505Zbrz3gf2; Wed, 11 Oct 2023 08:53:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697014436; 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=agVSiLqg2+RGiwMEDfYFbkekpk8VnEKrQVnkXHDWtIw=; b=tRy5osXf9g2xGAK5hJXfiZlfUz6/AsiaiEq380XI0nBRGHvJNB/pK19vef1bNfBaHi/X0p Gk6vdiknEd8OTwNKGjEfhIwAaM/GPoo9OI50076vM3BaYOHpAuBRIfa0uMdpwiduP+IZEp 9sOrrQWNVwQJvmEVDhIXqY9d2RbaJm1FagrFC6lRGbuKAeRGUkSPErBcBfenJlDFmJkmt/ jQd6JMM4ECm+yihDZI5+psrb78Sl717AbnUDnPSijiTphVh/Cty9sRwH1WNoKDq2GPOACa R3xfNCKUtkv4cp7jK8ulTmpJKqls/rQMLPTF8RrcRIa6Kb2aHaNHkDIrV1UmPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697014436; a=rsa-sha256; cv=none; b=IMloBuyNYZ998K0dJMVdku/DvvgCbnuaUx8/bS2aNpzzagFHGT0xeVyLL0DtIWsicn+AwH ztJ/hHOlf4+qIzvFYUu4lHo+nWn1260btoKAH7TqBOsXP0QlyCpjgyAMLkrz9Q5lZKz6ne mW4ddDWYruWbmXFgOvwVbuvOEq4VZBdVNGo3Y1ppIdRRpuojRsH4L4lkV9+oHjDZcQY5MM W6uIQZW/vW380Am0S5Y73WHXMmxI2p2gIBYresbZWv+9keD0XlLi85h/GafDumsIMkt2Nk 5285WWiqfgPqjPqkcwKn1IeIPKb+gaK9U0NWGMSUV5lt4DEWFnc2pScPTFyMfw== 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=1697014436; 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=agVSiLqg2+RGiwMEDfYFbkekpk8VnEKrQVnkXHDWtIw=; b=Ri5W5Wuy67ECn55H9HaGSvBbZxuCOSYM6arM8aGom5cSNsO0XvtnA7VSILgOlIuj64NFsh AShRdfWOUb0uMR8czqSmMSx6IoYdY4e83epzMvWnKDpCBeO0S0FMLFLCJb/aAvvtO4YN+b WNi4A1omOBgmsEGvHKCCX47uLd4g8wPkeDj1JYTW7f2v5GKyL8804ygz2boVLRsl2iwhHj tw4jOOd7PYPodUjcXCoasrVTpoU7kzcCEfRKWX+p82tSB/sZDNOwg4oFDHW3CBdW64r7j+ aXc9yWeeBKNK3DH7IeJ8Tta+DvcH4yaW6oDIkZ3mbXxTfrgIXGm92EQLRojEfA== 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 4S56504bRcz14m; Wed, 11 Oct 2023 08:53:56 +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 39B8rum0036096; Wed, 11 Oct 2023 08:53:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39B8ruUW036094; Wed, 11 Oct 2023 08:53:56 GMT (envelope-from git) Date: Wed, 11 Oct 2023 08:53:56 GMT Message-Id: <202310110853.39B8ruUW036094@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: 7ae5aaf4ca84 - main - ports-mgmt/poudriere: 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: 7ae5aaf4ca84d8b994c17f93ebd59f8731802b53 Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=7ae5aaf4ca84d8b994c17f93ebd59f8731802b53 commit 7ae5aaf4ca84d8b994c17f93ebd59f8731802b53 Author: Guido Falsi AuthorDate: 2023-10-11 08:49:52 +0000 Commit: Guido Falsi CommitDate: 2023-10-11 08:49:52 +0000 ports-mgmt/poudriere: Also adapt "testport" to accept portconfig Approved by: bapt Obtained from: https://github.com/freebsd/poudriere/commit/9c2a5dcc81d35b388a69ba711db77b5f20e261f3 --- ports-mgmt/poudriere/Makefile | 2 +- ports-mgmt/poudriere/files/patch-portconfig | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ports-mgmt/poudriere/Makefile b/ports-mgmt/poudriere/Makefile index 2894302c41a2..135ce57818ed 100644 --- a/ports-mgmt/poudriere/Makefile +++ b/ports-mgmt/poudriere/Makefile @@ -1,6 +1,6 @@ PORTNAME= poudriere DISTVERSION= 3.3.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ diff --git a/ports-mgmt/poudriere/files/patch-portconfig b/ports-mgmt/poudriere/files/patch-portconfig index 723ffd38cf69..ef7d75cc1471 100644 --- a/ports-mgmt/poudriere/files/patch-portconfig +++ b/ports-mgmt/poudriere/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} \