From nobody Wed Nov 10 20:02:46 2021 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 AD9001842EAA; Wed, 10 Nov 2021 20:02:46 +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 4HqG3p4Y5Lz3hFd; Wed, 10 Nov 2021 20:02:46 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 7C0731EACC; Wed, 10 Nov 2021 20:02:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AAK2kDI081946; Wed, 10 Nov 2021 20:02:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AAK2kBl081945; Wed, 10 Nov 2021 20:02:46 GMT (envelope-from git) Date: Wed, 10 Nov 2021 20:02:46 GMT Message-Id: <202111102002.1AAK2kBl081945@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: f667fd98f21f - main - devel/py-pyinstaller: fix build with python 3.10 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: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f667fd98f21f1d274dbeab2c886952fb33aa530a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=f667fd98f21f1d274dbeab2c886952fb33aa530a commit f667fd98f21f1d274dbeab2c886952fb33aa530a Author: Dmitry Marakasov AuthorDate: 2021-11-10 20:01:42 +0000 Commit: Dmitry Marakasov CommitDate: 2021-11-10 20:01:53 +0000 devel/py-pyinstaller: fix build with python 3.10 Update internal help2rst.py script to support output of from python 3.10 argparse Approved by: portmgr blanket --- devel/py-pyinstaller/files/patch-doc_help2rst.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/devel/py-pyinstaller/files/patch-doc_help2rst.py b/devel/py-pyinstaller/files/patch-doc_help2rst.py new file mode 100644 index 000000000000..a3be2b618b1a --- /dev/null +++ b/devel/py-pyinstaller/files/patch-doc_help2rst.py @@ -0,0 +1,12 @@ +--- doc/help2rst.py.orig 2019-07-09 19:14:04 UTC ++++ doc/help2rst.py +@@ -63,6 +63,9 @@ def process(program, generate_headings, headings_chara + elif '\noptional arguments:' in help: + # argparse style + help = help.split('\noptional arguments:', 1)[1] ++ elif '\noptions:' in help: ++ # argparse style, since python 3.10 ++ help = help.split('\noptions:', 1)[1] + else: + raise SystemError('unexpected format of output for --help') + # Remove any obsolete options