- Update to 1.5.1

- Added plugins support
- Removed static build, doesn't work more details:
https://github.com/tarantool/tarantool/issues/19
- Added patch from devel/libev

Approved by:	eadler (mentor)

3 files changed, 31 insertions, 31 deletions

diff --git a/databases/tarantool/files/patch-src_CMakeLists.txt b/databases/tarantool/files/patch-src_CMakeLists.txt
index 0d801ac6c72b..76841b2f711c 100644
--- a/databases/tarantool/files/patch-src_CMakeLists.txt
+++ b/databases/tarantool/files/patch-src_CMakeLists.txt
@@ -1,22 +1,12 @@
---- src/CMakeLists.txt.orig	2013-05-18 07:08:17.087914237 +0000
-+++ src/CMakeLists.txt	2013-05-18 10:23:24.584910099 +0000
-@@ -138,6 +138,10 @@
-     set (common_libraries ${common_libraries} dl)
+--- src/CMakeLists.txt.orig	2013-09-30 17:30:23.623968376 +0000
++++ src/CMakeLists.txt	2013-09-30 17:30:50.254969720 +0000
+@@ -153,7 +153,8 @@
  endif()
  
-+if (TARGET_OS_FREEBSD)
-+    set (common_libraries ${common_libraries} intl)
-+endif()
-+
- if (ENABLE_BACKTRACE AND HAVE_BFD)
-     set (common_libraries ${common_libraries} bfd)
-     if (NOT TARGET_OS_DARWIN)
-@@ -145,7 +149,7 @@
-     endif()
-     if (ENABLE_STATIC OR TARGET_OS_FREEBSD)
-         include (FindZLIB)
--        set (common_libraries ${common_libraries} ${ZLIB_LIBRARIES})
-+        set (common_libraries ${common_libraries} ${ZLIB_LIBRARIES} iconv intl)
-     endif()
+ if (TARGET_OS_FREEBSD AND NOT TARGET_OS_DEBIAN_FREEBSD)
+-    set (common_libraries ${common_libraries} intl)
++    find_library (INTL intl)
++    set (common_libraries ${common_libraries} ${INTL})
  endif()
  
+ if (ENABLE_BACKTRACE AND HAVE_BFD)
diff --git a/databases/tarantool/files/patch-test_CMakeLists.txt b/databases/tarantool/files/patch-test_CMakeLists.txt
index ae8556625c68..30e9bdc5e5c7 100644
--- a/databases/tarantool/files/patch-test_CMakeLists.txt
+++ b/databases/tarantool/files/patch-test_CMakeLists.txt
@@ -1,16 +1,11 @@
---- test/CMakeLists.txt.orig	2012-07-30 17:05:05.000000000 +0400
-+++ test/CMakeLists.txt	2012-11-02 14:25:15.725342910 +0400
-@@ -18,12 +18,9 @@ else()
-     if (NOT CPACK_GENERATOR OR "${CPACK_GENERATOR}" STREQUAL "TGZ")
-         install (FILES ${CMAKE_SOURCE_DIR}/test/share/tarantool_tgz.cfg
-                  DESTINATION "${CMAKE_SYSCONF_DIR}"
--                 RENAME "tarantool.cfg")
-+                 RENAME "tarantool.cfg.sample")
-     else()
-         install (FILES ${CMAKE_SOURCE_DIR}/test/share/tarantool.cfg
-                  DESTINATION "${CMAKE_SYSCONF_DIR}")
-     endif()
--
+--- test/CMakeLists.txt.orig	2013-09-08 19:12:21.819118224 +0000
++++ test/CMakeLists.txt	2013-09-08 19:13:09.021114858 +0000
+@@ -22,7 +22,5 @@ if (ENABLE_RPM)
+ else()
+     install (FILES ${CMAKE_SOURCE_DIR}/test/share/tarantool_tgz.cfg
+              DESTINATION "${CMAKE_SYSCONF_DIR}"
+-             RENAME "tarantool.cfg")
 -    install (FILES ${CMAKE_SOURCE_DIR}/test/box/00000000000000000001.snap
 -             DESTINATION "${CMAKE_LOCALSTATE_DIR}/lib/tarantool")
++             RENAME "tarantool.cfg.sample")
  endif()
diff --git a/databases/tarantool/files/patch-third_party__libev_ev.c b/databases/tarantool/files/patch-third_party__libev_ev.c
new file mode 100644
index 000000000000..446a86217997
--- /dev/null
+++ b/databases/tarantool/files/patch-third_party__libev_ev.c
@@ -0,0 +1,15 @@
+--- third_party/libev/ev.c.orig	2013-09-25 17:14:35.398672102 +0000
++++ third_party/libev/ev.c	2013-09-25 17:15:23.878672738 +0000
+@@ -2226,10 +2226,12 @@
+   unsigned int flags = ev_supported_backends ();
+ 
+ #ifndef __NetBSD__
++#ifndef __FreeBSD__
+   /* kqueue is borked on everything but netbsd apparently */
+   /* it usually doesn't work correctly on anything but sockets and pipes */
+   flags &= ~EVBACKEND_KQUEUE;
+ #endif
++#endif
+ #ifdef __APPLE__
+   /* only select works correctly on that "unix-certified" platform */
+   flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */