Attachment #219375 for bug #250884

Lines 58-65 Link Here

(-)math/cantor/Makefile (-2 / +1 lines)
58	post-patch:	58	post-patch:
59	${REINPLACE_CMD} -e '/FIND_PROGRAM(_GFORTRAN_EXECUTABLE/s,gfortran,${FC},' \	59	${REINPLACE_CMD} -e '/FIND_PROGRAM(_GFORTRAN_EXECUTABLE/s,gfortran,${FC},' \
60	${WRKSRC}/cmake/FindR.cmake	60	${WRKSRC}/cmake/FindR.cmake
61	${REINPLACE_CMD} -e '/find_library(PYTHONLIBS3_LIBRARY/s,python3.5m,python3.5m python3.6m,' \	61	${REINPLACE_CMD} -e 's\|%%PYTHON_VERSION%%\|${PYTHON_VERSION}\|g' \
62	-e '/pkg_check_modules/s,python3,python-${PYTHON_VER},' \
63	${WRKSRC}/cmake/FindPythonLibs3.cmake	62	${WRKSRC}/cmake/FindPythonLibs3.cmake
64		63
65	.include <bsd.port.mk>	64	.include <bsd.port.mk>




--- cmake/FindPythonLibs3.cmake.orig	2020-10-31 16:59:49 UTC
+++ cmake/FindPythonLibs3.cmake
@@ -1,5 +1,5 @@
 find_package(PkgConfig)
-pkg_check_modules(PYTHONLIBS3 QUIET python3)
+pkg_check_modules(PYTHONLIBS3 QUIET %%PYTHON_VERSION%%)
 set(PYTHONLIBS3_DEFINITIONS ${PYTHONLIBS3_CFLAGS_OTHER})
 
 find_path(PYTHONLIBS3_INCLUDE_DIR Python.h
@@ -9,7 +9,7 @@ IF(WIN32)
   find_library(PYTHONLIBS3_LIBRARY NAMES python32 python33 python34 python35 python36 python37 python38
                HINTS ${PYTHONLIBS3_LIBDIR} ${PYTHONLIBS3_LIBRARY_DIRS} )
 ELSE()
-  find_library(PYTHONLIBS3_LIBRARY NAMES python3.2m python3.3m python3.4m python3.5m python3.6m python3.7m python3.8
+  find_library(PYTHONLIBS3_LIBRARY NAMES %%PYTHON_VERSION%% python3.7 python3.2m python3.3m python3.4m python3.5m python3.6m python3.7m python3.8
                HINTS ${PYTHONLIBS3_LIBDIR} ${PYTHONLIBS3_LIBRARY_DIRS} )
 ENDIF()
 

Return to bug 250884

Line 0 Link Here

(-)math/cantor/files/patch-cmake_FindPythonLibs3.cmake (+18 lines)
	1	--- cmake/FindPythonLibs3.cmake.orig 2020-10-31 16:59:49 UTC
	2	+++ cmake/FindPythonLibs3.cmake
	3	@@ -1,5 +1,5 @@
	4	find_package(PkgConfig)
	5	-pkg_check_modules(PYTHONLIBS3 QUIET python3)
	6	+pkg_check_modules(PYTHONLIBS3 QUIET %%PYTHON_VERSION%%)
	7	set(PYTHONLIBS3_DEFINITIONS ${PYTHONLIBS3_CFLAGS_OTHER})
	8
	9	find_path(PYTHONLIBS3_INCLUDE_DIR Python.h
	10	@@ -9,7 +9,7 @@ IF(WIN32)
	11	find_library(PYTHONLIBS3_LIBRARY NAMES python32 python33 python34 python35 python36 python37 python38
	12	HINTS ${PYTHONLIBS3_LIBDIR} ${PYTHONLIBS3_LIBRARY_DIRS} )
	13	ELSE()
	14	- find_library(PYTHONLIBS3_LIBRARY NAMES python3.2m python3.3m python3.4m python3.5m python3.6m python3.7m python3.8
	15	+ find_library(PYTHONLIBS3_LIBRARY NAMES %%PYTHON_VERSION%% python3.7 python3.2m python3.3m python3.4m python3.5m python3.6m python3.7m python3.8
	16	HINTS ${PYTHONLIBS3_LIBDIR} ${PYTHONLIBS3_LIBRARY_DIRS} )
	17	ENDIF()
	18