diff --git a/graphics/colmap/Makefile b/graphics/colmap/Makefile
index acc2e7ea3edf..6a0fb4625ab2 100644
--- a/graphics/colmap/Makefile
+++ b/graphics/colmap/Makefile
@@ -1,89 +1,88 @@
 PORTNAME=	colmap
-DISTVERSION=	3.6
-PORTREVISION=	10
+DISTVERSION=	3.7
 CATEGORIES=	graphics
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	fuz@fuz.su
 COMMENT=	Structure from motion and multi-view stereo
 WWW=		https://colmap.github.io/
 
 LICENSE=	BSD2CLAUSE BSD3CLAUSE CC-BY-3.0 GPLv3+ MIT SIFTGPU
 LICENSE_COMB=	multi
 LICENSE_NAME_SIFTGPU=	SiftGPU non-commercial license
-LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/lib/VLFeat/LICENSE
-LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/COPYING.txt # also FLANN
+LICENSE_FILE_BSD2CLAUSE=	${WRKSRC}/lib/VLFeat/LICENSE
+LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/COPYING.txt # also FLANN
 LICENSE_FILE_CC-BY-3.0=	${WRKSRC}/src/ui/media/LICENSE
 LICENSE_FILE_GPLv3+ =	${WRKSRC}/lib/PBA/LICENSE # also Graclus, LSD
 LICENSE_FILE_MIT=	${WRKSRC}/lib/PoissonRecon/LICENSE
 LICENSE_FILE_SIFTGPU=	${WRKSRC}/lib/SiftGPU/LICENSE
 LICENSE_PERMS_SIFTGPU=	dist-mirror pkg-mirror auto-accept
 
 LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
-		libglog.so:devel/glog \
+		libceres.so:math/ceres-solver \
 		libfreeimage.so:graphics/freeimage \
-		libceres.so:math/ceres-solver
+		libglog.so:devel/glog
 
-USES=		cmake compiler:${OPENMP}c++11-lib eigen:3 gl localbase qt:5 \
-		sqlite
+USES=		cmake compiler:${OPENMP}c++11-lib desktop-file-utils eigen:3 gl \
+		localbase python:env qt:5 sqlite
 USE_GITHUB=	yes
 USE_GL=		gl glew
-USE_QT=		qmake:build buildtools:build core gui opengl:build widgets
+USE_QT=		core gui widgets buildtools:build opengl:build qmake:build
 EXCLUDE=	SQLite
-EXTRACT_AFTER_ARGS=	${EXCLUDE:S,^,--exclude lib/,}
 CMAKE_OFF=	BOOST_STATIC CUDA_ENABLED
-LDFLAGS+=	-Wl,--as-needed # gflags, glu, xi, xmu
 TEST_TARGET=	test
 
+LDFLAGS+=	-Wl,--as-needed # gflags, glu, xi, xmu
+
+EXTRACT_AFTER_ARGS=	${EXCLUDE:S,^,--exclude lib/,}
+
 OPTIONS_DEFINE=		CGAL DOCS OPENMP SIMD TEST
 OPTIONS_DEFAULT=	CGAL OPENMP SIMD
 
 CGAL_DESC=		Graph-cut on Delaunay triangulation based meshing algorithm
 CGAL_BUILD_DEPENDS=	cgal>0:math/cgal
+CGAL_LIB_DEPENDS=	libgmp.so:math/gmp
 CGAL_CMAKE_BOOL=	CGAL_ENABLED
 
