Index: head/databases/tarantool/Makefile =================================================================== --- head/databases/tarantool/Makefile (revision 479114) +++ head/databases/tarantool/Makefile (revision 479115) @@ -1,64 +1,64 @@ # Created by: Veniamin Gvozdikov # $FreeBSD$ PORTNAME= tarantool -PORTVERSION= 1.9.1 -PORTREVISION= 2 +PORTVERSION= 1.9.2 CATEGORIES= databases MAINTAINER= sunpoet@FreeBSD.org COMMENT= NoSQL database running in a Lua application server LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE NOT_FOR_ARCHS= armv6 powerpc64 sparc64 NOT_FOR_ARCHS_REASON= fails to build: Unsupported architecture 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 gettext-runtime gmake iconv perl5 readline ssl +USE_PERL5= build + CMAKE_ARGS= -DCMAKE_INSTALL_FULL_SYSCONFDIR=${ETCDIR} \ -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ -DCMAKE_INSTALL_MANDIR=${PREFIX}/man CMAKE_OFF= ENABLE_BUNDLED_LIBYAML ENABLE_BUNDLED_MSGPUCK ENABLE_BUNDLED_ZSTD CMAKE_ON= ENABLE_DIST MAKE_JOBS_UNSAFE= yes -USES= cmake:noninja compiler:c++11-lang gettext-runtime gmake perl5 readline ssl -USE_PERL5= build USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} PLIST_SUB= TT_DATADIR=${TT_DATADIR} \ TT_LOGDIR=${TT_LOGDIR} SUB_FILES= pkg-message GH_TUPLE= rtsisyk:luafun:04c99f9:luafun/third_party/luafun \ tarantool:luajit:b8587fa:luajit/third_party/luajit \ tarantool:luarocks:6e6fe62:luarocks/third_party/luarocks \ tarantool:small:22d1bad:small/src/lib/small \ tarantool:test-run:ff5fb4f:test_run/test-run USE_GITHUB= yes USERS= tarantool GROUPS= tarantool 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|' post-install: @${RMDIR} ${STAGEDIR}${PREFIX}/lib/tarantool/ .include Index: head/databases/tarantool/distinfo =================================================================== --- head/databases/tarantool/distinfo (revision 479114) +++ head/databases/tarantool/distinfo (revision 479115) @@ -1,13 +1,13 @@ -TIMESTAMP = 1526575388 -SHA256 (tarantool-tarantool-1.9.1_GH0.tar.gz) = b4db2bdd2858409707f27f75058e48b61b58268658effaf12ad3c2688e5dc93c -SIZE (tarantool-tarantool-1.9.1_GH0.tar.gz) = 2365702 +TIMESTAMP = 1536249044 +SHA256 (tarantool-tarantool-1.9.2_GH0.tar.gz) = a263518ae3198b7d30d55f1f75dd1d24e2b943fc846f12f2a1ecbf210d9cbf63 +SIZE (tarantool-tarantool-1.9.2_GH0.tar.gz) = 2383272 SHA256 (rtsisyk-luafun-04c99f9_GH0.tar.gz) = 4f135f25a2d31116723162ec8ad54f7d4e0e1258557bb1665557532ac64dc625 SIZE (rtsisyk-luafun-04c99f9_GH0.tar.gz) = 67326 SHA256 (tarantool-luajit-b8587fa_GH0.tar.gz) = 620a023a5ee6a52fc5f9fb3ece568b5ff58246a807c9ba4e31a8157451e9cff2 SIZE (tarantool-luajit-b8587fa_GH0.tar.gz) = 1027765 SHA256 (tarantool-luarocks-6e6fe62_GH0.tar.gz) = 69091525588e4b1f19341aecd1628eaace7919eed57c7177bb8ffdba9bf27c56 SIZE (tarantool-luarocks-6e6fe62_GH0.tar.gz) = 4027514 SHA256 (tarantool-small-22d1bad_GH0.tar.gz) = 760e2e25e0688915f4902921c070f8c5ddba0ad85f86204c2bbc35ad9b0544eb SIZE (tarantool-small-22d1bad_GH0.tar.gz) = 108894 SHA256 (tarantool-test-run-ff5fb4f_GH0.tar.gz) = 78f8ac985b07138a9a35b05240cdb33a8f99948b81c1e44d0459923e87c42202 SIZE (tarantool-test-run-ff5fb4f_GH0.tar.gz) = 55148 Index: head/databases/tarantool/files/patch-src-CMakeLists.txt =================================================================== --- head/databases/tarantool/files/patch-src-CMakeLists.txt (revision 479114) +++ head/databases/tarantool/files/patch-src-CMakeLists.txt (nonexistent) @@ -1,15 +0,0 @@ ---- src/CMakeLists.txt.orig 2018-05-14 06:50:08 UTC -+++ src/CMakeLists.txt -@@ -234,12 +234,6 @@ if (TARGET_OS_FREEBSD AND NOT TARGET_OS_ - else() - set (common_libraries ${common_libraries} ${INTL}) - endif() -- find_library (ICONV iconv) -- if (NOT ICONV) -- message(FATAL_ERROR "iconv library not found") -- else() -- set (common_libraries ${common_libraries} ${ICONV}) -- endif() - endif() - - set (common_libraries ${common_libraries} ${LIBUUID_LIBRARIES}) Property changes on: head/databases/tarantool/files/patch-src-CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/tarantool/files/patch-cmake-FindICONV.cmake =================================================================== --- head/databases/tarantool/files/patch-cmake-FindICONV.cmake (nonexistent) +++ head/databases/tarantool/files/patch-cmake-FindICONV.cmake (revision 479115) @@ -0,0 +1,18 @@ +--- cmake/FindICONV.cmake.orig 2018-09-06 16:31:05 UTC ++++ cmake/FindICONV.cmake +@@ -4,14 +4,8 @@ + # ICONV_LIBRARIES + # + +-if (TARGET_OS_LINUX) ++if (TARGET_OS_FREEBSD OR TARGET_OS_LINUX) + set(ICONV_LIBRARY "") +-else() +- find_library(ICONV_LIBRARY iconv) +- if(NOT ICONV_LIBRARY) +- message(WARNING "iconv library not found") +- set(ICONV_LIBRARY "") +- endif() + endif() + find_path(ICONV_INCLUDE_DIR iconv.h) + if(NOT ICONV_INCLUDE_DIR) Property changes on: head/databases/tarantool/files/patch-cmake-FindICONV.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property