Index: projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests/Makefile
===================================================================
--- projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests/Makefile	(revision 344349)
+++ projects/import-googletest-1.8.1/lib/googletest/gmock_main/tests/Makefile	(revision 344350)
@@ -1,34 +1,37 @@
 # $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_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-internal-utils_test
 GTESTS+=	gmock-matchers_test
 GTESTS+=	gmock-more-actions_test
 GTESTS+=	gmock-nice-strict_test
 GTESTS+=	gmock-port_test
 GTESTS+=	gmock-spec-builders_test
 GTESTS+=	gmock_link_test
 GTESTS+=	gmock_test
 
 CXXFLAGS+=	-I${GOOGLEMOCK_SRCROOT}/include
 CXXFLAGS+=	-I${GOOGLEMOCK_SRCROOT}
+CXXFLAGS+=	-I${GOOGLETEST_SRCROOT}/include
+CXXFLAGS+=	-I${GOOGLETEST_SRCROOT}
 
-.for test in ${GTESTS}
-SRCS.${test}=	gmock_main.cc
-.endfor
+SRCS.gmock_link_test=		\
+	gmock_link_test.cc	\
+	gmock_link2_test.cc
 
-SRCS.gmock_link_test+=	gmock_link2_test.cc
+LIBADD=		gmock_main gmock gtest
 
-LIBADD=		gmock
+# XXX: https://github.com/google/googletest/pull/2119
+NO_WERROR=
 
 .include <bsd.test.mk>