diff options
| -rw-r--r-- | devel/leatherman/Makefile | 3 | ||||
| -rw-r--r-- | devel/leatherman/distinfo | 6 | ||||
| -rw-r--r-- | devel/leatherman/files/patch-cmake_cflags.cmake | 19 |
3 files changed, 15 insertions, 13 deletions
diff --git a/devel/leatherman/Makefile b/devel/leatherman/Makefile index 3b9137526452..dc1ca6a41f28 100644 --- a/devel/leatherman/Makefile +++ b/devel/leatherman/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= leatherman -PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTVERSION= 1.1.1 CATEGORIES= devel MAINTAINER= puppet@FreeBSD.org diff --git a/devel/leatherman/distinfo b/devel/leatherman/distinfo index c30432558591..e4f16d739b48 100644 --- a/devel/leatherman/distinfo +++ b/devel/leatherman/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499512611 -SHA256 (puppetlabs-leatherman-1.0.0_GH0.tar.gz) = 4bcb8eaf08429e9e62cc6fcbfc1f216bd2eff800f751dbacabbec7d714ed21a2 -SIZE (puppetlabs-leatherman-1.0.0_GH0.tar.gz) = 423859 +TIMESTAMP = 1503479577 +SHA256 (puppetlabs-leatherman-1.1.1_GH0.tar.gz) = 5c277b094cdfd8bfec43aef57bd02443d8789e85c203821acb7d0fbe42fa20c3 +SIZE (puppetlabs-leatherman-1.1.1_GH0.tar.gz) = 429468 diff --git a/devel/leatherman/files/patch-cmake_cflags.cmake b/devel/leatherman/files/patch-cmake_cflags.cmake index b4c671cf2d81..043dae030bb8 100644 --- a/devel/leatherman/files/patch-cmake_cflags.cmake +++ b/devel/leatherman/files/patch-cmake_cflags.cmake @@ -1,20 +1,23 @@ ---- cmake/cflags.cmake.orig 2017-01-05 04:17:18 UTC + +$FreeBSD$ + +--- cmake/cflags.cmake.orig +++ 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 "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-tautological-constant-out-of-range-compare") -+ set(LEATHERMAN_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -Wno-unused-parameter -Wno-tautological-constant-out-of-range-compare") +- 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 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQ - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-maybe-uninitialized") +@@ -41,7 +41,7 @@ + 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 "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror -Wno-unused-parameter -Wno-unused-local-typedefs -Wno-unknown-pragmas -Wno-missing-field-initializers") -+ set(LEATHERMAN_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wno-unused-parameter -Wno-unused-local-typedefs -Wno-unknown-pragmas -Wno-missing-field-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 "${LEATHERMAN_CXX_FLAGS} -Wextra") + set(LEATHERMAN_CXX_FLAGS "-Wextra ${LEATHERMAN_CXX_FLAGS}") endif() |