Index: head/devel/googlemock/Makefile =================================================================== --- head/devel/googlemock/Makefile (revision 426137) +++ head/devel/googlemock/Makefile (revision 426138) @@ -1,42 +1,44 @@ # Created by: Cheng-Lung Sung # $FreeBSD$ PORTNAME= googlemock -PORTVERSION= 1.7.0 DISTVERSIONPREFIX= release- -PORTREVISION= 1 +DISTVERSION= 1.8.0-11 +DISTVERSIONSUFFIX= -ga2b8a8e CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org 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.7.0:devel/googletest + googletest>=1.8.0:devel/googletest LIB_DEPENDS= libgtest.so:devel/googletest USE_GITHUB= yes GH_ACCOUNT= google +GH_PROJECT= googletest -USES= autoreconf libtool +USES= autoreconf libtool localbase +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 USE_LDCONFIG= yes 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 post-install: ${INSTALL_SCRIPT} ${WRKSRC}/scripts/gmock-config ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/scripts/gmock_doctor.py ${STAGEDIR}${PREFIX}/bin .include Index: head/devel/googlemock/distinfo =================================================================== --- head/devel/googlemock/distinfo (revision 426137) +++ head/devel/googlemock/distinfo (revision 426138) @@ -1,2 +1,3 @@ -SHA256 (google-googlemock-release-1.7.0_GH0.tar.gz) = 3f20b6acb37e5a98e8c4518165711e3e35d47deb6cdb5a4dd4566563b5efd232 -SIZE (google-googlemock-release-1.7.0_GH0.tar.gz) = 296168 +TIMESTAMP = 1471419713 +SHA256 (google-googletest-release-1.8.0-11-ga2b8a8e_GH0.tar.gz) = 5e7cb72292eec51ca0ecb9c83d4769c667b7ead7daba83a89cbc20f7fbd2fd74 +SIZE (google-googletest-release-1.8.0-11-ga2b8a8e_GH0.tar.gz) = 1282276 Index: head/devel/googlemock/files/patch-scripts_gmock__doctor.py =================================================================== --- head/devel/googlemock/files/patch-scripts_gmock__doctor.py (revision 426137) +++ head/devel/googlemock/files/patch-scripts_gmock__doctor.py (nonexistent) @@ -1,41 +0,0 @@ -From ac830d6b197f8b8dad24782d7900c69cee0ab77e Mon Sep 17 00:00:00 2001 -From: Syl -Date: Sun, 30 Aug 2015 08:57:48 +0200 -Subject: [PATCH] Fix gmock_doctor.py for Python3 - ---- scripts/gmock_doctor.py.orig 2013-09-19 00:32:04 UTC -+++ scripts/gmock_doctor.py -@@ -590,7 +590,7 @@ def main(): - print ('Please copy and paste the compiler errors here. Press c-D when ' - 'you are done:') - else: -- print 'Waiting for compiler errors on stdin . . .' -+ print ('Waiting for compiler errors on stdin . . .') - - msg = sys.stdin.read().strip() - diagnoses = Diagnose(msg) -@@ -608,18 +608,18 @@ If you send your source code and the com - %s, you can be helped and I can get smarter -- - win-win for us!""" % (msg, _EMAIL)) - else: -- print '------------------------------------------------------------' -- print 'Your code appears to have the following', -+ print ('------------------------------------------------------------') -+ print ('Your code appears to have the following',) - if count > 1: -- print '%s diseases:' % (count,) -+ print ('%s diseases:' % (count,)) - else: -- print 'disease:' -+ print ('disease:') - i = 0 - for d in diagnoses: - i += 1 - if count > 1: -- print '\n#%s:' % (i,) -- print d -+ print ('\n#%s:' % (i,)) -+ print (d) - print (""" - How did I do? If you think I'm wrong or unhelpful, please send your - source code and the compiler's error messages to %s. Property changes on: head/devel/googlemock/files/patch-scripts_gmock__doctor.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/googlemock/files/patch-Makefile.am =================================================================== --- head/devel/googlemock/files/patch-Makefile.am (nonexistent) +++ head/devel/googlemock/files/patch-Makefile.am (revision 426138) @@ -0,0 +1,16 @@ +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 Property changes on: head/devel/googlemock/files/patch-Makefile.am ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/googlemock/pkg-plist =================================================================== --- head/devel/googlemock/pkg-plist (revision 426137) +++ head/devel/googlemock/pkg-plist (revision 426138) @@ -1,24 +1,27 @@ bin/gmock-config bin/gmock_doctor.py include/gmock/gmock-actions.h include/gmock/gmock-cardinalities.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-spec-builders.h include/gmock/gmock.h +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 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 Index: head/devel/googletest/Makefile =================================================================== --- head/devel/googletest/Makefile (revision 426137) +++ head/devel/googletest/Makefile (revision 426138) @@ -1,35 +1,37 @@ # Created by: Cheng-Lung Sung # $FreeBSD$ PORTNAME= googletest -PORTVERSION= 1.7.0 DISTVERSIONPREFIX= release- +DISTVERSION= 1.8.0-11 +DISTVERSIONSUFFIX= -ga2b8a8e CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org COMMENT= Framework for writing C++ tests on a variety of platforms LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE USE_GITHUB= yes GH_ACCOUNT= google USES= autoreconf 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 USE_LDCONFIG= yes post-patch: # enable vendor make install again (revert 661758e) @${REINPLACE_CMD} -E 's/install-(exec|data)-local/&-dummy/' \ ${WRKSRC}/Makefile.am post-install: ${INSTALL_SCRIPT} ${WRKSRC}/scripts/gtest-config ${STAGEDIR}${PREFIX}/bin .include Index: head/devel/googletest/distinfo =================================================================== --- head/devel/googletest/distinfo (revision 426137) +++ head/devel/googletest/distinfo (revision 426138) @@ -1,2 +1,3 @@ -SHA256 (google-googletest-release-1.7.0_GH0.tar.gz) = f73a6546fdf9fce9ff93a5015e0333a8af3062a152a9ad6bcb772c96687016cc -SIZE (google-googletest-release-1.7.0_GH0.tar.gz) = 468653 +TIMESTAMP = 1471419713 +SHA256 (google-googletest-release-1.8.0-11-ga2b8a8e_GH0.tar.gz) = 5e7cb72292eec51ca0ecb9c83d4769c667b7ead7daba83a89cbc20f7fbd2fd74 +SIZE (google-googletest-release-1.8.0-11-ga2b8a8e_GH0.tar.gz) = 1282276 Index: head/devel/googletest/files/patch-Makefile.am =================================================================== --- head/devel/googletest/files/patch-Makefile.am (nonexistent) +++ head/devel/googletest/files/patch-Makefile.am (revision 426138) @@ -0,0 +1,16 @@ +Move custom headers into their own directory + +--- Makefile.am.orig 2016-11-03 20:36:28 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 Property changes on: head/devel/googletest/files/patch-Makefile.am ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/googletest/files/patch-bsd-defines =================================================================== --- head/devel/googletest/files/patch-bsd-defines (revision 426137) +++ head/devel/googletest/files/patch-bsd-defines (revision 426138) @@ -1,215 +1,210 @@ -Index: include/gtest/internal/gtest-port.h -=================================================================== ---- include/gtest/internal/gtest-port.h (revision 692) -+++ include/gtest/internal/gtest-port.h (working copy) -@@ -128,6 +128,10 @@ - // GTEST_OS_IOS - iOS - // GTEST_OS_IOS_SIMULATOR - iOS simulator - // GTEST_OS_NACL - Google Native Client (NaCl) -+// GTEST_OS_GNU_KFREEBSD - GNU/kFreeBSD -+// GTEST_OS_DRAGONFLY - DragonFly -+// GTEST_OS_FREEBSD - FreeBSD -+// GTEST_OS_NETBSD - NetBSD - // GTEST_OS_OPENBSD - OpenBSD - // GTEST_OS_QNX - QNX - // GTEST_OS_SOLARIS - Sun Solaris -@@ -341,6 +345,14 @@ +o Add DragonFly, NetBSD 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 +@@ -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 __linux__ +@@ -84,6 +88,8 @@ # define GTEST_OS_HPUX 1 #elif defined __native_client__ # define GTEST_OS_NACL 1 -+#elif defined(__GLIBC__) && defined(__FreeBSD_kernel__) -+# define GTEST_OS_GNU_KFREEBSD 1 -+#elif defined __DragonFly__ -+# define GTEST_OS_DRAGONFLY 1 -+#elif defined __FreeBSD__ -+# define GTEST_OS_FREEBSD 1 +#elif defined __NetBSD__ +# define GTEST_OS_NETBSD 1 #elif defined __OpenBSD__ # define GTEST_OS_OPENBSD 1 #elif defined __QNX__ -@@ -611,6 +623,8 @@ struct _RTL_CRITICAL_SECTION; +--- include/gtest/internal/gtest-port.h.orig 2016-11-03 20:36:28 UTC ++++ include/gtest/internal/gtest-port.h +@@ -121,13 +121,16 @@ + // + // 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_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 // 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_FREEBSD \ -+ || GTEST_OS_NETBSD || GTEST_OS_OPENBSD \ - || GTEST_OS_QNX) ++ || GTEST_OS_GNU_KFREEBSD || GTEST_OS_DRAGONFLY || GTEST_OS_NETBSD || GTEST_OS_OPENBSD \ + || GTEST_OS_QNX || GTEST_OS_FREEBSD || GTEST_OS_NACL) #endif // GTEST_HAS_PTHREAD -@@ -791,7 +805,8 @@ using ::std::tuple_size; - (GTEST_OS_MAC && !GTEST_OS_IOS) || GTEST_OS_IOS_SIMULATOR || \ +@@ -800,6 +804,7 @@ 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_GNU_KFREEBSD || GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || \ -+ GTEST_OS_NETBSD || GTEST_OS_OPENBSD || GTEST_OS_QNX) ++ GTEST_OS_GNU_KFREEBSD || GTEST_OS_DRAGONFLY || GTEST_OS_NETBSD || \ + GTEST_OS_OPENBSD || GTEST_OS_QNX || GTEST_OS_FREEBSD) # define GTEST_HAS_DEATH_TEST 1 - # include // NOLINT #endif -@@ -824,7 +839,8 @@ using ::std::tuple_size; +@@ -832,7 +837,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. -#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 -Index: src/gtest-port.cc -=================================================================== ---- src/gtest-port.cc (revision 692) -+++ src/gtest-port.cc (working copy) -@@ -51,6 +51,14 @@ +--- src/gtest-port.cc.orig 2016-11-03 20:36:28 UTC ++++ src/gtest-port.cc +@@ -52,6 +52,14 @@ # include #endif // GTEST_OS_MAC +#if GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD || \ + GTEST_OS_NETBSD || GTEST_OS_OPENBSD +# include +# if GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD +# include +# endif +#endif + #if GTEST_OS_QNX # include # include -@@ -104,6 +112,80 @@ size_t GetThreadCount() { +@@ -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 -Index: src/gtest.cc -=================================================================== ---- src/gtest.cc (revision 692) -+++ src/gtest.cc (working copy) -@@ -126,7 +126,7 @@ +--- src/gtest.cc.orig 2016-11-03 20:36:28 UTC ++++ src/gtest.cc +@@ -127,7 +127,7 @@ #endif #if GTEST_CAN_STREAM_RESULTS_ -# include // NOLINT -+# include ++# include // NOLINT # include // NOLINT - #endif - -Index: test/gtest-port_test.cc -=================================================================== ---- test/gtest-port_test.cc (revision 692) -+++ test/gtest-port_test.cc (working copy) -@@ -304,7 +304,8 @@ TEST(FormatCompilerIndependentFileLocationTest, Fo + # include // NOLINT + # include // NOLINT +--- test/gtest-port_test.cc.orig 2016-11-03 20:36:28 UTC ++++ test/gtest-port_test.cc +@@ -304,7 +304,8 @@ TEST(FormatCompilerIndependentFileLocati EXPECT_EQ("unknown file", FormatCompilerIndependentFileLocation(NULL, -1)); } --#if GTEST_OS_MAC || GTEST_OS_QNX -+#if GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || \ -+ GTEST_OS_GNU_KFREEBSD || GTEST_OS_NETBSD || GTEST_OS_OPENBSD +-#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX ++#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_DRAGONFLY || \ ++ GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD || GTEST_OS_NETBSD || GTEST_OS_OPENBSD void* ThreadFunc(void* data) { - pthread_mutex_t* mutex = static_cast(data); - pthread_mutex_lock(mutex); -@@ -355,7 +356,7 @@ TEST(GetThreadCountTest, ReturnsCorrectValue) { - TEST(GetThreadCountTest, ReturnsZeroWhenUnableToCountThreads) { - EXPECT_EQ(0U, GetThreadCount()); - } --#endif // GTEST_OS_MAC || GTEST_OS_QNX -+#endif // GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_*BSD - - TEST(GtestCheckDeathTest, DiesWithCorrectOutputOnFailure) { - const bool a_false_condition = false; -Index: test/gtest_unittest.cc -=================================================================== ---- test/gtest_unittest.cc (revision 692) -+++ test/gtest_unittest.cc (working copy) -@@ -117,6 +117,7 @@ TEST_F(StreamingListenerTest, OnTestIterationEnd) + internal::Mutex* mutex = static_cast(data); + mutex->Lock(); +--- test/gtest_unittest.cc.orig 2016-11-03 20:36:28 UTC ++++ test/gtest_unittest.cc +@@ -118,6 +118,7 @@ TEST_F(StreamingListenerTest, OnTestIter EXPECT_EQ("event=TestIterationEnd&passed=1&elapsed_time=0ms\n", *output()); } +#if GTEST_LANG_CXX11 // workaround breakage with GCC 4.2 TEST_F(StreamingListenerTest, OnTestCaseStart) { *output() = ""; streamer_.OnTestCaseStart(TestCase("FooTest", "Bar", NULL, NULL)); -@@ -128,6 +129,7 @@ TEST_F(StreamingListenerTest, OnTestCaseEnd) { +@@ -129,6 +130,7 @@ TEST_F(StreamingListenerTest, OnTestCase streamer_.OnTestCaseEnd(TestCase("FooTest", "Bar", NULL, NULL)); EXPECT_EQ("event=TestCaseEnd&passed=1&elapsed_time=0ms\n", *output()); } +#endif TEST_F(StreamingListenerTest, OnTestStart) { *output() = ""; Index: head/devel/googletest/pkg-plist =================================================================== --- head/devel/googletest/pkg-plist (revision 426137) +++ head/devel/googletest/pkg-plist (revision 426138) @@ -1,30 +1,34 @@ bin/gtest-config include/gtest/gtest-death-test.h include/gtest/gtest-message.h include/gtest/gtest-param-test.h include/gtest/gtest-printers.h include/gtest/gtest-spi.h include/gtest/gtest-test-part.h 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/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 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 Index: head/science/orthanc/Makefile =================================================================== --- head/science/orthanc/Makefile (revision 426137) +++ head/science/orthanc/Makefile (revision 426138) @@ -1,92 +1,93 @@ # Created by: mp39590@gmail.com # $FreeBSD$ PORTNAME= orthanc PORTVERSION= 1.1.0 +PORTREVISION= 1 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 DISTFILES= Orthanc-${PORTVERSION}.tar.gz:main \ mongoose-3.8.tgz:mongoose DIST_SUBDIR= ${PORTNAME} MAINTAINER= mp39590@gmail.com COMMENT= RESTful DICOM server for healthcare and medical research # GPLv3 license, with the OpenSSL exception. LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libcurl.so:ftp/curl \ libjsoncpp.so:devel/jsoncpp \ libuuid.so:misc/e2fsprogs-libuuid \ libboost_filesystem.so:devel/boost-libs \ libboost_thread.so:devel/boost-libs \ libboost_system.so:devel/boost-libs \ libboost_date_time.so:devel/boost-libs \ libboost_regex.so:devel/boost-libs \ libboost_locale.so:devel/boost-libs \ libdcmdsig.so:devel/dcmtk \ libcharls.so:devel/dcmtk \ libdcmjpls.so:devel/dcmtk \ libsqlite3.so:databases/sqlite3 \ libpng16.so:graphics/png \ libgtest.so:devel/googletest \ libpugixml.so:textproc/pugixml BROKEN_powerpc64= Does not build CMAKE_ARGS= -DDCMTK_LIBRARIES="dcmdsig;charls;dcmjpls" \ -DDCMTK_DIR="${LOCALBASE}" \ -DDCMTK_DICTIONARY_DIR="${LOCALBASE}/share/dcmtk" \ -DUSE_SYSTEM_MONGOOSE=OFF \ -DUNIT_TESTS_WITH_HTTP_CONNEXIONS=OFF USES= cmake:outsource dos2unix jpeg lua:51 python:build ssl CFLAGS+= -I${LOCALBASE}/include DOS2UNIX_FILES= CMakeLists.txt USE_LDCONFIG= yes USE_RC_SUBR= orthanc WRKSRC= ${WRKDIR}/Orthanc-${PORTVERSION} USERS= orthanc GROUPS= orthanc PLIST_SUB+= PORTVERSION=${PORTVERSION} # This is mongoose sources, downloaded from Orthanc author homepage. Orthanc # requires mongoose webserver, but after version 3.8, mongoose developers has # changed the license from MIT to GPLv2 only. This action made illegal to # combine new mongoose versions with GPLv3 only Orthanc. # We download sources manually and pass USE_SYSTEM_MONGOOSE=OFF to Orthanc # cmake variables to tell that mongoose is not presented on the host OS and # should be build together with the software instead. # https://www.mail-archive.com/mongoose-users@googlegroups.com/msg00625.html post-patch: ${MKDIR} ${WRKSRC}/ThirdPartyDownloads ${CP} ${DISTDIR}/${DIST_SUBDIR}/mongoose-3.8.tgz ${WRKSRC}/ThirdPartyDownloads # Orthanc hardcodes /usr/local paths for libs and includes. @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/Resources/CMake/*.cmake # There is no way to disable building of test units without a patch, on other # hand it brings only one build dependency (devel/googletest) and running it was # helpful in early bug detection in Debian. # Some tests require connections to be made to the outside world, this is # definitely unsupported behaviour and therefor those tests are disabled with # cmake variable above (-DUNIT_TESTS_WITH_HTTP_CONNEXIONS=OFF). post-build: @cd ${BUILD_WRKSRC} && ./UnitTests post-install: ${MKDIR} ${STAGEDIR}/var/db/orthanc/db/db-v5 ${MKDIR} ${STAGEDIR}${DATADIR}/plugins ${MKDIR} ${STAGEDIR}${ETCDIR} ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/Resources/Configuration.json ${CP} ${WRKSRC}/Resources/Configuration.json ${STAGEDIR}${ETCDIR}/orthanc.json.sample ${STRIP_CMD} ${STAGEDIR}${DATADIR}/plugins/libServeFolders.so.${PORTVERSION} .include .if ${OSVERSION} < 1001000 IGNORE= supported only on 10.x by upstream, not all unit tests are passed .endif .include Index: head/science/orthanc-dicomweb/Makefile =================================================================== --- head/science/orthanc-dicomweb/Makefile (revision 426137) +++ head/science/orthanc-dicomweb/Makefile (revision 426138) @@ -1,42 +1,43 @@ # Created by: mp39590@gmail.com # $FreeBSD$ PORTNAME= orthanc-dicomweb PORTVERSION= 0.3 +PORTREVISION= 1 CATEGORIES= science net MASTER_SITES= http://orthanc-server.com/downloads/get.php?path=/plugin-dicom-web/ DISTNAME= OrthancDicomWeb-${PORTVERSION} DIST_SUBDIR= orthanc MAINTAINER= mp39590@gmail.com COMMENT= WADO and DICOMweb support for Orthanc LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/include/orthanc/OrthancCPlugin.h:science/orthanc LIB_DEPENDS= libgdcmCommon.so:devel/gdcm \ libboost_filesystem.so:devel/boost-libs \ libboost_thread.so:devel/boost-libs \ libboost_system.so:devel/boost-libs \ libboost_date_time.so:devel/boost-libs \ libboost_regex.so:devel/boost-libs \ libboost_locale.so:devel/boost-libs \ libjsoncpp.so:devel/jsoncpp \ libuuid.so:misc/e2fsprogs-libuuid \ libpugixml.so:textproc/pugixml \ libgtest.so:devel/googletest USES= cmake:outsource localbase python:build WRKSRC= ${WRKDIR}/OrthancDicomWeb-${PORTVERSION} PLIST_FILES= share/orthanc/plugins/libOrthancDicomWeb.so \ share/orthanc/plugins/libOrthancDicomWeb.so.${PORTVERSION} post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/Orthanc/Resources/CMake/*.cmake do-test: @cd ${BUILD_WRKSRC} && ./UnitTests .include Index: head/science/orthanc-webviewer/Makefile =================================================================== --- head/science/orthanc-webviewer/Makefile (revision 426137) +++ head/science/orthanc-webviewer/Makefile (revision 426138) @@ -1,54 +1,55 @@ # Created by: mp39590@gmail.com # $FreeBSD$ PORTNAME= orthanc-webviewer PORTVERSION= 2.2 +PORTREVISION= 1 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 DISTFILES= OrthancWebViewer-${PORTVERSION}.tar.gz:main \ jsPanel-2.3.3-fixed.zip:thirdparty \ cornerstone-0.8.4.zip:thirdparty \ jquery-ui-1.11.3.zip:thirdparty \ pako-0.2.5.zip:thirdparty \ js-url-1.8.6.zip:thirdparty DIST_SUBDIR= orthanc MAINTAINER= mp39590@gmail.com COMMENT= Web viewer plugin for Orthanc LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/include/orthanc/OrthancCPlugin.h:science/orthanc \ gtest-config:devel/googletest LIB_DEPENDS= libgdcmCommon.so:devel/gdcm \ libboost_system.so:devel/boost-libs \ libboost_thread.so:devel/boost-libs \ libboost_filesystem.so:devel/boost-libs \ libjsoncpp.so:devel/jsoncpp \ libsqlite3.so:databases/sqlite3 \ libuuid.so:misc/e2fsprogs-libuuid \ libgtest.so:devel/googletest USES= cmake:outsource localbase python:build WRKSRC= ${WRKDIR}/OrthancWebViewer-${PORTVERSION} PLIST_FILES= share/orthanc/plugins/libOrthancWebViewer.so \ share/orthanc/plugins/libOrthancWebViewer.so.${PORTVERSION} post-extract: ${MKDIR} ${WRKSRC}/ThirdPartyDownloads ${CP} ${DISTDIR}/${DIST_SUBDIR}/jsPanel-2.3.3-fixed.zip ${WRKSRC}/ThirdPartyDownloads ${CP} ${DISTDIR}/${DIST_SUBDIR}/cornerstone-0.8.4.zip ${WRKSRC}/ThirdPartyDownloads ${CP} ${DISTDIR}/${DIST_SUBDIR}/jquery-ui-1.11.3.zip ${WRKSRC}/ThirdPartyDownloads ${CP} ${DISTDIR}/${DIST_SUBDIR}/pako-0.2.5.zip ${WRKSRC}/ThirdPartyDownloads ${CP} ${DISTDIR}/${DIST_SUBDIR}/js-url-1.8.6.zip ${WRKSRC}/ThirdPartyDownloads post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/Orthanc/Resources/CMake/*.cmake post-build: @cd ${BUILD_WRKSRC} && ./UnitTests .include Index: head/security/certificate-transparency/Makefile =================================================================== --- head/security/certificate-transparency/Makefile (revision 426137) +++ head/security/certificate-transparency/Makefile (revision 426138) @@ -1,42 +1,42 @@ # Created by: Edward Tomasz Napierala # $FreeBSD$ PORTNAME= certificate-transparency PORTVERSION= 20161015 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MAINTAINER= ports@FreeBSD.org COMMENT= Open framework for monitoring and auditing SSL certificates LICENSE= APACHE20 LIB_DEPENDS?= libevent.so:devel/libevent2 \ libevhtp.so:www/libevhtp \ libgtest.so:devel/googletest \ libgflags.so:devel/gflags \ libglog.so:devel/glog \ libgmock.so:devel/googlemock \ libicuuc.so:devel/icu \ libjson-c.so:devel/json-c \ libleveldb.so:databases/leveldb \ libobjecthash.so:devel/objecthash \ libprotobuf.so:devel/protobuf \ libsqlite3.so:databases/sqlite3 \ libtcmalloc.so:devel/google-perftools BROKEN_FreeBSD_9= does not build on FreeBSD < 10.x USES= autoreconf compiler:c++11-lib gmake pkgconfig GNU_CONFIGURE= yes CONFIGURE_ENV+= "CFLAGS+=-I${LOCALBASE}/include CXXFLAGS+=-lgtest CXXFLAGS+=-lgmock" MAKE_FLAGS+= "V=1" USE_GITHUB= yes GH_ACCOUNT= google GH_TAGNAME= 28478cb CPPFLAGS+= "-I${LOCALBASE}/include" CPPFLAGS+= "-I${LOCALBASE}/include/evhtp" LDFLAGS+= "-L${LOCALBASE}/lib" .include