diff --git a/databases/tarantool/Makefile b/databases/tarantool/Makefile
index 36e789f0f231..c170fe338de8 100644
--- a/databases/tarantool/Makefile
+++ b/databases/tarantool/Makefile
@@ -1,66 +1,65 @@
 PORTNAME=	tarantool
-PORTVERSION=	2.10.0
-PORTREVISION=	2
+PORTVERSION=	2.10.1
 CATEGORIES=	databases
 MASTER_SITES=	https://download.tarantool.org/tarantool/src/
 
 MAINTAINER=	balaev@tarantool.org
 COMMENT=	NoSQL database running in a Lua application server
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_aarch64=		fails to compile: mmintrin.h:50:12: invalid conversion between vector type '__m64' (vector of 1 'long long' value) and integer type 'int' of different siz
 BROKEN_riscv64=		fails to compile: mmintrin.h:50:12: invalid conversion between vector type '__m64' (vector of 1 'long long' value) and integer type 'int' of different siz
 NOT_FOR_ARCHS=		armv6 powerpc64 sparc64
 NOT_FOR_ARCHS_REASON=	fails to build: Unsupported architecture
 
 BUILD_DEPENDS=	gsed:textproc/gsed \
-		msgpuck>=2.0_4:devel/msgpuck
+		msgpuck>=2.0_5:devel/msgpuck
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libicui18n.so:devel/icu \
 		libmsgpuck.so:devel/msgpuck \
 		libyaml.so:textproc/libyaml \
 		libzstd.so:archivers/zstd
 
 USES=		cmake:noninja compiler:c++11-lang cpe gettext-runtime gmake iconv perl5 readline ssl
 USE_PERL5=	build
 
 BINARY_ALIAS=	sed=${LOCALBASE}/bin/gsed
 CMAKE_ARGS=	-DCMAKE_INSTALL_FULL_SYSCONFDIR=${ETCDIR} \
 		-DCMAKE_INSTALL_LOCALSTATEDIR=/var \
 		-DCMAKE_INSTALL_MANDIR=${PREFIX}/share/man
 CMAKE_OFF=	ENABLE_BUNDLED_LIBCURL \
 		ENABLE_BUNDLED_LIBYAML \
 		ENABLE_BUNDLED_MSGPUCK \
 		ENABLE_BUNDLED_ZSTD
 CMAKE_ON=	ENABLE_DIST
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	tarantool
 
 USERS=		tarantool
 GROUPS=		tarantool
 
 PLIST_SUB=	TT_DATADIR=${TT_DATADIR} \
 		TT_LOGDIR=${TT_LOGDIR}
 SUB_FILES=	pkg-message
 
 TT_DATADIR?=	/var/db/tarantool
 TT_LOGDIR?=	/var/log/tarantool
 TT_RUNDIR?=	/var/run/tarantool
 
 OPTIONS_DEFINE=	DEBUG
 
 DEBUG_CMAKE_BOOL=	ENABLE_BACKTRACE
 
 post-patch:
 	@${ECHO_CMD} ${PORTVERSION}-0 > ${WRKSRC}/VERSION
 	@${GREP} -lr 'msgpuck/msgpuck.h' ${WRKSRC}/ | ${XARGS} ${REINPLACE_CMD} -e 's|msgpuck/msgpuck.h|msgpuck.h|'
 	@${REINPLACE_CMD} -e 's|libmsgpuck.a|libmsgpuck.so|' ${WRKSRC}/cmake/FindMsgPuck.cmake
 	@${REINPLACE_CMD} -e 's|lib/msgpuck.h|msgpuck.h|' ${WRKSRC}/src/lib/core/decimal.c
 
 post-install:
 	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/tarantool/
 
 .include <bsd.port.mk>
