From nobody Sat Jan 21 17:09:02 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 4NzjWf5cytz32M7F; Sat, 21 Jan 2023 17:09:02 +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 4NzjWf53tWz4Pn3; Sat, 21 Jan 2023 17:09:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674320942; 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=f4gS5K+fBTb1qHpzWoFeC6NsPY/PdUHlGP93xU/Ipys=; b=TI8mDieFGZleSu7V/YmtBCmTq0gxkPEtiYAaDtFZf/1ZqMD6M0//C5nf2BrDEuXyvk3t+D 687fvICo3B/DdYR3FM+1VO7ClK1lhVgEsAgRixbaq4ow+nonQ4ERrwxGdRtx1DU5BhX57t 9luZ8VC0zU7RltQ4zx76MtI42fU3UXhxZ9NtppWDMyyVDb1WFqj7eeC7TlSkLI+RlXawX6 Gj747n94fJsqNLX/PczlMWZf6fHx4P4lQa6vLGKAsOwAqxlRUrXhf0irXFpwYGpCgSfR1i Kntf8ysKfK5KO7LPJgc/LEDcCIKkZQe32YzrLBdxOHsHajbDmqGDzC5s5FQCRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674320942; 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=f4gS5K+fBTb1qHpzWoFeC6NsPY/PdUHlGP93xU/Ipys=; b=ATTcxEFuj2/xHMM+s4JBe5BPQztVdlqyDru6pNNYKoMm1EczUUQTY8vleSWhJiaTLoeQRK 9bi0ybHd6qNSpk2ZUxnQDHVQqa/TEg8YoXBHFREGLNwgcDEH82xgP+ntU1cFUsBBTpx09s LUxyN81bjO5DfqY6UUNlPQOrNM9FmQ4tpBzIDR/U3Gemb0ii4vfhFeIKQcb9tH1R9+53P3 pyv7orpp3JOaQsVakvBwthSgNFwVOqSfY1qEINY0HAz9QZifapuvkUDCvZsr3WpENoUpYG e/3onV/IiS0Zbvyi9Vi2oHOj6ZHiZKQxDOdeLtAyzpuCRCudKMXTy71DQkikoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674320942; a=rsa-sha256; cv=none; b=oOB//i/l7c4tk/L1901uBOnbIliHDCHXmUFnfXZuzQsIJkXy7RINPYeOKX5+EoVhK1HZZM OuTtqk3XMUvdj/4sPB4wRlsPvSo4g5yNvfzR8k6wQQBRH3yMcJKr3EWtxoHgR7BKW3vg7P k9zwlDNzygFYLvCdfeSrP06AoVr0L5q7eU5lKsERnEX+GeIx18L7/G24RVx6oknHYkZPpQ xqyzpcvZsn3f8fdBvUXZ4V8911JbLedw1YNRybbqZee0dOdP815ntkPurzSVHdsmGWUP+W C+f0zmZeeYNr0p7DQo3yHPZs/HE6jivej/oiBVazph7kQA2tACqLbOxGmiA87w== 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 4NzjWf45f7zHhQ; Sat, 21 Jan 2023 17:09:02 +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 30LH92Go068498; Sat, 21 Jan 2023 17:09:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30LH928C068497; Sat, 21 Jan 2023 17:09:02 GMT (envelope-from git) Date: Sat, 21 Jan 2023 17:09:02 GMT Message-Id: <202301211709.30LH928C068497@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: 3f69044fbd9c - main - science/dakota: Update 6.16.0 -> 6.17.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: 3f69044fbd9c42875f7ae52e0a06b7fd0709ad8c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f69044fbd9c42875f7ae52e0a06b7fd0709ad8c commit 3f69044fbd9c42875f7ae52e0a06b7fd0709ad8c Author: Yuri Victorovich AuthorDate: 2023-01-21 17:05:31 +0000 Commit: Yuri Victorovich CommitDate: 2023-01-21 17:08:59 +0000 science/dakota: Update 6.16.0 -> 6.17.0 --- science/dakota/Makefile | 13 +++++----- science/dakota/distinfo | 6 ++--- science/dakota/files/patch-CMakeLists.txt | 32 ++++++++++++------------- science/dakota/files/patch-DakotaBoostDLLimport | 30 ----------------------- science/dakota/pkg-plist | 8 +------ 5 files changed, 26 insertions(+), 63 deletions(-) diff --git a/science/dakota/Makefile b/science/dakota/Makefile index 3d5bfac7c1e5..8a26578a5b07 100644 --- a/science/dakota/Makefile +++ b/science/dakota/Makefile @@ -1,9 +1,8 @@ PORTNAME= dakota -DISTVERSION= 6.16.0 -PORTREVISION= 4 +DISTVERSION= 6.17.0 CATEGORIES= science MASTER_SITES= https://dakota.sandia.gov/sites/default/files/distributions/public/ -DISTNAME= ${PORTNAME}-${DISTVERSION}-public-src-cli +DISTNAME= ${PORTNAME}-${DISTVERSION}-release-public-src-cli DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= yuri@FreeBSD.org @@ -80,19 +79,19 @@ post-install: # remove *.orig files ${RM} ${STAGEDIR}${PREFIX}/include/colin/AppResponse.h.orig # install libraries that it fails to install -.for l in libmuqSamplingAlgorithms.so libmuqApproximation.so libmuqInference.so libmuqModeling.so libmuqOptimization.so libmuqUtilities.so +.for l in libmuqSamplingAlgorithms.so libmuqModeling.so libmuqUtilities.so ${INSTALL_LIB} ${BUILD_WRKSRC}/packages/external/muq2/lib/${l} ${STAGEDIR}${PREFIX}/lib .endfor -do-test: # from Additional Test Suites @ https://dakota.sandia.gov/content/additional-test-suites (many tests are known to fail) +do-test: install # from Additional Test Suites @ https://dakota.sandia.gov/content/additional-test-suites (many tests are known to fail) ## minimal set of fast-running tests that should NOT FAIL (may DIFF, depending on platform / compiler) - #cd ${WRKSRC}/test && ./dakota_test.perl + cd ${WRKSRC}/test && ./dakota_test.perl ## test suite that should PASS on any supported platform (NO DIFF or FAIL) #cd ${WRKSRC}/test && ./dakota_test.perl --label-regex=AcceptanceTest ## run all Dakota tests active in this build (should PASS or DIFF) #cd ${WRKSRC}/test && ./dakota_test.perl --label-regex=dakota_ # Tests should be this way, but this fails: - @cd ${BUILD_WRKSRC} && \ + #@cd ${BUILD_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DDAKOTA_ENABLE_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ (cd ${WRKSRC} && ctest -j 4 -L FastTest -LE Diff) diff --git a/science/dakota/distinfo b/science/dakota/distinfo index 04dbc6a736aa..3a5ff0870e92 100644 --- a/science/dakota/distinfo +++ b/science/dakota/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1655340859 -SHA256 (dakota-6.16.0-public-src-cli.tar.gz) = 49684ade2a937465d85b0fc69c96408be38bc1603ed2e7e8156d93eee3567d2f -SIZE (dakota-6.16.0-public-src-cli.tar.gz) = 124726774 +TIMESTAMP = 1674268260 +SHA256 (dakota-6.17.0-release-public-src-cli.tar.gz) = a6045784426b75d4981efcc1f243a5cd74dfcf29d4572927d6162a82a12757c6 +SIZE (dakota-6.17.0-release-public-src-cli.tar.gz) = 142641074 SHA256 (stan-dev-math-v2.18.0_GH0.tar.gz) = 53fbce2b28aea76695af7a91f51fdd356367153fc42b3573e2b91e6586eca91d SIZE (stan-dev-math-v2.18.0_GH0.tar.gz) = 17528084 diff --git a/science/dakota/files/patch-CMakeLists.txt b/science/dakota/files/patch-CMakeLists.txt index 866abe14d720..a86a5f282821 100644 --- a/science/dakota/files/patch-CMakeLists.txt +++ b/science/dakota/files/patch-CMakeLists.txt @@ -1,20 +1,20 @@ ---- CMakeLists.txt.orig 2021-11-05 17:27:37 UTC +--- CMakeLists.txt.orig 2022-11-11 20:23:57 UTC +++ CMakeLists.txt -@@ -258,9 +258,11 @@ if(ENABLE_DAKOTA_DOCS) - endif() +@@ -243,9 +243,11 @@ if(DAKOTA_MODULE_DAKOTA) + endif() - # Legacy examples --add_subdirectory(examples) -+if (FREEBSD_ENABLE_EXAMPLES) -+ add_subdirectory(examples) -+endif() - # New examples library, taking care to guard against empty directory --if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/dakota-examples/CMakeLists.txt") -+if(FREEBSD_ENABLE_EXAMPLES AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/dakota-examples/CMakeLists.txt") - add_subdirectory(dakota-examples) - endif() + # Legacy examples +- add_subdirectory(examples) ++ if (FREEBSD_ENABLE_EXAMPLES) ++ add_subdirectory(examples) ++ endif() + # New examples library, taking care to guard against empty directory +- if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/dakota-examples/CMakeLists.txt") ++ if(FREEBSD_ENABLE_EXAMPLES AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/dakota-examples/CMakeLists.txt") + add_subdirectory(dakota-examples) + endif() -@@ -284,19 +286,23 @@ install(FILES INSTALL LICENSE COPYRIGHT README +@@ -268,19 +270,23 @@ install(FILES INSTALL LICENSE COPYRIGHT README DESTINATION ${DAKOTA_TOPFILES_INSTALL} ) @@ -36,5 +36,5 @@ ) +endif() - # Final CPack settings - dakota_cpack_finalize() + if(DAKOTA_VERSION_FOUND) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/VERSION DESTINATION diff --git a/science/dakota/files/patch-DakotaBoostDLLimport b/science/dakota/files/patch-DakotaBoostDLLimport deleted file mode 100644 index 3c1b4fbc2378..000000000000 --- a/science/dakota/files/patch-DakotaBoostDLLimport +++ /dev/null @@ -1,30 +0,0 @@ -- patch from upstream received through the ML for latest Boost version issues. - -diff --git src/PluginInterface.cpp src/PluginInterface.cpp -index 60f4008..953ad0e 100644 ---- src/PluginInterface.cpp -+++ src/PluginInterface.cpp -@@ -13,6 +13,14 @@ - #include - #include - -+// Boost 1.76 and newer avoid the C++20 import keyword -+// RATIONALE: Using preprocessor as isolated to this compilation unit -+#if BOOST_VERSION >= 107600 -+#define dakota_boost_dll_import boost::dll::import_symbol -+#else -+#define dakota_boost_dll_import boost::dll::import -+#endif -+ - - namespace Dakota { - -@@ -111,7 +119,7 @@ void PluginInterface::load_plugin() - { - if (pluginInterface) return; - try { -- pluginInterface = boost::dll::import -+ pluginInterface = dakota_boost_dll_import - (pluginPath, - "dakota_interface_plugin" // name of the symbol to import - // TODO: append .dll, .so, .dylib via diff --git a/science/dakota/pkg-plist b/science/dakota/pkg-plist index c013407552cd..1f0347e2ed67 100644 --- a/science/dakota/pkg-plist +++ b/science/dakota/pkg-plist @@ -1104,6 +1104,7 @@ include/RelaxedVarConstraints.hpp include/RelaxedVariables.hpp include/Response.h include/ResponseSurfaceAnalyzer.h +include/RestartVersion.hpp include/ResultsDBAny.hpp include/ResultsDBBase.hpp include/ResultsDBHDF5.hpp @@ -2531,10 +2532,7 @@ lib/liblhs.so lib/liblhs_mod.so lib/liblhs_mods.so lib/libmoga.so -lib/libmuqApproximation.so -lib/libmuqInference.so lib/libmuqModeling.so -lib/libmuqOptimization.so lib/libmuqSamplingAlgorithms.so lib/libmuqUtilities.so lib/libncsuopt.so @@ -2583,11 +2581,7 @@ lib/libutilities.so %%DATADIR%%/LICENSE %%DATADIR%%/LICENSE_HOPSPACK %%DATADIR%%/Python/dakota/__init__.py -%%DATADIR%%/Python/dakota/__pycache__/__init__.cpython-36.pyc %%DATADIR%%/Python/dakota/interfacing/__init__.py -%%DATADIR%%/Python/dakota/interfacing/__pycache__/__init__.cpython-36.pyc -%%DATADIR%%/Python/dakota/interfacing/__pycache__/dprepro.cpython-36.pyc -%%DATADIR%%/Python/dakota/interfacing/__pycache__/interfacing.cpython-36.pyc %%DATADIR%%/Python/dakota/interfacing/dprepro.py %%DATADIR%%/Python/dakota/interfacing/interfacing.py %%DATADIR%%/Python/dakota/interfacing/parallel.py