From nobody Mon Sep 11 06:51:47 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rkcnv3vsqz4t3BV; Mon, 11 Sep 2023 06:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rkcnv2RfWz4NqJ; Mon, 11 Sep 2023 06:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694415107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RVbMeB1rpqgnvHUAJ9BotJeK+tLs1eUfySBg9DaRS+o=; b=KcizdEuHJ/eW5n45AMPg/MP42uAeFB7sa207AyfCqDP/6ogiFX45Xbpq9Bynt4VRzI2Ppn xGScmHKazS5c0+Xhe3+Ou/8K5eJhWVgrTVYMLAITK5v9KKdoyY2Oosbk7Q1O0YuYECXdsc 9lvoyVVUwy97aVV78j9mYo5dd7Xf1HEiFlN8ieAQjuV/GN6qK3TKlgRVMLebDBxPKtlEo+ i5L0EmaWrPX1IROODwvWQQFVhbsepYEZr40Hd56riR6qyYtIMy93EU9AqiNQSb3YKBLoOF +s8idotNOG2tDT+7gh7eoNSNJYPQN20CCWksbqfb83pGx5E6OMreIEznod2S8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694415107; a=rsa-sha256; cv=none; b=p4klOzOLNzxMlvnDXpjeh2HG6GWNUJfQXSNXF+xBgBu7+NevPYtWgQVjqDfSnTKqy3guJo /WzSi4ilhbR5cHbGSyYUDquT+NYwd7qnv/5A5D5OttHO28q+T93aHAHv8ijNmQyVBvaz/T nL4FR+5f3O/MH3KR1wENsgfppzcwCKKrLALqIFbX+W/AOJiUPof/1p2e2jnSqKesPJhyci T23kUZe0nHyqFCJI2nbAQZnv7PNp6OR7nl5CeQN4xgjKaNyffyoN/cJczWPQPt+GxQpRL3 YUmfx8nYd7lZrVodOVt63gM1wltE/oEuYfapTn1dZ0gD/pR0b1d37wPx4VGVWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694415107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RVbMeB1rpqgnvHUAJ9BotJeK+tLs1eUfySBg9DaRS+o=; b=hMcAO+bUeCgklYmL0OTH0d3uVaD9PfAv8/GaaP8F5yzwHpTsQKRwTXE7MM2sB84ZbxNxsz tUo5o9yj1tIVNOivTxrG+uSu+pCCiT6pusU1RWXzsODRDslVL37PnlDNWFXo3ZoDCTFa6z OCzmeyZGKGHJ6pfh0VBVGtUp0fWlLf7OeM01i4wI4oBzy+6U3kZPgDf7bhR/V0dlJrxTlr vVBGSJqDjAJXcuJ38zWCw5jygOYN/4ZEmkzZDSLvxZNh1IUMsZNzt84SSS3sCn9qs07s+9 Ewd01ONE4tbn9jyKWXoCuKIxMgQRLNTL9AZiGc2YhqIjh7rOK1XeBQiR0ajmZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rkcnv1YSgzfhc; Mon, 11 Sep 2023 06:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38B6plnu090316; Mon, 11 Sep 2023 06:51:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38B6plGV090313; Mon, 11 Sep 2023 06:51:47 GMT (envelope-from git) Date: Mon, 11 Sep 2023 06:51:47 GMT Message-Id: <202309110651.38B6plGV090313@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 773d13870c68 - main - science/{,py-}spglib: update 2.0.2 =?utf-8?Q?=E2=86=92?= 2.1.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 773d13870c68007ee3b01e6b40bfdaadad32bac1 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=773d13870c68007ee3b01e6b40bfdaadad32bac1 commit 773d13870c68007ee3b01e6b40bfdaadad32bac1 Author: Yuri Victorovich AuthorDate: 2023-09-11 06:50:09 +0000 Commit: Yuri Victorovich CommitDate: 2023-09-11 06:51:41 +0000 science/{,py-}spglib: update 2.0.2 → 2.1.0 Reported by: portscout --- science/avogadrolibs/Makefile | 2 +- science/octopus/Makefile | 2 +- science/py-spglib/Makefile | 15 +++++---- science/py-spglib/distinfo | 6 ++-- science/py-spglib/files/patch-CMakeLists.txt | 39 +++++++++++++++++++++++ science/py-spglib/pkg-plist | 3 ++ science/sirius/Makefile | 1 + science/spglib/Makefile | 19 ++++------- science/spglib/distinfo | 6 ++-- science/spglib/files/patch-fortran_CMakeLists.txt | 13 ++++++++ science/spglib/pkg-plist | 22 +++++++------ 11 files changed, 93 insertions(+), 35 deletions(-) diff --git a/science/avogadrolibs/Makefile b/science/avogadrolibs/Makefile index 80d49b2cea1b..c4a14c195afb 100644 --- a/science/avogadrolibs/Makefile +++ b/science/avogadrolibs/Makefile @@ -1,6 +1,6 @@ PORTNAME= avogadrolibs DISTVERSION= 1.97.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org diff --git a/science/octopus/Makefile b/science/octopus/Makefile index 2db6784a4d57..1440b846b8b8 100644 --- a/science/octopus/Makefile +++ b/science/octopus/Makefile @@ -1,6 +1,6 @@ PORTNAME= octopus DISTVERSION= 11.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= science # chemistry MASTER_SITES= https://octopus-code.org/download/${DISTVERSION}/ diff --git a/science/py-spglib/Makefile b/science/py-spglib/Makefile index 00be8b2ed1ba..3a1a7b4d8bc3 100644 --- a/science/py-spglib/Makefile +++ b/science/py-spglib/Makefile @@ -1,7 +1,6 @@ PORTNAME= spglib DISTVERSIONPREFIX= v -DISTVERSION= 2.0.2 -PORTREVISION= 1 +DISTVERSION= 2.1.0 CATEGORIES= science python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,15 +11,19 @@ WWW= https://atztogo.github.io/spglib/ LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${PYNUMPY} +LIB_DEPENDS= libsymspg.so:science/spglib RUN_DEPENDS= ${PYNUMPY} -USES= python -USE_PYTHON= distutils autoplist pytest # tests fail to run, see https://github.com/spglib/spglib/issues/192 +USES= cmake python +USE_PYTHON= flavors pytest # tests fail to run, see https://github.com/spglib/spglib/issues/192 USE_GITHUB= yes +CMAKE_ARGS= -DPython3_EXECUTABLE=${PYTHON_CMD} + WRKSRC_SUBDIR= python -post-install: - @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/spglib/_spglib*.so +post-patch: + #@cd ${WRKSRC} && ${RLN} ../test . + @cd ${WRKSRC} && ${CP} -r ../test . .include diff --git a/science/py-spglib/distinfo b/science/py-spglib/distinfo index 4b1eec8259f9..3f4784db3f19 100644 --- a/science/py-spglib/distinfo +++ b/science/py-spglib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674925944 -SHA256 (spglib-spglib-v2.0.2_GH0.tar.gz) = 10e44a35099a0a5d0fc6ee0cdb39d472c23cb98b1f5167c0e2b08f6069f3db1e -SIZE (spglib-spglib-v2.0.2_GH0.tar.gz) = 2880537 +TIMESTAMP = 1694412381 +SHA256 (spglib-spglib-v2.1.0_GH0.tar.gz) = 31bca273a1bc54e1cff4058eebe7c0a35d5f9b489579e84667d8e005c73dcc13 +SIZE (spglib-spglib-v2.1.0_GH0.tar.gz) = 2901649 diff --git a/science/py-spglib/files/patch-CMakeLists.txt b/science/py-spglib/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..ffabaf7a1e8c --- /dev/null +++ b/science/py-spglib/files/patch-CMakeLists.txt @@ -0,0 +1,39 @@ +--- CMakeLists.txt.orig 2023-09-10 07:23:28 UTC ++++ CMakeLists.txt +@@ -1,8 +1,13 @@ ++cmake_minimum_required(VERSION 3.15) ++ ++find_package(Spglib REQUIRED) ++find_package(Python3 COMPONENTS REQUIRED Interpreter Development.Module NumPy) ++ + Python3_add_library(Spglib_python MODULE WITH_SOABI _spglib.c) + set_target_properties(Spglib_python PROPERTIES + OUTPUT_NAME _spglib) + target_link_libraries(Spglib_python PRIVATE +- Spglib_symspg Python3::NumPy) ++ Spglib::symspg Python3::NumPy) + if (NOT Python_INSTALL_DIR) + if (SKBUILD) + # If built with scikit-build-core, let it handle the installation +@@ -12,7 +17,7 @@ if (NOT Python_INSTALL_DIR) + set(Python_INSTALL_DIR ${Python3_SITEARCH}/spglib) + endif () + endif () +-if (SPGLIB_INSTALL) ++if (TRUE) + if (WIN32) + # Windows needs RUNTIME as well to install the .dll file to + install(TARGETS Spglib_symspg +@@ -22,9 +27,9 @@ if (SPGLIB_INSTALL) + else () + # TODO: Cmake forces to install PUBLIC_HEADER when defined + # https://gitlab.kitware.com/cmake/cmake/-/issues/24326 +- install(TARGETS Spglib_symspg +- LIBRARY DESTINATION ${Python_INSTALL_DIR} COMPONENT Spglib_Runtime +- PUBLIC_HEADER DESTINATION ${Python_INSTALL_DIR} COMPONENT Spglib_Runtime) ++ #install(TARGETS Spglib_symspg ++ # LIBRARY DESTINATION ${Python_INSTALL_DIR} COMPONENT Spglib_Runtime ++ # PUBLIC_HEADER DESTINATION ${Python_INSTALL_DIR} COMPONENT Spglib_Runtime) + endif () + install(TARGETS Spglib_python + LIBRARY DESTINATION ${Python_INSTALL_DIR} COMPONENT Spglib_Runtime) diff --git a/science/py-spglib/pkg-plist b/science/py-spglib/pkg-plist new file mode 100644 index 000000000000..55a2e8a2dc92 --- /dev/null +++ b/science/py-spglib/pkg-plist @@ -0,0 +1,3 @@ +%%PYTHON_SITELIBDIR%%/spglib/__init__.py +%%PYTHON_SITELIBDIR%%/spglib/_spglib%%PYTHON_EXT_SUFFIX%%.so +%%PYTHON_SITELIBDIR%%/spglib/spglib.py diff --git a/science/sirius/Makefile b/science/sirius/Makefile index 87a6b3de5ccf..2dead0619269 100644 --- a/science/sirius/Makefile +++ b/science/sirius/Makefile @@ -1,6 +1,7 @@ PORTNAME= sirius DISTVERSIONPREFIX= v DISTVERSION= 7.4.3 +PORTREVISION= 1 CATEGORIES= science PKGNAMESUFFIX= -quantum-chemistry # other software also has the name "sirius" diff --git a/science/spglib/Makefile b/science/spglib/Makefile index 0f3dcdf481fb..2196e898c783 100644 --- a/science/spglib/Makefile +++ b/science/spglib/Makefile @@ -1,7 +1,6 @@ PORTNAME= spglib DISTVERSIONPREFIX= v -DISTVERSION= 2.0.2 -PORTREVISION= 1 +DISTVERSION= 2.1.0 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org @@ -11,12 +10,15 @@ WWW= https://spglib.github.io/spglib/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake +USES= cmake:testing USE_GITHUB= yes USE_LDCONFIG= yes +CMAKE_OFF= SPGLIB_WITH_TESTS +CMAKE_TESTING_ON= SPGLIB_WITH_TESTS + .if !exists(/usr/include/omp.h) -CMAKE_OFF+= USE_OMP +CMAKE_OFF+= SPGLIB_USE_OMP .else FORTRAN_LDFLAGS= -lomp # workaround for: undefined reference to `__kmpc_fork_call' .endif @@ -26,13 +28,6 @@ OPTIONS_DEFAULT= FORTRAN OPTIONS_SUB= yes FORTRAN_USES= fortran -FORTRAN_CMAKE_BOOL= WITH_Fortran - -do-test: # from test/README.md - cd ${WRKSRC}/test && \ - ${CMAKE_BIN} -S . -B build -DUSE_SANITIZER="Address" -DCMAKE_BUILD_TYPE="Debug" && \ - ${CMAKE_BIN} --build build -j ${_MAKE_JOBS} && \ - cd build && \ - ctest +FORTRAN_CMAKE_BOOL= SPGLIB_WITH_Fortran .include diff --git a/science/spglib/distinfo b/science/spglib/distinfo index ae6151d27fc1..0fba2daad36c 100644 --- a/science/spglib/distinfo +++ b/science/spglib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674925518 -SHA256 (spglib-spglib-v2.0.2_GH0.tar.gz) = 10e44a35099a0a5d0fc6ee0cdb39d472c23cb98b1f5167c0e2b08f6069f3db1e -SIZE (spglib-spglib-v2.0.2_GH0.tar.gz) = 2880537 +TIMESTAMP = 1694406506 +SHA256 (spglib-spglib-v2.1.0_GH0.tar.gz) = 31bca273a1bc54e1cff4058eebe7c0a35d5f9b489579e84667d8e005c73dcc13 +SIZE (spglib-spglib-v2.1.0_GH0.tar.gz) = 2901649 diff --git a/science/spglib/files/patch-fortran_CMakeLists.txt b/science/spglib/files/patch-fortran_CMakeLists.txt new file mode 100644 index 000000000000..5cbec0d72be8 --- /dev/null +++ b/science/spglib/files/patch-fortran_CMakeLists.txt @@ -0,0 +1,13 @@ +- remove compiler ID from include path + +--- fortran/CMakeLists.txt.orig 2023-09-11 04:42:53 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 diff --git a/science/spglib/pkg-plist b/science/spglib/pkg-plist index 241ebc0b5c93..065a9b090382 100644 --- a/science/spglib/pkg-plist +++ b/science/spglib/pkg-plist @@ -1,14 +1,18 @@ -%%FORTRAN%%bin/spglib_example_fortran.X include/spglib.h -include/spglib_f08.f90 -%%FORTRAN%%lib/libspglib_f08.a +%%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 +lib/cmake/Spglib/SpglibTargets_shared-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Spglib/SpglibTargets_shared.cmake %%FORTRAN%%lib/libspglib_f08.so -%%FORTRAN%%lib/libspglib_f08.so.1 -%%FORTRAN%%lib/libspglib_f08.so.2.0.2 -lib/libsymspg.a +%%FORTRAN%%lib/libspglib_f08.so.2 +%%FORTRAN%%lib/libspglib_f08.so.2.1.0 lib/libsymspg.so -lib/libsymspg.so.1 -lib/libsymspg.so.2.0.2 -%%FORTRAN%%lib/spglib_f08.mod +lib/libsymspg.so.2 +lib/libsymspg.so.2.1.0 libdata/pkgconfig/spglib.pc %%FORTRAN%%libdata/pkgconfig/spglib_f08.pc