Index: head/devel/leatherman/Makefile =================================================================== --- head/devel/leatherman/Makefile (revision 448836) +++ head/devel/leatherman/Makefile (revision 448837) @@ -1,29 +1,29 @@ # $FreeBSD$ PORTNAME= leatherman -PORTVERSION= 1.1.1 +PORTVERSION= 1.1.2 CATEGORIES= devel MAINTAINER= puppet@FreeBSD.org COMMENT= Leatherman C++ Tool library LICENSE= APACHE20 LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libcurl.so:ftp/curl BROKEN_armv6= fails to configure: CMake: execution of make failed BROKEN_powerpc64= fails to compile: cc1plus: error: unrecognized command line option "-std=c++11" USE_GITHUB= yes GH_ACCOUNT= puppetlabs USES= cmake gettext USE_RUBY= yes CMAKE_ARGS= -DLEATHERMAN_SHARED:BOOL=ON USE_LDCONFIG= yes TEST_TARGET= test PLIST_SUB= PORTVERSION=${PORTVERSION} .include Index: head/devel/leatherman/distinfo =================================================================== --- head/devel/leatherman/distinfo (revision 448836) +++ head/devel/leatherman/distinfo (revision 448837) @@ -1,3 +1,3 @@ -TIMESTAMP = 1503479577 -SHA256 (puppetlabs-leatherman-1.1.1_GH0.tar.gz) = 5c277b094cdfd8bfec43aef57bd02443d8789e85c203821acb7d0fbe42fa20c3 -SIZE (puppetlabs-leatherman-1.1.1_GH0.tar.gz) = 429468 +TIMESTAMP = 1503861160 +SHA256 (puppetlabs-leatherman-1.1.2_GH0.tar.gz) = 1feca2ba8472252132ad90c6bcc3fba6dbb85ee912b1cbcde9853d812d54729f +SIZE (puppetlabs-leatherman-1.1.2_GH0.tar.gz) = 430545 Index: head/devel/leatherman/files/patch-cmake_cflags.cmake =================================================================== --- head/devel/leatherman/files/patch-cmake_cflags.cmake (revision 448836) +++ head/devel/leatherman/files/patch-cmake_cflags.cmake (revision 448837) @@ -1,20 +1,20 @@ ---- cmake/cflags.cmake.orig +--- cmake/cflags.cmake.orig 2017-08-25 18:32:21 UTC +++ cmake/cflags.cmake @@ -2,7 +2,7 @@ # Each of our project dirs sets CMAKE_CXX_FLAGS based on these. We do # not set CMAKE_CXX_FLAGS globally because gtest is not warning-clean. if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "\\w*Clang") - set(LEATHERMAN_CXX_FLAGS "-std=c++11 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-tautological-constant-out-of-range-compare ${CMAKE_CXX_FLAGS}") + set(LEATHERMAN_CXX_FLAGS "-std=c++11 -Wall -Wextra -Wno-unused-parameter -Wno-tautological-constant-out-of-range-compare ${CMAKE_CXX_FLAGS}") # Clang warns that 'register' is deprecated; 'register' is used throughout boost, so it can't be an error yet. # The warning flag is different on different clang versions so we need to extract the clang version. -@@ -41,7 +41,7 @@ +@@ -41,7 +41,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQ set(CMAKE_CXX_FLAGS "-Wno-maybe-uninitialized ${CMAKE_CXX_FLAGS}") # missing-field-initializers is disabled because GCC can't make up their mind how to treat C++11 initializers - set(LEATHERMAN_CXX_FLAGS "-std=c++11 -Wall -Werror -Wno-unused-parameter -Wno-unused-local-typedefs -Wno-unknown-pragmas -Wno-missing-field-initializers ${CMAKE_CXX_FLAGS}") + set(LEATHERMAN_CXX_FLAGS "-std=c++11 -Wall -Wno-unused-parameter -Wno-unused-local-typedefs -Wno-unknown-pragmas -Wno-missing-field-initializers ${CMAKE_CXX_FLAGS}") if (NOT "${CMAKE_SYSTEM_NAME}" MATCHES "SunOS") set(LEATHERMAN_CXX_FLAGS "-Wextra ${LEATHERMAN_CXX_FLAGS}") endif() Index: head/devel/leatherman/files/patch-cmake_leatherman.cmake.in =================================================================== --- head/devel/leatherman/files/patch-cmake_leatherman.cmake.in (revision 448836) +++ head/devel/leatherman/files/patch-cmake_leatherman.cmake.in (revision 448837) @@ -1,14 +1,14 @@ ---- cmake/leatherman.cmake.in.orig +--- cmake/leatherman.cmake.in.orig 2017-08-25 18:32:21 UTC +++ cmake/leatherman.cmake.in -@@ -83,11 +83,6 @@ +@@ -83,11 +83,6 @@ macro(leatherman_install) RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}) - foreach(ARG ${ARGV}) - if (TARGET ${ARG}) - set_target_properties(${ARG} PROPERTIES PREFIX "" IMPORT_PREFIX "") - endif() - endforeach() endmacro() # Usage: add_cppcheck_dirs(dir1 dir2) Index: head/devel/leatherman/files/patch-json__container_tests_json__container__test.cc =================================================================== --- head/devel/leatherman/files/patch-json__container_tests_json__container__test.cc (nonexistent) +++ head/devel/leatherman/files/patch-json__container_tests_json__container__test.cc (revision 448837) @@ -0,0 +1,13 @@ +This is a workaround for this bug: +https://github.com/philsquared/Catch/blob/master/docs/limitations.md#clangg----skipping-leaf-sections-after-an-exception +--- json_container/tests/json_container_test.cc.orig 2017-08-25 18:32:21 UTC ++++ json_container/tests/json_container_test.cc +@@ -80,7 +80,7 @@ TEST_CASE("JsonContainer::JsonContainer + json_value = "null"; + } + +- REQUIRE_NOTHROW(JsonContainer { json_value }); ++ REQUIRE_NOTHROW(if (json_value != "") { JsonContainer { json_value };}); + } + + SECTION("it should throw a data_parse_error in case of empty string") { Property changes on: head/devel/leatherman/files/patch-json__container_tests_json__container__test.cc ___________________________________________________________________ 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