Index: head/math/xtensor/Makefile
===================================================================
--- head/math/xtensor/Makefile	(revision 470206)
+++ head/math/xtensor/Makefile	(revision 470207)
@@ -1,32 +1,32 @@
 # $FreeBSD$
 
 PORTNAME=	xtensor
-DISTVERSION=	0.15.9
+DISTVERSION=	0.16.0
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Multi-dimensional arrays with broadcasting and lazy computing
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 TEST_DEPENDS=	googletest>0:devel/googletest
 
 USES=		cmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	QuantStack
-GH_TUPLE=	QuantStack:xtl:0.4.4:xtl/xtl
+GH_TUPLE=	QuantStack:xtl:0.4.9:xtl/xtl
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 post-install:
 	cd ${WRKSRC}/xtl/include && ${COPYTREE_SHARE} xtl ${STAGEDIR}${PREFIX}/include
 
 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 <bsd.port.mk>
Index: head/math/xtensor/distinfo
===================================================================
--- head/math/xtensor/distinfo	(revision 470206)
+++ head/math/xtensor/distinfo	(revision 470207)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1523524334
-SHA256 (QuantStack-xtensor-0.15.9_GH0.tar.gz) = 2a2386f526c3c5fdfeda43515c68e503ff237e55cdb5c6f43db0161e2ee19a56
-SIZE (QuantStack-xtensor-0.15.9_GH0.tar.gz) = 729185
-SHA256 (QuantStack-xtl-0.4.4_GH0.tar.gz) = 2e24ae1e990b36c21134ee8b2017e4d8f1aa760ba0e62e57c9de8f6339052f7f
-SIZE (QuantStack-xtl-0.4.4_GH0.tar.gz) = 80592
+TIMESTAMP = 1526545877
+SHA256 (QuantStack-xtensor-0.16.0_GH0.tar.gz) = 2ea01524e12da84137e099f497ab7fc2a98e2aaec49011b3ccf5849e225fba2a
+SIZE (QuantStack-xtensor-0.16.0_GH0.tar.gz) = 745524
+SHA256 (QuantStack-xtl-0.4.9_GH0.tar.gz) = 587251bb7787b7dd05a2d432712bb2a7f05411155c61a9bc4a0f69c7b4e85dc3
+SIZE (QuantStack-xtl-0.4.9_GH0.tar.gz) = 81044
Index: head/math/xtensor/files/patch-CMakeLists.txt
===================================================================
--- head/math/xtensor/files/patch-CMakeLists.txt	(revision 470206)
+++ head/math/xtensor/files/patch-CMakeLists.txt	(revision 470207)
@@ -1,14 +1,14 @@
---- CMakeLists.txt.orig	2018-03-13 17:28:19 UTC
+--- CMakeLists.txt.orig	2018-05-16 08:49:00 UTC
 +++ CMakeLists.txt
-@@ -28,8 +28,9 @@ message(STATUS "Building xtensor v${${PR
+@@ -28,9 +28,9 @@ message(STATUS "Building xtensor v${${PR
  # Dependencies
  # ============
  
 -find_package(xtl 0.4.1 REQUIRED)
--message(STATUS "Found xtl: ${xtl_INCLUDE_DIRS}/xtl")
 +#find_package(xtl 0.4.1 REQUIRED)
+ 
+-message(STATUS "Found xtl: ${xtl_INCLUDE_DIRS}/xtl")
 +message(STATUS "Found xtl: xtl/include")
-+
  
- # Build
- # =====
+ find_package(nlohmann_json 3.1.1)
+ 
Index: head/math/xtensor/pkg-plist
===================================================================
--- head/math/xtensor/pkg-plist	(revision 470206)
+++ head/math/xtensor/pkg-plist	(revision 470207)
@@ -1,77 +1,77 @@
 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/xeval.hpp
 include/xtensor/xexception.hpp
 include/xtensor/xexpression.hpp
 include/xtensor/xfixed.hpp
 include/xtensor/xfunction.hpp
 include/xtensor/xfunctor_view.hpp
 include/xtensor/xgenerator.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/xmath.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/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/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
 include/xtl/xany.hpp
 include/xtl/xbase64.hpp
 include/xtl/xbasic_fixed_string.hpp
 include/xtl/xclosure.hpp
 include/xtl/xcomplex.hpp
-include/xtl/xcrtp.hpp
 include/xtl/xdynamic_bitset.hpp
 include/xtl/xfunctional.hpp
 include/xtl/xhash.hpp
 include/xtl/xhierarchy_generator.hpp
-include/xtl/xholder.hpp
 include/xtl/xiterator_base.hpp
+include/xtl/xjson.hpp
 include/xtl/xmeta_utils.hpp
 include/xtl/xoptional.hpp
 include/xtl/xoptional_sequence.hpp
 include/xtl/xproxy_wrapper.hpp
 include/xtl/xsequence.hpp
 include/xtl/xtl_config.hpp
 include/xtl/xtype_traits.hpp
 include/xtl/xvariant.hpp
 include/xtl/xvariant_impl.hpp
 lib/cmake/xtensor/xtensorConfig.cmake
 lib/cmake/xtensor/xtensorConfigVersion.cmake
 lib/cmake/xtensor/xtensorTargets.cmake
 libdata/pkgconfig/xtensor.pc