diff options
author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2018-03-01 13:35:00 +0000 |
---|---|---|
committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2018-03-01 13:35:00 +0000 |
commit | 09982779f8ea407b0a653e64238d0be6f6782e5f (patch) | |
tree | 1f2d02300532e3e8644baaa2659296a1468ad4d1 /databases/tarantool-c | |
parent | 2075c77ea2337152254cb362812d546e3b399e73 (diff) | |
download | ports-09982779f8ea407b0a653e64238d0be6f6782e5f.tar.gz ports-09982779f8ea407b0a653e64238d0be6f6782e5f.zip |
Update to 1.0.1
- Add LICENSE
- Use CMAKE_OFF
- Bump PORTREVISION for package change
- Take maintainership
Changes: https://github.com/tarantool/tarantool-c/commits/master
Notes
Notes:
svn path=/head/; revision=463310
Diffstat (limited to 'databases/tarantool-c')
-rw-r--r-- | databases/tarantool-c/Makefile | 17 | ||||
-rw-r--r-- | databases/tarantool-c/distinfo | 5 | ||||
-rw-r--r-- | databases/tarantool-c/files/patch-cmake_FindMsgPuck.cmake | 10 | ||||
-rw-r--r-- | databases/tarantool-c/files/patch-tnt-CMakeLists.txt | 26 | ||||
-rw-r--r-- | databases/tarantool-c/files/patch-tnt_tnt__net.c | 10 |
5 files changed, 38 insertions, 30 deletions
diff --git a/databases/tarantool-c/Makefile b/databases/tarantool-c/Makefile index 7e825f50352b..b90aa88f3a13 100644 --- a/databases/tarantool-c/Makefile +++ b/databases/tarantool-c/Makefile @@ -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 - -USES= cmake -CMAKE_ARGS= -DENABLE_BUNDLED_MSGPUCK=false +GH_TAGNAME= 7bb49a1 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 <bsd.port.mk> diff --git a/databases/tarantool-c/distinfo b/databases/tarantool-c/distinfo index a6b62c906c75..59ecb0d6647b 100644 --- a/databases/tarantool-c/distinfo +++ b/databases/tarantool-c/distinfo @@ -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 diff --git a/databases/tarantool-c/files/patch-cmake_FindMsgPuck.cmake b/databases/tarantool-c/files/patch-cmake_FindMsgPuck.cmake deleted file mode 100644 index 560ec81adc09..000000000000 --- a/databases/tarantool-c/files/patch-cmake_FindMsgPuck.cmake +++ /dev/null @@ -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) diff --git a/databases/tarantool-c/files/patch-tnt-CMakeLists.txt b/databases/tarantool-c/files/patch-tnt-CMakeLists.txt new file mode 100644 index 000000000000..567508ec9414 --- /dev/null +++ b/databases/tarantool-c/files/patch-tnt-CMakeLists.txt @@ -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") diff --git a/databases/tarantool-c/files/patch-tnt_tnt__net.c b/databases/tarantool-c/files/patch-tnt_tnt__net.c deleted file mode 100644 index df5ce3ac1b13..000000000000 --- a/databases/tarantool-c/files/patch-tnt_tnt__net.c +++ /dev/null @@ -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 <stdlib.h> - #include <stdio.h> - #include <stdarg.h> -+#include <stdint.h> - #include <string.h> - #include <stdbool.h> - |