diff options
| -rw-r--r-- | science/dakota/Makefile | 13 | ||||
| -rw-r--r-- | science/dakota/distinfo | 6 | ||||
| -rw-r--r-- | science/dakota/files/patch-CMakeLists.txt | 32 | ||||
| -rw-r--r-- | science/dakota/files/patch-DakotaBoostDLLimport | 30 | ||||
| -rw-r--r-- | 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 <boost/dll/import.hpp> - #include <boost/filesystem.hpp> - -+// 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<DakotaPlugins::DakotaInterfaceAPI> -+ pluginInterface = dakota_boost_dll_import<DakotaPlugins::DakotaInterfaceAPI> - (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 |