Index: head/math/xtensor/Makefile =================================================================== --- head/math/xtensor/Makefile (revision 492579) +++ head/math/xtensor/Makefile (revision 492580) @@ -1,35 +1,35 @@ # $FreeBSD$ PORTNAME= xtensor -DISTVERSION= 0.19.1 +DISTVERSION= 0.19.3 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 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 492579) +++ head/math/xtensor/distinfo (revision 492580) @@ -1,3 +1,3 @@ -TIMESTAMP = 1545516526 -SHA256 (QuantStack-xtensor-0.19.1_GH0.tar.gz) = 52ac9081138d413485b9bf70376722f109ab32e5ed2ed3311257f5d7e9a88bc7 -SIZE (QuantStack-xtensor-0.19.1_GH0.tar.gz) = 904812 +TIMESTAMP = 1549754028 +SHA256 (QuantStack-xtensor-0.19.3_GH0.tar.gz) = 51510735809ee7ab5312197b303f117167667aacb9254605f272b08efa8880f2 +SIZE (QuantStack-xtensor-0.19.3_GH0.tar.gz) = 903954 Index: head/math/xtensor/files/patch-test_CMakeLists.txt =================================================================== --- head/math/xtensor/files/patch-test_CMakeLists.txt (revision 492579) +++ head/math/xtensor/files/patch-test_CMakeLists.txt (revision 492580) @@ -1,38 +1,38 @@ ---- test/CMakeLists.txt.orig 2018-06-22 15:12:37 UTC +--- test/CMakeLists.txt.orig 2019-02-04 09:16:01 UTC +++ test/CMakeLists.txt @@ -8,12 +8,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) -@@ -174,7 +175,7 @@ add_custom_target( - foreach(filename IN LISTS XTENSOR_TESTS) +@@ -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) add_dependencies(${targetname} gtest_main) endif() -@@ -188,6 +189,6 @@ add_executable(${XTENSOR_TARGET} ${COMMO +@@ -207,6 +208,6 @@ target_include_directories(test_xtensor_ if(DOWNLOAD_GTEST OR GTEST_SRC_DIR) - add_dependencies(${XTENSOR_TARGET} gtest_main) + add_dependencies(test_xtensor_lib gtest_main) endif() --target_link_libraries(${XTENSOR_TARGET} xtensor ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) -+target_link_libraries(${XTENSOR_TARGET} ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) +-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}) - add_custom_target(xtest COMMAND ${XTENSOR_TARGET} DEPENDS ${XTENSOR_TARGET}) + add_custom_target(xtest COMMAND test_xtensor_lib DEPENDS test_xtensor_lib) Index: head/math/xtensor/pkg-plist =================================================================== --- head/math/xtensor/pkg-plist (revision 492579) +++ head/math/xtensor/pkg-plist (revision 492580) @@ -1,66 +1,65 @@ include/xtensor/xaccumulator.hpp include/xtensor/xadapt.hpp include/xtensor/xarray.hpp include/xtensor/xassign.hpp include/xtensor/xaxis_iterator.hpp include/xtensor/xbroadcast.hpp include/xtensor/xbuffer_adaptor.hpp include/xtensor/xbuilder.hpp include/xtensor/xcomplex.hpp -include/xtensor/xconcepts.hpp include/xtensor/xcontainer.hpp include/xtensor/xcsv.hpp include/xtensor/xdynamic_view.hpp include/xtensor/xeval.hpp include/xtensor/xexception.hpp include/xtensor/xexpression.hpp include/xtensor/xexpression_holder.hpp include/xtensor/xfixed.hpp include/xtensor/xfunction.hpp include/xtensor/xfunctor_view.hpp include/xtensor/xgenerator.hpp include/xtensor/xhistogram.hpp include/xtensor/xindex_view.hpp include/xtensor/xinfo.hpp include/xtensor/xio.hpp include/xtensor/xiterable.hpp include/xtensor/xiterator.hpp include/xtensor/xjson.hpp include/xtensor/xlayout.hpp include/xtensor/xmanipulation.hpp include/xtensor/xmasked_value.hpp include/xtensor/xmasked_view.hpp include/xtensor/xmath.hpp include/xtensor/xmime.hpp include/xtensor/xnoalias.hpp include/xtensor/xnorm.hpp include/xtensor/xnpy.hpp include/xtensor/xoffset_view.hpp include/xtensor/xoperation.hpp include/xtensor/xoptional.hpp include/xtensor/xoptional_assembly.hpp include/xtensor/xoptional_assembly_base.hpp include/xtensor/xoptional_assembly_storage.hpp include/xtensor/xrandom.hpp include/xtensor/xreducer.hpp include/xtensor/xscalar.hpp include/xtensor/xsemantic.hpp include/xtensor/xshape.hpp include/xtensor/xslice.hpp include/xtensor/xsort.hpp include/xtensor/xstorage.hpp include/xtensor/xstrided_view.hpp include/xtensor/xstrided_view_base.hpp include/xtensor/xstrides.hpp include/xtensor/xtensor.hpp include/xtensor/xtensor_config.hpp include/xtensor/xtensor_forward.hpp include/xtensor/xtensor_simd.hpp include/xtensor/xutils.hpp include/xtensor/xvectorize.hpp include/xtensor/xview.hpp include/xtensor/xview_utils.hpp lib/cmake/xtensor/xtensorConfig.cmake lib/cmake/xtensor/xtensorConfigVersion.cmake lib/cmake/xtensor/xtensorTargets.cmake libdata/pkgconfig/xtensor.pc