Index: head/misc/openvdb/Makefile
===================================================================
--- head/misc/openvdb/Makefile	(revision 501899)
+++ head/misc/openvdb/Makefile	(revision 501900)
@@ -1,37 +1,51 @@
 # $FreeBSD$
 
 PORTNAME=	openvdb
 DISTVERSIONPREFIX=	v
 DISTVERSION=	6.1.0
+PORTREVISION=	1
 CATEGORIES=	misc
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Tools for storage and manipulation of sparse volumetric data
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libblosc.so:archivers/c-blosc \
 		libboost_system.so:devel/boost-libs \
 		libHalf.so:graphics/ilmbase \
 		libtbb.so:devel/tbb
 
 USES=		cmake compiler:c++11-lang pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	AcademySoftwareFoundation
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	OPENVDB_CORE_STATIC
 
-OPTIONS_DEFINE=		PYTHON
-OPTIONS_DEFAULT=	PYTHON
+OPTIONS_DEFINE=		PYTHON TOOLS DOCS # TOOLS should be a subpackage
+OPTIONS_DEFAULT=	PYTHON TOOLS
 OPTIONS_SUB=		yes
 
 PYTHON_USES=		python:2.7 # 3.6 is broken: https://github.com/AcademySoftwareFoundation/openvdb/issues/427
 PYTHON_CMAKE_BOOL=	OPENVDB_BUILD_PYTHON_MODULE
 PYTHON_CMAKE_ON=	-DFREEBSD_PYTHON_VER:STRING=${PYTHON_VER} -DUSE_NUMPY:BOOL=ON
 PYTHON_LIB_DEPENDS=	${PY_BOOST}
 PYTHON_BUILD_DEPENDS=	${PYNUMPY}
 PYTHON_RUN_DEPENDS=	${PYNUMPY}
+
+TOOLS_DESC=		Build CLI tools
+TOOLS_CMAKE_BOOL=	OPENVDB_BUILD_BINARIES OPENVDB_BUILD_VDB_LOD \
+			OPENVDB_BUILD_VDB_RENDER OPENVDB_BUILD_VDB_VIEW
+TOOLS_LIB_DEPENDS=	libglfw.so:graphics/glfw \
+			libIlmImf.so:graphics/openexr
+TOOLS_USES=		gl
+TOOLS_USE=		GL=gl,glu XORG=x11,xcursor,xi,xinerama,xrandr,xxf86vm
+
+DOCS_CMAKE_BOOL=	OPENVDB_BUILD_DOCS
+DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
+
+PORTDOCS=	*
 
 .include <bsd.port.mk>
Index: head/misc/openvdb/files/patch-CMakeLists.txt
===================================================================
--- head/misc/openvdb/files/patch-CMakeLists.txt	(revision 501899)
+++ head/misc/openvdb/files/patch-CMakeLists.txt	(revision 501900)
@@ -1,11 +1,20 @@
---- CMakeLists.txt.orig	2019-05-11 05:39:52 UTC
+--- CMakeLists.txt.orig	2019-05-07 20:58:35 UTC
 +++ CMakeLists.txt
-@@ -177,7 +177,7 @@ if(NOT DISABLE_DEPENDENCY_VERSION_CHECKS
+@@ -177,7 +177,7 @@ if(NOT DISABLE_DEPENDENCY_VERSION_CHECKS)
    set(MINIMUM_ZLIB_VERSION 1.2.7)
    set(MINIMUM_TBB_VERSION 4.4)
  
 -  set(MINIMUM_PYTHON_VERSION 2.7)
 +  set(MINIMUM_PYTHON_VERSION ${FREEBSD_PYTHON_VER})
    set(MINIMUM_NUMPY_VERSION 1.9.2)
  
    set(MINIMUM_CPPUNIT_VERSION 1.10)
+@@ -271,7 +271,7 @@ if(OPENVDB_BUILD_DOCS)
+     COMMENT "Generating API documentation with Doxygen" VERBATIM
+   )
+ 
+-  install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc/html DESTINATION docs)
++  install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc/html DESTINATION share/doc/openvdb)
+ endif()
+ 
+ # Early exit if there's nothing to build
Index: head/misc/openvdb/pkg-plist
===================================================================
--- head/misc/openvdb/pkg-plist	(revision 501899)
+++ head/misc/openvdb/pkg-plist	(revision 501900)
@@ -1,142 +1,145 @@
 bin/vdb_print
