[pkgsrc/trunk]: pkgsrc/devel/googletest Updated googletest to 1.8.0.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3b34cc42ef11
branches:  trunk
changeset: 354501:3b34cc42ef11
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Oct 31 16:43:17 2016 +0000

description:
Updated googletest to 1.8.0.

Changes not found, but this merges googletest and googlemock/gmock.

diffstat:

 devel/googletest/Makefile                                          |  36 +-------
 devel/googletest/PLIST                                             |  41 ++++++++-
 devel/googletest/distinfo                                          |  13 +-
 devel/googletest/patches/patch-Makefile.in                         |  23 -----
 devel/googletest/patches/patch-configure                           |  15 ---
 devel/googletest/patches/patch-include_gtest_internal_gtest-port.h |  21 -----
 6 files changed, 48 insertions(+), 101 deletions(-)

diffs (206 lines):

diff -r 70a1fb2dc8fa -r 3b34cc42ef11 devel/googletest/Makefile
--- a/devel/googletest/Makefile Mon Oct 31 16:35:33 2016 +0000
+++ b/devel/googletest/Makefile Mon Oct 31 16:43:17 2016 +0000
@@ -1,41 +1,19 @@
-# $NetBSD: Makefile,v 1.11 2016/07/09 13:03:38 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2016/10/31 16:43:17 wiz Exp $
 
-DISTNAME=      gtest-1.6.0
-PKGNAME=       ${DISTNAME:S/gtest/googletest/}
-PKGREVISION=   1
+DISTNAME=      googletest-1.8.0
 CATEGORIES=    devel
-MASTER_SITES=  http://googletest.googlecode.com/files/
-EXTRACT_SUFX=  .zip
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=google/}
+GITHUB_TAG=    release-${PKGVERSION_NOREV}
 
 MAINTAINER=    reed%reedmedia.net@localhost
-HOMEPAGE=      http://code.google.com/p/googletest/
+HOMEPAGE=      https://github.com/google/googletest
 COMMENT=       Google's C++ testing framework
 LICENSE=       modified-bsd
 
 INSTALLATION_DIRS=     bin
 
-GNU_CONFIGURE= yes
+USE_CMAKE=     yes
 USE_LANGUAGES= c++ c