diff --git a/databases/tarantool/distinfo b/databases/tarantool/distinfo
index fcf280ddef9a..4710c7f29def 100644
--- a/databases/tarantool/distinfo
+++ b/databases/tarantool/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1653072329
-SHA256 (tarantool-2.10.0.tar.gz) = 42bb5a714ddf788a89ba4b2062582aee16a2bc7b68c7c3b8c03d7a30be878e2b
-SIZE (tarantool-2.10.0.tar.gz) = 45203838
+TIMESTAMP = 1661154605
+SHA256 (tarantool-2.10.1.tar.gz) = 615c9471ed4b4277427bd24b008a7ca7942da349d3391ba466823dab2bc34e6f
+SIZE (tarantool-2.10.1.tar.gz) = 46704498
diff --git a/databases/tarantool/files/patch-src-lib-tzcode-CMakeLists.txt b/databases/tarantool/files/patch-src-lib-tzcode-CMakeLists.txt
deleted file mode 100644
index 3294e0bbcc6f..000000000000
--- a/databases/tarantool/files/patch-src-lib-tzcode-CMakeLists.txt
+++ /dev/null
@@ -1,60 +0,0 @@
---- src/lib/tzcode/CMakeLists.txt.orig	2022-05-24 21:51:37.355897000 +0300
-+++ src/lib/tzcode/CMakeLists.txt	2022-05-24 21:55:26.136676000 +0300
-@@ -1,57 +1,3 @@
- add_library(tzcode STATIC
-             strftime.c strptime.c timelocal.c localtime.c timezone.c)
- target_link_libraries(tzcode)
--
--set(TZCODE_PROJECT tzcode-iana)
--set(TZCODE_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR})
--set(TZCODE_PREFIX_DIR tz)
--set(TZCODE_PREFIX ${TZCODE_BUILD_DIR}/${TZCODE_PREFIX_DIR})
--set(TZDATA_TARGET main.zi)
--set(TZCODE_SRC ${PROJECT_SOURCE_DIR}/src/lib/tzcode)
--set(TZLUA_SRC ${PROJECT_SOURCE_DIR}/src/lua)
--
--set(TZDATA_FULL_TARGET
--    ${TZCODE_PREFIX}/src/${TZCODE_PROJECT}/${TZDATA_TARGET})
--
--ExternalProject_Add(${TZCODE_PROJECT}
--    GIT_REPOSITORY https://github.com/tarantool/tz
--    GIT_TAG 2022a
--    GIT_SHALLOW YES
--
--    EXCLUDE_FROM_ALL 1
--    INSTALL_DIR ${TZCODE_BUILD_DIR}/install
--    PREFIX ${TZCODE_PREFIX_DIR}
--
--    UPDATE_COMMAND ""
--    CONFIGURE_COMMAND ""
--
--    BUILD_COMMAND ${CMAKE_COMMAND} -E env
--        CC=${CMAKE_C_COMPILER}
--        CFLAGS=${CMAKE_C_FLAGS}
--        PACKRATDATA=backzone
--        make -C <SOURCE_DIR> ${TZDATA_TARGET}
--    BUILD_IN_SOURCE TRUE
--    TEST_COMMAND ""
--    INSTALL_COMMAND make DESTDIR=<INSTALL_DIR> install
--    BUILD_BYPRODUCTS ${TZDATA_FULL_TARGET}
--)
--
--find_program(PERL perl)
--
--add_custom_target(gen-timezones DEPENDS ${TZCODE_PROJECT})
--add_custom_command(TARGET gen-timezones
--    COMMAND
--    ${PERL} ${TZCODE_SRC}/gen-zone-abbrevs.pl
--        ${TZCODE_SRC}/zone-abbrevs.txt ${TZDATA_FULL_TARGET}
--        ${TZCODE_SRC}/timezones.h ${TZLUA_SRC}/timezones.lua
--    COMMENT "Generating timezones.h and timezones.lua"
--)
--
--# We excluded build of gen-timezones and tzcode-iana (main.zi) targets
--# from ALL dependencies (see EXCLUDE_FROM_ALL=1) if you, by either reason
--# need to regenerate timezones.h then invoke target manually:
--# ```sh
--#   make gen-timezones VERBOSE=1
--# ```
--# it will regenerate `timezones.h`, `timezones.lua` in-place, in their
--# repository location.
diff --git a/databases/tarantool/files/patch-test-unit-CMakeLists.txt b/databases/tarantool/files/patch-test-unit-CMakeLists.txt
deleted file mode 100644
index 79d3653cab85..000000000000
--- a/databases/tarantool/files/patch-test-unit-CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
-index 442597255..1207beff5 100644
---- test/unit/CMakeLists.txt.orig
-+++ test/unit/CMakeLists.txt
-@@ -297,7 +297,8 @@ target_link_libraries(popen.test misc unit core)
- add_executable(serializer.test serializer.c box_test_utils.c)
- target_link_libraries(serializer.test unit box ${LUAJIT_LIBRARIES})
- 
--add_executable(watcher.test watcher.c)
-+add_executable(watcher.test watcher.c
-+	${PROJECT_SOURCE_DIR}/test/unit/box_test_utils.c)
- target_link_libraries(watcher.test unit box)
- 
- add_executable(grp_alloc.test grp_alloc.c box_test_utils.c)
diff --git a/databases/tarantool/pkg-plist b/databases/tarantool/pkg-plist
index 5313e8f612c7..7092049d1d8c 100644
--- a/databases/tarantool/pkg-plist
+++ b/databases/tarantool/pkg-plist
@@ -1,109 +1,110 @@
 bin/tarantool
 bin/tarantoolctl
 etc/tarantool/default/tarantool
 etc/tarantool/instances.available/example.lua
 include/tarantool/lauxlib.h
 include/tarantool/lmisclib.h
 include/tarantool/lua.h
 include/tarantool/lua.hpp
 include/tarantool/luaconf.h
 include/tarantool/luajit.h
 include/tarantool/lualib.h
 include/tarantool/module.h
 share/man/man1/tarantool.1.gz
 share/man/man1/tarantoolctl.1.gz
 %%DATADIR%%/luarocks/admin/cache.lua
 %%DATADIR%%/luarocks/admin/cmd/add.lua
 %%DATADIR%%/luarocks/admin/cmd/make_manifest.lua
 %%DATADIR%%/luarocks/admin/cmd/refresh_cache.lua
 %%DATADIR%%/luarocks/admin/cmd/remove.lua
 %%DATADIR%%/luarocks/admin/index.lua
 %%DATADIR%%/luarocks/build.lua
 %%DATADIR%%/luarocks/build/builtin.lua
 %%DATADIR%%/luarocks/build/cmake.lua
 %%DATADIR%%/luarocks/build/command.lua
 %%DATADIR%%/luarocks/build/make.lua
 %%DATADIR%%/luarocks/cmd.lua
 %%DATADIR%%/luarocks/cmd/build.lua
 %%DATADIR%%/luarocks/cmd/config.lua
 %%DATADIR%%/luarocks/cmd/doc.lua
 %%DATADIR%%/luarocks/cmd/download.lua
 %%DATADIR%%/luarocks/cmd/help.lua
 %%DATADIR%%/luarocks/cmd/init.lua
 %%DATADIR%%/luarocks/cmd/install.lua
 %%DATADIR%%/luarocks/cmd/lint.lua
 %%DATADIR%%/luarocks/cmd/list.lua
 %%DATADIR%%/luarocks/cmd/make.lua
 %%DATADIR%%/luarocks/cmd/new_version.lua
 %%DATADIR%%/luarocks/cmd/pack.lua
 %%DATADIR%%/luarocks/cmd/path.lua
 %%DATADIR%%/luarocks/cmd/purge.lua
 %%DATADIR%%/luarocks/cmd/remove.lua
 %%DATADIR%%/luarocks/cmd/search.lua
 %%DATADIR%%/luarocks/cmd/show.lua
 %%DATADIR%%/luarocks/cmd/test.lua
 %%DATADIR%%/luarocks/cmd/unpack.lua
 %%DATADIR%%/luarocks/cmd/upload.lua
 %%DATADIR%%/luarocks/cmd/which.lua
 %%DATADIR%%/luarocks/cmd/write_rockspec.lua
 %%DATADIR%%/luarocks/core/cfg.lua
 %%DATADIR%%/luarocks/core/dir.lua
 %%DATADIR%%/luarocks/core/hardcoded.lua
 %%DATADIR%%/luarocks/core/manif.lua
 %%DATADIR%%/luarocks/core/path.lua
 %%DATADIR%%/luarocks/core/persist.lua
 %%DATADIR%%/luarocks/core/sysdetect.lua
 %%DATADIR%%/luarocks/core/util.lua
 %%DATADIR%%/luarocks/core/vers.lua
 %%DATADIR%%/luarocks/deps.lua
 %%DATADIR%%/luarocks/dir.lua
 %%DATADIR%%/luarocks/download.lua
 %%DATADIR%%/luarocks/fetch.lua
 %%DATADIR%%/luarocks/fetch/cvs.lua
 %%DATADIR%%/luarocks/fetch/git.lua
 %%DATADIR%%/luarocks/fetch/git_file.lua
 %%DATADIR%%/luarocks/fetch/git_http.lua
 %%DATADIR%%/luarocks/fetch/git_https.lua
 %%DATADIR%%/luarocks/fetch/git_ssh.lua
 %%DATADIR%%/luarocks/fetch/hg.lua
 %%DATADIR%%/luarocks/fetch/hg_http.lua
 %%DATADIR%%/luarocks/fetch/hg_https.lua
 %%DATADIR%%/luarocks/fetch/hg_ssh.lua
 %%DATADIR%%/luarocks/fetch/sscm.lua
 %%DATADIR%%/luarocks/fetch/svn.lua
 %%DATADIR%%/luarocks/fs.lua
+%%DATADIR%%/luarocks/fs/freebsd.lua
 %%DATADIR%%/luarocks/fs/lua.lua
 %%DATADIR%%/luarocks/fs/tools.lua
 %%DATADIR%%/luarocks/fs/unix.lua
 %%DATADIR%%/luarocks/fs/unix/tools.lua
 %%DATADIR%%/luarocks/fs/win32.lua
 %%DATADIR%%/luarocks/fs/win32/tools.lua
 %%DATADIR%%/luarocks/fun.lua
 %%DATADIR%%/luarocks/loader.lua
 %%DATADIR%%/luarocks/manif.lua
 %%DATADIR%%/luarocks/manif/writer.lua
 %%DATADIR%%/luarocks/pack.lua
 %%DATADIR%%/luarocks/path.lua
 %%DATADIR%%/luarocks/persist.lua
 %%DATADIR%%/luarocks/queries.lua
 %%DATADIR%%/luarocks/remove.lua
 %%DATADIR%%/luarocks/repos.lua
 %%DATADIR%%/luarocks/require.lua
 %%DATADIR%%/luarocks/results.lua
 %%DATADIR%%/luarocks/rockspecs.lua
 %%DATADIR%%/luarocks/search.lua
 %%DATADIR%%/luarocks/signing.lua
 %%DATADIR%%/luarocks/test.lua
 %%DATADIR%%/luarocks/test/busted.lua
 %%DATADIR%%/luarocks/test/command.lua
 %%DATADIR%%/luarocks/tools/patch.lua
 %%DATADIR%%/luarocks/tools/tar.lua
 %%DATADIR%%/luarocks/tools/zip.lua
 %%DATADIR%%/luarocks/type/manifest.lua
 %%DATADIR%%/luarocks/type/rockspec.lua
 %%DATADIR%%/luarocks/type_check.lua
 %%DATADIR%%/luarocks/upload/api.lua
 %%DATADIR%%/luarocks/upload/multipart.lua
 %%DATADIR%%/luarocks/util.lua
 @dir(tarantool,tarantool,) %%TT_DATADIR%%
 @dir(tarantool,tarantool,) %%TT_LOGDIR%%