+%%TOOLS%%bin/vdb_lod
+%%TOOLS%%bin/vdb_render
+%%TOOLS%%bin/vdb_view
 include/openvdb/Exceptions.h
 include/openvdb/Grid.h
 include/openvdb/MetaMap.h
 include/openvdb/Metadata.h
 include/openvdb/Platform.h
 include/openvdb/PlatformConfig.h
 include/openvdb/Types.h
 include/openvdb/io/Archive.h
 include/openvdb/io/Compression.h
 include/openvdb/io/File.h
 include/openvdb/io/GridDescriptor.h
 include/openvdb/io/Queue.h
 include/openvdb/io/Stream.h
 include/openvdb/io/TempFile.h
 include/openvdb/io/io.h
 include/openvdb/math/BBox.h
 include/openvdb/math/ConjGradient.h
 include/openvdb/math/Coord.h
 include/openvdb/math/DDA.h
 include/openvdb/math/FiniteDifference.h
 include/openvdb/math/LegacyFrustum.h
 include/openvdb/math/Maps.h
 include/openvdb/math/Mat.h
 include/openvdb/math/Mat3.h
 include/openvdb/math/Mat4.h
 include/openvdb/math/Math.h
 include/openvdb/math/Operators.h
 include/openvdb/math/Proximity.h
 include/openvdb/math/QuantizedUnitVec.h
 include/openvdb/math/Quat.h
 include/openvdb/math/Ray.h
 include/openvdb/math/Stats.h
 include/openvdb/math/Stencils.h
 include/openvdb/math/Transform.h
 include/openvdb/math/Tuple.h
 include/openvdb/math/Vec2.h
 include/openvdb/math/Vec3.h
 include/openvdb/math/Vec4.h
 include/openvdb/openvdb.h
 include/openvdb/points/AttributeArray.h
 include/openvdb/points/AttributeArrayString.h
 include/openvdb/points/AttributeGroup.h
 include/openvdb/points/AttributeSet.h
 include/openvdb/points/IndexFilter.h
 include/openvdb/points/IndexIterator.h
 include/openvdb/points/PointAdvect.h
 include/openvdb/points/PointAttribute.h
 include/openvdb/points/PointConversion.h
 include/openvdb/points/PointCount.h
 include/openvdb/points/PointDataGrid.h
 include/openvdb/points/PointDelete.h
 include/openvdb/points/PointGroup.h
 include/openvdb/points/PointMask.h
 include/openvdb/points/PointMove.h
 include/openvdb/points/PointSample.h
 include/openvdb/points/PointScatter.h
 include/openvdb/points/StreamCompression.h
 %%PYTHON%%include/openvdb/python/pyopenvdb.h
 include/openvdb/tools/ChangeBackground.h
 include/openvdb/tools/Clip.h
 include/openvdb/tools/Composite.h
 include/openvdb/tools/Dense.h
 include/openvdb/tools/DenseSparseTools.h
 include/openvdb/tools/Diagnostics.h
 include/openvdb/tools/Filter.h
 include/openvdb/tools/GridOperators.h
 include/openvdb/tools/GridTransformer.h
 include/openvdb/tools/Interpolation.h
 include/openvdb/tools/LevelSetAdvect.h
 include/openvdb/tools/LevelSetFilter.h
 include/openvdb/tools/LevelSetFracture.h
 include/openvdb/tools/LevelSetMeasure.h
 include/openvdb/tools/LevelSetMorph.h
 include/openvdb/tools/LevelSetPlatonic.h
 include/openvdb/tools/LevelSetRebuild.h
 include/openvdb/tools/LevelSetSphere.h
 include/openvdb/tools/LevelSetTracker.h
 include/openvdb/tools/LevelSetUtil.h
 include/openvdb/tools/Mask.h
 include/openvdb/tools/MeshToVolume.h
 include/openvdb/tools/Morphology.h
 include/openvdb/tools/MultiResGrid.h
 include/openvdb/tools/ParticleAtlas.h
 include/openvdb/tools/ParticlesToLevelSet.h
 include/openvdb/tools/PointAdvect.h
 include/openvdb/tools/PointIndexGrid.h
 include/openvdb/tools/PointPartitioner.h
 include/openvdb/tools/PointScatter.h
 include/openvdb/tools/PointsToMask.h
 include/openvdb/tools/PoissonSolver.h
 include/openvdb/tools/PotentialFlow.h
 include/openvdb/tools/Prune.h
 include/openvdb/tools/RayIntersector.h
 include/openvdb/tools/RayTracer.h
 include/openvdb/tools/SignedFloodFill.h
 include/openvdb/tools/Statistics.h
 include/openvdb/tools/TopologyToLevelSet.h
 include/openvdb/tools/ValueTransformer.h
 include/openvdb/tools/VectorTransformer.h
 include/openvdb/tools/VelocityFields.h
 include/openvdb/tools/VolumeAdvect.h
 include/openvdb/tools/VolumeToMesh.h
 include/openvdb/tools/VolumeToSpheres.h
 include/openvdb/tree/InternalNode.h
 include/openvdb/tree/Iterator.h
 include/openvdb/tree/LeafBuffer.h
 include/openvdb/tree/LeafManager.h
 include/openvdb/tree/LeafNode.h
 include/openvdb/tree/LeafNodeBool.h
 include/openvdb/tree/LeafNodeMask.h
 include/openvdb/tree/NodeManager.h
 include/openvdb/tree/NodeUnion.h
 include/openvdb/tree/RootNode.h
 include/openvdb/tree/Tree.h
 include/openvdb/tree/TreeIterator.h
 include/openvdb/tree/ValueAccessor.h
 include/openvdb/util/CpuTimer.h
 include/openvdb/util/Formats.h
 include/openvdb/util/MapsUtil.h
 include/openvdb/util/Name.h
 include/openvdb/util/NodeMasks.h
 include/openvdb/util/NullInterrupter.h
 include/openvdb/util/PagedArray.h
 include/openvdb/util/Util.h
 include/openvdb/util/logging.h
 include/openvdb/version.h
 lib/cmake/OpenVDB/FindBlosc.cmake
 lib/cmake/OpenVDB/FindCppUnit.cmake
 lib/cmake/OpenVDB/FindIlmBase.cmake
 lib/cmake/OpenVDB/FindLog4cplus.cmake
 lib/cmake/OpenVDB/FindOpenEXR.cmake
 lib/cmake/OpenVDB/FindOpenVDB.cmake
 lib/cmake/OpenVDB/FindTBB.cmake
 lib/cmake/OpenVDB/OpenVDBGLFW3Setup.cmake
 lib/cmake/OpenVDB/OpenVDBHoudiniSetup.cmake
 lib/cmake/OpenVDB/OpenVDBMayaSetup.cmake
 lib/cmake/OpenVDB/OpenVDBUtils.cmake
 lib/libopenvdb.so
 lib/libopenvdb.so.6.1
 lib/libopenvdb.so.6.1.0
 %%PYTHON%%%%PYTHON_LIBDIR%%/pyopenvdb.so