From nobody Sat Jan 22 01:37:26 2022 X-Original-To: dev-commits-ports-main@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 DE244195D28F; Sat, 22 Jan 2022 01:37:26 +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 4Jgf4k42BSz4dHd; Sat, 22 Jan 2022 01:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642815446; 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=tOfDDmTBUXsPqagT4/5OrlxD0a+0sHvinrKGS7WSNkY=; b=d1sNwuK2dwfjlWSvavH/ogDL/G3FX1Qa1777CQuvB8aGqWNTOeACLOe2CVVPSh9F4GUpiu b2LecfuViGKSVnYVw49Eb4Ue+/H9iJQW6zISPkYFz3FF9C7etsisaxrdhw0Mo/+pN0waJx 9FQlIVUQT8qmpWJYJbtNvI2Tsu5mgYJSROgpcBoPFEnKvcHgsUo3McAKzbv9bvRJGuPTd/ uYw5NCVopWE8WNd0QJawKAhDRcIcor+THnHnAim5Ah+i/F0s3xANEwqfjk+hTVsaBogKJ0 erO/RYXXL438msgCbxbWKdGKmqYX8/flUbpxcMD4GLeH6vxaBy5RqduYciTbuA== 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 5D3F22646A; Sat, 22 Jan 2022 01:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20M1bQMu058212; Sat, 22 Jan 2022 01:37:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20M1bQZZ058211; Sat, 22 Jan 2022 01:37:26 GMT (envelope-from git) Date: Sat, 22 Jan 2022 01:37:26 GMT Message-Id: <202201220137.20M1bQZZ058211@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: cb6ca134ee11 - main - science/py-hoomd-blue: Backport patch supporting latest cereal. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: cb6ca134ee11502a336336d5be35b4d82eaa2de4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642815446; 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=tOfDDmTBUXsPqagT4/5OrlxD0a+0sHvinrKGS7WSNkY=; b=S1p50gLXdjIxfHnSfmLBY0Xs5etMSbuKXzJMsQbI5p62bZftTPu8cUecJLvFEIIugwY1BK GQX3xb9+W5j6FgMu7VYPfRXNAu46JtyE3CojPL3kTkAstPa0XgXpbomqDcb7VRvN6Y4O+w 4WlwcJ/4t46JTwY1mhegPwf4ohZ+ICzurS7MC57i7cNWLf4Jar5Y3/XSe3M2glj/ypi3HG W+3JPnvglpooRygUL6z/+1kItp3zF5WoaMYewSLWH2q5VyJ1Q1eQ4qI5QP7Mz8p1nN9+OK csjiF8DAd5fFuGdwCDds4LCCikxBV4sYF5XL00KohxyxLkLCkFjxK5L/qkPhyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642815446; a=rsa-sha256; cv=none; b=DwdwTA687Wh4S+JU5XQhPDL08I4GuhcD18iNreLa0uoBWDIHkLTSOguvbkw7UZONrvI4bx 2DGuyGTljiDYyjsjE964y7QIdraEvasEiUWBSSJ+gkCkoiCxTUCsV2KJoORlMiw2N+EOu/ dNRJnDDuTpp/viDVqaWIuK8oQKThwomATgGaKuGL8yIqK9TwNn0cPDhZbvpv4Mqx1166ey zxAlS/8q5EHx6RAXBGnXU42gw2ec8zODNWHNYOa5OM3/+LnuqKt0oEuPb9bjEtpUzNlkIm pf+vuazz7wR6WijkSh9qIVgLtRj0C2wUdTkwKFCRx+QtI1ZT7KbMD/39dyQF3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=cb6ca134ee11502a336336d5be35b4d82eaa2de4 commit cb6ca134ee11502a336336d5be35b4d82eaa2de4 Author: Yuri Victorovich AuthorDate: 2022-01-21 20:57:49 +0000 Commit: Yuri Victorovich CommitDate: 2022-01-22 01:37:21 +0000 science/py-hoomd-blue: Backport patch supporting latest cereal. --- science/py-hoomd-blue/Makefile | 3 +++ science/py-hoomd-blue/distinfo | 4 +++- .../py-hoomd-blue/files/patch-CMake_hoomd_HOOMDMPISetup.cmake | 11 ----------- science/py-hoomd-blue/files/patch-hoomd_CMakeLists.txt | 11 ----------- 4 files changed, 6 insertions(+), 23 deletions(-) diff --git a/science/py-hoomd-blue/Makefile b/science/py-hoomd-blue/Makefile index c6f16513e948..a2de9dba94a5 100644 --- a/science/py-hoomd-blue/Makefile +++ b/science/py-hoomd-blue/Makefile @@ -4,6 +4,9 @@ DISTVERSION= 3.0.0-beta.13 CATEGORIES= science # physics PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ +PATCHFILES= 3f8ed3abb36aa51c6d91c3ff1c1563ffc6ee37c2.patch:-p1 + MAINTAINER= yuri@FreeBSD.org COMMENT= Molecular dynamics and Monte Carlo soft matter simulation diff --git a/science/py-hoomd-blue/distinfo b/science/py-hoomd-blue/distinfo index 4452bb97ba91..4430413de391 100644 --- a/science/py-hoomd-blue/distinfo +++ b/science/py-hoomd-blue/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1642744229 +TIMESTAMP = 1642797728 SHA256 (glotzerlab-hoomd-blue-v3.0.0-beta.13_GH0.tar.gz) = e655a9afc7a8f7fe668552e0ffd9ba4a38884e791afd8ab45d81cc0df614fb40 SIZE (glotzerlab-hoomd-blue-v3.0.0-beta.13_GH0.tar.gz) = 2525133 SHA256 (glotzerlab-libgetar-85de0f2355ea938474452aaf6bb78904a91293ec_GH0.tar.gz) = 12815869b556c09f537e3d5ebed830298c61d458a8c967a60f7af607201750ed @@ -25,3 +25,5 @@ SHA256 (glotzerlab-hoomd-examples-5a5e4e11e96397b761e90b27983cc38e2fb1a324_GH0.t SIZE (glotzerlab-hoomd-examples-5a5e4e11e96397b761e90b27983cc38e2fb1a324_GH0.tar.gz) = 5054053 SHA256 (mphowardlab-hipper-b6da049a516ada03e4e1b66ca6b4c2c7c9668595_GH0.tar.gz) = c64a484884eaab3eb9fd8f7b27b144a7bfadfeab101e95d82bc2a6f7e4fb7cec SIZE (mphowardlab-hipper-b6da049a516ada03e4e1b66ca6b4c2c7c9668595_GH0.tar.gz) = 20228 +SHA256 (3f8ed3abb36aa51c6d91c3ff1c1563ffc6ee37c2.patch) = c2e0fecf532d9a73dd42cfce40302d7fe8402ff5d98620b70aca434032c1d0c9 +SIZE (3f8ed3abb36aa51c6d91c3ff1c1563ffc6ee37c2.patch) = 2719 diff --git a/science/py-hoomd-blue/files/patch-CMake_hoomd_HOOMDMPISetup.cmake b/science/py-hoomd-blue/files/patch-CMake_hoomd_HOOMDMPISetup.cmake deleted file mode 100644 index 51c295f79964..000000000000 --- a/science/py-hoomd-blue/files/patch-CMake_hoomd_HOOMDMPISetup.cmake +++ /dev/null @@ -1,11 +0,0 @@ ---- CMake/hoomd/HOOMDMPISetup.cmake.orig 2022-01-21 08:21:04 UTC -+++ CMake/hoomd/HOOMDMPISetup.cmake -@@ -13,7 +13,7 @@ if (ENABLE_MPI) - - find_path(cereal_INCLUDE_DIR NAMES cereal/cereal.hpp - PATHS ${CMAKE_INSTALL_PREFIX}/include) -- add_library(cereal INTERFACE IMPORTED) -+ #add_library(cereal INTERFACE IMPORTED) - set_target_properties(cereal PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${cereal_INCLUDE_DIR}") - find_package_message(cereal "Could not find cereal, assuming it is on a default path" "[${cereal_INCLUDE_DIR}]") - endif() diff --git a/science/py-hoomd-blue/files/patch-hoomd_CMakeLists.txt b/science/py-hoomd-blue/files/patch-hoomd_CMakeLists.txt deleted file mode 100644 index 0e99b6d6de1b..000000000000 --- a/science/py-hoomd-blue/files/patch-hoomd_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- hoomd/CMakeLists.txt.orig 2022-01-21 08:28:13 UTC -+++ hoomd/CMakeLists.txt -@@ -338,7 +338,7 @@ endif() - # Libraries and compile definitions for MPI enabled builds - if (ENABLE_MPI) - target_compile_definitions(_hoomd PUBLIC ENABLE_MPI) -- target_link_libraries(_hoomd PUBLIC MPI::MPI_CXX cereal) -+ target_link_libraries(_hoomd PUBLIC MPI::MPI_CXX) - - if (ENABLE_MPI_CUDA) - target_compile_definitions(_hoomd PUBLIC ENABLE_MPI_CUDA)