4 files changed, 29 insertions, 43 deletions

diff --git a/devel/googletest/Makefile b/devel/googletest/Makefile
index fc01b68fce93..48cc531dd578 100644
--- a/devel/googletest/Makefile
+++ b/devel/googletest/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	googletest
 DISTVERSIONPREFIX=	release-
-DISTVERSION=	1.8.0-50
-DISTVERSIONSUFFIX=	-g59c795c
+DISTVERSION=	1.8.0-358
+DISTVERSIONSUFFIX=	-gf1a87d7
 CATEGORIES=	devel
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/devel/googletest/distinfo b/devel/googletest/distinfo
index 3e5e785b327e..ee4d4ba8f98d 100644
--- a/devel/googletest/distinfo
+++ b/devel/googletest/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495138798
-SHA256 (google-googletest-release-1.8.0-50-g59c795c_GH0.tar.gz) = c342155719a2dd5e6d38344056cfffea3c960569879727e22888f9cd6ae5ca66
-SIZE (google-googletest-release-1.8.0-50-g59c795c_GH0.tar.gz) = 1285161
+TIMESTAMP = 1506208862
+SHA256 (google-googletest-release-1.8.0-358-gf1a87d7_GH0.tar.gz) = cc71cd610a5781cca285d1568e4b573e7a33f585bf690b7569e433c2dff99c41
+SIZE (google-googletest-release-1.8.0-358-gf1a87d7_GH0.tar.gz) = 953367
diff --git a/devel/googletest/files/patch-Makefile.am b/devel/googletest/files/patch-Makefile.am
index 139ad1ce2316..187c8d7abb3e 100644
--- a/devel/googletest/files/patch-Makefile.am
+++ b/devel/googletest/files/patch-Makefile.am
@@ -1,6 +1,6 @@
 Move custom headers into their own directory
 
---- Makefile.am.orig	2016-11-03 20:36:28 UTC
+--- 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 \
diff --git a/devel/googletest/files/patch-bsd-defines b/devel/googletest/files/patch-bsd-defines
index c8ed2fcb5047..790cce795bdf 100644
--- a/devel/googletest/files/patch-bsd-defines
+++ b/devel/googletest/files/patch-bsd-defines
@@ -1,8 +1,8 @@
-o Add DragonFly, NetBSD and GNU/kFreeBSD support
+o Add DragonFly and GNU/kFreeBSD support
 o Implement GetThreadCount() for BSDs
 o Work around StreamingListenerTest with GCC 4.2
 
---- include/gtest/internal/gtest-port-arch.h.orig	2016-11-03 20:36:28 UTC
+--- 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
@@ -14,52 +14,38 @@ o Work around StreamingListenerTest with GCC 4.2
 +# define GTEST_OS_GNU_KFREEBSD 1
  #elif defined __FreeBSD__
  # define GTEST_OS_FREEBSD 1
- #elif defined __linux__
-@@ -84,6 +88,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__
---- include/gtest/internal/gtest-port.h.orig	2016-11-03 20:36:28 UTC
+ #elif defined __Fuchsia__
+--- include/gtest/internal/gtest-port.h.orig	2017-09-23 23:21:02 UTC
 +++ include/gtest/internal/gtest-port.h
-@@ -121,13 +121,16 @@
+@@ -121,7 +121,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
- //     GTEST_OS_LINUX_ANDROID - Google Android
- //   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
-@@ -607,6 +610,7 @@ typedef struct _RTL_CRITICAL_SECTION GTE
- // To disable threading support in Google Test, add -DGTEST_HAS_PTHREAD=0
+@@ -610,6 +612,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_GNU_KFREEBSD || GTEST_OS_DRAGONFLY || GTEST_OS_NETBSD || GTEST_OS_OPENBSD \
-     || GTEST_OS_QNX || GTEST_OS_FREEBSD || GTEST_OS_NACL)
+ #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
  
