From nobody Mon Jul 18 12:52:04 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 4LmhgV1DvJz4T4vH; Mon, 18 Jul 2022 12:52:06 +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 4LmhgS70dxz3nGr; Mon, 18 Jul 2022 12:52:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658148725; 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=94hpQvqz7UViSSQ+fePY5W67ZH2N/6OgfvKNLrbmxIc=; b=Q5QKTp41OtrRHkpFpXn9d7PhltGwF75P4FXWYewcfIqMLTsLKUqevNsjBqXRoQrAPfIiOR vKloAOzkhpI0IoAXqKzoAGn8W1EJLCiZ/sJOcgGWgCcP8mKZ6b/wsO2SXuNrY/h44dmmp1 fmXp6vRxe/8BVQe/fDfBFsaUz1unKk+bxuhMhJ+E1FNEu6KvusysHFuupf8ZhCMWPurj02 fRi41BbMn1gx3ee8tlpVEZfn5A31IfVY4RJTf+mKXvIsrAsLDz7239Lqwx4WLv8luE2w3I Y6HYI3fCYt7ka2miRXEa5CoWud1bP8YqMEz4WP3ebcBmo9E8l40sFo+snxqGfw== 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 4LmhgS2gVrzgPw; Mon, 18 Jul 2022 12:52:04 +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 26ICq47W092225; Mon, 18 Jul 2022 12:52:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26ICq4Va092224; Mon, 18 Jul 2022 12:52:04 GMT (envelope-from git) Date: Mon, 18 Jul 2022 12:52:04 GMT Message-Id: <202207181252.26ICq4Va092224@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: d98decf4c6f7 - main - science/votca: Fix build with HDF5 1.12.0+ 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d98decf4c6f7a8d92e742a8fd7b7795818a0904f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658148725; 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=94hpQvqz7UViSSQ+fePY5W67ZH2N/6OgfvKNLrbmxIc=; b=WsZnXtBVtNXVqT1xGI5bBehd/azruuMN4yfLgfUlYUTM/L/RnnEXIrNgu6b7xkIWL1Cdv7 Q7OxwQ+6BE2UqGp8UZByqDwdoiRksDrYIPiOZoc2FE74WXQSJpbMn2obQl/lZKJ/CghFdA MJLtJnP4vFBYp2Dk3fRgjmeX8fYK2rmRT5ZU8CtnqJMhZEdpEEPFXZ8eb+cxdqUsREukAt 5ygjZbP+bIZWlbresps4OtICbGmGXx2IrMrWzzdvho2guvMZGfm73+l19YeKX+bi3EiTHs UxVumla/YGoawUcygBKEwS4gDlEp7pFFAJGE3AEMvFWY+IrQ/kuGSq3ZV20VEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658148725; a=rsa-sha256; cv=none; b=DlFm61WD3wbVR1JWI2pBWx1gfp+HVSSrMQCbUXb/y1D5lHP1lcCj39loPxsKOSvjQNgk/o JZdT4+1gmsDBoDk1fIDs3m2ojxVfKTIeDrNosZ8kPLj8H3SQXwYMHNhZcpc8vvBbmV+Ra6 DjfpPDNOhy8htf7+vAsDc47c1vz3fReMAiSvvoQxKU8OzoNQES+/CbAkuwDvnVfoWKa0jq gOaA1mwzAAZWcmpDAc/eEyTn7KhHdyk39KnXxWhkkYrXbTOJaSkqJOQMhCgmvtfK8aXEXt XQ9JB+cM4Kk5wgygzdLFTtaUawGVxe+0iFzNNNzGD7cR5lM8QMn8Yw7U+KBXyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=d98decf4c6f7a8d92e742a8fd7b7795818a0904f commit d98decf4c6f7a8d92e742a8fd7b7795818a0904f Author: Po-Chuan Hsieh AuthorDate: 2022-07-18 12:50:26 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-07-18 12:51:29 +0000 science/votca: Fix build with HDF5 1.12.0+ --- science/votca/Makefile | 2 +- science/votca/files/patch-hdf5 | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/science/votca/Makefile b/science/votca/Makefile index 0a05b64299e6..6c8ad2ba96bc 100644 --- a/science/votca/Makefile +++ b/science/votca/Makefile @@ -47,7 +47,7 @@ SHEBANG_FILES= csg/scripts/csg_call.in csg/scripts/csg_inverse.in \ xtp/scripts/xtp_qmmm2qm.in CMAKE_ON= BUILD_XTP -CMAKE_ARGS= -DPython_EXECUTABLE=${PYTHON_CMD} +CMAKE_ARGS= -DLOCALBASE=${LOCALBASE} -DPython_EXECUTABLE=${PYTHON_CMD} OPTIONS_DEFINE= APPS OPTIONS_DEFAULT= APPS diff --git a/science/votca/files/patch-hdf5 b/science/votca/files/patch-hdf5 new file mode 100644 index 000000000000..24bcadb8e571 --- /dev/null +++ b/science/votca/files/patch-hdf5 @@ -0,0 +1,28 @@ +--- csg/src/libcsg/CMakeLists.txt.orig 2022-01-15 22:47:05 UTC ++++ csg/src/libcsg/CMakeLists.txt +@@ -14,8 +14,9 @@ if (TARGET Gromacs::libgromacs) + target_link_libraries(votca_csg PRIVATE Gromacs::libgromacs) + endif() + +- +-find_package(HDF5 COMPONENTS "CXX") ++set(HDF5_FOUND TRUE) ++set(HDF5_INCLUDE_DIRS "${LOCALBASE}/include") ++set(HDF5_LIBRARIES "-L${LOCALBASE}/lib -lhdf5 -lhdf5_cpp") + set_package_properties(HDF5 PROPERTIES TYPE RECOMMENDED PURPOSE "Used to read h5md data files") + if(HDF5_FOUND) + set(H5MD true) +--- xtp/CMakeLists.txt.orig 2022-01-15 22:47:05 UTC ++++ xtp/CMakeLists.txt +@@ -50,7 +50,10 @@ find_package(ecpint REQUIRED) + set_package_properties(ecpint PROPERTIES TYPE REQUIRED PURPOSE "Calculates Gaussian integrals over pseudo potentials") + message(STATUS "Found libecpint: ${ecpint_DIR}") + +-find_package(HDF5 1.8 REQUIRED COMPONENTS CXX) ++set(HDF5_FOUND TRUE) ++set(HDF5_VERSION 1.12) ++set(HDF5_INCLUDE_DIRS "${LOCALBASE}/include") ++set(HDF5_LIBRARIES "-L${LOCALBASE}/lib -lhdf5 -lhdf5_cpp") + set_package_properties(HDF5 PROPERTIES TYPE REQUIRED PURPOSE "Used to read/write HDF5 data files") + + if(HDF5_VERSION VERSION_GREATER 1.8)