From nobody Sun Jul 17 20:04:15 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 4LmGJb4v5zz4X9Tx; Sun, 17 Jul 2022 20:04:15 +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 4LmGJb42dTz3Ftf; Sun, 17 Jul 2022 20:04:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658088255; 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=Q25CoCdJEVnxHI81nGWt4KQF4mXqS3Uow7iBWHYPoqs=; b=mjoSRRB1I9sgwio9Kn8f8FZ4XcbzYn8dVt7gRuNnahDbzOXXPebeeO86P/efexEnCwHwnb K4L6UT5j6dCry+S2lyv2yXJhvCUb+4Fmu4Oc9mdXFFeCQClx9v4K7Ic3mgEDkh0F0GO69b NyLH/qSP6ZtzfpSlWknK2ee/em19twVoNY+19h5SlQshd31/AYsc64xtTOngcuPJ2qIYVO Nt7GeLxFjj8eFEBYOXFhy/Ab8Gqu0BJ7qqhjb8ZnvpfPSCT8S+JNLOJYeyX/B55mCzrKop k8I5QL7m8QFa02X0aoEYPW8uKgkROq1HSrtntz/GRSOwM6D1XfaijoRcs8N9oQ== 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 4LmGJb38N3z1Bmv; Sun, 17 Jul 2022 20:04:15 +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 26HK4FrH020217; Sun, 17 Jul 2022 20:04:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26HK4Fui020216; Sun, 17 Jul 2022 20:04:15 GMT (envelope-from git) Date: Sun, 17 Jul 2022 20:04:15 GMT Message-Id: <202207172004.26HK4Fui020216@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: 9c92256b3bfa - main - science/thermofun: Update 0.3.9 -> 0.4.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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c92256b3bfad9d1c347ebfca7fd7e6ecf697f08 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658088255; 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=Q25CoCdJEVnxHI81nGWt4KQF4mXqS3Uow7iBWHYPoqs=; b=Tc69V+PjszcC3LN9AUOHlwYk9flgOksUbtVt6tM3zFthp0mOG45P6WV1TTUhOunxe2q/05 0rEJBWL1gyu81XmKq7TgicFxcGImILeUuDGt9CtrS2JuAuegOmPclzoYkzrUSVDpvexOR5 78ISVTx+DFGtkn/USVh2su9ATMBaA71cZWW2ZSEMXv+cspP0sEGbffEHhg1cPapvC//kdK Kzjb6NAroz9bQEX6lyKUTdE4+QnOxcORWDys0DiSDQxiV8FEzhcwrArqgKqV71FSQAnc4J ormSY2eDzsO43X1Fm6dSaT2s0Vw13TeWCM3QYSmTm5aF4TUsYkw6R69yGwZ3VA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658088255; a=rsa-sha256; cv=none; b=kYNQP/Q8MvNMDTCzAWCJtLDKE4HqlGUknjQoFtRILJ0PwQ5CMMiSzM8uxxr/rgW8qUTaZn uxaQ+9AOsQpYsfkrpjp1BonoD8e8DpaucKjH6om3f1hl87eI0VhFhG8sMYM8mZATqpxPcC ov0qAckDZivSVa1WArwY4R5KPuQpHYZVNf+moriwtvbbLlP1fCRqHFe6a27VivL+EYqax8 gMCwpG7AsNqKMWQG+eNIhXTuIvBz86EBT1GfYYX3RV3TtyPsEA32q5YkRDEU0RLaqdH7Ik 9DqsAL6cW45Bb0aTMXMyxyFg4sOLgHLEJU7bRknQnfpnRZkPjDHgkrhwgDL0Dg== 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=9c92256b3bfad9d1c347ebfca7fd7e6ecf697f08 commit 9c92256b3bfad9d1c347ebfca7fd7e6ecf697f08 Author: Yuri Victorovich AuthorDate: 2022-07-17 20:03:20 +0000 Commit: Yuri Victorovich CommitDate: 2022-07-17 20:04:09 +0000 science/thermofun: Update 0.3.9 -> 0.4.0 Reported by: portscout --- science/thermofun/Makefile | 20 +++++++++++++++++--- science/thermofun/distinfo | 6 +++--- .../files/patch-python_thermofun_CMakeLists.txt | 11 +++++++++++ science/thermofun/pkg-plist | 4 ++++ 4 files changed, 35 insertions(+), 6 deletions(-) diff --git a/science/thermofun/Makefile b/science/thermofun/Makefile index 20738a3c4cc3..395e3421c7df 100644 --- a/science/thermofun/Makefile +++ b/science/thermofun/Makefile @@ -1,6 +1,6 @@ PORTNAME= thermofun DISTVERSIONPREFIX= v -DISTVERSION= 0.3.9 +DISTVERSION= 0.4.0 CATEGORIES= science # chemistry MAINTAINER= yuri@FreeBSD.org @@ -9,7 +9,8 @@ COMMENT= Code for calculating thermodynamic properties of materials LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= nlohmann-json>0:devel/nlohmann-json +BUILD_DEPENDS= nlohmann-json>0:devel/nlohmann-json \ + spdlog>0:devel/spdlog LIB_DEPENDS= libChemicalFun.so:science/chemicalfun USES= cmake compiler:c++14-lang @@ -17,6 +18,19 @@ USES= cmake compiler:c++14-lang USE_GITHUB= yes GH_ACCOUNT= thermohub -CMAKE_OFF= TFUN_BUILD_PYTHON +CXXFLAGS+= -DSPDLOG_FMT_EXTERNAL # see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=258073#c3 + +OPTIONS_DEFINE= PYTHON +OPTIONS_DEFAULT= PYTHON +OPTIONS_SUB= yes + +PYTHON_USES= python +PYTHON_USE= PYTHON=pytest +PYTHON_CMAKE_BOOL= TFUN_BUILD_PYTHON +PYTHON_CMAKE_ON= -DFREEBSD_STAGEDIR=${STAGEDIR} +PYTHON_BUILD_DEPENDS= pybind11>0:devel/pybind11 + +post-install-PYTHON-on: + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/thermofun/PyThermoFun${PYTHON_EXT_SUFFIX}.so .include diff --git a/science/thermofun/distinfo b/science/thermofun/distinfo index 8b8352d191d7..6271051840cf 100644 --- a/science/thermofun/distinfo +++ b/science/thermofun/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1642529596 -SHA256 (thermohub-thermofun-v0.3.9_GH0.tar.gz) = 49995b3a139e7ed93d2bf6ab09a316459bca809cf3f612878c9fa017befaf913 -SIZE (thermohub-thermofun-v0.3.9_GH0.tar.gz) = 1338633 +TIMESTAMP = 1658079403 +SHA256 (thermohub-thermofun-v0.4.0_GH0.tar.gz) = bd863174a272ddf166643312bc4b759cb429ed0230e9023678357673e56569b2 +SIZE (thermohub-thermofun-v0.4.0_GH0.tar.gz) = 1340065 diff --git a/science/thermofun/files/patch-python_thermofun_CMakeLists.txt b/science/thermofun/files/patch-python_thermofun_CMakeLists.txt new file mode 100644 index 000000000000..9919f4931845 --- /dev/null +++ b/science/thermofun/files/patch-python_thermofun_CMakeLists.txt @@ -0,0 +1,11 @@ +--- python/thermofun/CMakeLists.txt.orig 2022-07-17 19:24:14 UTC ++++ python/thermofun/CMakeLists.txt +@@ -43,7 +43,7 @@ install(CODE + endif() + + execute_process( +- COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} install --prefix=\${THERMOFUN_PYTHON_INSTALL_PREFIX_NATIVE} ++ COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} install --root=${FREEBSD_STAGEDIR} --prefix=\${THERMOFUN_PYTHON_INSTALL_PREFIX_NATIVE} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + " + ) diff --git a/science/thermofun/pkg-plist b/science/thermofun/pkg-plist index 6270720c9aa4..ae0bee96a6b6 100644 --- a/science/thermofun/pkg-plist +++ b/science/thermofun/pkg-plist @@ -68,3 +68,7 @@ lib/cmake/ThermoFun/ThermoFunConfigVersion.cmake lib/cmake/ThermoFun/ThermoFunTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/ThermoFun/ThermoFunTargets.cmake lib/libThermoFun.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/thermofun/PyThermoFun%%PYTHON_EXT_SUFFIX%%.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/thermofun/__init__.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/thermofun/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/thermofun-0.4.0-py%%PYTHON_VER%%.egg-info