devel/google{test,mock}: update to 1.10.0

- Drop static library
- Drop gtest-config and gmock-config
- Drop GTEST_LIB_CHECK autoconf macro
- Drop gmock_doctory.py as it's too old
- Expose tests via option

Changes:	https://github.com/google/googletest/compare/release-1.8.1...release-1.10.0
Reported by:	GitHub (watch releases)
PR:		239654
Differential Revision:	https://reviews.freebsd.org/D19430

19 files changed, 61 insertions, 294 deletions

diff --git a/databases/clickhouse/Makefile b/databases/clickhouse/Makefile
index 32834b89339d..375b013ee2c3 100644
--- a/databases/clickhouse/Makefile
+++ b/databases/clickhouse/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	clickhouse
 PORTVERSION=	19.11.5.28
 DISTVERSIONPREFIX=	v
 DISTVERSIONSUFFIX=	-stable
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 
 MAINTAINER=	proler@gmail.com
diff --git a/devel/android-tools-adb/files/Makefile b/devel/android-tools-adb/files/Makefile
index 676164ed9754..52883461eb10 100644
--- a/devel/android-tools-adb/files/Makefile
+++ b/devel/android-tools-adb/files/Makefile
@@ -112,8 +112,8 @@ CFLAGS+= ${CPPFLAGS}
 CXXFLAGS+= ${CPPFLAGS}
 .endif
 
-TEST_CPPFLAGS+= $$(${GTEST_CONFIG} --cppflags)
-TEST_CPPFLAGS+= $$(${GMOCK_CONFIG} --cppflags)
+TEST_CPPFLAGS+= $$(${PKG_CONFIG} gtest --cflags)
+TEST_CPPFLAGS+= $$(${PKG_CONFIG} gmock --cflags)
 .for f in ${TEST_SRCS}
 CPPFLAGS.${f}+= ${TEST_CPPFLAGS}
 .endfor
@@ -122,14 +122,12 @@ LDADD+= $$(${PKG_CONFIG} libcrypto --libs 2>/dev/null || echo -lcrypto)
 LDADD+= $$(${PKG_CONFIG} libusb-1.0 --libs 2>/dev/null || echo -lusb)
 LDADD+= \-lpthread
 DPADD+= ${LIBCRYPTO} ${LIBPTHREAD} ${LIBUSB}
-TEST_LDADD+= $$(${GTEST_CONFIG} --libs --ldflags)
-TEST_LDADD+= $$(${GMOCK_CONFIG} --libs --ldflags)
+TEST_LDADD+= $$(${PKG_CONFIG} gtest --libs)
+TEST_LDADD+= $$(${PKG_CONFIG} gmock --libs)
 
 TEST_OBJS+= ${TEST_SRCS:R:S/$/.o/}
 CLEANFILES+= ${PROG}_test ${TEST_OBJS}
 
-GTEST_CONFIG?= gtest-config
-GMOCK_CONFIG?= gmock-config
 PKG_CONFIG?= pkg-config
 
 beforeinstall:
diff --git a/devel/android-tools-simpleperf/files/Makefile b/devel/android-tools-simpleperf/files/Makefile
index 0745244c29c5..127989901607 100644
--- a/devel/android-tools-simpleperf/files/Makefile
+++ b/devel/android-tools-simpleperf/files/Makefile
@@ -84,7 +84,7 @@ CFLAGS+=	${CPPFLAGS}
 CXXFLAGS+=	${CPPFLAGS}
 .endif
 
-TEST_CPPFLAGS+=	$$(${GTEST_CONFIG} --cppflags)
+TEST_CPPFLAGS+=	$$(${PKG_CONFIG} gtest --cflags)
 .for f in ${TEST_SRCS}
 CPPFLAGS.${f}+=	${TEST_CPPFLAGS}
 .endfor
