From owner-svn-ports-all@freebsd.org Thu Dec 19 03:41:41 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A886B1D3463; Thu, 19 Dec 2019 03:41:41 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47dd393zL6z4BWG; Thu, 19 Dec 2019 03:41:41 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 83D4489FC; Thu, 19 Dec 2019 03:41:41 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBJ3ffXb017963; Thu, 19 Dec 2019 03:41:41 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBJ3fd89017244; Thu, 19 Dec 2019 03:41:39 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201912190341.xBJ3fd89017244@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 19 Dec 2019 03:41:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r520417 - in head: . devel devel/android-tools-adb devel/googlemock devel/googletest devel/protobuf finance/gnucash games/rlvm multimedia/intel-media-sdk security/certificate-transparency X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head: . devel devel/android-tools-adb devel/googlemock devel/googletest devel/protobuf finance/gnucash games/rlvm multimedia/intel-media-sdk security/certificate-transparency X-SVN-Commit-Revision: 520417 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Dec 2019 03:41:41 -0000 Author: jbeich Date: Thu Dec 19 03:41:38 2019 New Revision: 520417 URL: https://svnweb.freebsd.org/changeset/ports/520417 Log: devel/googletest: merge googlemock Avoid micromanaging installed files to simplify maintenance. Already done upstream since 1.8.0. Other distributions (e.g., Arch, PkgSrc) have followed. Deleted: head/devel/googlemock/ Modified: head/MOVED head/devel/Makefile head/devel/android-tools-adb/Makefile head/devel/googletest/Makefile head/devel/googletest/pkg-descr head/devel/googletest/pkg-plist head/devel/protobuf/Makefile head/finance/gnucash/Makefile head/games/rlvm/Makefile head/multimedia/intel-media-sdk/Makefile head/security/certificate-transparency/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Thu Dec 19 03:14:46 2019 (r520416) +++ head/MOVED Thu Dec 19 03:41:38 2019 (r520417) @@ -13599,3 +13599,4 @@ www/php71-session|www/php72-session|2019-12-17|Has exp www/php71-tidy|www/php72-tidy|2019-12-17|Has expired: upstream security support ended lang/php71-extensions|lang/php72-extensions|2019-12-17|Has expired: upstream security support ended devel/pecl-request||2019-12-17|Has expired: upstream security support ended +devel/googlemock||2019-12-19|Merged into devel/googletest Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Thu Dec 19 03:14:46 2019 (r520416) +++ head/devel/Makefile Thu Dec 19 03:41:38 2019 (r520417) @@ -878,7 +878,6 @@ SUBDIR += google-gdata SUBDIR += google-perftools SUBDIR += google-styleguide - SUBDIR += googlemock SUBDIR += googletest SUBDIR += goprotobuf SUBDIR += gorm Modified: head/devel/android-tools-adb/Makefile ============================================================================== --- head/devel/android-tools-adb/Makefile Thu Dec 19 03:14:46 2019 (r520416) +++ head/devel/android-tools-adb/Makefile Thu Dec 19 03:41:38 2019 (r520417) @@ -53,8 +53,7 @@ MDNSRESPONDER_USES= localbase:ldflags MDNSRESPONDER_LDFLAGS= -ldns_sd MDNSRESPONDER_MAKE_ENV_OFF= MDNSEXT=_unsupported -TEST_BUILD_DEPENDS+= googlemock>=1.6.0:devel/googlemock \ - googletest>=1.6.0:devel/googletest +TEST_BUILD_DEPENDS+= googletest>=1.6.0:devel/googletest TEST_ALL_TARGET= adb_test TEST_PYTHON_DESC= ${TEST_DESC:S/tests/python &/} Modified: head/devel/googletest/Makefile ============================================================================== --- head/devel/googletest/Makefile Thu Dec 19 03:14:46 2019 (r520416) +++ head/devel/googletest/Makefile Thu Dec 19 03:41:38 2019 (r520417) @@ -4,6 +4,7 @@ PORTNAME= googletest DISTVERSIONPREFIX= release- DISTVERSION= 1.10.0 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org @@ -18,13 +19,16 @@ GH_ACCOUNT= google USES= cmake compiler:c++11-lib USE_LDCONFIG= yes CMAKE_ON= BUILD_SHARED_LIBS -CMAKE_OFF= BUILD_GMOCK OPTIONS_DEFINE= TEST TEST_USES= python:build -TEST_CMAKE_BOOL= gtest_build_tests +TEST_CMAKE_BOOL= gtest_build_tests gmock_build_tests TEST_TEST_TARGET= test + +post-install: +# Drop unused not preprocessed headers + ${FIND} ${STAGEDIR}${PREFIX} -name '*.pump' -delete pre-install-TEST-on: do-test Modified: head/devel/googletest/pkg-descr ============================================================================== --- head/devel/googletest/pkg-descr Thu Dec 19 03:14:46 2019 (r520416) +++ head/devel/googletest/pkg-descr Thu Dec 19 03:41:38 2019 (r520417) @@ -1,9 +1,17 @@ -Google's framework for writing C++ tests on a variety of platforms -(Linux, Mac OS X, Windows, Cygwin, Windows CE, and Symbian). - -Based on the xUnit architecture. Supports automatic test discovery, -a rich set of assertions, user-defined assertions, death tests, -fatal and non-fatal failures, type-parameterized tests, various +GoogleTest is based on the xUnit architecture. Supports automatic test +discovery, a rich set of assertions, user-defined assertions, death +tests, fatal and non-fatal failures, type-parameterized tests, various options for running the tests, and XML test report generation. + +GoogleMock is inspired by jMock, EasyMock, and Hamcrest, and designed +with C++'s specifics in mind, Google C++ Mocking Framework (or Google +Mock for short) is a library for writing and using C++ mock +classes. Google Mock: + + * lets you create mock classes trivially using simple macros, + * supports a rich set of matchers and actions, + * handles unordered, partially ordered, or completely ordered expectations, + * is extensible by users, and + * works on Linux, Windows, and Mac OS X. WWW: https://github.com/google/googletest Modified: head/devel/googletest/pkg-plist ============================================================================== --- head/devel/googletest/pkg-plist Thu Dec 19 03:14:46 2019 (r520416) +++ head/devel/googletest/pkg-plist Thu Dec 19 03:41:38 2019 (r520417) @@ -1,3 +1,22 @@ +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-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-internal-utils.h +include/gmock/internal/gmock-port.h +include/gmock/internal/gmock-pp.h include/gtest/gtest-death-test.h include/gtest/gtest-matchers.h include/gtest/gtest-message.h @@ -21,12 +40,15 @@ include/gtest/internal/gtest-port-arch.h include/gtest/internal/gtest-port.h include/gtest/internal/gtest-string.h 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-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/GTest/GTestTargets.cmake +lib/libgmock.so +lib/libgmock_main.so lib/libgtest.so lib/libgtest_main.so +libdata/pkgconfig/gmock.pc +libdata/pkgconfig/gmock_main.pc libdata/pkgconfig/gtest.pc libdata/pkgconfig/gtest_main.pc Modified: head/devel/protobuf/Makefile ============================================================================== --- head/devel/protobuf/Makefile Thu Dec 19 03:14:46 2019 (r520416) +++ head/devel/protobuf/Makefile Thu Dec 19 03:41:38 2019 (r520417) @@ -16,8 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_sparc64= fails to compile: no atomic ops available -TEST_DEPENDS= googlemock>=0:devel/googlemock \ - googletest>=0:devel/googletest +TEST_DEPENDS= googletest>=0:devel/googletest USES= compiler:c++11-lang gmake libtool localbase pathfix pkgconfig Modified: head/finance/gnucash/Makefile ============================================================================== --- head/finance/gnucash/Makefile Thu Dec 19 03:14:46 2019 (r520416) +++ head/finance/gnucash/Makefile Thu Dec 19 03:41:38 2019 (r520417) @@ -85,13 +85,13 @@ OFX_LIB_DEPENDS= libofx.so:finance/libofx 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 \ +TEST_BUILD_DEPENDS= ${NONEXISTENT}:devel/googletest:build \ googletest>0:devel/googletest .include .if ${PORT_OPTIONS:MTEST} -GMOCK_WRKSRC!= cd ${PORTSDIR}/devel/googlemock && ${MAKE} -V WRKSRC +GMOCK_WRKSRC!= cd ${PORTSDIR}/devel/googletest && ${MAKE} -V WRKSRC CONFIGURE_ENV+= GMOCK_ROOT="${GMOCK_WRKSRC}" .endif Modified: head/games/rlvm/Makefile ============================================================================== --- head/games/rlvm/Makefile Thu Dec 19 03:14:46 2019 (r520416) +++ head/games/rlvm/Makefile Thu Dec 19 03:41:38 2019 (r520417) @@ -58,7 +58,6 @@ NLS_USES= gettext NLS_EXTRA_PATCHES_OFF=${FILESDIR}/extra-patch-disable-nls TEST_USES= lua:51 TEST_BUILD_DEPENDS=googletest>=1.7.0:devel/googletest \ - googlemock>=1.7.0:devel/googlemock \ luabind>0:devel/luabind TEST_EXTRA_PATCHES_OFF=${FILESDIR}/extra-patch-disable-test Modified: head/multimedia/intel-media-sdk/Makefile ============================================================================== --- head/multimedia/intel-media-sdk/Makefile Thu Dec 19 03:14:46 2019 (r520416) +++ head/multimedia/intel-media-sdk/Makefile Thu Dec 19 03:41:38 2019 (r520417) @@ -45,7 +45,7 @@ WAYLAND_LIB_DEPENDS= libdrm_intel.so:graphics/libdrm \ libwayland-client.so:graphics/wayland WAYLAND_CMAKE_BOOL= ENABLE_WAYLAND -TEST_BUILD_DEPENDS= googlemock>0:devel/googlemock +TEST_BUILD_DEPENDS= googletest>0:devel/googletest TEST_USES= localbase:ldflags TEST_CMAKE_BOOL= BUILD_TESTS USE_SYSTEM_GTEST TEST_TEST_TARGET= test Modified: head/security/certificate-transparency/Makefile ============================================================================== --- head/security/certificate-transparency/Makefile Thu Dec 19 03:14:46 2019 (r520416) +++ head/security/certificate-transparency/Makefile Thu Dec 19 03:41:38 2019 (r520417) @@ -3,7 +3,7 @@ PORTNAME= certificate-transparency PORTVERSION= 20161015 -PORTREVISION= 40 +PORTREVISION= 41 CATEGORIES= security MAINTAINER= ports@FreeBSD.org @@ -17,7 +17,7 @@ LIB_DEPENDS= libevent.so:devel/libevent \ libgtest.so:devel/googletest \ libgflags.so:devel/gflags \ libglog.so:devel/glog \ - libgmock.so:devel/googlemock \ + libgmock.so:devel/googletest \ libicuuc.so:devel/icu \ libjson-c.so:devel/json-c \ libleveldb.so:databases/leveldb \