googletest: updatee to 1.8.1

v1.8.1:
1.8.1 Release reflects a current version of the project.
The 1.8.x is the last release supporting pre-C++11 compilers.
The 1.8.x will not accept any requests for any new features and any bugfix requests will only be accepted if proven "critical"

5 files changed, 18 insertions, 58 deletions

diff --git a/devel/googletest/Makefile b/devel/googletest/Makefile
index b4c3535e856..8bab85da82b 100644
--- a/devel/googletest/Makefile
+++ b/devel/googletest/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2017/07/04 20:51:07 kamil Exp $
+# $NetBSD: Makefile,v 1.15 2018/09/10 10:23:33 adam Exp $
 
-DISTNAME=	googletest-1.8.0
-PKGREVISION=	1
+DISTNAME=	googletest-1.8.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=google/}
 GITHUB_TAG=	release-${PKGVERSION_NOREV}
@@ -16,7 +15,4 @@ INSTALLATION_DIRS=	bin
 USE_CMAKE=	yes
 USE_LANGUAGES=	c c++11
 
-post-install:
-	${RUN} cd ${DESTDIR} && find . -name '*.orig' -exec rm -f {} \;
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/googletest/PLIST b/devel/googletest/PLIST
index 8d5f7630b58..55c7b344e59 100644
--- a/devel/googletest/PLIST
+++ b/devel/googletest/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2016/10/31 16:43:17 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2018/09/10 10:23:33 adam Exp $
 include/gmock/gmock-actions.h
 include/gmock/gmock-cardinalities.h
 include/gmock/gmock-generated-actions.h
@@ -14,6 +14,7 @@ include/gmock/gmock-more-actions.h
 include/gmock/gmock-more-matchers.h
 include/gmock/gmock-spec-builders.h
 include/gmock/gmock.h
+include/gmock/internal/custom/README.md
 include/gmock/internal/custom/gmock-generated-actions.h
 include/gmock/internal/custom/gmock-generated-actions.h.pump
 include/gmock/internal/custom/gmock-matchers.h
@@ -33,6 +34,7 @@ include/gtest/gtest-typed-test.h
 include/gtest/gtest.h
 include/gtest/gtest_pred_impl.h
 include/gtest/gtest_prod.h
+include/gtest/internal/custom/README.md
 include/gtest/internal/custom/gtest-port.h
 include/gtest/internal/custom/gtest-printers.h
 include/gtest/internal/custom/gtest.h
@@ -50,7 +52,15 @@ include/gtest/internal/gtest-tuple.h
 include/gtest/internal/gtest-tuple.h.pump
 include/gtest/internal/gtest-type-util.h
 include/gtest/internal/gtest-type-util.h.pump
+lib/cmake/GTest/GTestConfig.cmake
+lib/cmake/GTest/GTestConfigVersion.cmake
+lib/cmake/GTest/GTestTargets-noconfig.cmake
+lib/cmake/GTest/GTestTargets.cmake
 lib/libgmock.a
 lib/libgmock_main.a
 lib/libgtest.a
 lib/libgtest_main.a
+lib/pkgconfig/gmock.pc
+lib/pkgconfig/gmock_main.pc
+lib/pkgconfig/gtest.pc
+lib/pkgconfig/gtest_main.pc
diff --git a/devel/googletest/distinfo b/devel/googletest/distinfo
index 1dc9359654f..a829eea4edd 100644
--- a/devel/googletest/distinfo
+++ b/devel/googletest/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.8 2017/07/04 20:51:07 kamil Exp $
+$NetBSD: distinfo,v 1.9 2018/09/10 10:23:33 adam Exp $
 
