From nobody Tue Mar 21 19:34:44 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 4Ph1yX3W9kz40ktM; Tue, 21 Mar 2023 19:34:44 +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 4Ph1yX2lfcz3F2l; Tue, 21 Mar 2023 19:34:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679427284; 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=qbBOYbheATD4F8UQO52OPBX47QjFfh3IxEf+K+MPpIw=; b=DdGDn0u6IQYO/4Qexp76PujzvuV8a+GsTi6SXMBXxeabGDKHO3aeXetv2eqgfCVMMVl8UO kZTg9GuMxBs47IUVWPvK6XVCHbmRIRu15a+7X4ONAV3xl1j8yu6j8UN4oJbYAEgAu6z3ol MByQ8kHbkSJpbOBu+Te7hz0u6i1nOyJnbjG4QPp4IBDUgSbjzbpWZrzIVM53/aiRIcJG7i DvQ3kis5sqESGtrcyMKPq9WLtCCkAt0tJBsbq5iGNBTCWkzqUr+4o9cAg8UUdwVhqf+9hL YLho0sc0pa5JYaCV7WKsQmvaqp/kC0Rrw+RxijPVtahB7KVWIx4NFepjQJs6JA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679427284; 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=qbBOYbheATD4F8UQO52OPBX47QjFfh3IxEf+K+MPpIw=; b=q0zcilvQ9y09mmaZfe7+dKRO4d11vjtu7JCdz7wl/XmoT6uPeHislUGFML4qYULgiRS0gO nvqKDkLEDjvWgEifKhrxdWDCAm0HLM/EdLjQ69bQ/dUDAnrfAW8esBRjS/RjzoITmOrnOh WizEO41+JYCeFEorMn10FMZERps+0u18OchadifA9MpJzFmr+EcyJwh0J6DiPHRG0//bEC dnk5D2XIxVgdir+lCOLWNIQrnjrDCUMbY8EhAXVrE1KpK6ah6m2YBpBvq/AIT6ABK/U90N 7Tfkp/knpjB34xYfXzAUgXBykwzuD5fqrd+9xxrXgy4RLupwwholkOXDUueISw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679427284; a=rsa-sha256; cv=none; b=EIdu6Y1ZQdfXnDEk6nRNptpocFiUbMU8myvczdLDECCjk4DcNR6Tf9CqTbZrnkocAaBW5c 2c6ZCw+8Kpd66GmVlZLaFMLI8Q90sA0bqAIxN1SwGk8yZgJAOVIc0zq5wF427LbRv8Wne5 noPV/8yRRCx7uhICu/l6sAsFHg/IE8o63LOWxnDcAZh/bImzoKzBmPXkuOymWUUZZ3nyGo dIcogEe+emmZxaSwUWclabtA32U9X3jYqxm8vQhPdK4s/W+kn5aO7wULetaemQ9Scu+73A Qz1iuoDS7Xq5U70m+u/Wt5Dj2T1jc8Jw/JqnZH9Ty0IBLl5UADqLyxBd2n5wvQ== 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 4Ph1yX1nMVzQ0T; Tue, 21 Mar 2023 19:34:44 +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 32LJYikA053932; Tue, 21 Mar 2023 19:34:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32LJYift053930; Tue, 21 Mar 2023 19:34:44 GMT (envelope-from git) Date: Tue, 21 Mar 2023 19:34:44 GMT Message-Id: <202303211934.32LJYift053930@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: fb46fe4b4c6d - main - Mk/Uses/python.mk: Add support for post-release version (.postX) 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb46fe4b4c6d1b0e9a5c21284497c62af8c85000 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=fb46fe4b4c6d1b0e9a5c21284497c62af8c85000 commit fb46fe4b4c6d1b0e9a5c21284497c62af8c85000 Author: Po-Chuan Hsieh AuthorDate: 2023-03-21 18:54:29 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-03-21 19:22:25 +0000 Mk/Uses/python.mk: Add support for post-release version (.postX) The post-release version is normalized to .postX in PEP440. However, it will be converted to .pX in FreeBSD which means an older version. % pkg ver -t 1.2.3 1.2.3.p4 > If the original release is already in the tree, rather than bumping PORTEPOCH, you could bump PORTREVISION and add .postX to DISTVERSIONSUFFIX. This fix allows the port to build in this situation. --- Mk/Uses/python.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index 7199abd73363..59e11f95bf97 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -151,7 +151,7 @@ # default: # # PEP517_INSTALL_CMD - Command sequence for a PEP-517 install frontend that installs a wheel. -# default: ${PYTHON_CMD} -m installer --destdir ${STAGEDIR} --no-compile-bytecode --prefix ${PREFIX} ${BUILD_WRKSRC}/dist/${PORTNAME:C|[-_]+|_|g}-${DISTVERSION}-*.whl +# default: ${PYTHON_CMD} -m installer --destdir ${STAGEDIR} --no-compile-bytecode --prefix ${PREFIX} ${BUILD_WRKSRC}/dist/${PORTNAME:C|[-_]+|_|g}-${DISTVERSION}*.whl # # PEP517_INSTALL_DEPEND - Port needed to execute ${PEP517_INSTALL_CMD}. # default: ${PYTHON_PKGNAMEPREFIX}installer>0:devel/py-installer@${PY_FLAVOR} @@ -680,7 +680,7 @@ PYDISTUTILS_EGGINFODIR?=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} # PEP-517 support PEP517_BUILD_CMD?= ${PYTHON_CMD} -m build --no-isolation --wheel ${PEP517_BUILD_CONFIG_SETTING} PEP517_BUILD_DEPEND?= ${PYTHON_PKGNAMEPREFIX}build>=0:devel/py-build@${PY_FLAVOR} -PEP517_INSTALL_CMD?= ${PYTHON_CMD} -m installer --destdir ${STAGEDIR} --no-compile-bytecode --prefix ${PREFIX} ${BUILD_WRKSRC}/dist/${PORTNAME:C|[-_]+|_|g}-${DISTVERSION}-*.whl +PEP517_INSTALL_CMD?= ${PYTHON_CMD} -m installer --destdir ${STAGEDIR} --no-compile-bytecode --prefix ${PREFIX} ${BUILD_WRKSRC}/dist/${PORTNAME:C|[-_]+|_|g}-${DISTVERSION}*.whl PEP517_INSTALL_DEPEND?= ${PYTHON_PKGNAMEPREFIX}installer>=0:devel/py-installer@${PY_FLAVOR} # nose support @@ -901,7 +901,7 @@ do-install: @${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} @cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PEP517_INSTALL_CMD} @${PYTHON_CMD} -B ${PORTSDIR}/Mk/Scripts/strip_RECORD.py \ - ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME:C|[-_]+|_|g}-${DISTVERSION}.dist-info/RECORD >> ${_PYTHONPKGLIST} + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME:C|[-_]+|_|g}-${DISTVERSION}*.dist-info/RECORD >> ${_PYTHONPKGLIST} @${REINPLACE_CMD} -e 's|^|${PYTHONPREFIX_SITELIBDIR}/|' \ -e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../etc/|etc/|' \ -e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../bin/|bin/|' \