From f3dbcc0a9f1742328ca59b8197d81e435098f33b Mon Sep 17 00:00:00 2001 From: Sunpoet Po-Chuan Hsieh Date: Thu, 1 Mar 2018 13:34:49 +0000 Subject: [PATCH] Update to 2.0 - Update COMMENT - Add LICENSE_FILE - Update pkg-descr - Take maintainership Changes: https://github.com/tarantool/msgpuck/commits/master --- devel/msgpuck/Makefile | 13 ++++---- devel/msgpuck/distinfo | 5 +-- devel/msgpuck/files/patch-CMakeLists.txt | 31 +++++++++++++++++++ devel/msgpuck/files/patch-test-CMakeLists.txt | 11 +++++++ devel/msgpuck/pkg-descr | 14 +++------ devel/msgpuck/pkg-plist | 2 +- 6 files changed, 58 insertions(+), 18 deletions(-) create mode 100644 devel/msgpuck/files/patch-CMakeLists.txt create mode 100644 devel/msgpuck/files/patch-test-CMakeLists.txt diff --git a/devel/msgpuck/Makefile b/devel/msgpuck/Makefile index 205b3c2326eb..c7de519dbb5a 100644 --- a/devel/msgpuck/Makefile +++ b/devel/msgpuck/Makefile @@ -1,18 +1,19 @@ # $FreeBSD$ PORTNAME= msgpuck -PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTVERSION= 2.0 CATEGORIES= devel -MAINTAINER= ports@FreeBSD.org -COMMENT= MsgPack binary serialization library in a self-contained header +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Lightweight MessagePack library LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE + +USES= cmake +USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= tarantool -USES= cmake - .include diff --git a/devel/msgpuck/distinfo b/devel/msgpuck/distinfo index 5852e01b773d..dba9c66069c0 100644 --- a/devel/msgpuck/distinfo +++ b/devel/msgpuck/distinfo @@ -1,2 +1,3 @@ -SHA256 (tarantool-msgpuck-1.0.0_GH0.tar.gz) = f49f58ea6729d52431b1f03ac715374c962cdc9f158f2a953019cce9184fb33e -SIZE (tarantool-msgpuck-1.0.0_GH0.tar.gz) = 43196 +TIMESTAMP = 1519663819 +SHA256 (tarantool-msgpuck-2.0_GH0.tar.gz) = 01e6aa55d4d52a5b19f7ce9a9845506d9ab3f5abcf844a75e880b8378150a63d +SIZE (tarantool-msgpuck-2.0_GH0.tar.gz) = 51548 diff --git a/devel/msgpuck/files/patch-CMakeLists.txt b/devel/msgpuck/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..d3a117bac679 --- /dev/null +++ b/devel/msgpuck/files/patch-CMakeLists.txt @@ -0,0 +1,31 @@ +--- CMakeLists.txt.orig 2017-02-07 12:14:17 UTC ++++ CMakeLists.txt +@@ -12,9 +12,12 @@ endif() + include(CheckCCompilerFlag) + check_c_compiler_flag("-mno-unaligned-access" CC_HAS_MNO_UNALIGNED_ACCESS) + +-add_library(msgpuck STATIC msgpuck.c hints.c) +-set_target_properties(msgpuck PROPERTIES VERSION 1.0 SOVERSION 1) +-set_target_properties(msgpuck PROPERTIES OUTPUT_NAME "msgpuck") ++add_library(msgpuck_shared SHARED msgpuck.c hints.c) ++set_target_properties(msgpuck_shared PROPERTIES VERSION 1.0 SOVERSION 1) ++set_target_properties(msgpuck_shared PROPERTIES OUTPUT_NAME "msgpuck") ++add_library(msgpuck_static STATIC msgpuck.c hints.c) ++set_target_properties(msgpuck_static PROPERTIES VERSION 1.0 SOVERSION 1) ++set_target_properties(msgpuck_static PROPERTIES OUTPUT_NAME "msgpuck") + + if (NOT ${PROJECT_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR}) + # Embedded mode, skip tests, documentation and the install targets +@@ -32,7 +35,11 @@ endif() + add_subdirectory(test) + + include(GNUInstallDirs) +-install(TARGETS msgpuck ++install(TARGETS msgpuck_shared ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ COMPONENT library) ++install(TARGETS msgpuck_static + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + COMPONENT library) diff --git a/devel/msgpuck/files/patch-test-CMakeLists.txt b/devel/msgpuck/files/patch-test-CMakeLists.txt new file mode 100644 index 000000000000..cb43fdd92bec --- /dev/null +++ b/devel/msgpuck/files/patch-test-CMakeLists.txt @@ -0,0 +1,11 @@ +--- test/CMakeLists.txt.orig 2017-02-07 12:14:17 UTC ++++ test/CMakeLists.txt +@@ -14,7 +14,7 @@ endif() + set(alltests) + foreach (test msgpuck) + add_executable(${test}.test ${test}.c test.c) +- target_link_libraries(${test}.test msgpuck) ++ target_link_libraries(${test}.test msgpuck_shared) + + list(APPEND alltests ${test}.test_run) + add_custom_target(${test}.test_run diff --git a/devel/msgpuck/pkg-descr b/devel/msgpuck/pkg-descr index c38e051d64cd..fe4c8037a55d 100644 --- a/devel/msgpuck/pkg-descr +++ b/devel/msgpuck/pkg-descr @@ -1,11 +1,7 @@ -MsgPuck is a simple and efficient MsgPack binary serialization library in -a self-contained header file. - -* Can be easily incorporated into your project -* Is very easy to use (see examples below) -* Is fully tested and documented -* Has clean and readable C source code -* Is published under the very liberal license (BSD-2) - +MsgPuck is a compact and efficient MessagePack serialization library: +- Zero-cost abstractions and zero overhead +- Clean and readable C code ready to use +- Easy to incorporate into your project +- Fully documented and covered by unit tests WWW: https://github.com/tarantool/msgpuck diff --git a/devel/msgpuck/pkg-plist b/devel/msgpuck/pkg-plist index d012af0bba86..943740af96d6 100644 --- a/devel/msgpuck/pkg-plist +++ b/devel/msgpuck/pkg-plist @@ -1,4 +1,4 @@ -include/msgpuck/msgpuck.h +include/msgpuck.h lib/libmsgpuck.a lib/libmsgpuck.so lib/libmsgpuck.so.1