pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

py-maturin: fix DEPENDS, fix version, simplify PLIST



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Mon May 2 13:46:17 2022 +0200
Changeset:	4d94dce44e68034319f2df4d62cd2d368df2025c

Modified Files:
	py-maturin/Makefile
	py-maturin/PLIST

Log Message:
py-maturin: fix DEPENDS, fix version, simplify PLIST

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4d94dce44e68034319f2df4d62cd2d368df2025c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-maturin/Makefile | 13 +++++++------
 py-maturin/PLIST    | 12 ++++++------
 2 files changed, 13 insertions(+), 12 deletions(-)

diffs:
diff --git a/py-maturin/Makefile b/py-maturin/Makefile
index de5d39f69e..00eec9f74d 100644
--- a/py-maturin/Makefile
+++ b/py-maturin/Makefile
@@ -10,13 +10,14 @@ HOMEPAGE=	https://github.com/PyO3/maturin
 COMMENT=	Build and publish crates with pyo3, rust-cpython and cffi bindings
 LICENSE=	apache-2.0
 
-DEPENDS+=	${PYPKGPREFIX}-toml-[0-9]*:../../textproc/py-toml
+DEPENDS+=	${PYPKGPREFIX}-tomli-[0-9]*:../../textproc/py-tomli
+
+SUBST_CLASSES+=			fix-version
+SUBST_STAGE.fix-version=	pre-build
+SUBST_MESSAGE.fix-version=	Adding version to pyproject.toml
+SUBST_FILES.fix-version=	pyproject.toml
+SUBST_SED.fix-version=		-e 's|PKGSRC_VERSION|"'${PKGVERSION_NOREV}'"|' 
 
-SUBST_CLASSES+=                fix-version
-SUBST_STAGE.fix-version=   pre-build
-SUBST_MESSAGE.fix-version= Adding version to pyproject.toml
-SUBST_FILES.fix-version=   pyproject.toml
-SUBST_SED.fix-version=     -e 's|PKGSRC_VERSION|"0.12.12"|'
 .include "cargo-depends.mk"
 
 .include "../../lang/rust/cargo.mk"
diff --git a/py-maturin/PLIST b/py-maturin/PLIST
index f13c2344f4..4f738a09b9 100644
--- a/py-maturin/PLIST
+++ b/py-maturin/PLIST
@@ -3,11 +3,11 @@ bin/maturin
 ${PYSITELIB}/get_interpreter_metadata.py
 ${PYSITELIB}/get_interpreter_metadata.pyc
 ${PYSITELIB}/get_interpreter_metadata.pyo
-${PYSITELIB}/maturin-0.12.12-py${PYVERSSUFFIX}.egg-info/PKG-INFO
-${PYSITELIB}/maturin-0.12.12-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
-${PYSITELIB}/maturin-0.12.12-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
-${PYSITELIB}/maturin-0.12.12-py${PYVERSSUFFIX}.egg-info/not-zip-safe
-${PYSITELIB}/maturin-0.12.12-py${PYVERSSUFFIX}.egg-info/requires.txt
-${PYSITELIB}/maturin-0.12.12-py${PYVERSSUFFIX}.egg-info/top_level.txt
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/maturin/__init__.py
 ${PYSITELIB}/maturin/import_hook.py


Home | Main Index | Thread Index | Old Index