diff --git a/databases/tarantool/Makefile b/databases/tarantool/Makefile index 9737a5153616..cd75b536f167 100644 --- a/databases/tarantool/Makefile +++ b/databases/tarantool/Makefile @@ -1,67 +1,62 @@ PORTNAME= tarantool -PORTVERSION= 2.10.5 -PORTREVISION= 1 +PORTVERSION= 2.11.0 CATEGORIES= databases MASTER_SITES= https://download.tarantool.org/tarantool/src/ MAINTAINER= balaev@tarantool.org COMMENT= NoSQL database running in a Lua application server WWW= https://tarantool.io/ 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 i386 powerpc64 sparc64 NOT_FOR_ARCHS_REASON= fails to build: Unsupported architecture BUILD_DEPENDS= gsed:textproc/gsed \ 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 diff --git a/databases/tarantool/distinfo b/databases/tarantool/distinfo index df70beb1f374..711804b12c73 100644 --- a/databases/tarantool/distinfo +++ b/databases/tarantool/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676981388 -SHA256 (tarantool-2.10.5.tar.gz) = 9386dd01070769afd0673cfef9d528aaa23039a4102a3b69b2e55af627011136 -SIZE (tarantool-2.10.5.tar.gz) = 46943380 +TIMESTAMP = 1685009465 +SHA256 (tarantool-2.11.0.tar.gz) = 4506e7208cd20f3c1858d14b9b40fe388083592faac5c79ec30aa751e095f1f2 +SIZE (tarantool-2.11.0.tar.gz) = 41044197 diff --git a/databases/tarantool/files/patch-cmake-BuildLibUnwind.cmake b/databases/tarantool/files/patch-cmake-BuildLibUnwind.cmake deleted file mode 100644 index 2448e543e640..000000000000 --- a/databases/tarantool/files/patch-cmake-BuildLibUnwind.cmake +++ /dev/null @@ -1,29 +0,0 @@ ---- cmake/BuildLibUnwind.cmake.orig 2022-11-14 13:17:09.046425000 +0100 -+++ cmake/BuildLibUnwind.cmake 2022-11-14 13:18:30.382852000 +0100 -@@ -18,6 +18,11 @@ - The paths to the libunwind libraries. - #]========================================================================] - -+set(SYSTEM_ARCH ${CMAKE_SYSTEM_PROCESSOR}) -+if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD AND SYSTEM_ARCH STREQUAL amd64) -+ set(SYSTEM_ARCH x86_64) -+endif() -+ - macro(libunwind_build) - set(LIBUNWIND_SOURCE_DIR ${PROJECT_SOURCE_DIR}/third_party/libunwind) - set(LIBUNWIND_BUILD_DIR ${PROJECT_BINARY_DIR}/build/libunwind) -@@ -91,12 +96,12 @@ - add_library(bundled-libunwind-platform STATIC IMPORTED GLOBAL) - set_target_properties(bundled-libunwind-platform PROPERTIES - IMPORTED_LOCATION -- ${LIBUNWIND_INSTALL_DIR}/lib/libunwind-${CMAKE_SYSTEM_PROCESSOR}.a) -+ ${LIBUNWIND_INSTALL_DIR}/lib/libunwind-${SYSTEM_ARCH}.a) - add_dependencies(bundled-libunwind-platform bundled-libunwind-project) - - set(LIBUNWIND_INCLUDE_DIR ${LIBUNWIND_INSTALL_DIR}/include) - set(LIBUNWIND_LIBRARIES -- ${LIBUNWIND_INSTALL_DIR}/lib/libunwind-${CMAKE_SYSTEM_PROCESSOR}.a -+ ${LIBUNWIND_INSTALL_DIR}/lib/libunwind-${SYSTEM_ARCH}.a - ${LIBUNWIND_INSTALL_DIR}/lib/libunwind.a) - - message(STATUS "Using bundled libunwind")