Index: head/devel/leatherman/Makefile
===================================================================
--- head/devel/leatherman/Makefile	(revision 487823)
+++ head/devel/leatherman/Makefile	(revision 487824)
@@ -1,27 +1,28 @@
 # $FreeBSD$
 
 PORTNAME=	leatherman
-PORTVERSION=	1.5.3
+PORTVERSION=	1.5.4
 PORTREVISION=	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
 
 USES=		compiler:c++11-lang cmake:outsource gettext
 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
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 .include <bsd.port.mk>
Index: head/devel/leatherman/distinfo
===================================================================
--- head/devel/leatherman/distinfo	(revision 487823)
+++ head/devel/leatherman/distinfo	(revision 487824)
@@ -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
Index: head/devel/leatherman/files/patch-cmake_cflags.cmake
===================================================================
--- head/devel/leatherman/files/patch-cmake_cflags.cmake	(revision 487823)
+++ head/devel/leatherman/files/patch-cmake_cflags.cmake	(nonexistent)
@@ -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()

Property changes on: head/devel/leatherman/files/patch-cmake_cflags.cmake
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property