Index: head/math/xtensor/Makefile =================================================================== --- head/math/xtensor/Makefile (revision 519184) +++ head/math/xtensor/Makefile (revision 519185) @@ -1,35 +1,35 @@ # $FreeBSD$ PORTNAME= xtensor -DISTVERSION= 0.20.4 +DISTVERSION= 0.20.10 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org COMMENT= Multi-dimensional arrays with broadcasting and lazy computing LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= nlohmann-json>0:devel/nlohmann-json \ xtl-quant-stack>0:devel/xtl-quant-stack RUN_DEPENDS= nlohmann-json>0:devel/nlohmann-json \ xtl-quant-stack>0:devel/xtl-quant-stack TEST_DEPENDS= nlohmann-json>0:devel/nlohmann-json \ xtl-quant-stack>0:devel/xtl-quant-stack \ googletest>0:devel/googletest USES= cmake USE_GITHUB= yes -GH_ACCOUNT= QuantStack +GH_ACCOUNT= xtensor-stack NO_BUILD= yes NO_ARCH= yes do-test: @${RLN} ${STAGEDIR}${PREFIX}/include ${WRKSRC}/test/staged-include @cd ${WRKSRC}/test && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} . && \ ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} && \ ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} xtest .include Index: head/math/xtensor/distinfo =================================================================== --- head/math/xtensor/distinfo (revision 519184) +++ head/math/xtensor/distinfo (revision 519185) @@ -1,3 +1,3 @@ -TIMESTAMP = 1556176920 -SHA256 (QuantStack-xtensor-0.20.4_GH0.tar.gz) = 5f629fc9b90a6ecd83456a06fe5f209f23c6efe3e81d1b0d6360fc75bf80c221 -SIZE (QuantStack-xtensor-0.20.4_GH0.tar.gz) = 932083 +TIMESTAMP = 1575699810 +SHA256 (xtensor-stack-xtensor-0.20.10_GH0.tar.gz) = 91af282e7d029e27a4e981ac766a6b8d66a501bbe2e5ca0dc15e01af4f385af8 +SIZE (xtensor-stack-xtensor-0.20.10_GH0.tar.gz) = 1115261 Index: head/math/xtensor/files/patch-test_CMakeLists.txt =================================================================== --- head/math/xtensor/files/patch-test_CMakeLists.txt (revision 519184) +++ head/math/xtensor/files/patch-test_CMakeLists.txt (revision 519185) @@ -1,38 +1,47 @@ ---- test/CMakeLists.txt.orig 2019-02-04 09:16:01 UTC +--- test/CMakeLists.txt.orig 2019-10-02 11:22:22 UTC +++ test/CMakeLists.txt -@@ -8,12 +8,13 @@ +@@ -9,12 +9,13 @@ cmake_minimum_required(VERSION 3.1) -if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) - project(xtensor-test) +#if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) + #project(xtensor-test) - find_package(xtensor REQUIRED CONFIG) - set(XTENSOR_INCLUDE_DIR ${xtensor_INCLUDE_DIRS}) -endif () + #find_package(xtensor REQUIRED CONFIG) + #set(XTENSOR_INCLUDE_DIR ${xtensor_INCLUDE_DIRS}) + include_directories(staged-include) +#endif () - message(STATUS "Forcing tests build type to Release") - set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE) -@@ -192,7 +193,7 @@ foreach(filename IN LISTS XTENSOR_TESTS) - string(REPLACE ".cpp" "" targetname ${filename}) - add_executable(${targetname} ${COMMON_BASE} ${filename} ${XTENSOR_HEADERS}) - target_include_directories(${targetname} PRIVATE ${XTENSOR_INCLUDE_DIR}) -- target_link_libraries(${targetname} xtensor ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) -+ target_link_libraries(${targetname} ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) - if(DOWNLOAD_GTEST OR GTEST_SRC_DIR) + if(NOT CMAKE_BUILD_TYPE) + message(STATUS "Setting tests build type to Release") +@@ -241,7 +242,7 @@ foreach(filename IN LISTS COMMON_BASE XTENSOR_TESTS) add_dependencies(${targetname} gtest_main) endif() -@@ -207,6 +208,6 @@ target_include_directories(test_xtensor_ - if(DOWNLOAD_GTEST OR GTEST_SRC_DIR) - add_dependencies(test_xtensor_lib gtest_main) + target_include_directories(${targetname} PRIVATE ${XTENSOR_INCLUDE_DIR}) +- target_link_libraries(${targetname} PRIVATE xtensor ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) ++ target_link_libraries(${targetname} PRIVATE ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) + add_custom_target( + x${targetname} + COMMAND ${targetname} +@@ -267,7 +268,7 @@ if(DOWNLOAD_GTEST OR GTEST_SRC_DIR) endif() --target_link_libraries(test_xtensor_lib xtensor ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) -+target_link_libraries(test_xtensor_lib ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) + target_include_directories(test_xtensor_lib PRIVATE ${XTENSOR_INCLUDE_DIR}) +-target_link_libraries(test_xtensor_lib PRIVATE xtensor ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) ++target_link_libraries(test_xtensor_lib PRIVATE ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) + add_custom_target(xtest COMMAND test_xtensor_lib DEPENDS test_xtensor_lib) + +@@ -281,6 +282,6 @@ if(DOWNLOAD_GTEST OR GTEST_SRC_DIR) + add_dependencies(test_xtensor_core_lib gtest_main) + endif() + +-target_link_libraries(test_xtensor_core_lib PRIVATE xtensor ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) ++target_link_libraries(test_xtensor_core_lib PRIVATE ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) + add_custom_target(coverity COMMAND coverity_scan DEPENDS test_xtensor_core_lib) +