diff options
| author | Romain Tartière <romain@FreeBSD.org> | 2018-12-20 02:06:04 +0000 |
|---|---|---|
| committer | Romain Tartière <romain@FreeBSD.org> | 2018-12-20 02:06:04 +0000 |
| commit | 7e9ff6c8f1c86319ab5de0442cdefec08672b7bf (patch) | |
| tree | 249f393c9f44dfc57b56f25988b7c41514003967 /devel/leatherman | |
| parent | dca411da1e668ac7cd3f865351fb8bd65621d56d (diff) | |
| download | ports-7e9ff6c8f1c86319ab5de0442cdefec08672b7bf.tar.gz ports-7e9ff6c8f1c86319ab5de0442cdefec08672b7bf.zip | |
Update to 1.5.4
While here, instead of patching cflags.cmake, rely on the ENABLE_CXX_WERROR
CMake option.
With hat: puppet
Notes
Notes:
svn path=/head/; revision=487824
Diffstat (limited to 'devel/leatherman')
| -rw-r--r-- | devel/leatherman/Makefile | 5 | ||||
| -rw-r--r-- | devel/leatherman/distinfo | 6 | ||||
| -rw-r--r-- | devel/leatherman/files/patch-cmake_cflags.cmake | 20 |
3 files changed, 6 insertions, 25 deletions
diff --git a/devel/leatherman/Makefile b/devel/leatherman/Makefile index e2ee26576647..5ffb6e35edc9 100644 --- a/devel/leatherman/Makefile +++ b/devel/leatherman/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= leatherman -PORTVERSION= 1.5.3 +PORTVERSION= 1.5.4 PORTREVISION= 2 CATEGORIES= devel @@ -18,7 +18,8 @@ USE_GITHUB= yes GH_ACCOUNT= puppetlabs USE_RUBY= yes -CMAKE_ARGS= -DLEATHERMAN_SHARED:BOOL=ON +CMAKE_ON= LEATHERMAN_SHARED +CMAKE_OFF= ENABLE_CXX_WERROR USE_LDCONFIG= yes TEST_TARGET= test diff --git a/devel/leatherman/distinfo b/devel/leatherman/distinfo index be519d18766e..b6a9e7745677 100644 --- a/devel/leatherman/distinfo +++ b/devel/leatherman/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541235794 -SHA256 (puppetlabs-leatherman-1.5.3_GH0.tar.gz) = 4d96053df166eec1b58943a199e156081663feef0c5c8adbb1adaed7546bfd7c -SIZE (puppetlabs-leatherman-1.5.3_GH0.tar.gz) = 814340 +TIMESTAMP = 1545174153 +SHA256 (puppetlabs-leatherman-1.5.4_GH0.tar.gz) = f4b777de15f89ee0f5db99d065ca96290559e91ceadee39671e0f68318c84f97 +SIZE (puppetlabs-leatherman-1.5.4_GH0.tar.gz) = 814395 diff --git a/devel/leatherman/files/patch-cmake_cflags.cmake b/devel/leatherman/files/patch-cmake_cflags.cmake deleted file mode 100644 index d23bf62adf4e..000000000000 --- a/devel/leatherman/files/patch-cmake_cflags.cmake +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 @@ 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() |