-DOCS_BUILD_DEPENDS=	gmake:devel/gmake \
-			sphinx-build:textproc/py-sphinx \
-			${NONEXISTENT}:textproc/py-sphinx_rtd_theme
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \
+			gmake:devel/gmake \
+			sphinx-build:textproc/py-sphinx
 DOCS_PORTDOCS=		*
 
 OPENMP_CMAKE_BOOL=	OPENMP_ENABLED
 .if !exists(/usr/include/omp.h)
 # XXX ports/199603: LLVM openmp in base doesn't support armv6, armv7 yet
 OPENMP_VARS=		OPENMP=gcc-
 .endif
 
 SIMD_CMAKE_BOOL=	SIMD_ENABLED
 
 TEST_CMAKE_BOOL=	TESTS_ENABLED
 
 post-patch:
 # XXX math/flann has -DUSE_OPENMP=OFF and lacks tunning:
 # https://github.com/colmap/colmap/commit/4b594eb85c13
 # https://github.com/colmap/colmap/commit/1e9f1f3324cd
 	@${REINPLACE_CMD} -e '/SQLite/d' \
 		${WRKSRC}/lib/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's,SQLite/,,' \
 		${WRKSRC}/src/base/database.h \
 		${WRKSRC}/src/util/sqlite3_utils.h
 .if !defined(DISPLAY) # QApplication
