Index: head/math/xtensor/Makefile
===================================================================
--- head/math/xtensor/Makefile	(revision 476997)
+++ head/math/xtensor/Makefile	(revision 476998)
@@ -1,32 +1,35 @@
 # $FreeBSD$
 
 PORTNAME=	xtensor
 DISTVERSION=	0.17.1
+PORTREVISION=	1
 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
+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_TUPLE=	QuantStack:xtl:0.4.14: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/files/patch-CMakeLists.txt
===================================================================
--- head/math/xtensor/files/patch-CMakeLists.txt	(revision 476997)
+++ head/math/xtensor/files/patch-CMakeLists.txt	(nonexistent)
@@ -1,14 +0,0 @@
---- CMakeLists.txt.orig	2018-08-01 12:53:03 UTC
-+++ CMakeLists.txt
-@@ -28,9 +28,9 @@ message(STATUS "Building xtensor v${${PR
- # Dependencies
- # ============
- 
--find_package(xtl 0.4.14 REQUIRED)
-+#find_package(xtl 0.4.14 REQUIRED)
- 
--message(STATUS "Found xtl: ${xtl_INCLUDE_DIRS}/xtl")
-+message(STATUS "Found xtl: xtl/include")
- 
- find_package(nlohmann_json 3.1.1 QUIET)
- 

Property changes on: head/math/xtensor/files/patch-CMakeLists.txt
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/math/xtensor/pkg-plist
===================================================================
--- head/math/xtensor/pkg-plist	(revision 476997)
+++ head/math/xtensor/pkg-plist	(revision 476998)
@@ -1,82 +1,61 @@
 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/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/xmasked_view.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/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
-include/xtl/xany.hpp
-include/xtl/xbase64.hpp
-include/xtl/xbasic_fixed_string.hpp
-include/xtl/xclosure.hpp
-include/xtl/xcomplex.hpp
-include/xtl/xcomplex_sequence.hpp
-include/xtl/xdynamic_bitset.hpp
-include/xtl/xfunctional.hpp
-include/xtl/xhash.hpp
-include/xtl/xhierarchy_generator.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