-SHA1 (googletest-1.8.0.tar.gz) = e7e646a6204638fe8e87e165292b8dd9cd4c36ed
-RMD160 (googletest-1.8.0.tar.gz) = b0a9e48874df3291a261ed85a0c0a4d677b01dc1
-SHA512 (googletest-1.8.0.tar.gz) = 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
-Size (googletest-1.8.0.tar.gz) = 1281617 bytes
-SHA1 (patch-googletest_include_gtest_internal_gtest-port-arch.h) = 105ef4b84a5fea957c9cffc0f202829c774136dc
-SHA1 (patch-googletest_include_gtest_internal_gtest-port.h) = 86319a127b60083e07d565dbeb496af17a6f84e4
+SHA1 (googletest-1.8.1.tar.gz) = 152b849610d91a9dfa1401293f43230c2e0c33f8
+RMD160 (googletest-1.8.1.tar.gz) = ad357c51fa7a1f4f6be069cc1ceae2c722fc28a2
+SHA512 (googletest-1.8.1.tar.gz) = e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
+Size (googletest-1.8.1.tar.gz) = 992298 bytes
diff --git a/devel/googletest/patches/patch-googletest_include_gtest_internal_gtest-port-arch.h b/devel/googletest/patches/patch-googletest_include_gtest_internal_gtest-port-arch.h
deleted file mode 100644
index f92c47d0849..00000000000
--- a/devel/googletest/patches/patch-googletest_include_gtest_internal_gtest-port-arch.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-googletest_include_gtest_internal_gtest-port-arch.h,v 1.1 2017/07/04 20:51:07 kamil Exp $
-
---- googletest/include/gtest/internal/gtest-port-arch.h.orig	2016-07-14 17:15:38.000000000 +0000
-+++ googletest/include/gtest/internal/gtest-port-arch.h
-@@ -84,6 +84,8 @@
- # define GTEST_OS_HPUX 1
- #elif defined __native_client__
- # define GTEST_OS_NACL 1
-+#elif defined __NetBSD__
-+# define GTEST_OS_NETBSD 1
- #elif defined __OpenBSD__
- # define GTEST_OS_OPENBSD 1
- #elif defined __QNX__
diff --git a/devel/googletest/patches/patch-googletest_include_gtest_internal_gtest-port.h b/devel/googletest/patches/patch-googletest_include_gtest_internal_gtest-port.h
deleted file mode 100644
index f0874b148dd..00000000000
--- a/devel/googletest/patches/patch-googletest_include_gtest_internal_gtest-port.h
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-googletest_include_gtest_internal_gtest-port.h,v 1.1 2017/07/04 20:51:07 kamil Exp $
-
---- googletest/include/gtest/internal/gtest-port.h.orig	2016-07-14 17:15:38.000000000 +0000
-+++ googletest/include/gtest/internal/gtest-port.h
-@@ -128,6 +128,7 @@
- //   GTEST_OS_MAC      - Mac OS X
- //     GTEST_OS_IOS    - iOS
- //   GTEST_OS_NACL     - Google Native Client (NaCl)
-+//   GTEST_OS_NETBSD   - NetBSD
- //   GTEST_OS_OPENBSD  - OpenBSD
- //   GTEST_OS_QNX      - QNX
- //   GTEST_OS_SOLARIS  - Sun Solaris
-@@ -601,7 +602,7 @@ struct _RTL_CRITICAL_SECTION;
- // To disable threading support in Google Test, add -DGTEST_HAS_PTHREAD=0
- // to your compiler flags.
- # define GTEST_HAS_PTHREAD (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_HPUX \
--    || GTEST_OS_QNX || GTEST_OS_FREEBSD || GTEST_OS_NACL)
-+    || GTEST_OS_QNX || GTEST_OS_FREEBSD || GTEST_OS_NACL || GTEST_OS_NETBSD)
- #endif  // GTEST_HAS_PTHREAD
- 
- #if GTEST_HAS_PTHREAD
-@@ -790,7 +791,8 @@ using ::std::tuple_size;
-      (GTEST_OS_MAC && !GTEST_OS_IOS) || \
-      (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \
-      GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \
--     GTEST_OS_OPENBSD || GTEST_OS_QNX || GTEST_OS_FREEBSD)
-+     GTEST_OS_OPENBSD || GTEST_OS_QNX || GTEST_OS_FREEBSD || \
-+     GTEST_OS_NETBSD)
- # define GTEST_HAS_DEATH_TEST 1
- #endif
-