Index: head/math/py-gau2grid/Makefile =================================================================== --- head/math/py-gau2grid/Makefile (revision 558320) +++ head/math/py-gau2grid/Makefile (revision 558321) @@ -1,35 +1,35 @@ # $FreeBSD$ PORTNAME= gau2grid DISTVERSIONPREFIX= v -DISTVERSION= 2.0.4 +DISTVERSION= 2.0.5 CATEGORIES= math python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Fast computation of a gaussian and its derivative on a grid LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYNUMPY} \ cmake:devel/cmake RUN_DEPENDS= ${PYNUMPY} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} USES= cmake compiler:c11 python USE_GITHUB= yes GH_ACCOUNT= dgasmith USE_PYTHON= flavors CMAKE_ON= INSTALL_PYMOD CMAKE_ARGS= -DPYMOD_INSTALL_LIBDIR:STRING=${PYTHON_SITELIBDIR} -DFREEBSD_PYTHON_VER:STRING=${PYTHON_VER} post-install: @${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR}/gau2grid/__pycache__ @${RM} -r ${STAGEDIR}${LOCALBASE}//lib/usr # LICENSE is installed under there do-test: @cd ${WRKSRC} && ${PYTHON_CMD} -m pytest .include Index: head/math/py-gau2grid/distinfo =================================================================== --- head/math/py-gau2grid/distinfo (revision 558320) +++ head/math/py-gau2grid/distinfo (revision 558321) @@ -1,3 +1,3 @@ -TIMESTAMP = 1578813504 -SHA256 (dgasmith-gau2grid-v2.0.4_GH0.tar.gz) = 1129730e4be1b558d72db8bc49e8a7e480bb960980ff5bee45dcfc257589e56c -SIZE (dgasmith-gau2grid-v2.0.4_GH0.tar.gz) = 84005 +TIMESTAMP = 1608236776 +SHA256 (dgasmith-gau2grid-v2.0.5_GH0.tar.gz) = b6534bfd2b8b469f66d98d030701ce96e61ded84c1ba521b95f897101d3a5832 +SIZE (dgasmith-gau2grid-v2.0.5_GH0.tar.gz) = 84178 Index: head/math/py-gau2grid/files/patch-CMakeLists.txt =================================================================== --- head/math/py-gau2grid/files/patch-CMakeLists.txt (revision 558320) +++ head/math/py-gau2grid/files/patch-CMakeLists.txt (revision 558321) @@ -1,41 +1,42 @@ ---- CMakeLists.txt.orig 2018-12-17 15:06:15 UTC +--- CMakeLists.txt.orig 2020-12-15 13:54:30 UTC +++ CMakeLists.txt -@@ -56,7 +56,7 @@ message(STATUS "gau2grid install: ${CMAK +@@ -51,7 +51,7 @@ message(STATUS "gau2grid install: ${CMAKE_INSTALL_PREF # << Python >> - set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5) # adjust with CMake minimum FindPythonInterp --find_package(PythonLibsNew 2.7 REQUIRED) + set(Python_ADDITIONAL_VERSIONS 3.9 3.8 3.7 3.6 3.5) # adjust with CMake minimum FindPythonInterp +-find_package(PythonLibsNew 3.6 REQUIRED) +find_package(PythonLibsNew ${FREEBSD_PYTHON_VER} REQUIRED) message(STATUS "${Cyan}Found Python ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}${ColourReset}: ${PYTHON_EXECUTABLE} (found version ${PYTHON_VERSION_STRING})") -@@ -112,6 +112,7 @@ target_include_directories(gg INTERFACE +@@ -110,6 +110,7 @@ target_include_directories(gg INTERFACE $) # GNUInstallDirs "DATADIR" wrong here; CMake search path wants "share". +if (FALSE) # see https://github.com/dgasmith/gau2grid/issues/39#issuecomment-457856365 set(CMAKECONFIG_INSTALL_DIR "share/cmake/${PN}") configure_package_config_file(cmake/${PN}Config.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/${PN}Config.cmake" -@@ -138,6 +139,7 @@ if(NOT(${INSTALL_PYMOD} AND ${NATIVE_PYT - NAMESPACE "${PN}::" - DESTINATION ${CMAKECONFIG_INSTALL_DIR}) +@@ -139,6 +140,7 @@ if(${NATIVE_PYTHON_INSTALL_WITH_LIB} OR (NOT(${INSTALL + NAMESPACE "${PN}::" + FILE "${PROJECT_BINARY_DIR}/${PN}Targets.cmake") endif() +endif() if(${INSTALL_PYMOD}) if(${NATIVE_PYTHON_INSTALL}) -@@ -161,11 +163,11 @@ if(${INSTALL_PYMOD}) +@@ -162,12 +164,12 @@ if(${INSTALL_PYMOD}) OUTPUT_STRIP_TRAILING_WHITESPACE) install(DIRECTORY gau2grid - DESTINATION ${CMAKE_INSTALL_LIBDIR}${PYMOD_INSTALL_LIBDIR} + DESTINATION ${PYMOD_INSTALL_LIBDIR} USE_SOURCE_PERMISSIONS FILES_MATCHING PATTERN "*.py") install(FILES $ - DESTINATION ${CMAKE_INSTALL_LIBDIR}${PYMOD_INSTALL_LIBDIR}/gau2grid + DESTINATION ${PYMOD_INSTALL_LIBDIR}/gau2grid RENAME "gg${PYLIB_EXTENSION}") - endif() + + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE