16 files changed, 37 insertions, 75 deletions
diff --git a/lib/googletest/Makefile b/lib/googletest/Makefile
index 47d4939f2166..2cbc40829d13 100644
--- a/lib/googletest/Makefile
+++ b/lib/googletest/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 .include <src.opts.mk>
 
 SUBDIR+=		gtest
diff --git a/lib/googletest/Makefile.inc b/lib/googletest/Makefile.inc
index b77322df4ee2..231d7545f364 100644
--- a/lib/googletest/Makefile.inc
+++ b/lib/googletest/Makefile.inc
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 .include <googletest.test.inc.mk>
 
 GTEST_DIR=	${SRCTOP}/contrib/googletest
@@ -8,8 +6,5 @@ GOOGLETEST_SRCROOT= ${GTEST_DIR}/googletest
 
 CXXFLAGS+=	${GTESTS_FLAGS}
 
-# Silence warnings about usage of deprecated std::auto_ptr
-CXXWARNFLAGS+=	-Wno-deprecated-declarations
-
 # Silence warnings about usage of deprecated implicit copy constructors
 CXXWARNFLAGS+=  -Wno-deprecated-copy
diff --git a/lib/googletest/gmock/Makefile b/lib/googletest/gmock/Makefile
index d5a71d3c33a6..b6f8b69e356a 100644
--- a/lib/googletest/gmock/Makefile
+++ b/lib/googletest/gmock/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 .include <bsd.init.mk>
 
 .PATH:	${GOOGLEMOCK_SRCROOT}/include ${GOOGLEMOCK_SRCROOT}/src
@@ -18,27 +16,25 @@ LDFLAGS+=	-L${.OBJDIR:H}/gtest
 INCSGROUPS=	MAIN_INCS INTERNAL_INCS INTERNAL_CUSTOM_INCS
 
 MAIN_INCSDIR=	${INCLUDEDIR}${PRIVATELIB:D/private/${LIB}}
+MAIN_INCS+=	gmock/gmock-actions.h
+MAIN_INCS+=	gmock/gmock-cardinalities.h
+MAIN_INCS+=	gmock/gmock-function-mocker.h
 MAIN_INCS+=	gmock/gmock-matchers.h
 MAIN_INCS+=	gmock/gmock-more-actions.h
-MAIN_INCS+=	gmock/gmock-generated-actions.h
-MAIN_INCS+=	gmock/gmock-generated-matchers.h
-MAIN_INCS+=	gmock/gmock-generated-nice-strict.h
 MAIN_INCS+=	gmock/gmock-more-matchers.h
-MAIN_INCS+=	gmock/gmock-generated-function-mockers.h
-MAIN_INCS+=	gmock/gmock-cardinalities.h
+MAIN_INCS+=	gmock/gmock-nice-strict.h
 MAIN_INCS+=	gmock/gmock-spec-builders.h
 MAIN_INCS+=	gmock/gmock.h
-MAIN_INCS+=	gmock/gmock-actions.h
 
 INTERNAL_INCSDIR=	${MAIN_INCSDIR}/internal
-INTERNAL_INCS+=		gmock/internal/gmock-port.h
 INTERNAL_INCS+=		gmock/internal/gmock-internal-utils.h
-INTERNAL_INCS+=		gmock/internal/gmock-generated-internal-utils.h
+INTERNAL_INCS+=		gmock/internal/gmock-port.h
+INTERNAL_INCS+=		gmock/internal/gmock-pp.h
 
 INTERNAL_CUSTOM_INCSDIR= ${INTERNAL_INCSDIR}/custom
-INTERNAL_CUSTOM_INCS+=	gmock/internal/custom/gmock-port.h
-INTERNAL_CUSTOM_INCS+=	gmock/internal/custom/gmock-matchers.h
 INTERNAL_CUSTOM_INCS+=	gmock/internal/custom/gmock-generated-actions.h
+INTERNAL_CUSTOM_INCS+=	gmock/internal/custom/gmock-matchers.h
+INTERNAL_CUSTOM_INCS+=	gmock/internal/custom/gmock-port.h
 
 SRCS+=		gmock-all.cc
 
