Update to 2.4.2

Changes:	https://github.com/tarantool/tarantool/releases

4 files changed, 70 insertions, 47 deletions

diff --git a/databases/tarantool/Makefile b/databases/tarantool/Makefile
index 062234e4d073..f5f7c99c4b00 100644
--- a/databases/tarantool/Makefile
+++ b/databases/tarantool/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tarantool
-PORTVERSION=	2.3.1
-PORTREVISION=	3
+PORTVERSION=	2.4.2
 CATEGORIES=	databases
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -43,12 +42,12 @@ PLIST_SUB=	TT_DATADIR=${TT_DATADIR} \
 SUB_FILES=	pkg-message
 
 GH_TUPLE=	luafun:luafun:e248e00:luafun_luafun/third_party/luafun \
-		tarantool:decNumber:ec9e5be:tarantool_decNumber/third_party/decNumber \
-		tarantool:luajit:c9588f5:tarantool_luajit/third_party/luajit \
-		tarantool:luarocks:05312b5:tarantool_luarocks/third_party/luarocks \
+		tarantool:decNumber:5ddfde1:tarantool_decNumber/third_party/decNumber \
+		tarantool:luajit:377198b:tarantool_luajit/third_party/luajit \
+		tarantool:luarocks:954c2f5:tarantool_luarocks/third_party/luarocks \
 		tarantool:serpent:879580f:tarantool_serpent/third_party/serpent \
-		tarantool:small:50cb787:tarantool_small/src/lib/small \
-		tarantool:test-run:b23eeb7:tarantool_test_run/test-run
+		tarantool:small:fcac155:tarantool_small/src/lib/small \
+		tarantool:test-run:d920322:tarantool_test_run/test-run
 USE_GITHUB=	yes
 
 USERS=		tarantool
diff --git a/databases/tarantool/distinfo b/databases/tarantool/distinfo
index 20395c918027..c1bf29405a52 100644
--- a/databases/tarantool/distinfo
+++ b/databases/tarantool/distinfo
@@ -1,17 +1,17 @@
-TIMESTAMP = 1577872978
-SHA256 (tarantool-tarantool-2.3.1_GH0.tar.gz) = 8faca5641c255952425f0eaa3115dd124b592dafb2022f188a3abc8c71b74ce8
-SIZE (tarantool-tarantool-2.3.1_GH0.tar.gz) = 4517030
+TIMESTAMP = 1595416521
+SHA256 (tarantool-tarantool-2.4.2_GH0.tar.gz) = a3d2013a137522a6e7c5ba6eb95263f149101c727f495ad916e9676550473877
+SIZE (tarantool-tarantool-2.4.2_GH0.tar.gz) = 4659533
 SHA256 (luafun-luafun-e248e00_GH0.tar.gz) = 9978dd21c0688d5c6206846697be17363a4be446851c1c1d60e2427fe200b7f2
 SIZE (luafun-luafun-e248e00_GH0.tar.gz) = 67323
-SHA256 (tarantool-decNumber-ec9e5be_GH0.tar.gz) = 7585179a0efa992f98e959ae4b067527e037db798e2e510c71f2831315c5e297
-SIZE (tarantool-decNumber-ec9e5be_GH0.tar.gz) = 209429
-SHA256 (tarantool-luajit-c9588f5_GH0.tar.gz) = c176b5c60d8bcc80dce3cfe2213af30a2967a574a91ce4838da4cbc6698ae715
-SIZE (tarantool-luajit-c9588f5_GH0.tar.gz) = 1032347
-SHA256 (tarantool-luarocks-05312b5_GH0.tar.gz) = 4ee5ef77b67f2e5eed41aba8e4682aa7dd2516618c1d38caf781d38a7e19818f
-SIZE (tarantool-luarocks-05312b5_GH0.tar.gz) = 4027574
+SHA256 (tarantool-decNumber-5ddfde1_GH0.tar.gz) = 3518875bff0e0a4d5751d72b52152163c894a1e9c0a6311ae637bece338ede65
+SIZE (tarantool-decNumber-5ddfde1_GH0.tar.gz) = 209681
+SHA256 (tarantool-luajit-377198b_GH0.tar.gz) = a3cc07c41d5888320ca500b8b24dc11364563a7001532a786454899a75b9b8e4
+SIZE (tarantool-luajit-377198b_GH0.tar.gz) = 1041326
+SHA256 (tarantool-luarocks-954c2f5_GH0.tar.gz) = d8008994db63c725c23c03366cf85cbd8394a75da9ae14602bcacbcedacaa37b
+SIZE (tarantool-luarocks-954c2f5_GH0.tar.gz) = 5353746
 SHA256 (tarantool-serpent-879580f_GH0.tar.gz) = 2367c5e3ab069f5686a4d23124759a2332b991f73695f3760dd7728e295893be
 SIZE (tarantool-serpent-879580f_GH0.tar.gz) = 13234
-SHA256 (tarantool-small-50cb787_GH0.tar.gz) = 668f8b206868402601498a1e625d535b60db582806039a79e01c8fab004e99b5
-SIZE (tarantool-small-50cb787_GH0.tar.gz) = 115780
-SHA256 (tarantool-test-run-b23eeb7_GH0.tar.gz) = 832dccbd1e5273b7a97aadee13c7ee6c25bb596947559cb05ed971404400d842
-SIZE (tarantool-test-run-b23eeb7_GH0.tar.gz) = 61758
+SHA256 (tarantool-small-fcac155_GH0.tar.gz) = 8354d18a076e49a2f7642008f8e632ae7c8ee33bf3cb977d6e68a77935a77791
+SIZE (tarantool-small-fcac155_GH0.tar.gz) = 117174
+SHA256 (tarantool-test-run-d920322_GH0.tar.gz) = 24732d1422ccfa679de16307409af1fbcbf3b58e25e40a8091f1f3b6921fdb28
+SIZE (tarantool-test-run-d920322_GH0.tar.gz) = 62070
diff --git a/databases/tarantool/files/patch-cmake-BuildMisc.cmake b/databases/tarantool/files/patch-cmake-BuildMisc.cmake
index 44b8e090c08b..f803a79802fa 100644
--- a/databases/tarantool/files/patch-cmake-BuildMisc.cmake
+++ b/databases/tarantool/files/patch-cmake-BuildMisc.cmake
@@ -1,4 +1,4 @@
---- cmake/BuildMisc.cmake.orig	2018-10-12 19:53:35 UTC
+--- cmake/BuildMisc.cmake.orig	2020-07-17 11:22:52 UTC
 +++ cmake/BuildMisc.cmake
 @@ -35,11 +35,11 @@ macro(libmisc_build)
  
@@ -10,8 +10,8 @@
 -            set(GOMP_LIBRARY gomp)
 +            set(OMP_LIBRARY omp)
          endif()
--        target_link_libraries(misc ${GOMP_LIBRARY} pthread)
-+        target_link_libraries(misc ${OMP_LIBRARY} pthread)
+-        target_link_libraries(misc ${GOMP_LIBRARY} pthread ${CMAKE_DL_LIBS})
++        target_link_libraries(misc ${OMP_LIBRARY} pthread ${CMAKE_DL_LIBS})
      endif()
  
      unset(misc_src)
diff --git a/databases/tarantool/pkg-plist b/databases/tarantool/pkg-plist
index cc2a97f9872d..c979e41255b4 100644
--- a/databases/tarantool/pkg-plist
+++ b/databases/tarantool/pkg-plist
@@ -11,21 +11,51 @@ include/tarantool/lualib.h
 include/tarantool/module.h
 man/man1/tarantool.1.gz
 man/man1/tarantoolctl.1.gz
-%%DATADIR%%/luarocks/add.lua
-%%DATADIR%%/luarocks/admin_remove.lua
+%%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/cache.lua
-%%DATADIR%%/luarocks/cfg.lua
-%%DATADIR%%/luarocks/command_line.lua
-%%DATADIR%%/luarocks/config_cmd.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/doc.lua
 %%DATADIR%%/luarocks/download.lua
 %%DATADIR%%/luarocks/fetch.lua
 %%DATADIR%%/luarocks/fetch/cvs.lua
@@ -47,38 +77,32 @@ man/man1/tarantoolctl.1.gz
 %%DATADIR%%/luarocks/fs/unix/tools.lua
 %%DATADIR%%/luarocks/fs/win32.lua
 %%DATADIR%%/luarocks/fs/win32/tools.lua
-%%DATADIR%%/luarocks/help.lua
-%%DATADIR%%/luarocks/index.lua
-%%DATADIR%%/luarocks/install.lua
-%%DATADIR%%/luarocks/lint.lua
-%%DATADIR%%/luarocks/list.lua
+%%DATADIR%%/luarocks/fun.lua
 %%DATADIR%%/luarocks/loader.lua
-%%DATADIR%%/luarocks/make.lua
-%%DATADIR%%/luarocks/make_manifest.lua
 %%DATADIR%%/luarocks/manif.lua
-%%DATADIR%%/luarocks/manif_core.lua
-%%DATADIR%%/luarocks/new_version.lua
+%%DATADIR%%/luarocks/manif/writer.lua
 %%DATADIR%%/luarocks/pack.lua
 %%DATADIR%%/luarocks/path.lua
-%%DATADIR%%/luarocks/path_cmd.lua
 %%DATADIR%%/luarocks/persist.lua
-%%DATADIR%%/luarocks/purge.lua
-%%DATADIR%%/luarocks/refresh_cache.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/show.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/unpack.lua
-%%DATADIR%%/luarocks/upload.lua
 %%DATADIR%%/luarocks/upload/api.lua
 %%DATADIR%%/luarocks/upload/multipart.lua
 %%DATADIR%%/luarocks/util.lua
-%%DATADIR%%/luarocks/validate.lua
-%%DATADIR%%/luarocks/write_rockspec.lua
 @dir(tarantool,tarantool,) %%TT_DATADIR%%
 @dir(tarantool,tarantool,) %%TT_LOGDIR%%