- 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)

6 files changed, 92 insertions, 49 deletions

diff --git a/databases/tarantool/Makefile b/databases/tarantool/Makefile
index 98f98c2c498d..ed7b386f33ad 100644
--- a/databases/tarantool/Makefile
+++ b/databases/tarantool/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tarantool
-PORTVERSION=	1.4.9
+PORTVERSION=	1.5.1
 CATEGORIES=	databases
 MASTER_SITES=	http://tarantool.org/dist/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${TR_REV}-src
@@ -12,28 +12,47 @@ COMMENT=	High performance key/value storage server
 
 LICENSE=	BSD
 
-TR_REV=		45-g2f7b3f9
-USES=		cmake gettext:build gmake perl5
-USE_GCC=	yes
+TR_REV=		96-gae1ec01
+MAKE_JOBS_UNSAFE=yes
+USES=		cmake gettext:build gmake iconv perl5
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	${PORTNAME}
 SUB_FILES=	pkg-message
-MAN1=		tarantool_box.1
-CMAKE_ARGS=	-DCMAKE_MAN_DIR=man/man1
+CMAKE_ARGS=	-DCMAKE_MAN_DIR=man
 
-OPTIONS_DEFINE=	CLIENT DEBUG STATIC
+OPTIONS_DEFINE=	CLIENT MYSQL PGSQL
 CLIENT_DESC=	Enable client
 DEBUG_DESC=	Enable debug
-STATIC_DESC=	Enable static (got core dump)
+MYSQL_DESC=	Install MySQL plugin
+PGSQL_DESC=	Install PostgreSQL plugin
+USE_BINUTILS=	yes
+
+OPTIONS_DEFAULT=CLIENT
 
-OPTIONS_DEFAULT=CLIENT DEBUG
+MAN1=		tarantool_box.1
 
 NO_STAGE=	yes
+
 .include <bsd.port.options.mk>
 
+.if ${OSVERSION} < 900014 && !exists(${LOCALBASE}/bin/clang33)
+# No clang++ installed, use GCC from ports:
+USE_GCC=	4.6+
+.else
+.if ${OSVERSION} < 1000052
+BUILD_DEPENDS+=	clang33:${PORTSDIR}/lang/clang33
+CC=		clang33
+CXX=		clang++33
+CPP=		clang-cpp33
+.else
+CC=		clang
+CXX=		clang++
+CPP=		clang-cpp
+.endif
+.endif
+
 .if ${PORT_OPTIONS:MCLIENT}
 CMAKE_ARGS+=	-DENABLE_CLIENT=true
-CFLAGS+=	"-O0 -g"
 PLIST_SUB+=	CLIENT=""
 MAN1+=		tarantool.1
 .else
@@ -41,12 +60,31 @@ PLIST_SUB+=	CLIENT="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
-CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=RelWithDebugInfo
+CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
+		-DENABLE_BACKTRACE=ON
+.else
+CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Rel \
+		-DENABLE_BACKTRACE=OFF
 .endif
 
-.if ${PORT_OPTIONS:MSTATIC}
-LIB_DEPENDS+=	iconv:${PORTSDIR}/converters/iconv
-CMAKE_ARGS+=	-DENABLE_STATIC=true
+.if ${PORT_OPTIONS:MMYSQL}
+CMAKE_ARGS+=	-DWITH_MYSQL=ON \
+		-DMYSQL_INCLUDE_DIR=${LOCALBASE}/include/mysql \
+		-DMYSQL_LIBRARIES=${LOCALBASE}/lib/mysql
+PLIST_SUB+=	MYSQL=""
+USE_MYSQL=	yes
+.else
+CMAKE_ARGS+=	-DWITH_MYSQL=OFF
+PLIST_SUB+=	MYSQL="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MPGSQL}
+CMAKE_ARGS+=	-DWITH_POSTGRESQL=ON
+PLIST_SUB+=	PGSQL=""
+USE_PGSQL=	yes
+.else
+CMAKE_ARGS+=	-DWITH_POSTGRESQL=OFF
+PLIST_SUB+=	PGSQL="@comment "
 .endif
 
 post-install:
diff --git a/databases/tarantool/distinfo b/databases/tarantool/distinfo
index 4ff5f33476cc..0effca1b8e7b 100644
--- a/databases/tarantool/distinfo
+++ b/databases/tarantool/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tarantool-1.4.9-45-g2f7b3f9-src.tar.gz) = 45c37824c0f2cef8746523347ba727ced98e8c21eec17e11729d6ff38d1f7bbd
-SIZE (tarantool-1.4.9-45-g2f7b3f9-src.tar.gz) = 2772012
+SHA256 (tarantool-1.5.1-96-gae1ec01-src.tar.gz) = f9e927904a0e2097771ea3e53a62ee48cff6cd08c83621836a69edcfe410e8a1
+SIZE (tarantool-1.5.1-96-gae1ec01-src.tar.gz) = 2786139
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 */
diff --git a/databases/tarantool/pkg-plist b/databases/tarantool/pkg-plist
index 6ec1d5d2f1de..61ed541249b9 100644
--- a/databases/tarantool/pkg-plist
+++ b/databases/tarantool/pkg-plist
@@ -1,5 +1,6 @@
+bin/tarancheck
+bin/tarantar
 bin/tarantool_box
-bin/tarantool_checksum
 %%CLIENT%%bin/tarantool
 etc/tarantool.cfg.sample
 include/tarantool/tnt.h
@@ -45,10 +46,14 @@ lib/libtarantoolrpl.so.1.1
 lib/libtarantool.so.1
 lib/libtarantoolsql.so
 lib/libtarantool.so.1.1
-lib/libtarantoolrpl.a
 lib/libtarantool.so
+lib/libtarantoolrpl.a
+%%MYSQL%%lib/tarantool/plugins/libmysql.so
+%%PGSQL%%lib/tarantool/plugins/libpg.so
 %%DOCSDIR%%/README.md
 %%DOCSDIR%%/box-protocol.txt
 %%DOCSDIR%%/LICENSE
 @dirrm %%DOCSDIR%%
 @dirrm include/tarantool
+@dirrmtry lib/tarantool/plugins
+@dirrmtry lib/tarantool