-USE_LIBTOOL=   yes
-
-SUBST_CLASSES+=                rpathfix
-SUBST_FILES.rpathfix=  scripts/gtest-config.in
-SUBST_MESSAGE.rpathfix=        Adding rpath to gtest-config
-SUBST_SED.rpathfix=    -e 's/-L$${libdir}/${COMPILER_RPATH_FLAG}$${libdir} -L$${libdir}/g'
-SUBST_STAGE.rpathfix=  pre-configure
-
-REPLACE_PYTHON+=       scripts/*py
+CXXFLAGS+=     -std=c++11
 
-PYTHON_VERSIONS_INCOMPATIBLE=  34 35 # not yet ported as of 1.6.0
-
-.include "../../mk/compiler.mk"
-.if !empty(PKGSRC_COMPILER:Mclang)
-CXXFLAGS+=     -std=c++11
-.endif
-
-post-install:
-       ${INSTALL_SCRIPT} ${WRKSRC}/scripts/gtest-config ${DESTDIR}${PREFIX}/bin
-
-.include "../../lang/python/extension.mk"
-.include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 70a1fb2dc8fa -r 3b34cc42ef11 devel/googletest/PLIST
--- a/devel/googletest/PLIST    Mon Oct 31 16:35:33 2016 +0000
+++ b/devel/googletest/PLIST    Mon Oct 31 16:43:17 2016 +0000
@@ -1,8 +1,31 @@
-@comment $NetBSD: PLIST,v 1.4 2011/05/13 10:54:39 ryoon Exp $
-bin/gtest-config
+@comment $NetBSD: PLIST,v 1.5 2016/10/31 16:43:17 wiz Exp $
+include/gmock/gmock-actions.h
+include/gmock/gmock-cardinalities.h
+include/gmock/gmock-generated-actions.h
+include/gmock/gmock-generated-actions.h.pump
+include/gmock/gmock-generated-function-mockers.h
+include/gmock/gmock-generated-function-mockers.h.pump
+include/gmock/gmock-generated-matchers.h
+include/gmock/gmock-generated-matchers.h.pump
+include/gmock/gmock-generated-nice-strict.h
+include/gmock/gmock-generated-nice-strict.h.pump
+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-generated-actions.h.pump
+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-generated-internal-utils.h.pump
+include/gmock/internal/gmock-internal-utils.h
+include/gmock/internal/gmock-port.h
 include/gtest/gtest-death-test.h
 include/gtest/gtest-message.h
 include/gtest/gtest-param-test.h
+include/gtest/gtest-param-test.h.pump
 include/gtest/gtest-printers.h
 include/gtest/gtest-spi.h
 include/gtest/gtest-test-part.h
@@ -10,16 +33,24 @@
 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-generated.h.pump
 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-tuple.h.pump
 include/gtest/internal/gtest-type-util.h
-lib/libgtest.la
-lib/libgtest_main.la
-share/aclocal/gtest.m4
+include/gtest/internal/gtest-type-util.h.pump
+lib/libgmock.a
+lib/libgmock_main.a
+lib/libgtest.a
+lib/libgtest_main.a
diff -r 70a1fb2dc8fa -r 3b34cc42ef11 devel/googletest/distinfo
--- a/devel/googletest/distinfo Mon Oct 31 16:35:33 2016 +0000
+++ b/devel/googletest/distinfo Mon Oct 31 16:43:17 2016 +0000
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 03:27:30 agc Exp $
+$NetBSD: distinfo,v 1.7 2016/10/31 16:43:17 wiz Exp $
 
-SHA1 (gtest-1.6.0.zip) = 00d6be170eb9fc3b2198ffdcb1f1d6ba7fc6e621
-RMD160 (gtest-1.6.0.zip) = ae4be5325f0cd83fea9902aa8674915ef2dcf8b4
-SHA512 (gtest-1.6.0.zip) = f4718dfbfa3339bb9449c3f14e5b44ae405ea7df64c10a0957a6300985b71c4642981d069a1382e27ae041a4e2873527a9e442aff978447e795a190f99fac115
-Size (gtest-1.6.0.zip) = 1121697 bytes
-SHA1 (patch-Makefile.in) = f071727b3f8bc1c50837cc59dc87a20ff203ed72
-SHA1 (patch-configure) = 7e11bf665760d489ad0bbb0806d2f88c7e335738
-SHA1 (patch-include_gtest_internal_gtest-port.h) = 9cbe09192266019723f498238bbaa92132adb27e
+SHA1 (googletest-1.8.0.tar.gz) = e7e646a6204638fe8e87e165292b8dd9cd4c36ed
+RMD160 (googletest-1.8.0.tar.gz) = b0a9e48874df3291a261ed85a0c0a4d677b01dc1
+SHA512 (googletest-1.8.0.tar.gz) = 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
+Size (googletest-1.8.0.tar.gz) = 1281617 bytes
diff -r 70a1fb2dc8fa -r 3b34cc42ef11 devel/googletest/patches/patch-Makefile.in
--- a/devel/googletest/patches/patch-Makefile.in        Mon Oct 31 16:35:33 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.1 2011/05/13 10:54:39 ryoon Exp $
-
-* Enable 'make install'
-
---- Makefile.in.orig   2011-04-15 19:51:48.000000000 +0000
-+++ Makefile.in
-@@ -1215,14 +1215,14 @@ info: info-am
- 
- info-am:
- 
--install-data-am: install-data-local install-m4dataDATA \
-+install-data-am: install-m4dataDATA \
-       install-pkgincludeHEADERS install-pkginclude_internalHEADERS
- 
- install-dvi: install-dvi-am
- 
- install-dvi-am:
- 
--install-exec-am: install-exec-local install-libLTLIBRARIES
-+install-exec-am: install-libLTLIBRARIES
- 
- install-html: install-html-am
- 
diff -r 70a1fb2dc8fa -r 3b34cc42ef11 devel/googletest/patches/patch-configure
--- a/devel/googletest/patches/patch-configure  Mon Oct 31 16:35:33 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2011/05/13 10:54:39 ryoon Exp $
-
-* Improve compatibility
-
---- configure.orig     2011-04-15 19:51:47.000000000 +0000
-+++ configure
-@@ -14861,7 +14861,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
-        have_pthreads="$acx_pthread_ok"
- fi
-- if test "x$have_pthreads" == "xyes"; then
-+ if test "x$have_pthreads" = "xyes"; then
-   HAVE_PTHREADS_TRUE=
-   HAVE_PTHREADS_FALSE='#'
- else
diff -r 70a1fb2dc8fa -r 3b34cc42ef11 devel/googletest/patches/patch-include_gtest_internal_gtest-port.h
--- a/devel/googletest/patches/patch-include_gtest_internal_gtest-port.h        Mon Oct 31 16:35:33 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-include_gtest_internal_gtest-port.h,v 1.1 2013/05/09 13:49:10 joerg Exp $
-
---- include/gtest/internal/gtest-port.h.orig   2013-05-03 14:50:43.000000000 +0000
-+++ include/gtest/internal/gtest-port.h
-@@ -481,6 +481,16 @@
- #  define BOOST_TR1_DETAIL_CONFIG_HPP_INCLUDED
- #  include <tuple>
- 
-+# elif __cplusplus >= 201103L
-+#  include <tuple>
-+namespace std {
-+  namespace tr1 {
-+    using ::std::tuple;
-+    using ::std::tuple_element;
-+    using ::std::tuple_size;
-+    using ::std::get;
-+  }
-+}
- # elif defined(__GNUC__) && (GTEST_GCC_VER_ >= 40000)
- // GCC 4.0+ implements tr1/tuple in the <tr1/tuple> header.  This does
- // not conform to the TR1 spec, which requires the header to be <tuple>.