@@ -93,13 +93,13 @@ LDADD!=		${LLVM_CONFIG} --system-libs --libs --ldflags --link-static
 LDADD+=		-lz \-lpthread
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=223191#c3
 LDADD:=		${LDADD:S,-l/usr/lib/libexecinfo.so,-lexecinfo,}
-TEST_LDADD+=	$$(${GTEST_CONFIG} --libs --ldflags)
+TEST_LDADD+=	$$(${PKG_CONFIG} gtest --libs)
 
 TEST_OBJS+=	${TEST_SRCS:R:S/$/.o/}
 CLEANFILES+=	${PROG}_test ${TEST_OBJS}
 
 LLVM_CONFIG?=	llvm-config
-GTEST_CONFIG?=	gtest-config
+PKG_CONFIG?=	pkg-config
 
 .include <bsd.prog.mk>
 
diff --git a/devel/googlemock/Makefile b/devel/googlemock/Makefile
index 1ae76022fb52..d04bd579d0b1 100644
--- a/devel/googlemock/Makefile
+++ b/devel/googlemock/Makefile
@@ -3,8 +3,7 @@
 
 PORTNAME=	googlemock
 DISTVERSIONPREFIX=	release-
-DISTVERSION=	1.8.1
-PORTREVISION=	2
+DISTVERSION=	1.10.0
 CATEGORIES=	devel
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -13,33 +12,27 @@ COMMENT=	Library for writing and using C++ mock classes
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/ax_pthread.m4:devel/autoconf-archive \
-		googletest>=1.8.0:devel/googletest
 LIB_DEPENDS=	libgtest.so:devel/googletest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
 GH_PROJECT=	googletest
 
-USES=		autoreconf compiler:c++11-lang libtool localbase python:run shebangfix
-SHEBANG_FILES=	scripts/gmock_doctor.py
-WRKSRC_SUBDIR=	${PORTNAME}
-GNU_CONFIGURE=	yes
-# fused-src python tests are only useful for bundling. There's no point in
-# running them before installing system-wide without source files.
-CONFIGURE_ENV=	ac_cv_path_PYTHON=":"
-TEST_TARGET=	check
-INSTALL_TARGET=	install-strip
+USES=		cmake compiler:c++11-lib
 USE_LDCONFIG=	yes
+CMAKE_ON=	BUILD_GMOCK BUILD_SHARED_LIBS
 
-post-patch:
-	@${REINPLACE_CMD} '/acx_pthread.m4/d' ${WRKSRC}/configure.ac
-# enable vendor make install again (revert 52277c9)
-	@${REINPLACE_CMD} -E 's/install-(exec|data)-local/&-dummy/' \
-		${WRKSRC}/Makefile.am
+OPTIONS_DEFINE=	TEST
+
+TEST_USES=		python:build
+TEST_CMAKE_BOOL=	gmock_build_tests
+TEST_TEST_TARGET=	test
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/gmock-config ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/gmock_doctor.py ${STAGEDIR}${PREFIX}/bin
+# Clean unused stuff: googletest, unprocessed headers
+	${FIND} ${STAGEDIR}${PREFIX} \( -ipath "*gtest*" -o \
+		-name '*.pump' -o -empty \) -delete
+
+pre-install-TEST-on: do-test
 
 .include <bsd.port.mk>
