Mon Apr 18 11:28:54 2022 UTC ()
py-build: add PYVERSSUFFIX to binary name to avoid conflicts between Python versions


(adam)
diff -r0 -r1.1 pkgsrc/devel/py-build/ALTERNATIVES
diff -r1.4 -r1.5 pkgsrc/devel/py-build/Makefile
diff -r1.1 -r1.2 pkgsrc/devel/py-build/PLIST

File Added: pkgsrc/devel/py-build/ALTERNATIVES
in/pyproject-build @PREFIX@/bin/pyproject-build-@PYVERSSUFFIX@

cvs diff -r1.4 -r1.5 pkgsrc/devel/py-build/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/py-build/Makefile 2022/01/13 21:30:00 1.4
+++ pkgsrc/devel/py-build/Makefile 2022/04/18 11:28:54 1.5
@@ -1,30 +1,34 @@ @@ -1,30 +1,34 @@
1# $NetBSD: Makefile,v 1.4 2022/01/13 21:30:00 wiz Exp $ 1# $NetBSD: Makefile,v 1.5 2022/04/18 11:28:54 adam Exp $
2 2
3DISTNAME= build-0.7.0 3DISTNAME= build-0.7.0
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= devel python 6CATEGORIES= devel python
7MASTER_SITES= ${MASTER_SITE_PYPI:=b/build/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=b/build/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/pypa/build 10HOMEPAGE= https://github.com/pypa/build
11COMMENT= Simple, correct PEP517 package builder 11COMMENT= Simple, correct PEP517 package builder
12LICENSE= mit 12LICENSE= mit
13 13
14DEPENDS+= ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging 14DEPENDS+= ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging
15DEPENDS+= ${PYPKGPREFIX}-pep517-[0-9]*:../../devel/py-pep517 15DEPENDS+= ${PYPKGPREFIX}-pep517-[0-9]*:../../devel/py-pep517
16DEPENDS+= ${PYPKGPREFIX}-tomli-[0-9]*:../../textproc/py-tomli 16DEPENDS+= ${PYPKGPREFIX}-tomli-[0-9]*:../../textproc/py-tomli
17DEPENDS+= ${PYPKGPREFIX}-colorama-[0-9]*:../../comms/py-colorama 17DEPENDS+= ${PYPKGPREFIX}-colorama-[0-9]*:../../comms/py-colorama
18 18
19PYTHON_VERSIONS_INCOMPATIBLE= 27 19PYTHON_VERSIONS_INCOMPATIBLE= 27
20 20
21USE_PKG_RESOURCES= yes 21USE_PKG_RESOURCES= yes
22 22
23.include "../../lang/python/pyversion.mk" 23.include "../../lang/python/pyversion.mk"
24 24
25.if ${PYPKGPREFIX} == "py37" 25.if ${PYPKGPREFIX} == "py37"
26DEPENDS+= ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata 26DEPENDS+= ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata
27.endif 27.endif
28 28
 29post-install:
 30 cd ${DESTDIR}${PREFIX}/bin && \
 31 ${MV} pyproject-build pyproject-build-${PYVERSSUFFIX} || ${TRUE}
 32
29.include "../../lang/python/egg.mk" 33.include "../../lang/python/egg.mk"
30.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"

cvs diff -r1.1 -r1.2 pkgsrc/devel/py-build/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/py-build/PLIST 2021/11/25 21:18:28 1.1
+++ pkgsrc/devel/py-build/PLIST 2022/04/18 11:28:54 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1@comment $NetBSD: PLIST,v 1.1 2021/11/25 21:18:28 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.2 2022/04/18 11:28:54 adam Exp $
2bin/pyproject-build 2bin/pyproject-build-${PYVERSSUFFIX}
3${PYSITELIB}/${EGG_INFODIR}/PKG-INFO 3${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
4${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt 4${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
5${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt 5${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
6${PYSITELIB}/${EGG_INFODIR}/entry_points.txt 6${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
7${PYSITELIB}/${EGG_INFODIR}/requires.txt 7${PYSITELIB}/${EGG_INFODIR}/requires.txt
8${PYSITELIB}/${EGG_INFODIR}/top_level.txt 8${PYSITELIB}/${EGG_INFODIR}/top_level.txt
9${PYSITELIB}/build/__init__.py 9${PYSITELIB}/build/__init__.py
10${PYSITELIB}/build/__init__.pyc 10${PYSITELIB}/build/__init__.pyc
11${PYSITELIB}/build/__init__.pyo 11${PYSITELIB}/build/__init__.pyo
12${PYSITELIB}/build/__main__.py 12${PYSITELIB}/build/__main__.py
13${PYSITELIB}/build/__main__.pyc 13${PYSITELIB}/build/__main__.pyc
14${PYSITELIB}/build/__main__.pyo 14${PYSITELIB}/build/__main__.pyo
15${PYSITELIB}/build/env.py 15${PYSITELIB}/build/env.py