From nobody Thu Jan 13 04:40:27 2022 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 971C619578F6; Thu, 13 Jan 2022 04:40:28 +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 4JZBZ34qvwz4fDC; Thu, 13 Jan 2022 04:40:27 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 50E351A0DC; Thu, 13 Jan 2022 04:40:27 +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 20D4eRJj089441; Thu, 13 Jan 2022 04:40:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20D4eRbr089440; Thu, 13 Jan 2022 04:40:27 GMT (envelope-from git) Date: Thu, 13 Jan 2022 04:40:27 GMT Message-Id: <202201130440.20D4eRbr089440@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: 562a8eaddf08 - main - science/qmcpack: Update 3.12.0-217 -> 3.12.0-244 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: 562a8eaddf08cc13fcb3e5255eecef21015c2cff Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642048828; 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=YlqukliPGHJR9fC0qsJ512BspLrHa9DUaX1UKD6pVuE=; b=uXuAjVgThKKdHFhzd8KEcNH52zkrcWIX6XO3hNg0FaMGXY2jI9b76UKIlXE6khusOAVQq2 hCewTjF+6kkjSCy06W4OCuhXBHwB9PznYqxT/ILN6lINNCt+65e97IOJWPUaoJ6DFKadCq AYdFwNL/E2nmF36+8s2+vnune5S2X1X6iSuOZ/olobjB0SAdS2lvUbKkHz333j3q5wFpJB I9IgaHlE9ExBK+uAfSMvD6l8mlR/dV8UwQEahKXI5PGI0yQYICXpBg9rkSaDENV2jCb2qG Ekb+vmSaql6mY8TuhQn9LUyGH4JE3pUaEbz4sxxvdSClil8VL3bOur/DNgJ+zQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642048828; a=rsa-sha256; cv=none; b=o2d/1heNKo6pglClCbI2yfjiDJ7jDsBJKFiXFsNwLUZ/sD+o8/rkULrqCtxPfLaRhBfdSe cw4URIsE7TUbbTyGIfZfeUjB8u60Pw94AChhSqvJ8TW0U8nUfAdGLgmrydJ7Q9eIWF+LXj OEwmn2Ssmt1W6we/waVUKWax8/uHs+UiJh+J8TVgqI04PSS0FkuZUzofVOaDEknrfOuWmR WvGymPyFx8pGwNPouDcyg19QOpMLAYXsBomFkkKrYG3YdqTs47mWCbnuvlmRVbItpaf3OX Z/lYh+BRiQVYVvr8OvWK+EdhzuZqM/AIuyAOiR1cRAgL3f7fvJlmYCXn2hOCwQ== 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=562a8eaddf08cc13fcb3e5255eecef21015c2cff commit 562a8eaddf08cc13fcb3e5255eecef21015c2cff Author: Yuri Victorovich AuthorDate: 2022-01-13 04:38:47 +0000 Commit: Yuri Victorovich CommitDate: 2022-01-13 04:40:22 +0000 science/qmcpack: Update 3.12.0-217 -> 3.12.0-244 Add the NEXUS option that installs the Nexus utility used to orchestrate qmcpack workflow. --- science/qmcpack/Makefile | 33 ++++++++++++++++++++++++++---- science/qmcpack/distinfo | 6 +++--- science/qmcpack/files/patch-CMakeLists.txt | 11 ++++++++++ 3 files changed, 43 insertions(+), 7 deletions(-) diff --git a/science/qmcpack/Makefile b/science/qmcpack/Makefile index a887f21d5dfd..bdc11b19bb12 100644 --- a/science/qmcpack/Makefile +++ b/science/qmcpack/Makefile @@ -1,7 +1,7 @@ PORTNAME= qmcpack DISTVERSIONPREFIX= v -DISTVERSION= 3.12.0-217 # 3.12.0 is broken: https://github.com/QMCPACK/qmcpack/issues/3698 -DISTVERSIONSUFFIX= -g0297e8705 +DISTVERSION= 3.12.0-244 # 3.12.0 is broken: https://github.com/QMCPACK/qmcpack/issues/3698 +DISTVERSIONSUFFIX= -ga6ecd880c CATEGORIES= science MAINTAINER= yuri@FreeBSD.org @@ -20,13 +20,16 @@ LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libopenblas.so:math/openblas \ libsz.so:science/szip -USES= cmake:testing compiler:c++11-lang fortran gnome localbase:ldflags pkgconfig python:build +USES= cmake:testing compiler:c++11-lang fortran gnome localbase:ldflags pkgconfig python:build shebangfix USE_GNOME= libxml2 USE_GITHUB= yes GH_ACCOUNT= ${PORTNAME:tu} +SHEBANG_FILES= ${NEXUS_PLIST_FILES:C/^/nexus\//} + CMAKE_OFF= BUILD_UNIT_TESTS +CMAKE_ARGS= -DFREEBSD_PYTHON_VER=${PYTHON_VER} CMAKE_TESTING_ON= BUILD_UNIT_TESTS # at least 3 testcases are known to fail CXXFLAGS+= -I${LOCALBASE}/include/catch2 @@ -34,6 +37,28 @@ CXXFLAGS+= -I${LOCALBASE}/include/catch2 PROGS= convert4qmc convertpw4qmc qmc-check-affinity qmc-extract-eshdf-kvectors qmc-get-supercell qmcfinitesize qmcpack qmcpack.settings PLIST_FILES= ${PROGS:C/^/bin\//} -BINARY_ALIAS= python=${PYTHON_CMD} +BINARY_ALIAS= python=${PYTHON_CMD} python3=${PYTHON_CMD} + +OPTIONS_DEFINE= NEXUS +OPTIONS_DEFAULT= NEXUS +OPTIONS_SUB= yes + +NEXUS_DESC= Install Nexus (workflow utility) alongside QMCPACK +NEXUS_CMAKE_BOOL= INSTALL_NEXUS +NEXUS_CMAKE_USES= python +NEXUS_PY_DEPENDS= ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyscf>0:science/py-pyscf@${PY_FLAVOR} +NEXUS_BUILD_DEPENDS= ${NEXUS_PY_DEPENDS} +NEXUS_RUN_DEPENDS= ${NEXUS_PY_DEPENDS} +NEXUS_PLIST_FILES= bin/eshdf \ + bin/nxs-redo \ + bin/nxs-sim \ + bin/nxs-test \ + bin/qdens \ + bin/qdens-radial \ + bin/qmc-fit \ + bin/qmca .include diff --git a/science/qmcpack/distinfo b/science/qmcpack/distinfo index 9cb02328b195..10fe896442de 100644 --- a/science/qmcpack/distinfo +++ b/science/qmcpack/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1641587706 -SHA256 (QMCPACK-qmcpack-v3.12.0-217-g0297e8705_GH0.tar.gz) = 25801b4b792493dd18b26c7b066ddef6cace3b41699aa0d963998ac5e62bfe63 -SIZE (QMCPACK-qmcpack-v3.12.0-217-g0297e8705_GH0.tar.gz) = 114729126 +TIMESTAMP = 1642029544 +SHA256 (QMCPACK-qmcpack-v3.12.0-244-ga6ecd880c_GH0.tar.gz) = 4902b7d87a9e91cc13670625d5e6be26838871f1cc72049f90169ee33a1b3f75 +SIZE (QMCPACK-qmcpack-v3.12.0-244-ga6ecd880c_GH0.tar.gz) = 114740685 diff --git a/science/qmcpack/files/patch-CMakeLists.txt b/science/qmcpack/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..e3e42be39800 --- /dev/null +++ b/science/qmcpack/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2022-01-13 02:13:14 UTC ++++ CMakeLists.txt +@@ -1006,7 +1006,7 @@ include(CTest) + #------------------------------------------------------------------- + # Verify Python3 available + #------------------------------------------------------------------- +-find_package(Python3) ++find_package(Python3 ${FREEBSD_PYTHON_VER} EXACT) + if(NOT Python3_FOUND) + message(FATAL_ERROR "Could not find required python3") + endif(NOT Python3_FOUND)