Date: Mon, 25 Sep 2017 00:51:02 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r450562 - in head: devel/googlemock devel/googletest devel/googletest/files emulators/dolphin-emu science/libkml science/orthanc science/orthanc-dicomweb science/orthanc-webviewer secur... Message-ID: <201709250051.v8P0p2re053174@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Sep 25 00:51:02 2017 New Revision: 450562 URL: https://svnweb.freebsd.org/changeset/ports/450562 Log: devel/google{test,mock}: update to 1.8.0.358 Changes: https://github.com/google/googletest/compare/59c795c...f1a87d7 Modified: head/devel/googlemock/Makefile (contents, props changed) head/devel/googlemock/distinfo (contents, props changed) head/devel/googletest/Makefile (contents, props changed) head/devel/googletest/distinfo (contents, props changed) head/devel/googletest/files/patch-Makefile.am (contents, props changed) head/devel/googletest/files/patch-bsd-defines (contents, props changed) head/emulators/dolphin-emu/Makefile (contents, props changed) head/science/libkml/Makefile (contents, props changed) head/science/orthanc-dicomweb/Makefile (contents, props changed) head/science/orthanc-webviewer/Makefile (contents, props changed) head/science/orthanc/Makefile (contents, props changed) head/security/certificate-transparency/Makefile (contents, props changed) Modified: head/devel/googlemock/Makefile ============================================================================== --- head/devel/googlemock/Makefile Mon Sep 25 00:23:49 2017 (r450561) +++ head/devel/googlemock/Makefile Mon Sep 25 00:51:02 2017 (r450562) @@ -3,9 +3,8 @@ PORTNAME= googlemock DISTVERSIONPREFIX= release- -DISTVERSION= 1.8.0-50 -DISTVERSIONSUFFIX= -g59c795c -PORTREVISION= 1 +DISTVERSION= 1.8.0-358 +DISTVERSIONSUFFIX= -gf1a87d7 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org Modified: head/devel/googlemock/distinfo ============================================================================== --- head/devel/googlemock/distinfo Mon Sep 25 00:23:49 2017 (r450561) +++ head/devel/googlemock/distinfo Mon Sep 25 00:51:02 2017 (r450562) @@ -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 Modified: head/devel/googletest/Makefile ============================================================================== --- head/devel/googletest/Makefile Mon Sep 25 00:23:49 2017 (r450561) +++ head/devel/googletest/Makefile Mon Sep 25 00:51:02 2017 (r450562) @@ -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 Modified: head/devel/googletest/distinfo ============================================================================== --- head/devel/googletest/distinfo Mon Sep 25 00:23:49 2017 (r450561) +++ head/devel/googletest/distinfo Mon Sep 25 00:51:02 2017 (r450562) @@ -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 Modified: head/devel/googletest/files/patch-Makefile.am ============================================================================== --- head/devel/googletest/files/patch-Makefile.am Mon Sep 25 00:23:49 2017 (r450561) +++ head/devel/googletest/files/patch-Makefile.am Mon Sep 25 00:51:02 2017 (r450562) @@ -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 \ Modified: head/devel/googletest/files/patch-bsd-defines ============================================================================== --- head/devel/googletest/files/patch-bsd-defines Mon Sep 25 00:23:49 2017 (r450561) +++ head/devel/googletest/files/patch-bsd-defines Mon Sep 25 00:51:02 2017 (r450562) @@ -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()); } Modified: head/emulators/dolphin-emu/Makefile ============================================================================== --- head/emulators/dolphin-emu/Makefile Mon Sep 25 00:23:49 2017 (r450561) +++ head/emulators/dolphin-emu/Makefile Mon Sep 25 00:51:02 2017 (r450562) @@ -3,7 +3,7 @@ PORTNAME= dolphin-emu PORTVERSION= 5.0 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= emulators MAINTAINER= martymac@FreeBSD.org Modified: head/science/libkml/Makefile ============================================================================== --- head/science/libkml/Makefile Mon Sep 25 00:23:49 2017 (r450561) +++ head/science/libkml/Makefile Mon Sep 25 00:51:02 2017 (r450562) @@ -3,7 +3,7 @@ PORTNAME= libkml PORTVERSION= 1.3.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= science MAINTAINER= sunpoet@FreeBSD.org Modified: head/science/orthanc-dicomweb/Makefile ============================================================================== --- head/science/orthanc-dicomweb/Makefile Mon Sep 25 00:23:49 2017 (r450561) +++ head/science/orthanc-dicomweb/Makefile Mon Sep 25 00:51:02 2017 (r450562) @@ -3,7 +3,7 @@ PORTNAME= orthanc-dicomweb PORTVERSION= 0.3 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= science net MASTER_SITES= http://orthanc-server.com/downloads/get.php?path=/plugin-dicom-web/ DISTNAME= OrthancDicomWeb-${PORTVERSION} Modified: head/science/orthanc-webviewer/Makefile ============================================================================== --- head/science/orthanc-webviewer/Makefile Mon Sep 25 00:23:49 2017 (r450561) +++ head/science/orthanc-webviewer/Makefile Mon Sep 25 00:51:02 2017 (r450562) @@ -3,7 +3,7 @@ PORTNAME= orthanc-webviewer PORTVERSION= 2.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= science graphics MASTER_SITES= http://orthanc-server.com/downloads/get.php?path=/plugin-webviewer/:main \ http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/WebViewer/:thirdparty Modified: head/science/orthanc/Makefile ============================================================================== --- head/science/orthanc/Makefile Mon Sep 25 00:23:49 2017 (r450561) +++ head/science/orthanc/Makefile Mon Sep 25 00:51:02 2017 (r450562) @@ -3,7 +3,7 @@ PORTNAME= orthanc PORTVERSION= 1.1.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= science graphics net www MASTER_SITES= http://orthanc-server.com/downloads/get.php?path=/orthanc/:main \ http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/:mongoose Modified: head/security/certificate-transparency/Makefile ============================================================================== --- head/security/certificate-transparency/Makefile Mon Sep 25 00:23:49 2017 (r450561) +++ head/security/certificate-transparency/Makefile Mon Sep 25 00:51:02 2017 (r450562) @@ -3,7 +3,7 @@ PORTNAME= certificate-transparency PORTVERSION= 20161015 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= security MAINTAINER= ports@FreeBSD.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709250051.v8P0p2re053174>