Sun Jun 25 18:17:33 2023 UTC ()
Fix textproc/py-rapidfuzz on !x86


(js)
diff -r1.7 -r1.8 pkgsrc/textproc/py-rapidfuzz/Makefile
diff -r1.2 -r1.3 pkgsrc/textproc/py-rapidfuzz/PLIST
cvs diff -r1.7 -r1.8 pkgsrc/textproc/py-rapidfuzz/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/py-rapidfuzz/Makefile 2023/06/22 10:52:35 1.7
+++ pkgsrc/textproc/py-rapidfuzz/Makefile 2023/06/25 18:17:33 1.8
@@ -1,34 +1,38 @@ @@ -1,34 +1,38 @@
1# $NetBSD: Makefile,v 1.7 2023/06/22 10:52:35 jperkin Exp $ 1# $NetBSD: Makefile,v 1.8 2023/06/25 18:17:33 js Exp $
2 2
3DISTNAME= rapidfuzz-3.1.1 3DISTNAME= rapidfuzz-3.1.1
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5CATEGORIES= textproc python 5CATEGORIES= textproc python
6MASTER_SITES= ${MASTER_SITE_PYPI:=r/rapidfuzz/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=r/rapidfuzz/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://github.com/maxbachmann/RapidFuzz 9HOMEPAGE= https://github.com/maxbachmann/RapidFuzz
10COMMENT= Rapid fuzzy string matching 10COMMENT= Rapid fuzzy string matching
11LICENSE= mit 11LICENSE= mit
12 12
13TOOL_DEPENDS+= ${PYPKGPREFIX}-scikit-build>=0.17.0:../../devel/py-scikit-build 13TOOL_DEPENDS+= ${PYPKGPREFIX}-scikit-build>=0.17.0:../../devel/py-scikit-build
14TOOL_DEPENDS+= cmake-[0-9]*:../../devel/cmake 14TOOL_DEPENDS+= cmake-[0-9]*:../../devel/cmake
15TEST_DEPENDS+= ${PYPKGPREFIX}-test>=7.1:../../devel/py-test 15TEST_DEPENDS+= ${PYPKGPREFIX}-test>=7.1:../../devel/py-test
16# optional dependency, but not optional for testing 16# optional dependency, but not optional for testing
17TEST_DEPENDS+= ${PYPKGPREFIX}-numpy>=0:../../math/py-numpy 17TEST_DEPENDS+= ${PYPKGPREFIX}-numpy>=0:../../math/py-numpy
18TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis>=0:../../devel/py-hypothesis 18TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis>=0:../../devel/py-hypothesis
19 19
20PYTHON_VERSIONS_INCOMPATIBLE= 27 20PYTHON_VERSIONS_INCOMPATIBLE= 27
21 21
22PLIST_SUBST+= PYTHON_VERSION=${_PYTHON_VERSION} 22PLIST_SUBST+= PYTHON_VERSION=${_PYTHON_VERSION}
 23PLIST_VARS+= avx2
 24.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
 25PLIST.amd64= yes
 26.endif
23 27
24USE_LANGUAGES= c c++17 28USE_LANGUAGES= c c++17
25GCC_REQD+= 10 29GCC_REQD+= 10
26 30
27BUILDLINK_TRANSFORM.SunOS+= rm:-fno-fat-lto-objects 31BUILDLINK_TRANSFORM.SunOS+= rm:-fno-fat-lto-objects
28 32
29# needs 'make install' 33# needs 'make install'
30do-test: 34do-test:
31 cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} tests 35 cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} tests
32 36
33.include "../../lang/python/egg.mk" 37.include "../../lang/python/egg.mk"
34.include "../../mk/bsd.pkg.mk" 38.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/textproc/py-rapidfuzz/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/py-rapidfuzz/PLIST 2023/06/06 09:39:09 1.2
+++ pkgsrc/textproc/py-rapidfuzz/PLIST 2023/06/25 18:17:33 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.2 2023/06/06 09:39:09 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.3 2023/06/25 18:17:33 js Exp $
2${PYSITELIB}/${EGG_INFODIR}/PKG-INFO 2${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
3${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt 3${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
4${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt 4${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
5${PYSITELIB}/${EGG_INFODIR}/entry_points.txt 5${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
6${PYSITELIB}/${EGG_INFODIR}/not-zip-safe 6${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
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}/rapidfuzz/__init__.pxd 9${PYSITELIB}/rapidfuzz/__init__.pxd
10${PYSITELIB}/rapidfuzz/__init__.py 10${PYSITELIB}/rapidfuzz/__init__.py
11${PYSITELIB}/rapidfuzz/__init__.pyc 11${PYSITELIB}/rapidfuzz/__init__.pyc
12${PYSITELIB}/rapidfuzz/__init__.pyi 12${PYSITELIB}/rapidfuzz/__init__.pyi
13${PYSITELIB}/rapidfuzz/__init__.pyo 13${PYSITELIB}/rapidfuzz/__init__.pyo
14${PYSITELIB}/rapidfuzz/__pyinstaller/__init__.py 14${PYSITELIB}/rapidfuzz/__pyinstaller/__init__.py
@@ -16,27 +16,27 @@ ${PYSITELIB}/rapidfuzz/__pyinstaller/__i @@ -16,27 +16,27 @@ ${PYSITELIB}/rapidfuzz/__pyinstaller/__i
16${PYSITELIB}/rapidfuzz/__pyinstaller/__init__.pyo 16${PYSITELIB}/rapidfuzz/__pyinstaller/__init__.pyo
17${PYSITELIB}/rapidfuzz/__pyinstaller/hook-rapidfuzz.py 17${PYSITELIB}/rapidfuzz/__pyinstaller/hook-rapidfuzz.py
18${PYSITELIB}/rapidfuzz/__pyinstaller/hook-rapidfuzz.pyc 18${PYSITELIB}/rapidfuzz/__pyinstaller/hook-rapidfuzz.pyc
19${PYSITELIB}/rapidfuzz/__pyinstaller/hook-rapidfuzz.pyo 19${PYSITELIB}/rapidfuzz/__pyinstaller/hook-rapidfuzz.pyo
20${PYSITELIB}/rapidfuzz/__pyinstaller/test_rapidfuzz_packaging.py 20${PYSITELIB}/rapidfuzz/__pyinstaller/test_rapidfuzz_packaging.py
21${PYSITELIB}/rapidfuzz/__pyinstaller/test_rapidfuzz_packaging.pyc 21${PYSITELIB}/rapidfuzz/__pyinstaller/test_rapidfuzz_packaging.pyc
22${PYSITELIB}/rapidfuzz/__pyinstaller/test_rapidfuzz_packaging.pyo 22${PYSITELIB}/rapidfuzz/__pyinstaller/test_rapidfuzz_packaging.pyo
23${PYSITELIB}/rapidfuzz/_common_py.py 23${PYSITELIB}/rapidfuzz/_common_py.py
24${PYSITELIB}/rapidfuzz/_common_py.pyc 24${PYSITELIB}/rapidfuzz/_common_py.pyc
25${PYSITELIB}/rapidfuzz/_common_py.pyo 25${PYSITELIB}/rapidfuzz/_common_py.pyo
26${PYSITELIB}/rapidfuzz/_feature_detector.py 26${PYSITELIB}/rapidfuzz/_feature_detector.py
27${PYSITELIB}/rapidfuzz/_feature_detector.pyc 27${PYSITELIB}/rapidfuzz/_feature_detector.pyc
28${PYSITELIB}/rapidfuzz/_feature_detector.pyo 28${PYSITELIB}/rapidfuzz/_feature_detector.pyo
29${PYSITELIB}/rapidfuzz/_feature_detector_cpp.cpython-${PYTHON_VERSION}.so 29${PLIST.avx2}${PYSITELIB}/rapidfuzz/_feature_detector_cpp.cpython-${PYTHON_VERSION}.so
30${PYSITELIB}/rapidfuzz/_utils.py 30${PYSITELIB}/rapidfuzz/_utils.py
31${PYSITELIB}/rapidfuzz/_utils.pyc 31${PYSITELIB}/rapidfuzz/_utils.pyc
32${PYSITELIB}/rapidfuzz/_utils.pyo 32${PYSITELIB}/rapidfuzz/_utils.pyo
33${PYSITELIB}/rapidfuzz/distance/DamerauLevenshtein.py 33${PYSITELIB}/rapidfuzz/distance/DamerauLevenshtein.py
34${PYSITELIB}/rapidfuzz/distance/DamerauLevenshtein.pyc 34${PYSITELIB}/rapidfuzz/distance/DamerauLevenshtein.pyc
35${PYSITELIB}/rapidfuzz/distance/DamerauLevenshtein.pyi 35${PYSITELIB}/rapidfuzz/distance/DamerauLevenshtein.pyi
36${PYSITELIB}/rapidfuzz/distance/DamerauLevenshtein.pyo 36${PYSITELIB}/rapidfuzz/distance/DamerauLevenshtein.pyo
37${PYSITELIB}/rapidfuzz/distance/DamerauLevenshtein_py.py 37${PYSITELIB}/rapidfuzz/distance/DamerauLevenshtein_py.py
38${PYSITELIB}/rapidfuzz/distance/DamerauLevenshtein_py.pyc 38${PYSITELIB}/rapidfuzz/distance/DamerauLevenshtein_py.pyc
39${PYSITELIB}/rapidfuzz/distance/DamerauLevenshtein_py.pyo 39${PYSITELIB}/rapidfuzz/distance/DamerauLevenshtein_py.pyo
40${PYSITELIB}/rapidfuzz/distance/Hamming.py 40${PYSITELIB}/rapidfuzz/distance/Hamming.py
41${PYSITELIB}/rapidfuzz/distance/Hamming.pyc 41${PYSITELIB}/rapidfuzz/distance/Hamming.pyc
42${PYSITELIB}/rapidfuzz/distance/Hamming.pyi 42${PYSITELIB}/rapidfuzz/distance/Hamming.pyi
@@ -102,36 +102,36 @@ ${PYSITELIB}/rapidfuzz/distance/__init__ @@ -102,36 +102,36 @@ ${PYSITELIB}/rapidfuzz/distance/__init__
102${PYSITELIB}/rapidfuzz/distance/__init__.pyc 102${PYSITELIB}/rapidfuzz/distance/__init__.pyc
103${PYSITELIB}/rapidfuzz/distance/__init__.pyi 103${PYSITELIB}/rapidfuzz/distance/__init__.pyi
104${PYSITELIB}/rapidfuzz/distance/__init__.pyo 104${PYSITELIB}/rapidfuzz/distance/__init__.pyo
105${PYSITELIB}/rapidfuzz/distance/_initialize.py 105${PYSITELIB}/rapidfuzz/distance/_initialize.py
106${PYSITELIB}/rapidfuzz/distance/_initialize.pyc 106${PYSITELIB}/rapidfuzz/distance/_initialize.pyc
107${PYSITELIB}/rapidfuzz/distance/_initialize.pyi 107${PYSITELIB}/rapidfuzz/distance/_initialize.pyi
108${PYSITELIB}/rapidfuzz/distance/_initialize.pyo 108${PYSITELIB}/rapidfuzz/distance/_initialize.pyo
109${PYSITELIB}/rapidfuzz/distance/_initialize_cpp.cpython-${PYTHON_VERSION}.so 109${PYSITELIB}/rapidfuzz/distance/_initialize_cpp.cpython-${PYTHON_VERSION}.so
110${PYSITELIB}/rapidfuzz/distance/_initialize_py.py 110${PYSITELIB}/rapidfuzz/distance/_initialize_py.py
111${PYSITELIB}/rapidfuzz/distance/_initialize_py.pyc 111${PYSITELIB}/rapidfuzz/distance/_initialize_py.pyc
112${PYSITELIB}/rapidfuzz/distance/_initialize_py.pyo 112${PYSITELIB}/rapidfuzz/distance/_initialize_py.pyo
113${PYSITELIB}/rapidfuzz/distance/metrics_cpp.cpython-${PYTHON_VERSION}.so 113${PYSITELIB}/rapidfuzz/distance/metrics_cpp.cpython-${PYTHON_VERSION}.so
114${PYSITELIB}/rapidfuzz/distance/metrics_cpp.pyi 114${PYSITELIB}/rapidfuzz/distance/metrics_cpp.pyi
115${PYSITELIB}/rapidfuzz/distance/metrics_cpp_avx2.cpython-${PYTHON_VERSION}.so 115${PLIST.avx2}${PYSITELIB}/rapidfuzz/distance/metrics_cpp_avx2.cpython-${PYTHON_VERSION}.so
116${PYSITELIB}/rapidfuzz/distance/metrics_py.py 116${PYSITELIB}/rapidfuzz/distance/metrics_py.py
117${PYSITELIB}/rapidfuzz/distance/metrics_py.pyc 117${PYSITELIB}/rapidfuzz/distance/metrics_py.pyc
118${PYSITELIB}/rapidfuzz/distance/metrics_py.pyo 118${PYSITELIB}/rapidfuzz/distance/metrics_py.pyo
119${PYSITELIB}/rapidfuzz/fuzz.py 119${PYSITELIB}/rapidfuzz/fuzz.py
120${PYSITELIB}/rapidfuzz/fuzz.pyc 120${PYSITELIB}/rapidfuzz/fuzz.pyc
121${PYSITELIB}/rapidfuzz/fuzz.pyi 121${PYSITELIB}/rapidfuzz/fuzz.pyi
122${PYSITELIB}/rapidfuzz/fuzz.pyo 122${PYSITELIB}/rapidfuzz/fuzz.pyo
123${PYSITELIB}/rapidfuzz/fuzz_cpp.cpython-${PYTHON_VERSION}.so 123${PYSITELIB}/rapidfuzz/fuzz_cpp.cpython-${PYTHON_VERSION}.so
124${PYSITELIB}/rapidfuzz/fuzz_cpp_avx2.cpython-${PYTHON_VERSION}.so 124${PLIST.avx2}${PYSITELIB}/rapidfuzz/fuzz_cpp_avx2.cpython-${PYTHON_VERSION}.so
125${PYSITELIB}/rapidfuzz/fuzz_py.py 125${PYSITELIB}/rapidfuzz/fuzz_py.py
126${PYSITELIB}/rapidfuzz/fuzz_py.pyc 126${PYSITELIB}/rapidfuzz/fuzz_py.pyc
127${PYSITELIB}/rapidfuzz/fuzz_py.pyo 127${PYSITELIB}/rapidfuzz/fuzz_py.pyo
128${PYSITELIB}/rapidfuzz/process.py 128${PYSITELIB}/rapidfuzz/process.py
129${PYSITELIB}/rapidfuzz/process.pyc 129${PYSITELIB}/rapidfuzz/process.pyc
130${PYSITELIB}/rapidfuzz/process.pyi 130${PYSITELIB}/rapidfuzz/process.pyi
131${PYSITELIB}/rapidfuzz/process.pyo 131${PYSITELIB}/rapidfuzz/process.pyo
132${PYSITELIB}/rapidfuzz/process_cpp.py 132${PYSITELIB}/rapidfuzz/process_cpp.py
133${PYSITELIB}/rapidfuzz/process_cpp.pyc 133${PYSITELIB}/rapidfuzz/process_cpp.pyc
134${PYSITELIB}/rapidfuzz/process_cpp.pyo 134${PYSITELIB}/rapidfuzz/process_cpp.pyo
135${PYSITELIB}/rapidfuzz/process_cpp_impl.cpython-${PYTHON_VERSION}.so 135${PYSITELIB}/rapidfuzz/process_cpp_impl.cpython-${PYTHON_VERSION}.so
136${PYSITELIB}/rapidfuzz/process_cpp_impl.pyi 136${PYSITELIB}/rapidfuzz/process_cpp_impl.pyi
137${PYSITELIB}/rapidfuzz/process_py.py 137${PYSITELIB}/rapidfuzz/process_py.py