diff --git a/lib/googletest/gmock/Makefile.inc b/lib/googletest/gmock/Makefile.inc
index fa0e8d2b6bda..f77e46b3451a 100644
--- a/lib/googletest/gmock/Makefile.inc
+++ b/lib/googletest/gmock/Makefile.inc
@@ -1,3 +1 @@
-# $FreeBSD$
-
 include ../Makefile.inc
diff --git a/lib/googletest/gmock_main/Makefile b/lib/googletest/gmock_main/Makefile
index 238f342d55eb..34b87a054269 100644
--- a/lib/googletest/gmock_main/Makefile
+++ b/lib/googletest/gmock_main/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 .include <bsd.init.mk>
 
 .PATH:	${GOOGLEMOCK_SRCROOT}/include ${GOOGLEMOCK_SRCROOT}/src
diff --git a/lib/googletest/gmock_main/Makefile.inc b/lib/googletest/gmock_main/Makefile.inc
index fa0e8d2b6bda..f77e46b3451a 100644
--- a/lib/googletest/gmock_main/Makefile.inc
+++ b/lib/googletest/gmock_main/Makefile.inc
@@ -1,3 +1 @@
-# $FreeBSD$
-
 include ../Makefile.inc
diff --git a/lib/googletest/gtest/Makefile b/lib/googletest/gtest/Makefile
index 470682faebc1..6475fd2e0430 100644
--- a/lib/googletest/gtest/Makefile
+++ b/lib/googletest/gtest/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 .include <bsd.init.mk>
 
 .PATH:	${GOOGLETEST_SRCROOT}/include ${GOOGLETEST_SRCROOT}/src
@@ -14,7 +12,9 @@ CXXFLAGS+=	-I${GOOGLETEST_SRCROOT}
 INCSGROUPS=	MAIN_INCS INTERNAL_INCS INTERNAL_CUSTOM_INCS
 
 MAIN_INCSDIR=	${INCLUDEDIR}${PRIVATELIB:D/private/${LIB}}
+MAIN_INCS+=	gtest/gtest-assertion-result.h
 MAIN_INCS+=	gtest/gtest-death-test.h
+MAIN_INCS+=	gtest/gtest-matchers.h
 MAIN_INCS+=	gtest/gtest-message.h
 MAIN_INCS+=	gtest/gtest-param-test.h
 MAIN_INCS+=	gtest/gtest-printers.h
@@ -29,13 +29,10 @@ INTERNAL_INCSDIR=	${MAIN_INCSDIR}/internal
 INTERNAL_INCS+=	gtest/internal/gtest-death-test-internal.h
 INTERNAL_INCS+=	gtest/internal/gtest-filepath.h
 INTERNAL_INCS+=	gtest/internal/gtest-internal.h
-INTERNAL_INCS+=	gtest/internal/gtest-linked_ptr.h
-INTERNAL_INCS+=	gtest/internal/gtest-param-util-generated.h
 INTERNAL_INCS+=	gtest/internal/gtest-param-util.h
 INTERNAL_INCS+=	gtest/internal/gtest-port-arch.h
 INTERNAL_INCS+=	gtest/internal/gtest-port.h
 INTERNAL_INCS+=	gtest/internal/gtest-string.h
-INTERNAL_INCS+=	gtest/internal/gtest-tuple.h
 INTERNAL_INCS+=	gtest/internal/gtest-type-util.h
 
 INTERNAL_CUSTOM_INCSDIR= ${INTERNAL_INCSDIR}/custom
diff --git a/lib/googletest/gtest/Makefile.inc b/lib/googletest/gtest/Makefile.inc
index fa0e8d2b6bda..f77e46b3451a 100644
--- a/lib/googletest/gtest/Makefile.inc
+++ b/lib/googletest/gtest/Makefile.inc
@@ -1,3 +1 @@
-# $FreeBSD$
-
 include ../Makefile.inc
diff --git a/lib/googletest/gtest_main/Makefile b/lib/googletest/gtest_main/Makefile
index dc102ed8a6e0..1a4eb5d71393 100644
--- a/lib/googletest/gtest_main/Makefile
+++ b/lib/googletest/gtest_main/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 .include <bsd.init.mk>
 
 .PATH:	${GOOGLETEST_SRCROOT}/include ${GOOGLETEST_SRCROOT}/src
diff --git a/lib/googletest/gtest_main/Makefile.inc b/lib/googletest/gtest_main/Makefile.inc
index fa0e8d2b6bda..f77e46b3451a 100644
--- a/lib/googletest/gtest_main/Makefile.inc
+++ b/lib/googletest/gtest_main/Makefile.inc
@@ -1,3 +1 @@
-# $FreeBSD$
-
 include ../Makefile.inc
diff --git a/lib/googletest/tests/Makefile b/lib/googletest/tests/Makefile
index 1df9936ff6cf..886b1a2fe49d 100644
--- a/lib/googletest/tests/Makefile
+++ b/lib/googletest/tests/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 
diff --git a/lib/googletest/tests/Makefile.inc b/lib/googletest/tests/Makefile.inc
index 667b5c102930..9691aaa93ded 100644
--- a/lib/googletest/tests/Makefile.inc
+++ b/lib/googletest/tests/Makefile.inc
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 .include "../Makefile.inc"
 # Keep the existing tests directory structure (with subdirs per component)
 # rather than installing all of them to /usr/tests/lib/googletest
diff --git a/lib/googletest/tests/gmock/Makefile b/lib/googletest/tests/gmock/Makefile
index 0f31e87018de..493567100630 100644
--- a/lib/googletest/tests/gmock/Makefile
+++ b/lib/googletest/tests/gmock/Makefile
@@ -1,14 +1,9 @@
-# $FreeBSD$
-
 .include <bsd.init.mk>
 
-.PATH: ${GOOGLEMOCK_SRCROOT}/src ${GOOGLEMOCK_SRCROOT}/test
+.PATH:	${GOOGLEMOCK_SRCROOT}/src ${GOOGLEMOCK_SRCROOT}/test
 
 GTESTS+=	gmock_stress_test
 
 LIBADD+=	pthread gtest gmock
 
-# The next release will resolve a number of build warnings issues.
-MK_WERROR=	no
-
 .include <bsd.test.mk>
diff --git a/lib/googletest/tests/gmock_main/Makefile b/lib/googletest/tests/gmock_main/Makefile
index a44d893b96f0..1b191924fb9d 100644
--- a/lib/googletest/tests/gmock_main/Makefile
+++ b/lib/googletest/tests/gmock_main/Makefile
@@ -1,22 +1,20 @@
-# $FreeBSD$
-
 .include <bsd.init.mk>
 
 .PATH:	${GOOGLEMOCK_SRCROOT}/src ${GOOGLEMOCK_SRCROOT}/test
 
 GTESTS+=	gmock-actions_test
 GTESTS+=	gmock-cardinalities_test
-GTESTS+=	gmock_ex_test
-GTESTS+=	gmock-generated-actions_test
-GTESTS+=	gmock-generated-function-mockers_test
-GTESTS+=	gmock-generated-internal-utils_test
-GTESTS+=	gmock-generated-matchers_test
+GTESTS+=	gmock-function-mocker_test
 GTESTS+=	gmock-internal-utils_test
-GTESTS+=	gmock-matchers_test
+GTESTS+=	gmock-matchers-arithmetic_test
+GTESTS+=	gmock-matchers-comparisons_test
+GTESTS+=	gmock-matchers-containers_test
+GTESTS+=	gmock-matchers-misc_test
 GTESTS+=	gmock-more-actions_test
 GTESTS+=	gmock-nice-strict_test
 GTESTS+=	gmock-port_test
 GTESTS+=	gmock-spec-builders_test
+GTESTS+=	gmock_ex_test
 GTESTS+=	gmock_link_test
 GTESTS+=	gmock_test
 
@@ -29,9 +27,12 @@ SRCS.gmock_link_test=		\
 	gmock_link_test.cc	\
 	gmock_link2_test.cc
 
-LIBADD=		gmock_main gmock gtest
+LIBADD=		gmock_main
 