-	@${REINPLACE_CMD} -e '/feature_matching_test/d' \
-		-e '/feature_extraction_test/d' \
-		${WRKSRC}/src/base/CMakeLists.txt
 	@${REINPLACE_CMD} -e '/opengl_utils_test/d' \
 		${WRKSRC}/src/util/CMakeLists.txt
 .endif
 
 post-build-DOCS-on:
 	@${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} html -C${WRKSRC}/doc
 
 pre-install-TEST-on: do-test
 
 post-install:
 # XXX Clean up garbage after install(DIRECTORY)
 	@${FIND} ${STAGEDIR}${PREFIX}/include -type d -empty -delete
 
 post-install-DOCS-on:
 	(cd ${WRKSRC}/doc/_build/html && ${COPYTREE_SHARE} \
 		"${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/graphics/colmap/distinfo b/graphics/colmap/distinfo
index 6797595808ca..fe2a60c2aa37 100644
--- a/graphics/colmap/distinfo
+++ b/graphics/colmap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1595590074
-SHA256 (colmap-colmap-3.6_GH0.tar.gz) = ea22d026a3b13d339551319f4562fe1471b7232433695970704669755031a192
-SIZE (colmap-colmap-3.6_GH0.tar.gz) = 6322652
+TIMESTAMP = 1667929528
+SHA256 (colmap-colmap-3.7_GH0.tar.gz) = ceb7cca204550d65b890cd0082c66f4bc69193daf9da64616d8147a46b76cc55
+SIZE (colmap-colmap-3.7_GH0.tar.gz) = 6354531
diff --git a/graphics/colmap/pkg-plist b/graphics/colmap/pkg-plist
index 1530c9535338..93ad7e14b50a 100644
--- a/graphics/colmap/pkg-plist
+++ b/graphics/colmap/pkg-plist
@@ -1,319 +1,327 @@
 bin/colmap
 include/colmap/base/camera.h
 include/colmap/base/camera_database.h
 include/colmap/base/camera_models.h
 include/colmap/base/camera_rig.h
 include/colmap/base/correspondence_graph.h
 include/colmap/base/cost_functions.h
 include/colmap/base/database.h
 include/colmap/base/database_cache.h
 include/colmap/base/essential_matrix.h
 include/colmap/base/gps.h
 include/colmap/base/graph_cut.h
 include/colmap/base/homography_matrix.h
 include/colmap/base/image.h
 include/colmap/base/image_reader.h
 include/colmap/base/line.h
 include/colmap/base/point2d.h
 include/colmap/base/point3d.h
 include/colmap/base/polynomial.h
 include/colmap/base/pose.h
 include/colmap/base/projection.h
 include/colmap/base/reconstruction.h
 include/colmap/base/reconstruction_manager.h
 include/colmap/base/scene_clustering.h
 include/colmap/base/similarity_transform.h
 include/colmap/base/track.h
 include/colmap/base/triangulation.h
 include/colmap/base/undistortion.h
 include/colmap/base/visibility_pyramid.h
 include/colmap/base/warp.h
 include/colmap/controllers/automatic_reconstruction.h
 include/colmap/controllers/bundle_adjustment.h
 include/colmap/controllers/hierarchical_mapper.h
 include/colmap/controllers/incremental_mapper.h
 include/colmap/estimators/absolute_pose.h
 include/colmap/estimators/affine_transform.h
 include/colmap/estimators/coordinate_frame.h
 include/colmap/estimators/essential_matrix.h
 include/colmap/estimators/essential_matrix_coeffs.h
 include/colmap/estimators/essential_matrix_poly.h
 include/colmap/estimators/euclidean_transform.h
 include/colmap/estimators/fundamental_matrix.h
 include/colmap/estimators/generalized_absolute_pose.h
 include/colmap/estimators/generalized_absolute_pose_coeffs.h
 include/colmap/estimators/generalized_relative_pose.h
 include/colmap/estimators/homography_matrix.h
 include/colmap/estimators/pose.h
 include/colmap/estimators/similarity_transform.h
 include/colmap/estimators/translation_transform.h
 include/colmap/estimators/triangulation.h
 include/colmap/estimators/two_view_geometry.h
 include/colmap/estimators/utils.h
+include/colmap/exe/database.h
+include/colmap/exe/feature.h
+include/colmap/exe/gui.h
+include/colmap/exe/image.h
+include/colmap/exe/model.h
+include/colmap/exe/mvs.h
+include/colmap/exe/sfm.h
+include/colmap/exe/vocab_tree.h
 include/colmap/feature/extraction.h
 include/colmap/feature/matching.h
 include/colmap/feature/sift.h
 include/colmap/feature/types.h
 include/colmap/feature/utils.h
 include/colmap/lib/FLANN/algorithms/all_indices.h
 include/colmap/lib/FLANN/algorithms/autotuned_index.h
 include/colmap/lib/FLANN/algorithms/center_chooser.h
 include/colmap/lib/FLANN/algorithms/composite_index.h
 include/colmap/lib/FLANN/algorithms/dist.h
 include/colmap/lib/FLANN/algorithms/hierarchical_clustering_index.h
 include/colmap/lib/FLANN/algorithms/kdtree_cuda_3d_index.h
 include/colmap/lib/FLANN/algorithms/kdtree_cuda_builder.h
 include/colmap/lib/FLANN/algorithms/kdtree_index.h
 include/colmap/lib/FLANN/algorithms/kdtree_single_index.h
 include/colmap/lib/FLANN/algorithms/kmeans_index.h
 include/colmap/lib/FLANN/algorithms/linear_index.h
 include/colmap/lib/FLANN/algorithms/lsh_index.h
 include/colmap/lib/FLANN/algorithms/nn_index.h
 include/colmap/lib/FLANN/config.h
 include/colmap/lib/FLANN/config.h.in
 include/colmap/lib/FLANN/defines.h
 include/colmap/lib/FLANN/ext/lz4.h
 include/colmap/lib/FLANN/ext/lz4hc.h
 include/colmap/lib/FLANN/flann.h
 include/colmap/lib/FLANN/flann.hpp
 include/colmap/lib/FLANN/general.h
 include/colmap/lib/FLANN/io/hdf5.h
 include/colmap/lib/FLANN/mpi/client.h
 include/colmap/lib/FLANN/mpi/index.h
 include/colmap/lib/FLANN/mpi/matrix.h
 include/colmap/lib/FLANN/mpi/queries.h
 include/colmap/lib/FLANN/mpi/server.h
 include/colmap/lib/FLANN/nn/ground_truth.h
 include/colmap/lib/FLANN/nn/index_testing.h
 include/colmap/lib/FLANN/nn/simplex_downhill.h
 include/colmap/lib/FLANN/util/allocator.h
 include/colmap/lib/FLANN/util/any.h
 include/colmap/lib/FLANN/util/cuda/heap.h
 include/colmap/lib/FLANN/util/cuda/result_set.h
 include/colmap/lib/FLANN/util/cutil_math.h
 include/colmap/lib/FLANN/util/dynamic_bitset.h
 include/colmap/lib/FLANN/util/heap.h
 include/colmap/lib/FLANN/util/logger.h
 include/colmap/lib/FLANN/util/lsh_table.h
 include/colmap/lib/FLANN/util/matrix.h
 include/colmap/lib/FLANN/util/object_factory.h
 include/colmap/lib/FLANN/util/params.h
 include/colmap/lib/FLANN/util/random.h
 include/colmap/lib/FLANN/util/result_set.h
 include/colmap/lib/FLANN/util/sampling.h
 include/colmap/lib/FLANN/util/saving.h
 include/colmap/lib/FLANN/util/serialization.h
 include/colmap/lib/FLANN/util/timer.h
 include/colmap/lib/Graclus/metisLib/defs.h
 include/colmap/lib/Graclus/metisLib/macros.h
 include/colmap/lib/Graclus/metisLib/metis.h
 include/colmap/lib/Graclus/metisLib/proto.h
 include/colmap/lib/Graclus/metisLib/rename.h
 include/colmap/lib/Graclus/metisLib/struct.h
 include/colmap/lib/LSD/lsd.h
 include/colmap/lib/PBA/ConfigBA.h
 include/colmap/lib/PBA/CuTexImage.h
 include/colmap/lib/PBA/DataInterface.h
 include/colmap/lib/PBA/ProgramCU.h
 include/colmap/lib/PBA/SparseBundleCPU.h
 include/colmap/lib/PBA/SparseBundleCU.h
 include/colmap/lib/PBA/pba.h
 include/colmap/lib/PBA/util.h
 include/colmap/lib/PoissonRecon/Allocator.h
 include/colmap/lib/PoissonRecon/Array.h
 include/colmap/lib/PoissonRecon/Array.inl
 include/colmap/lib/PoissonRecon/BSplineData.h
 include/colmap/lib/PoissonRecon/BSplineData.inl
 include/colmap/lib/PoissonRecon/BinaryNode.h
 include/colmap/lib/PoissonRecon/CmdLineParser.h
 include/colmap/lib/PoissonRecon/CmdLineParser.inl
 include/colmap/lib/PoissonRecon/Factor.h
 include/colmap/lib/PoissonRecon/FunctionData.h
 include/colmap/lib/PoissonRecon/FunctionData.inl
 include/colmap/lib/PoissonRecon/Geometry.h
 include/colmap/lib/PoissonRecon/Geometry.inl
 include/colmap/lib/PoissonRecon/Hash.h
 include/colmap/lib/PoissonRecon/MAT.h
 include/colmap/lib/PoissonRecon/MAT.inl
 include/colmap/lib/PoissonRecon/MarchingCubes.h
 include/colmap/lib/PoissonRecon/MemoryUsage.h
 include/colmap/lib/PoissonRecon/MultiGridOctreeData.Evaluation.inl
 include/colmap/lib/PoissonRecon/MultiGridOctreeData.IsoSurface.inl
 include/colmap/lib/PoissonRecon/MultiGridOctreeData.SortedTreeNodes.inl
 include/colmap/lib/PoissonRecon/MultiGridOctreeData.System.inl
 include/colmap/lib/PoissonRecon/MultiGridOctreeData.WeightedSamples.inl
 include/colmap/lib/PoissonRecon/MultiGridOctreeData.h
 include/colmap/lib/PoissonRecon/MultiGridOctreeData.inl
 include/colmap/lib/PoissonRecon/MyTime.h
 include/colmap/lib/PoissonRecon/Octree.h
 include/colmap/lib/PoissonRecon/Octree.inl
 include/colmap/lib/PoissonRecon/PPolynomial.h
 include/colmap/lib/PoissonRecon/PPolynomial.inl
 include/colmap/lib/PoissonRecon/Ply.h
 include/colmap/lib/PoissonRecon/PointStream.h
 include/colmap/lib/PoissonRecon/PointStream.inl
 include/colmap/lib/PoissonRecon/PoissonRecon.h
 include/colmap/lib/PoissonRecon/Polynomial.h
 include/colmap/lib/PoissonRecon/Polynomial.inl
 include/colmap/lib/PoissonRecon/SparseMatrix.h
 include/colmap/lib/PoissonRecon/SparseMatrix.inl
 include/colmap/lib/PoissonRecon/SurfaceTrimmer.h
 include/colmap/lib/SiftGPU/CLTexImage.h
 include/colmap/lib/SiftGPU/CuTexImage.h
 include/colmap/lib/SiftGPU/FrameBufferObject.h
 include/colmap/lib/SiftGPU/GLTexImage.h
 include/colmap/lib/SiftGPU/GlobalUtil.h
 include/colmap/lib/SiftGPU/LiteWindow.h
 include/colmap/lib/SiftGPU/ProgramCG.h
 include/colmap/lib/SiftGPU/ProgramCL.h
 include/colmap/lib/SiftGPU/ProgramCU.h
 include/colmap/lib/SiftGPU/ProgramGLSL.h
 include/colmap/lib/SiftGPU/ProgramGPU.h
 include/colmap/lib/SiftGPU/PyramidCL.h
 include/colmap/lib/SiftGPU/PyramidCU.h
 include/colmap/lib/SiftGPU/PyramidGL.h
 include/colmap/lib/SiftGPU/ShaderMan.h
 include/colmap/lib/SiftGPU/SiftGPU.h
 include/colmap/lib/SiftGPU/SiftMatch.h
 include/colmap/lib/SiftGPU/SiftMatchCU.h
 include/colmap/lib/SiftGPU/SiftPyramid.h
 include/colmap/lib/VLFeat/aib.h
 include/colmap/lib/VLFeat/array.h
 include/colmap/lib/VLFeat/covdet.h
 include/colmap/lib/VLFeat/dsift.h
 include/colmap/lib/VLFeat/fisher.h
 include/colmap/lib/VLFeat/float.h
 include/colmap/lib/VLFeat/generic.h
 include/colmap/lib/VLFeat/getopt_long.h
 include/colmap/lib/VLFeat/gmm.h
 include/colmap/lib/VLFeat/heap-def.h
 include/colmap/lib/VLFeat/hikmeans.h
 include/colmap/lib/VLFeat/hog.h
 include/colmap/lib/VLFeat/homkermap.h
 include/colmap/lib/VLFeat/host.h
 include/colmap/lib/VLFeat/ikmeans.h
 include/colmap/lib/VLFeat/imopv.h
 include/colmap/lib/VLFeat/imopv_sse2.h
 include/colmap/lib/VLFeat/kdtree.h
 include/colmap/lib/VLFeat/kmeans.h
 include/colmap/lib/VLFeat/lbp.h
 include/colmap/lib/VLFeat/liop.h
 include/colmap/lib/VLFeat/mathop.h
 include/colmap/lib/VLFeat/mathop_avx.h
 include/colmap/lib/VLFeat/mathop_sse2.h
 include/colmap/lib/VLFeat/mser.h
 include/colmap/lib/VLFeat/pgm.h
 include/colmap/lib/VLFeat/qsort-def.h
 include/colmap/lib/VLFeat/quickshift.h
 include/colmap/lib/VLFeat/random.h
 include/colmap/lib/VLFeat/rodrigues.h
 include/colmap/lib/VLFeat/scalespace.h
 include/colmap/lib/VLFeat/shuffle-def.h
 include/colmap/lib/VLFeat/sift.h
 include/colmap/lib/VLFeat/slic.h
 include/colmap/lib/VLFeat/stringop.h
 include/colmap/lib/VLFeat/svm.h
 include/colmap/lib/VLFeat/svmdataset.h
 include/colmap/lib/VLFeat/vlad.h
 include/colmap/mvs/consistency_graph.h
 include/colmap/mvs/cuda_array_wrapper.h
 include/colmap/mvs/cuda_flip.h
 include/colmap/mvs/cuda_rotate.h
 include/colmap/mvs/cuda_transpose.h
 include/colmap/mvs/depth_map.h
 include/colmap/mvs/fusion.h
 include/colmap/mvs/gpu_mat.h
 include/colmap/mvs/gpu_mat_prng.h
 include/colmap/mvs/gpu_mat_ref_image.h
 include/colmap/mvs/image.h
 include/colmap/mvs/mat.h
 include/colmap/mvs/meshing.h
 include/colmap/mvs/model.h
 include/colmap/mvs/normal_map.h
 include/colmap/mvs/patch_match.h
 include/colmap/mvs/patch_match_cuda.h
 include/colmap/mvs/workspace.h
 include/colmap/optim/bundle_adjustment.h
 include/colmap/optim/combination_sampler.h
 include/colmap/optim/least_absolute_deviations.h
 include/colmap/optim/loransac.h
 include/colmap/optim/progressive_sampler.h
 include/colmap/optim/random_sampler.h
 include/colmap/optim/ransac.h
 include/colmap/optim/sampler.h
 include/colmap/optim/sprt.h
 include/colmap/optim/support_measurement.h
 include/colmap/retrieval/geometry.h
 include/colmap/retrieval/inverted_file.h
 include/colmap/retrieval/inverted_file_entry.h
 include/colmap/retrieval/inverted_index.h
 include/colmap/retrieval/utils.h
 include/colmap/retrieval/visual_index.h
 include/colmap/retrieval/vote_and_verify.h
 include/colmap/sfm/incremental_mapper.h
 include/colmap/sfm/incremental_triangulator.h
 include/colmap/ui/automatic_reconstruction_widget.h
 include/colmap/ui/bundle_adjustment_widget.h
 include/colmap/ui/colormaps.h
 include/colmap/ui/database_management_widget.h
 include/colmap/ui/dense_reconstruction_widget.h
 include/colmap/ui/feature_extraction_widget.h
 include/colmap/ui/feature_matching_widget.h
 include/colmap/ui/image_viewer_widget.h
 include/colmap/ui/license_widget.h
 include/colmap/ui/line_painter.h
 include/colmap/ui/log_widget.h
 include/colmap/ui/main_window.h
 include/colmap/ui/match_matrix_widget.h
 include/colmap/ui/model_viewer_widget.h
 include/colmap/ui/movie_grabber_widget.h
 include/colmap/ui/options_widget.h
 include/colmap/ui/point_painter.h
 include/colmap/ui/point_viewer_widget.h
 include/colmap/ui/project_widget.h
 include/colmap/ui/qt_utils.h
 include/colmap/ui/reconstruction_manager_widget.h
 include/colmap/ui/reconstruction_options_widget.h
 include/colmap/ui/reconstruction_stats_widget.h
 include/colmap/ui/render_options.h
 include/colmap/ui/render_options_widget.h
 include/colmap/ui/thread_control_widget.h
 include/colmap/ui/triangle_painter.h
 include/colmap/ui/undistortion_widget.h
 include/colmap/util/alignment.h
 include/colmap/util/bitmap.h
 include/colmap/util/cache.h
 include/colmap/util/camera_specs.h
 include/colmap/util/cuda.h
 include/colmap/util/cudacc.h
 include/colmap/util/endian.h
 include/colmap/util/logging.h
 include/colmap/util/math.h
 include/colmap/util/matrix.h
 include/colmap/util/misc.h
 include/colmap/util/opengl_utils.h
 include/colmap/util/option_manager.h
 include/colmap/util/ply.h
 include/colmap/util/random.h
 include/colmap/util/sqlite3_utils.h
 include/colmap/util/string.h
 include/colmap/util/testing.h
 include/colmap/util/threading.h
 include/colmap/util/timer.h
 include/colmap/util/types.h
 include/colmap/util/version.h
 lib/colmap/libcolmap.a
 lib/colmap/libflann.a
 lib/colmap/libgraclus.a
 lib/colmap/liblsd.a
 lib/colmap/libpba.a
 lib/colmap/libpoisson_recon.a
 lib/colmap/libsift_gpu.a
 lib/colmap/libvlfeat.a
 share/applications/COLMAP.desktop
 %%DATADIR%%/COLMAPConfig.cmake
 %%DATADIR%%/COLMAPConfigVersion.cmake
 %%DATADIR%%/cmake/FindEigen3.cmake
 %%DATADIR%%/cmake/FindFreeImage.cmake
 %%DATADIR%%/cmake/FindGlew.cmake
 %%DATADIR%%/cmake/FindGlog.cmake