diff --git a/devel/googlemock/distinfo b/devel/googlemock/distinfo
index f6f1034eb488..2e0bcf6c9abc 100644
--- a/devel/googlemock/distinfo
+++ b/devel/googlemock/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535728917
-SHA256 (google-googletest-release-1.8.1_GH0.tar.gz) = 9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c
-SIZE (google-googletest-release-1.8.1_GH0.tar.gz) = 992298
+TIMESTAMP = 1570114335
+SHA256 (google-googletest-release-1.10.0_GH0.tar.gz) = 9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb
+SIZE (google-googletest-release-1.10.0_GH0.tar.gz) = 904349
diff --git a/devel/googlemock/files/patch-Makefile.am b/devel/googlemock/files/patch-Makefile.am
deleted file mode 100644
index 73e3dedeaad8..000000000000
--- a/devel/googlemock/files/patch-Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-Move custom headers into their own directory
-
---- Makefile.am.orig	2016-11-03 20:36:28 UTC
-+++ Makefile.am
-@@ -42,7 +42,10 @@ pkginclude_internaldir = $(pkgincludedir
- pkginclude_internal_HEADERS = \
-   include/gmock/internal/gmock-generated-internal-utils.h \
-   include/gmock/internal/gmock-internal-utils.h \
--  include/gmock/internal/gmock-port.h \
-+  include/gmock/internal/gmock-port.h
-+
-+pkginclude_internal_customdir = $(pkgincludedir)/internal/custom
-+pkginclude_internal_custom_HEADERS = \
-   include/gmock/internal/custom/gmock-generated-actions.h \
-   include/gmock/internal/custom/gmock-matchers.h \
-   include/gmock/internal/custom/gmock-port.h
diff --git a/devel/googlemock/pkg-plist b/devel/googlemock/pkg-plist
index caba3b153a6c..c3b8914f6aba 100644
--- a/devel/googlemock/pkg-plist
+++ b/devel/googlemock/pkg-plist
@@ -1,27 +1,23 @@
-bin/gmock-config
-bin/gmock_doctor.py
 include/gmock/gmock-actions.h
 include/gmock/gmock-cardinalities.h
+include/gmock/gmock-function-mocker.h
 include/gmock/gmock-generated-actions.h
 include/gmock/gmock-generated-function-mockers.h
 include/gmock/gmock-generated-matchers.h
-include/gmock/gmock-generated-nice-strict.h
 include/gmock/gmock-matchers.h
 include/gmock/gmock-more-actions.h
 include/gmock/gmock-more-matchers.h
+include/gmock/gmock-nice-strict.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-matchers.h
 include/gmock/internal/custom/gmock-port.h
-include/gmock/internal/gmock-generated-internal-utils.h
 include/gmock/internal/gmock-internal-utils.h
 include/gmock/internal/gmock-port.h
-lib/libgmock.a
+include/gmock/internal/gmock-pp.h
 lib/libgmock.so
-lib/libgmock.so.0
-lib/libgmock.so.0.0.0
-lib/libgmock_main.a
 lib/libgmock_main.so
-lib/libgmock_main.so.0
-lib/libgmock_main.so.0.0.0
+libdata/pkgconfig/gmock.pc
+libdata/pkgconfig/gmock_main.pc
diff --git a/devel/googletest/Makefile b/devel/googletest/Makefile
index 2e16afecae66..32d97d0c7c0b 100644
--- a/devel/googletest/Makefile
+++ b/devel/googletest/Makefile
@@ -3,8 +3,7 @@
 
 PORTNAME=	googletest
 DISTVERSIONPREFIX=	release-
-DISTVERSION=	1.8.1
-PORTREVISION=	3
+DISTVERSION=	1.10.0
 CATEGORIES=	devel
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -16,28 +15,17 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
 
-USES=		autoreconf compiler:c++11-lang libtool
-WRKSRC_SUBDIR=	${PORTNAME}
-GNU_CONFIGURE=	yes
-# fused-src python tests are only useful for bundling. There's no point in
-# running them before installing system-wide without source files.
-CONFIGURE_ENV=	ac_cv_path_PYTHON=":"
-TEST_TARGET=	check
-INSTALL_TARGET=	install-strip
+USES=		cmake compiler:c++11-lib
 USE_LDCONFIG=	yes
+CMAKE_ON=	BUILD_SHARED_LIBS
+CMAKE_OFF=	BUILD_GMOCK
 
-# googletest requires pthread in order to function and does not properly
-# detect pthread support.
-#
-# See: https://github.com/google/googletest/issues/2162
-LIBS+=		-lpthread
+OPTIONS_DEFINE=	TEST
 
-post-patch:
-# enable vendor make install again (revert 661758e)
-	@${REINPLACE_CMD} -E 's/install-(exec|data)-local/&-dummy/' \
-		${WRKSRC}/Makefile.am
+TEST_USES=		python:build
+TEST_CMAKE_BOOL=	gtest_build_tests
+TEST_TEST_TARGET=	test
 
-post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/gtest-config ${STAGEDIR}${PREFIX}/bin
+pre-install-TEST-on: do-test
 
 .include <bsd.port.mk>
diff --git a/devel/googletest/distinfo b/devel/googletest/distinfo
index f6f1034eb488..2e0bcf6c9abc 100644
--- a/devel/googletest/distinfo
+++ b/devel/googletest/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535728917
-SHA256 (google-googletest-release-1.8.1_GH0.tar.gz) = 9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c
-SIZE (google-googletest-release-1.8.1_GH0.tar.gz) = 992298
+TIMESTAMP = 1570114335
+SHA256 (google-googletest-release-1.10.0_GH0.tar.gz) = 9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb
+SIZE (google-googletest-release-1.10.0_GH0.tar.gz) = 904349
diff --git a/devel/googletest/files/patch-Makefile.am b/devel/googletest/files/patch-Makefile.am
deleted file mode 100644
index 187c8d7abb3e..000000000000
--- a/devel/googletest/files/patch-Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-Move custom headers into their own directory
-
---- Makefile.am.orig	2017-09-23 23:21:02 UTC
-+++ Makefile.am
-@@ -208,7 +208,10 @@ pkginclude_internal_HEADERS = \
-   include/gtest/internal/gtest-port-arch.h \
-   include/gtest/internal/gtest-string.h \
-   include/gtest/internal/gtest-tuple.h \
--  include/gtest/internal/gtest-type-util.h \
-+  include/gtest/internal/gtest-type-util.h
-+
-+pkginclude_internal_customdir = $(pkgincludedir)/internal/custom
-+pkginclude_internal_custom_HEADERS = \
-   include/gtest/internal/custom/gtest.h \
-   include/gtest/internal/custom/gtest-port.h \
-   include/gtest/internal/custom/gtest-printers.h
diff --git a/devel/googletest/files/patch-bsd-defines b/devel/googletest/files/patch-bsd-defines
deleted file mode 100644
index ff679caaf7ac..000000000000
--- a/devel/googletest/files/patch-bsd-defines
+++ /dev/null
@@ -1,178 +0,0 @@
-o Add DragonFly and GNU/kFreeBSD support
-o Implement GetThreadCount() for BSDs
-
---- include/gtest/internal/gtest-port-arch.h.orig	2017-09-23 23:21:02 UTC
-+++ include/gtest/internal/gtest-port-arch.h
-@@ -67,6 +67,10 @@
- # if TARGET_OS_IPHONE
- #  define GTEST_OS_IOS 1
- # endif
-+#elif defined __DragonFly__
-+# define GTEST_OS_DRAGONFLY 1
-+#elif defined(__GLIBC__) && defined(__FreeBSD_kernel__)
-+# define GTEST_OS_GNU_KFREEBSD 1
- #elif defined __FreeBSD__
- # define GTEST_OS_FREEBSD 1
- #elif defined __Fuchsia__
---- include/gtest/internal/gtest-port.h.orig	2018-08-31 15:21:57 UTC
-+++ include/gtest/internal/gtest-port.h
-@@ -125,7 +125,9 @@
- //
- //   GTEST_OS_AIX      - IBM AIX
- //   GTEST_OS_CYGWIN   - Cygwin
-+//   GTEST_OS_DRAGONFLY - DragonFly
- //   GTEST_OS_FREEBSD  - FreeBSD
-+//   GTEST_OS_GNU_KFREEBSD - GNU/kFreeBSD
- //   GTEST_OS_FUCHSIA  - Fuchsia
- //   GTEST_OS_HPUX     - HP-UX
- //   GTEST_OS_LINUX    - Linux
-@@ -623,6 +625,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SE
- // to your compiler flags.
- #define GTEST_HAS_PTHREAD                                             \
-   (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_HPUX || GTEST_OS_QNX || \
-+   GTEST_OS_GNU_KFREEBSD || GTEST_OS_DRAGONFLY || GTEST_OS_OPENBSD || \
-    GTEST_OS_FREEBSD || GTEST_OS_NACL || GTEST_OS_NETBSD || GTEST_OS_FUCHSIA)
- #endif  // GTEST_HAS_PTHREAD
- 
-@@ -829,7 +832,8 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SE
-      (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_NETBSD || GTEST_OS_FUCHSIA)
-+     GTEST_OS_NETBSD || GTEST_OS_FUCHSIA || GTEST_OS_DRAGONFLY || \
-+     GTEST_OS_GNU_KFREEBSD)
- # define GTEST_HAS_DEATH_TEST 1
- #endif
- 
-@@ -856,7 +860,8 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SE
-     (GTEST_OS_WINDOWS || GTEST_OS_CYGWIN || GTEST_OS_SYMBIAN || GTEST_OS_AIX)
- 
- // Determines whether test results can be streamed to a socket.
--#if GTEST_OS_LINUX
-+#if GTEST_OS_LINUX || GTEST_OS_GNU_KFREEBSD || GTEST_OS_DRAGONFLY || \
-+    GTEST_OS_FREEBSD || GTEST_OS_NETBSD || GTEST_OS_OPENBSD
- # define GTEST_CAN_STREAM_RESULTS_ 1
- #endif
- 
---- src/gtest-port.cc.orig	2017-09-23 23:21:02 UTC
-+++ src/gtest-port.cc
-@@ -52,6 +52,14 @@
- # include <mach/vm_map.h>
- #endif  // GTEST_OS_MAC
- 
-+#if GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD || \
-+    GTEST_OS_NETBSD || GTEST_OS_OPENBSD
-+# include <sys/sysctl.h>
-+# if GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD
-+#  include <sys/user.h>
-+# endif
-+#endif
-+
- #if GTEST_OS_QNX
- # include <devctl.h>
- # include <fcntl.h>
-@@ -131,6 +139,80 @@ size_t GetThreadCount() {
-   }
- }
- 
-+#elif GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD || \
-+      GTEST_OS_NETBSD
-+
-+#if GTEST_OS_NETBSD
-+#undef KERN_PROC
-+#define KERN_PROC KERN_PROC2
-+#define kinfo_proc kinfo_proc2
-+#endif
-+
-+#if GTEST_OS_DRAGONFLY
-+#define KP_NLWP(kp) (kp.kp_nthreads)
-+#elif GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD
-+#define KP_NLWP(kp) (kp.ki_numthreads)
-+#elif GTEST_OS_NETBSD
-+#define KP_NLWP(kp) (kp.p_nlwps)
-+#endif
-+
-+// Returns the number of threads running in the process, or 0 to indicate that
-+// we cannot detect it.
-+size_t GetThreadCount() {
-+  int mib[] = {
-+    CTL_KERN,
-+    KERN_PROC,
-+    KERN_PROC_PID,
-+    getpid(),
-+#if GTEST_OS_NETBSD
-+    sizeof(struct kinfo_proc),
-+    1,
-+#endif
-+  };
-+  u_int miblen = sizeof(mib) / sizeof(mib[0]);
-+  struct kinfo_proc info;
-+  size_t size = sizeof(info);
-+  if (sysctl(mib, miblen, &info, &size, NULL, 0)) {
-+    return 0;
-+  }
-+  return KP_NLWP(info);
-+}
-+#elif GTEST_OS_OPENBSD
-+
-+// Returns the number of threads running in the process, or 0 to indicate that
-+// we cannot detect it.
-+size_t GetThreadCount() {
-+  int mib[] = {
-+    CTL_KERN,
-+    KERN_PROC,
-+    KERN_PROC_PID | KERN_PROC_SHOW_THREADS,
-+    getpid(),
-+    sizeof(struct kinfo_proc),
-+    0,
-+  };
-+  u_int miblen = sizeof(mib) / sizeof(mib[0]);
-+
-+  // get number of structs
-+  size_t size;
-+  if (sysctl(mib, miblen, NULL, &size, NULL, 0)) {
-+    return 0;
-+  }
-+  mib[5] = size / mib[4];
-+
-+  // populate array of structs
-+  struct kinfo_proc info[mib[5]];
-+  if (sysctl(mib, miblen, &info, &size, NULL, 0)) {
-+    return 0;
-+  }
-+
-+  // exclude empty members
-+  int nthreads = 0;
-+  for (int i = 0; i < size / mib[4]; i++) {
-+    if (info[i].p_tid != -1)
-+      nthreads++;
-+  }
-+  return nthreads;
-+}
- #elif GTEST_OS_QNX
- 
- // Returns the number of threads running in the process, or 0 to indicate that
---- src/gtest.cc.orig	2017-09-23 23:21:02 UTC
-+++ src/gtest.cc
-@@ -127,7 +127,7 @@
- #endif
- 
- #if GTEST_CAN_STREAM_RESULTS_
--# include <arpa/inet.h>  // NOLINT
-+# include <sys/socket.h>  // NOLINT
- # include <netdb.h>  // NOLINT
- # include <sys/socket.h>  // NOLINT
- # include <sys/types.h>  // NOLINT
---- test/googletest-port-test.cc.orig	2018-08-31 15:21:57 UTC
-+++ test/googletest-port-test.cc
-@@ -293,7 +293,9 @@ TEST(FormatCompilerIndependentFileLocationTest, Format
-   EXPECT_EQ("unknown file", FormatCompilerIndependentFileLocation(NULL, -1));
- }
- 
--#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_FUCHSIA
-+#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_FUCHSIA || \
-+    GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD || \
-+    GTEST_OS_NETBSD || GTEST_OS_OPENBSD
- void* ThreadFunc(void* data) {
-   internal::Mutex* mutex = static_cast<internal::Mutex*>(data);
-   mutex->Lock();
diff --git a/devel/googletest/pkg-plist b/devel/googletest/pkg-plist
index 72761e87c221..353aafa601f3 100644
--- a/devel/googletest/pkg-plist
+++ b/devel/googletest/pkg-plist
@@ -1,5 +1,5 @@
-bin/gtest-config
 include/gtest/gtest-death-test.h
+include/gtest/gtest-matchers.h
 include/gtest/gtest-message.h
 include/gtest/gtest-param-test.h
 include/gtest/gtest-printers.h
@@ -9,26 +9,24 @@ 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
 include/gtest/internal/gtest-death-test-internal.h
 include/gtest/internal/gtest-filepath.h
 include/gtest/internal/gtest-internal.h
-include/gtest/internal/gtest-linked_ptr.h
-include/gtest/internal/gtest-param-util-generated.h
 include/gtest/internal/gtest-param-util.h
 include/gtest/internal/gtest-port-arch.h
 include/gtest/internal/gtest-port.h
 include/gtest/internal/gtest-string.h
-include/gtest/internal/gtest-tuple.h
 include/gtest/internal/gtest-type-util.h
-lib/libgtest.a
+include/gtest/internal/gtest-type-util.h.pump
+lib/cmake/GTest/GTestConfig.cmake
+lib/cmake/GTest/GTestConfigVersion.cmake
+lib/cmake/GTest/GTestTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/GTest/GTestTargets.cmake
 lib/libgtest.so
-lib/libgtest.so.0
-lib/libgtest.so.0.0.0
-lib/libgtest_main.a
 lib/libgtest_main.so
-lib/libgtest_main.so.0
-lib/libgtest_main.so.0.0.0
-share/aclocal/gtest.m4
+libdata/pkgconfig/gtest.pc
+libdata/pkgconfig/gtest_main.pc
diff --git a/devel/msgpack/Makefile b/devel/msgpack/Makefile
index 242b30c496e5..b02dff3f42d0 100644
--- a/devel/msgpack/Makefile
+++ b/devel/msgpack/Makefile
@@ -29,6 +29,10 @@ TEST_TARGET=	test
 USE_GCC=	yes
 .endif
 
+post-patch:
+# GoogleTest doesn't support C++98 consumers since 1.10.0
+	@${REINPLACE_CMD} -e 's/c++98/c++11/' ${WRKSRC}/CMakeLists.txt
+
 pre-test:
 	cd ${WRKSRC} && ${CMAKE_BIN} . && ${MAKE_CMD}
 
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 6f490ed32f92..22294d190c6b 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -85,7 +85,7 @@ OFX_VARS=		GLIB_SCHEMAS+=org.gnucash.dialogs.import.ofx.gschema.xml
 PYTHON_CMAKE_BOOL=	WITH_PYTHON
 PYTHON_USES=		python:3.3+
 TEST_BUILD_DEPENDS=	${NONEXISTENT}:devel/googlemock:build \
-			gtest-config:devel/googletest
+			googletest>0:devel/googletest
 
 .include <bsd.port.pre.mk>
 
diff --git a/lang/cling/Makefile b/lang/cling/Makefile
index e571f56ed35c..435f0ce8178e 100644
--- a/lang/cling/Makefile
+++ b/lang/cling/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=		cling
 DISTVERSION=		0.5-2018-08-13
-PORTREVISION=		3
+PORTREVISION=		4
 CATEGORIES=		lang devel
 MASTER_SITES=		https://root.cern.ch/download/cling/
 DISTNAME=		${PORTNAME}_${DISTVERSION:C/^[0-9]\.[0-9]-//}_sources
diff --git a/math/yacas/Makefile b/math/yacas/Makefile
index 33543596c02b..6e412305ea1b 100644
--- a/math/yacas/Makefile
+++ b/math/yacas/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 TEST_DEPENDS=	bash:shells/bash \
 
-BUILD_DEPENDS=	gtest-config:devel/googletest
+BUILD_DEPENDS=	googletest>0:devel/googletest
 
 CMAKE_ARGS=	-DENABLE_DOCS:BOOL=OFF \
 		-DENABLE_CYACAS_CONSOLE:BOOL=ON \
diff --git a/net-im/mtxclient/Makefile b/net-im/mtxclient/Makefile
index 333c89ee8a6a..debf8c099ae1 100644
--- a/net-im/mtxclient/Makefile
+++ b/net-im/mtxclient/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	nlohmann-json>=3:devel/nlohmann-json \
 		spdlog>=1.3:devel/spdlog \
-		gtest-config:devel/googletest
+		googletest>0:devel/googletest
 LIB_DEPENDS=	libsodium.so:security/libsodium \
 		libboost_date_time.so:devel/boost-libs \
 		libboost_chrono.so:devel/boost-libs \
diff --git a/science/libkml/Makefile b/science/libkml/Makefile
index f2b3ee20e8a4..f5905b430291 100644
--- a/science/libkml/Makefile
+++ b/science/libkml/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libkml
 PORTVERSION=	1.3.0
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	science
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/security/certificate-transparency/Makefile b/security/certificate-transparency/Makefile
index 1914faf4aa2f..855e796d888a 100644
--- a/security/certificate-transparency/Makefile
+++ b/security/certificate-transparency/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	certificate-transparency
 PORTVERSION=	20161015
-PORTREVISION=	38
+PORTREVISION=	39
 CATEGORIES=	security
 
 MAINTAINER=	ports@FreeBSD.org