google-benchmark: updated to 1.4.1

v1.4.1
Bug-fix release on v1.4.
Realign expectation that State::iterations() returns 0 before the main benchmark loop begins.
CMake error message fixes
Enscripten check fix
OpenBSD porting
Windows bazel fixes
Bazel pthread linking
Negative regexes
gmock fix

v1.4.0
Removal of deprecated headers
Improved CPU cache info reporting
Support State::KeepRunningBatch()
Support int64_t for AddRange()
New platform support: NetBSD, s390x, Solaris
Bazel build support
Support googletest unit tests
Add assembler tests
Various warnings fixed

v1.3.0
Ranged for loop optimization!
Make installation optional
Better stats including user-provided ones
JSON reporter format fixes
Documentation improvements

4 files changed, 18 insertions, 48 deletions

diff --git a/benchmarks/google-benchmark/Makefile b/benchmarks/google-benchmark/Makefile
index 7e29e199f3d..80ce900ee50 100644
--- a/benchmarks/google-benchmark/Makefile
+++ b/benchmarks/google-benchmark/Makefile
@@ -1,22 +1,22 @@
-# $NetBSD: Makefile,v 1.2 2017/03/24 11:41:58 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2019/03/21 22:16:25 adam Exp $
 
-DISTNAME=	benchmark-1.1.0
+DISTNAME=	benchmark-1.4.1
 PKGNAME=	google-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	benchmarks
 MASTER_SITES=	${MASTER_SITE_GITHUB:=google/}
 GITHUB_PROJECT=	benchmark
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	minskim@NetBSD.org
-HOMEPAGE=	https://github.com/google/benchmark/
+HOMEPAGE=	https://github.com/google/benchmark
 COMMENT=	Microbenchmark support library
 LICENSE=	apache-2.0
 
 USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
-
-CMAKE_ARGS=	-DCMAKE_BUILD_TYPE=Release
+CMAKE_ARGS+=	-DBENCHMARK_ENABLE_GTEST_TESTS=OFF
+CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
+TEST_TARGET=	test
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/google-benchmark/PLIST b/benchmarks/google-benchmark/PLIST
index 75575dac08d..6b88e31d257 100644
--- a/benchmarks/google-benchmark/PLIST
+++ b/benchmarks/google-benchmark/PLIST
@@ -1,6 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2016/11/21 18:20:30 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/03/21 22:16:25 adam Exp $
 include/benchmark/benchmark.h
-include/benchmark/benchmark_api.h
-include/benchmark/macros.h
-include/benchmark/reporter.h
+lib/cmake/benchmark/benchmarkConfig.cmake
+lib/cmake/benchmark/benchmarkConfigVersion.cmake
+lib/cmake/benchmark/benchmarkTargets-release.cmake
+lib/cmake/benchmark/benchmarkTargets.cmake
 lib/libbenchmark.a
+lib/libbenchmark_main.a
+lib/pkgconfig/benchmark.pc
diff --git a/benchmarks/google-benchmark/distinfo b/benchmarks/google-benchmark/distinfo
index d56c69cf18c..f614d4ec818 100644
--- a/benchmarks/google-benchmark/distinfo
+++ b/benchmarks/google-benchmark/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.3 2017/03/24 11:41:58 joerg Exp $
+$NetBSD: distinfo,v 1.4 2019/03/21 22:16:25 adam Exp $
 
-SHA1 (benchmark-1.1.0.tar.gz) = 8c539bbe2a212618fa87b6c38fba087100b6e4ae
-RMD160 (benchmark-1.1.0.tar.gz) = 7e7f2d687ef515a846c04933545f7c63752d2de5
-SHA512 (benchmark-1.1.0.tar.gz) = 533061531e6a37723a626addc9e779018c4c2cfc8634ae45860eec0d3800103b5b562f865ac1dc0c8dbe045579b81e59de887e1c48318cebf160f03c18321831
-Size (benchmark-1.1.0.tar.gz) = 87199 bytes
+SHA1 (benchmark-1.4.1.tar.gz) = 29d9dacea24ed352d77da6edc52972bba1299acd
+RMD160 (benchmark-1.4.1.tar.gz) = b3018488a233be21e99324640d1f9e7a705f5867
+SHA512 (benchmark-1.4.1.tar.gz) = e9d71b4679cb4e4d755f7bb4101e131b37e209b6aebd0853e0c63eb11c42b75faa5da4ff8c265149808a475f3a1cfb140c5b49f877acfda908a4bb7add983aae
+Size (benchmark-1.4.1.tar.gz) = 126850 bytes
 SHA1 (patch-CMakeLists.txt) = b76675097fde2b85fc3c7e9601666007654c1d0c
-SHA1 (patch-include_benchmark_benchmark__api.h) = 1fa32704d75d2f23fbc3fc9aa0d9b44e12b4c82b
diff --git a/benchmarks/google-benchmark/patches/patch-include_benchmark_benchmark__api.h b/benchmarks/google-benchmark/patches/patch-include_benchmark_benchmark__api.h
deleted file mode 100644
index 901c262ceda..00000000000
--- a/benchmarks/google-benchmark/patches/patch-include_benchmark_benchmark__api.h
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-include_benchmark_benchmark__api.h,v 1.1 2017/03/24 11:41:59 joerg Exp $
-
-8ae6448cc7ec6353e3491a2a15f972f9735f124b
-
---- include/benchmark/benchmark_api.h.orig	2017-03-23 20:34:16.066191652 +0000
-+++ include/benchmark/benchmark_api.h
-@@ -202,14 +202,6 @@ struct Voider {
-   typedef void type;
- };
- 
--template <class T, class = void>
--struct EnableIfString {};
--
--template <class T>
--struct EnableIfString<T, typename Voider<typename T::basic_string>::type> {
--  typedef int type;
--};
--
- void UseCharPointer(char const volatile*);
- 
- // Take ownership of the pointer and register the benchmark. Return the
-@@ -397,9 +389,7 @@ class State {
-   // This function does not participate in overload resolution unless StringType
-   // has the nested typename `basic_string`. This typename should be provided
-   // as an injected class name in the case of std::string.
--  template <class StringType>
--  void SetLabel(StringType const& str,
--                typename internal::EnableIfString<StringType>::type = 1) {
-+  void BENCHMARK_ALWAYS_INLINE SetLabel(const std::string& str) {
-     this->SetLabel(str.c_str());
-   }
-