diff --git a/science/py-spglib/Makefile b/science/py-spglib/Makefile index f3e9acbca1ea..bb6bf1c27a91 100644 --- a/science/py-spglib/Makefile +++ b/science/py-spglib/Makefile @@ -1,38 +1,37 @@ PORTNAME= spglib DISTVERSIONPREFIX= v -DISTVERSION= 2.3.1 -PORTREVISION= 1 +DISTVERSION= 2.4.0 CATEGORIES= science python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Library for finding and handling crystal symmetries (python binding) WWW= https://spglib.readthedocs.io/en/stable/ LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-build-core>0:devel/py-scikit-build-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproject-metadata>0:devel/py-pyproject-metadata@${PY_FLAVOR} \ cmake:devel/cmake-core \ ${PYNUMPY} RUN_DEPENDS= ${PYNUMPY} USES= python USE_PYTHON= pep517 autoplist pytest # tests fail to run, see https://github.com/spglib/spglib/issues/192 USE_GITHUB= yes CMAKE_ARGS= -DPython3_EXECUTABLE=${PYTHON_CMD} MAKE_ENV= SETUPTOOLS_SCM_PRETEND_VERSION=${DISTVERSION} TEST_WRKSRC= ${WRKSRC} TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} post-patch: ##@cd ${WRKSRC} && ${RLN} ../test . #@cd ${WRKSRC} && ${CP} -r ../test . # workaround for https://github.com/spglib/spglib/issues/429 @${REINPLACE_CMD} -i '' -e 's|^from ._version import|#&|' ${WRKSRC}/python/spglib/__init__.py .include diff --git a/science/py-spglib/distinfo b/science/py-spglib/distinfo index 29c3fb3df15a..9f8bce21d7f0 100644 --- a/science/py-spglib/distinfo +++ b/science/py-spglib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1707671341 -SHA256 (spglib-spglib-v2.3.1_GH0.tar.gz) = 6eb977053b35cd80eb2b5c3fa506a538ff2dad7092a43a612f4f0d4dc2069253 -SIZE (spglib-spglib-v2.3.1_GH0.tar.gz) = 2910916 +TIMESTAMP = 1712894995 +SHA256 (spglib-spglib-v2.4.0_GH0.tar.gz) = e33694b189c6864f719a59c31e2af55301a524fb68ba9fb65f08e95af471847d +SIZE (spglib-spglib-v2.4.0_GH0.tar.gz) = 2921409 diff --git a/science/spglib/Makefile b/science/spglib/Makefile index 637aceb28671..f82431cf69ff 100644 --- a/science/spglib/Makefile +++ b/science/spglib/Makefile @@ -1,35 +1,35 @@ PORTNAME= spglib DISTVERSIONPREFIX= v -DISTVERSION= 2.3.1 +DISTVERSION= 2.4.0 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org COMMENT= C library for finding and handling crystal symmetries WWW= https://spglib.github.io/spglib/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING USES= cmake:testing USE_GITHUB= yes USE_LDCONFIG= yes TEST_DEPENDS= googletest>0:devel/googletest CMAKE_OFF= SPGLIB_WITH_TESTS CMAKE_TESTING_ON= SPGLIB_WITH_TESTS .if !exists(/usr/include/omp.h) CMAKE_OFF+= SPGLIB_USE_OMP .else FORTRAN_LDFLAGS= -lomp # workaround for: undefined reference to `__kmpc_fork_call' .endif OPTIONS_DEFINE= FORTRAN OPTIONS_DEFAULT= FORTRAN OPTIONS_SUB= yes FORTRAN_USES= fortran FORTRAN_CMAKE_BOOL= SPGLIB_WITH_Fortran .include diff --git a/science/spglib/distinfo b/science/spglib/distinfo index 922298e099b7..4dc0d99ef754 100644 --- a/science/spglib/distinfo +++ b/science/spglib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1707671227 -SHA256 (spglib-spglib-v2.3.1_GH0.tar.gz) = 6eb977053b35cd80eb2b5c3fa506a538ff2dad7092a43a612f4f0d4dc2069253 -SIZE (spglib-spglib-v2.3.1_GH0.tar.gz) = 2910916 +TIMESTAMP = 1712894917 +SHA256 (spglib-spglib-v2.4.0_GH0.tar.gz) = e33694b189c6864f719a59c31e2af55301a524fb68ba9fb65f08e95af471847d +SIZE (spglib-spglib-v2.4.0_GH0.tar.gz) = 2921409 diff --git a/science/spglib/files/patch-fortran_CMakeLists.txt b/science/spglib/files/patch-fortran_CMakeLists.txt index 5cbec0d72be8..830b58b19a35 100644 --- a/science/spglib/files/patch-fortran_CMakeLists.txt +++ b/science/spglib/files/patch-fortran_CMakeLists.txt @@ -1,13 +1,13 @@ - remove compiler ID from include path ---- fortran/CMakeLists.txt.orig 2023-09-11 04:42:53 UTC +--- fortran/CMakeLists.txt.orig 2024-04-11 13:12:34 UTC +++ fortran/CMakeLists.txt -@@ -22,7 +22,7 @@ if (SPGLIB_INSTALL) - # Adapting the standard from fortran-stdlib - # https://gitlab.kitware.com/cmake/cmake/-/issues/19608 - # https://discourse.cmake.org/t/api-design-c-modules-source-listings-and-interface-properties/5389/14 -- cmake_path(APPEND CMAKE_INSTALL_INCLUDEDIR ${PROJECT_NAME} "${CMAKE_Fortran_COMPILER_ID}-${CMAKE_Fortran_COMPILER_VERSION}" -+ cmake_path(APPEND CMAKE_INSTALL_INCLUDEDIR - OUTPUT_VARIABLE _DEFAULT_CMAKE_INSTALL_MODULEDIR) - set(CMAKE_INSTALL_MODULEDIR ${_DEFAULT_CMAKE_INSTALL_MODULEDIR} - CACHE STRING +@@ -43,7 +43,7 @@ if (SPGLIB_INSTALL) + # Adapting the standard from fortran-stdlib + # https://gitlab.kitware.com/cmake/cmake/-/issues/19608 + # https://discourse.cmake.org/t/api-design-c-modules-source-listings-and-interface-properties/5389/14 +- cmake_path(APPEND CMAKE_INSTALL_INCLUDEDIR ${PROJECT_NAME} "${CMAKE_Fortran_COMPILER_ID}-${CMAKE_Fortran_COMPILER_VERSION}" ++ cmake_path(APPEND CMAKE_INSTALL_INCLUDEDIR + OUTPUT_VARIABLE _DEFAULT_CMAKE_INSTALL_MODULEDIR) + set(CMAKE_INSTALL_MODULEDIR ${_DEFAULT_CMAKE_INSTALL_MODULEDIR} + CACHE STRING diff --git a/science/spglib/pkg-plist b/science/spglib/pkg-plist index 6749e800c471..4968e83ec22c 100644 --- a/science/spglib/pkg-plist +++ b/science/spglib/pkg-plist @@ -1,19 +1,19 @@ include/spglib.h %%FORTRAN%%include/spglib_f08.F90 %%FORTRAN%%include/spglib_f08.mod lib/cmake/Spglib/PackageCompsHelper.cmake lib/cmake/Spglib/SpglibConfig.cmake lib/cmake/Spglib/SpglibConfigVersion.cmake -%%FORTRAN%%lib/cmake/Spglib/SpglibTargets_fortran-%%CMAKE_BUILD_TYPE%%.cmake -%%FORTRAN%%lib/cmake/Spglib/SpglibTargets_fortran.cmake +%%FORTRAN%%lib/cmake/Spglib/SpglibTargets_fortran_shared-%%CMAKE_BUILD_TYPE%%.cmake +%%FORTRAN%%lib/cmake/Spglib/SpglibTargets_fortran_shared.cmake lib/cmake/Spglib/SpglibTargets_shared-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Spglib/SpglibTargets_shared.cmake %%FORTRAN%%lib/cmake/Spglib/try_compile.f90 %%FORTRAN%%lib/libspglib_f08.so %%FORTRAN%%lib/libspglib_f08.so.2 -%%FORTRAN%%lib/libspglib_f08.so.2.3.1 +%%FORTRAN%%lib/libspglib_f08.so.2.4.0 lib/libsymspg.so lib/libsymspg.so.2 -lib/libsymspg.so.2.3.1 +lib/libsymspg.so.2.4.0 libdata/pkgconfig/spglib.pc %%FORTRAN%%libdata/pkgconfig/spglib_f08.pc