Index: head/databases/tarantool-c/Makefile =================================================================== --- head/databases/tarantool-c/Makefile (revision 463309) +++ head/databases/tarantool-c/Makefile (revision 463310) @@ -1,23 +1,24 @@ # $FreeBSD$ PORTNAME= tarantool-c -PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTVERSION= 1.0.1 CATEGORIES= databases -MAINTAINER= ports@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= C client for Tarantool 1.6+ +LICENSE= BSD2CLAUSE + LIB_DEPENDS= libmsgpuck.so:devel/msgpuck +CMAKE_OFF= ENABLE_BUNDLED_MSGPUCK +USES= cmake + USE_GITHUB= yes GH_ACCOUNT= tarantool -GH_TAGNAME= a251965 +GH_TAGNAME= 7bb49a1 -USES= cmake -CMAKE_ARGS= -DENABLE_BUNDLED_MSGPUCK=false - post-patch: - @${REINPLACE_CMD} -e '/-O3 -march=native/d' ${WRKSRC}/CMakeLists.txt + @${GREP} -lr 'msgpuck/msgpuck.h' ${WRKSRC}/ | ${XARGS} ${REINPLACE_CMD} -e 's|msgpuck/msgpuck.h|msgpuck.h|' .include Index: head/databases/tarantool-c/distinfo =================================================================== --- head/databases/tarantool-c/distinfo (revision 463309) +++ head/databases/tarantool-c/distinfo (revision 463310) @@ -1,2 +1,3 @@ -SHA256 (tarantool-tarantool-c-1.0.0-a251965_GH0.tar.gz) = dacac98acd5689a35d2f690049a0b3effd850bb4772dd3bf8d10e2f52e4d3ae7 -SIZE (tarantool-tarantool-c-1.0.0-a251965_GH0.tar.gz) = 126182 +TIMESTAMP = 1519680640 +SHA256 (tarantool-tarantool-c-1.0.1-7bb49a1_GH0.tar.gz) = 03250ab8bf2e8135e075953cef18ee5323061539056e2fff995cf34b33ea7ed2 +SIZE (tarantool-tarantool-c-1.0.1-7bb49a1_GH0.tar.gz) = 137960 Index: head/databases/tarantool-c/files/patch-cmake_FindMsgPuck.cmake =================================================================== --- head/databases/tarantool-c/files/patch-cmake_FindMsgPuck.cmake (revision 463309) +++ head/databases/tarantool-c/files/patch-cmake_FindMsgPuck.cmake (nonexistent) @@ -1,10 +0,0 @@ ---- cmake/FindMsgPuck.cmake.orig 2016-01-20 13:26:58 UTC -+++ cmake/FindMsgPuck.cmake -@@ -9,6 +9,7 @@ endif (MSGPUCK_INCLUDE_DIR) - if (MSGPUCK_INCLUDE_DIR) - if (NOT MSGPUCK_FIND_QUIETLY) - message(STATUS "Found msgpuck includes: ${MSGPUCK_INCLUDE_DIR}/msgpuck/msgpuck.h") -+ include_directories(${MSGPUCK_INCLUDE_DIR}) - endif (NOT MSGPUCK_FIND_QUIETLY) - else (MSGPUCK_INCLUDE_DIR) - if (MSGPUCK_REQUIRED) Property changes on: head/databases/tarantool-c/files/patch-cmake_FindMsgPuck.cmake ___________________________________________________________________ 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-c/files/patch-tnt_tnt__net.c =================================================================== --- head/databases/tarantool-c/files/patch-tnt_tnt__net.c (revision 463309) +++ head/databases/tarantool-c/files/patch-tnt_tnt__net.c (nonexistent) @@ -1,10 +0,0 @@ ---- tnt/tnt_net.c.orig 2016-01-21 12:48:00 UTC -+++ tnt/tnt_net.c -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - #include - #include - Property changes on: head/databases/tarantool-c/files/patch-tnt_tnt__net.c ___________________________________________________________________ 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-c/files/patch-tnt-CMakeLists.txt =================================================================== --- head/databases/tarantool-c/files/patch-tnt-CMakeLists.txt (nonexistent) +++ head/databases/tarantool-c/files/patch-tnt-CMakeLists.txt (revision 463310) @@ -0,0 +1,26 @@ +--- tnt/CMakeLists.txt.orig 2016-09-07 09:59:59 UTC ++++ tnt/CMakeLists.txt +@@ -42,7 +42,6 @@ set (TNT_SOURCES + ${CMAKE_SOURCE_DIR}/third_party/sha1.c + ${CMAKE_SOURCE_DIR}/third_party/base64.c + ${CMAKE_SOURCE_DIR}/third_party/PMurHash.c +- ${CMAKE_SOURCE_DIR}/third_party/msgpuck.c + ) + + #----------------------------------------------------------------------------# +@@ -52,6 +51,7 @@ set (TNT_SOURCES + ## Static library + project(tnt) + add_library(${PROJECT_NAME} STATIC ${TNT_SOURCES}) ++target_link_libraries(${PROJECT_NAME} ${MSGPUCK_LIBRARIES}) + set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${LIBTNT_VERSION}) + set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${LIBTNT_SOVERSION}) + set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "tarantool") +@@ -65,6 +65,7 @@ install (TARGETS ${PROJECT_NAME} + ## Shared library + project(tnt_shared) + add_library(${PROJECT_NAME} SHARED ${TNT_SOURCES}) ++target_link_libraries(${PROJECT_NAME} ${MSGPUCK_LIBRARIES}) + set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${LIBTNT_VERSION}) + set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${LIBTNT_SOVERSION}) + set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "tarantool") Property changes on: head/databases/tarantool-c/files/patch-tnt-CMakeLists.txt ___________________________________________________________________ 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