svn commit: r479115 - in head/databases/tarantool: . files
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Thu Sep 6 18:23:11 UTC 2018
Author: sunpoet
Date: Thu Sep 6 18:23:09 2018
New Revision: 479115
URL: https://svnweb.freebsd.org/changeset/ports/479115
Log:
Update to 1.9.2
Changes: https://github.com/tarantool/tarantool/releases
Added:
head/databases/tarantool/files/patch-cmake-FindICONV.cmake
- copied, changed from r479114, head/databases/tarantool/files/patch-src-CMakeLists.txt
Deleted:
head/databases/tarantool/files/patch-src-CMakeLists.txt
Modified:
head/databases/tarantool/Makefile
head/databases/tarantool/distinfo
Modified: head/databases/tarantool/Makefile
==============================================================================
--- head/databases/tarantool/Makefile Thu Sep 6 18:18:06 2018 (r479114)
+++ head/databases/tarantool/Makefile Thu Sep 6 18:23:09 2018 (r479115)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= tarantool
-PORTVERSION= 1.9.1
-PORTREVISION= 2
+PORTVERSION= 1.9.2
CATEGORIES= databases
MAINTAINER= sunpoet at 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}
Modified: head/databases/tarantool/distinfo
==============================================================================
--- head/databases/tarantool/distinfo Thu Sep 6 18:18:06 2018 (r479114)
+++ head/databases/tarantool/distinfo Thu Sep 6 18:23:09 2018 (r479115)
@@ -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
Copied and modified: head/databases/tarantool/files/patch-cmake-FindICONV.cmake (from r479114, head/databases/tarantool/files/patch-src-CMakeLists.txt)
==============================================================================
--- head/databases/tarantool/files/patch-src-CMakeLists.txt Thu Sep 6 18:18:06 2018 (r479114, copy source)
+++ head/databases/tarantool/files/patch-cmake-FindICONV.cmake Thu Sep 6 18:23:09 2018 (r479115)
@@ -1,15 +1,18 @@
---- 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})
+--- 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()
-
- set (common_libraries ${common_libraries} ${LIBUUID_LIBRARIES})
+ find_path(ICONV_INCLUDE_DIR iconv.h)
+ if(NOT ICONV_INCLUDE_DIR)
More information about the svn-ports-head
mailing list