On Thu 15/02/2018 23:14, Brian Callahan wrote: > > On 02/15/18 23:01, Björn Ketelaars wrote: > > On Fri 09/02/2018 18:29, Björn Ketelaars wrote: > > > On Fri 09/02/2018 17:09, Stuart Henderson wrote: > > > > On 2018/02/09 07:55, Björn Ketelaars wrote: > > > > > Included a diff for bringing devel/msgpack to 2.1.5. From CHANGELOG: > > > > > > > > > > - Improve cross platform configuration > > > > > - Add boost asio examples (including zlib) > > > > > - Remove some warnings > > > > > - Fix unpack visitor to treat float32/64 correctly > > > > > - Improve documents > > > > > - Fix alignment problem on some platform > > > > > - Fix conflict std::tuple, std::pair, and boost::fusion::sequence > > > > > problem > > > > > > > > > > While here drop GH_ in favour of MASTER_SITES, and switch HOMEPAGE to > > > > > https. No need to bump SHARED_LIBS. > > > > GH_* is correct here. > > > > > > > > /archive -> GH_* > > > > /releases -> MASTER_SITES > > New diff, which includes sthen@'s comment, and excludes the reordering of > > Makefile. Output make test: > > > > 100% tests passed, 0 tests failed out of 30 > > > > Build tested both consumers (editors/neovim and sysutils/tmate). Run > > tested with editors/neovim. > > > > OK? > > Sorry to make you do more work, but: > 1. Could you eliminate -Werror in all the patches? It's in one but not the > other. > > 2. There are some more -O3 floating around. For example:
Thanks for reviewing! I missed the remaining -O3, and didn't think that using -Werror is not preferred. Output 'make test' after removing these flags: 100% tests passed, 0 tests failed out of 30 Instead of patching 4 files I'm using sed. OK? Index: Makefile =================================================================== RCS file: /cvs/ports/devel/msgpack/Makefile,v retrieving revision 1.8 diff -u -p -r1.8 Makefile --- Makefile 20 Jan 2018 14:03:39 -0000 1.8 +++ Makefile 16 Feb 2018 11:31:08 -0000 @@ -2,13 +2,13 @@ COMMENT = MessagePack implementation for C and C++ -V = 2.1.4 +V = 2.1.5 DISTNAME = msgpack-${V} SHARED_LIBS += msgpackc 1.0 # 2.0 CATEGORIES = devel -HOMEPAGE = http://msgpack.org/ +HOMEPAGE = https://msgpack.org/ # Boost license PERMIT_PACKAGE_CDROM = Yes @@ -21,5 +21,11 @@ MODULES = devel/cmake BUILD_DEPENDS = devel/gtest TEST_DEPENDS = devel/gtest + +pre-configure: + cd ${WRKSRC} && sed -i 's,-Werror -g -O3,,' CMakeLists.txt \ + example/c/CMakeLists.txt \ + example/cpp03/CMakeLists.txt \ + test/CMakeLists.txt .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/devel/msgpack/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo 9 Aug 2017 23:02:22 -0000 1.4 +++ distinfo 16 Feb 2018 11:31:08 -0000 @@ -1,2 +1,2 @@ -SHA256 (msgpack-2.1.4.tar.gz) = DjufGzKWf4m0FuAor+LH98wI4middd4i8HrZtNsU9a4= -SIZE (msgpack-2.1.4.tar.gz) = 460891 +SHA256 (msgpack-2.1.5.tar.gz) = nIf4D8ZRuQB3LervCrFUtjFgx00pJSm1vm0G1khdRkA= +SIZE (msgpack-2.1.5.tar.gz) = 461179 Index: patches/patch-CMakeLists_txt =================================================================== RCS file: patches/patch-CMakeLists_txt diff -N patches/patch-CMakeLists_txt --- patches/patch-CMakeLists_txt 16 Jun 2017 18:55:07 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ -$OpenBSD: patch-CMakeLists_txt,v 1.3 2017/06/16 18:55:07 jasper Exp $ - -Kill -g -O3. - -Index: CMakeLists.txt ---- CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -237,9 +237,9 @@ ENDIF () - - IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - IF (MSGPACK_ENABLE_SHARED) -- SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3 -DPIC") -+ SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -DPIC") - ENDIF () -- SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3" ) -+ SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror" ) - ENDIF () - - IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") Index: patches/patch-test_CMakeLists_txt =================================================================== RCS file: patches/patch-test_CMakeLists_txt diff -N patches/patch-test_CMakeLists_txt --- patches/patch-test_CMakeLists_txt 16 Jun 2017 18:55:07 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-test_CMakeLists_txt,v 1.3 2017/06/16 18:55:07 jasper Exp $ - -Kill -g -O3. Kill -Werror, as gtest header makes warnings. - -Index: test/CMakeLists.txt ---- test/CMakeLists.txt.orig -+++ test/CMakeLists.txt -@@ -86,7 +86,7 @@ FOREACH (source_file ${check_PROGRAMS}) - ) - ADD_TEST (${source_file_we} ${source_file_we}) - IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") -- SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3 ") -+ SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra") - ENDIF () - IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")