Index: head/devel/leatherman/Makefile
===================================================================
--- head/devel/leatherman/Makefile	(revision 482900)
+++ head/devel/leatherman/Makefile	(revision 482901)
@@ -1,26 +1,27 @@
 # $FreeBSD$
 
 PORTNAME=	leatherman
 PORTVERSION=	1.5.1
+PORTREVISION=	1
 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
 USE_LDCONFIG=	yes
 TEST_TARGET=	test
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 .include <bsd.port.mk>
Index: head/devel/leatherman/files/patch-execution_src_posix_execution.cc
===================================================================
--- head/devel/leatherman/files/patch-execution_src_posix_execution.cc	(nonexistent)
+++ head/devel/leatherman/files/patch-execution_src_posix_execution.cc	(revision 482901)
@@ -0,0 +1,13 @@
+--- execution/src/posix/execution.cc.orig	2018-09-29 16:21:31 UTC
++++ execution/src/posix/execution.cc
+@@ -314,9 +314,7 @@ namespace leatherman { namespace executi
+         }
+ 
+         // Close all open file descriptors above stderr
+-        for (uint64_t i = (STDERR_FILENO + 1); i < max_fd; ++i) {
+-            close(i);
+-        }
++        closefrom(STDERR_FILENO + 1);
+ 
+         // Execute the given program; this should not return if successful
+         execve(program, const_cast<char* const*>(argv), const_cast<char* const*>(envp));

Property changes on: head/devel/leatherman/files/patch-execution_src_posix_execution.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
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	(revision 482900)
+++ head/devel/leatherman/files/patch-json__container_tests_json__container__test.cc	(revision 482901)
@@ -1,16 +1,16 @@
---- json_container/tests/json_container_test.cc.orig
+--- json_container/tests/json_container_test.cc.orig	2018-09-29 16:21:31 UTC
 +++ json_container/tests/json_container_test.cc
-@@ -22,11 +22,13 @@
+@@ -22,11 +22,13 @@ TEST_CASE("JsonContainer::JsonContainer 
      std::string json_value {};
  
      SECTION("it should instantiate by passing any JSON value") {
 +        json_value = "{}";
          SECTION("object") {
              json_value = JSON;
          }
  
          SECTION("array") {
 +            json_value = "[]";
              SECTION("of numbers") {
                  json_value = "[1, 2, 3]";
              }
Index: head/devel/leatherman/files/patch-locale_src_locale.cc
===================================================================
--- head/devel/leatherman/files/patch-locale_src_locale.cc	(revision 482900)
+++ head/devel/leatherman/files/patch-locale_src_locale.cc	(revision 482901)
@@ -1,12 +1,12 @@
---- locale/src/locale.cc.orig	2017-10-10 10:16:35 UTC
+--- locale/src/locale.cc.orig	2018-09-29 16:21:31 UTC
 +++ locale/src/locale.cc
-@@ -43,6 +43,9 @@ namespace leatherman { namespace locale 
+@@ -44,6 +44,9 @@ namespace leatherman { namespace locale 
              gen.add_messages_domain(domain);
          }
  
 +        if (id.empty())
 +            return g_locales.insert(make_pair(domain, std::locale())).first->second;
 +
          // Ensure creating and adding a new locale is thread-safe.
          try {
              return g_locales.insert(make_pair(domain, gen(id))).first->second;