From 9b18aeecebc579ac8f89c5096155255eee9ae84c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Tue, 13 Feb 2018 12:48:06 +0000 Subject: [PATCH] Update leatherman to 1.4.0 ChangeLog: https://github.com/puppetlabs/leatherman/blob/master/CHANGELOG.md#140 Bump PORTREVISION of dependent ports. With hat: puppet --- devel/cpp-hocon/Makefile | 2 +- devel/leatherman/Makefile | 3 +-- devel/leatherman/distinfo | 6 +++--- ...h-json__container_tests_json__container__test.cc | 13 ------------- sysutils/facter/Makefile | 1 + 5 files changed, 6 insertions(+), 19 deletions(-) delete mode 100644 devel/leatherman/files/patch-json__container_tests_json__container__test.cc diff --git a/devel/cpp-hocon/Makefile b/devel/cpp-hocon/Makefile index 037cdbaa6ba4..0a110203c60e 100644 --- a/devel/cpp-hocon/Makefile +++ b/devel/cpp-hocon/Makefile @@ -2,7 +2,7 @@ PORTNAME= cpp-hocon PORTVERSION= 0.1.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MAINTAINER= puppet@FreeBSD.org diff --git a/devel/leatherman/Makefile b/devel/leatherman/Makefile index 0d22a2219cd3..f9e80c1bf8af 100644 --- a/devel/leatherman/Makefile +++ b/devel/leatherman/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= leatherman -PORTVERSION= 1.3.0 -PORTREVISION= 4 +PORTVERSION= 1.4.0 CATEGORIES= devel MAINTAINER= puppet@FreeBSD.org diff --git a/devel/leatherman/distinfo b/devel/leatherman/distinfo index 47cea684c3e2..a9892066a0e2 100644 --- a/devel/leatherman/distinfo +++ b/devel/leatherman/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1505892582 -SHA256 (puppetlabs-leatherman-1.3.0_GH0.tar.gz) = 282bc54ca28e8269a392bbda423b940177a5925246ab961c7a5c338046b51ba0 -SIZE (puppetlabs-leatherman-1.3.0_GH0.tar.gz) = 434229 +TIMESTAMP = 1518523478 +SHA256 (puppetlabs-leatherman-1.4.0_GH0.tar.gz) = 34e638458d7353fb6887d976f60acde436c760e081d7478dbf5643e0b7657d57 +SIZE (puppetlabs-leatherman-1.4.0_GH0.tar.gz) = 805151 diff --git a/devel/leatherman/files/patch-json__container_tests_json__container__test.cc b/devel/leatherman/files/patch-json__container_tests_json__container__test.cc deleted file mode 100644 index 72ec8f3beb09..000000000000 --- a/devel/leatherman/files/patch-json__container_tests_json__container__test.cc +++ /dev/null @@ -1,13 +0,0 @@ -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") { diff --git a/sysutils/facter/Makefile b/sysutils/facter/Makefile index 928a907430a4..17d749c7eaaf 100644 --- a/sysutils/facter/Makefile +++ b/sysutils/facter/Makefile @@ -2,6 +2,7 @@ PORTNAME= facter PORTVERSION= 3.9.4 +PORTREVISION= 1 CATEGORIES?= sysutils MASTER_SITES= http://downloads.puppetlabs.com/facter/