-@@ -800,6 +804,7 @@ using ::std::tuple_size;
+@@ -803,7 +806,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_NETBSD)
 +     GTEST_OS_GNU_KFREEBSD || GTEST_OS_DRAGONFLY || GTEST_OS_NETBSD ||	\
-      GTEST_OS_OPENBSD || GTEST_OS_QNX || GTEST_OS_FREEBSD)
++     GTEST_OS_OPENBSD || GTEST_OS_QNX || GTEST_OS_FREEBSD)
  # define GTEST_HAS_DEATH_TEST 1
  #endif
-@@ -832,7 +837,8 @@ using ::std::tuple_size;
+ 
+@@ -835,7 +839,8 @@ using ::std::tuple_size;
      (GTEST_OS_WINDOWS || GTEST_OS_CYGWIN || GTEST_OS_SYMBIAN || GTEST_OS_AIX)
  
  // Determines whether test results can be streamed to a socket.
@@ -69,7 +55,7 @@ o Work around StreamingListenerTest with GCC 4.2
  # define GTEST_CAN_STREAM_RESULTS_ 1
  #endif
  
---- src/gtest-port.cc.orig	2016-11-03 20:36:28 UTC
+--- 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>
@@ -167,7 +153,7 @@ o Work around StreamingListenerTest with GCC 4.2
  #elif GTEST_OS_QNX
  
  // Returns the number of threads running in the process, or 0 to indicate that
---- src/gtest.cc.orig	2016-11-03 20:36:28 UTC
+--- src/gtest.cc.orig	2017-09-23 23:21:02 UTC
 +++ src/gtest.cc
 @@ -127,7 +127,7 @@
  #endif
@@ -178,9 +164,9 @@ o Work around StreamingListenerTest with GCC 4.2
  # include <netdb.h>  // NOLINT
  # include <sys/socket.h>  // NOLINT
  # include <sys/types.h>  // NOLINT
---- test/gtest-port_test.cc.orig	2016-11-03 20:36:28 UTC
+--- test/gtest-port_test.cc.orig	2017-09-23 23:21:02 UTC
 +++ test/gtest-port_test.cc
-@@ -304,7 +304,8 @@ TEST(FormatCompilerIndependentFileLocati
+@@ -304,7 +304,8 @@ TEST(FormatCompilerIndependentFileLocationTest, Format
    EXPECT_EQ("unknown file", FormatCompilerIndependentFileLocation(NULL, -1));
  }
  
@@ -190,9 +176,9 @@ o Work around StreamingListenerTest with GCC 4.2
  void* ThreadFunc(void* data) {
    internal::Mutex* mutex = static_cast<internal::Mutex*>(data);
    mutex->Lock();
---- test/gtest_unittest.cc.orig	2016-11-03 20:36:28 UTC
+--- test/gtest_unittest.cc.orig	2017-09-23 23:21:02 UTC
 +++ test/gtest_unittest.cc
-@@ -118,6 +118,7 @@ TEST_F(StreamingListenerTest, OnTestIter
+@@ -118,6 +118,7 @@ TEST_F(StreamingListenerTest, OnTestIterationEnd) {
    EXPECT_EQ("event=TestIterationEnd&passed=1&elapsed_time=0ms\n", *output());
  }
  
@@ -200,7 +186,7 @@ o Work around StreamingListenerTest with GCC 4.2
  TEST_F(StreamingListenerTest, OnTestCaseStart) {
    *output() = "";
    streamer_.OnTestCaseStart(TestCase("FooTest", "Bar", NULL, NULL));
-@@ -129,6 +130,7 @@ TEST_F(StreamingListenerTest, OnTestCase
+@@ -129,6 +130,7 @@ TEST_F(StreamingListenerTest, OnTestCaseEnd) {
    streamer_.OnTestCaseEnd(TestCase("FooTest", "Bar", NULL, NULL));
    EXPECT_EQ("event=TestCaseEnd&passed=1&elapsed_time=0ms\n", *output());
  }