-# The next release will resolve a number of build warnings issues.
-MK_WERROR=	no
+CXXFLAGS.clang+=	-Wno-error=inconsistent-missing-override
+CXXFLAGS.clang+=	-Wno-error=missing-variable-declarations
+CXXFLAGS.clang+=	-Wno-error=sign-compare
+CXXFLAGS.clang+=	-Wno-error=unused-parameter
+MK_WERROR.gcc=		no
 
 .include <bsd.test.mk>
diff --git a/lib/googletest/tests/gtest/Makefile b/lib/googletest/tests/gtest/Makefile
index 07b43884dedd..5834ca788985 100644
--- a/lib/googletest/tests/gtest/Makefile
+++ b/lib/googletest/tests/gtest/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 .include <bsd.init.mk>
 
 .PATH:	${GOOGLETEST_SRCROOT}/src ${GOOGLETEST_SRCROOT}/test
@@ -30,17 +28,17 @@ CXXFLAGS.gtest-death-test_ex_catch_test+=	\
 CXXFLAGS.gtest-death-test_ex_nocatch_test+=     \
 	-DGTEST_ENABLE_CATCH_EXCEPTIONS_=0
 
-SRCS.googletest-param-test-test=	\
-	googletest-param-test-test.cc	\
+SRCS.googletest-param-test-test=       \
+	googletest-param-test-test.cc   \
 	googletest-param-test2-test.cc
 
 LIBADD+=	gtest
 
+CXXFLAGS.clang+=	-Wno-error=missing-variable-declarations
+MK_WERROR.gcc=		no
+
 # XXX: explicitly listing -lpthread is incorrect. src.libnames.mk should be
 #      handling this.
-LIBADD.gtest_stress_test+=	pthread
-
-# The next release will resolve a number of build warnings issues.
-MK_WERROR=	no
+LIBADD.gtest_stress_test+=     pthread
 
 .include <bsd.test.mk>
diff --git a/lib/googletest/tests/gtest_main/Makefile b/lib/googletest/tests/gtest_main/Makefile
index 0d4175735b1c..de9bc2f4a78a 100644
--- a/lib/googletest/tests/gtest_main/Makefile
+++ b/lib/googletest/tests/gtest_main/Makefile
@@ -1,25 +1,22 @@
-# $FreeBSD$
-
 .include <bsd.init.mk>
 
 .PATH:	${GOOGLETEST_SRCROOT}/src ${GOOGLETEST_SRCROOT}/test
 
 GTESTS+=	googletest-death-test-test
 GTESTS+=	googletest-filepath-test
-GTESTS+=	googletest-linked-ptr-test
 GTESTS+=	googletest-listener-test
-GTESTS+=	gtest_main_unittest
 GTESTS+=	googletest-message-test
 GTESTS+=	googletest-options-test
 GTESTS+=	googletest-port-test
-GTESTS+=	gtest_pred_impl_unittest
 GTESTS+=	googletest-printers-test
-GTESTS+=	gtest_prod_test
-GTESTS+=	gtest_sole_header_test
 GTESTS+=	googletest-test-part-test
 GTESTS+=	gtest-typed-test_test
+GTESTS+=	gtest_main_unittest
+GTESTS+=	gtest_pred_impl_unittest
+GTESTS+=	gtest_prod_test
 GTESTS+=	gtest_skip_test
 GTESTS+=	gtest_skip_in_environment_setup_test
+GTESTS+=	gtest_sole_header_test
 GTESTS+=	gtest_unittest
 
 CXXFLAGS+=	-I${GOOGLETEST_SRCROOT}/include
@@ -33,12 +30,13 @@ SRCS.gtest_prod_test=			\
 	gtest_prod_test.cc		\
 	production.cc
 
-LIBADD+=	gtest gtest_main
+LIBADD+=	gtest_main
 
 LIBADD.googletest-port-test+=	pthread
 LIBADD.gtest_unittest+=		pthread
 
-# The next release will resolve a number of build warnings issues.
-MK_WERROR=	no
+CXXFLAGS.clang+=	-Wno-error=missing-variable-declarations
+CXXFLAGS.clang+=	-Wno-error=unused-but-set-variable
+MK_WERROR.gcc=		no
 
 .include <bsd.test.mk>