diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2018-09-06 18:23:09 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2018-09-06 18:23:09 +0000 |
| commit | 8faa5bb6b527e9d6334c0315325953bae8c31533 (patch) | |
| tree | 4a5a8f7a7906547ba5e1cefcce6839770535e69f /databases/tarantool | |
| parent | 73a8bf5f3ac56cdaa128f5872569823c33272665 (diff) | |
Notes
Diffstat (limited to 'databases/tarantool')
| -rw-r--r-- | databases/tarantool/Makefile | 8 | ||||
| -rw-r--r-- | databases/tarantool/distinfo | 6 | ||||
| -rw-r--r-- | databases/tarantool/files/patch-cmake-FindICONV.cmake | 18 | ||||
| -rw-r--r-- | databases/tarantool/files/patch-src-CMakeLists.txt | 15 |
4 files changed, 25 insertions, 22 deletions
diff --git a/databases/tarantool/Makefile b/databases/tarantool/Makefile index 95b268022d4e..82af962963b5 100644 --- a/databases/tarantool/Makefile +++ b/databases/tarantool/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= tarantool -PORTVERSION= 1.9.1 -PORTREVISION= 2 +PORTVERSION= 1.9.2 CATEGORIES= databases MAINTAINER= sunpoet@FreeBSD.org @@ -21,14 +20,15 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ 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} diff --git a/databases/tarantool/distinfo b/databases/tarantool/distinfo index ccf5f5648acb..0302c3902a54 100644 --- a/databases/tarantool/distinfo +++ b/databases/tarantool/distinfo @@ -1,6 +1,6 @@ -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 diff --git a/databases/tarantool/files/patch-cmake-FindICONV.cmake b/databases/tarantool/files/patch-cmake-FindICONV.cmake new file mode 100644 index 000000000000..ee19d1bda426 --- /dev/null +++ b/databases/tarantool/files/patch-cmake-FindICONV.cmake @@ -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) diff --git a/databases/tarantool/files/patch-src-CMakeLists.txt b/databases/tarantool/files/patch-src-CMakeLists.txt deleted file mode 100644 index 85338e2e920b..000000000000 --- a/databases/tarantool/files/patch-src-CMakeLists.txt +++ /dev/null @@ -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}) |