Index: projects/import-googletest-1.8.1/lib/googletest/Makefile.inc
===================================================================
--- projects/import-googletest-1.8.1/lib/googletest/Makefile.inc	(revision 344379)
+++ projects/import-googletest-1.8.1/lib/googletest/Makefile.inc	(revision 344380)
@@ -1,13 +1,13 @@
 # $FreeBSD$
 
-CXXFLAGS+=	-DGTEST_HAS_POSIX_RE=1
-CXXFLAGS+=	-DGTEST_HAS_PTHREAD=1
-CXXFLAGS+=	-DGTEST_HAS_STREAM_REDIRECTION=1
+.include <googletest.test.inc.mk>
 
 GTEST_DIR=	${SRCTOP}/contrib/googletest
-GOOGLEMOCK_SRCROOT=	${GTEST_DIR}/googlemock
-GOOGLETEST_SRCROOT=	${GTEST_DIR}/googletest
+GOOGLEMOCK_SRCROOT= ${GTEST_DIR}/googlemock
+GOOGLETEST_SRCROOT= ${GTEST_DIR}/googletest
+
+CXXFLAGS+=	${GTESTS_FLAGS}
 
 NO_WTHREAD_SAFETY=
 
 WARNS?=		6
Index: projects/import-googletest-1.8.1/share/mk/Makefile
===================================================================
--- projects/import-googletest-1.8.1/share/mk/Makefile	(revision 344379)
+++ projects/import-googletest-1.8.1/share/mk/Makefile	(revision 344380)
@@ -1,83 +1,84 @@
 # $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
 
 # Only parse this if executing make in this directory, not in other places
 # in src that lack a Makefile, such as sys/dev/*.  Otherwise the MAKESYSPATH
 # will read this Makefile since it auto includes it into -I.
 .if ${.CURDIR} == ${.PARSEDIR}
 
 # Avoid creating a Makefile.depend here as it would get included anywhere
 # in the build, similar to the problem above.  It would cause dirdeps.mk
 # to be included more times than desired.
 UPDATE_DEPENDFILE= no
 
 .include <src.opts.mk>
 
 FILES=	\
 	auto.obj.mk \
 	bsd.README \
 	bsd.arch.inc.mk \
 	bsd.clang-analyze.mk \
 	bsd.compiler.mk \
 	bsd.confs.mk \
 	bsd.cpu.mk \
 	bsd.crunchgen.mk \
 	bsd.dep.mk \
 	bsd.dirs.mk \
 	bsd.doc.mk \
 	bsd.dtb.mk \
 	bsd.endian.mk \
 	bsd.files.mk \
 	bsd.incs.mk \
 	bsd.info.mk \
 	bsd.init.mk \
 	bsd.kmod.mk \
 	bsd.lib.mk \
 	bsd.libnames.mk \
 	bsd.linker.mk \
 	bsd.links.mk \
 	bsd.man.mk \
 	bsd.mkopt.mk \
 	bsd.nls.mk \
 	bsd.obj.mk \
 	bsd.opts.mk \
 	bsd.own.mk \
 	bsd.port.mk \
 	bsd.port.options.mk \
 	bsd.port.post.mk \
 	bsd.port.pre.mk \
 	bsd.port.subdir.mk \
 	bsd.prog.mk \
 	bsd.progs.mk \
 	bsd.snmpmod.mk \
 	bsd.subdir.mk \
 	bsd.suffixes-posix.mk \
 	bsd.suffixes.mk \
 	bsd.symver.mk \
 	bsd.sys.mk \
 	bsd.test.mk \
 	dirdeps.mk \
 	dirdeps-options.mk \
 	gendirdeps.mk \
 	install-new.mk \
 	meta.autodep.mk \
 	meta.stage.mk \
 	meta.subdir.mk \
 	meta.sys.mk \
 	stage-install.sh \
 	sys.mk \
 	sys.dependfile.mk \
 	version_gen.awk
 
 FILESDIR=	${BINDIR}/mk
 
 .if ${MK_TESTS} != "no"
 FILES+=	atf.test.mk
+FILES+=	googletest.test.inc.mk
 FILES+=	googletest.test.mk
 FILES+=	plain.test.mk
 FILES+=	suite.test.mk
 FILES+=	tap.test.mk
 .endif
 
 .include <bsd.prog.mk>
 .endif	# CURDIR == PARSEDIR
Index: projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk
===================================================================
--- projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk	(nonexistent)
+++ projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk	(revision 344380)
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+GTESTS_CXXFLAGS+= -DGTESTS_HAS_RTTI=1
+GTESTS_CXXFLAGS+= -DGTESTS_HAS_POSIX_RE=1
+GTESTS_CXXFLAGS+= -DGTESTS_HAS_PTHREAD=1
+GTESTS_CXXFLAGS+= -DGTESTS_HAS_STREAM_REDIRECTION=1
+GTESTS_CXXFLAGS+= -DGTESTS_LANG_CXX11=1
+GTESTS_CXXFLAGS+= -frtti
+GTESTS_CXXFLAGS+= -std=c++11

Property changes on: projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: projects/import-googletest-1.8.1/share/mk/googletest.test.mk
===================================================================
--- projects/import-googletest-1.8.1/share/mk/googletest.test.mk	(revision 344379)
+++ projects/import-googletest-1.8.1/share/mk/googletest.test.mk	(revision 344380)
@@ -1,38 +1,41 @@
 # $FreeBSD$
 #
 # You must include bsd.test.mk instead of this file from your Makefile.
 #
 # Logic to build and install GoogleTest based test programs.
 #
 # GoogleTest is a C++ test framework, thus, it does not describe/articulate how
 # to write tests in other languages, e.g., C or shell, unlike the ATF, plain,
 # and TAP raw test interfaces.
 #
 # For now this is a thin wrapper around the `plain` test interface, but in the
 # future this will rely on a newer version of kyua which will integrate in
 # GoogleTest support.
 
 .if !target(__<bsd.test.mk>__)
 .error googletest.test.mk cannot be included directly.
 .endif
 
 # List of GoogleTest test programs to build.
 #
 # Programs listed here are built according to the semantics of bsd.progs.mk for
 # PROGS_CXX.
 #
 # Test programs registered in this manner are set to be installed into TESTSDIR
 # (which should be overridden by the Makefile) and are not required to provide a
 # manpage.
 GTESTS?=
 
 .if !empty(GTESTS)
+.include <googletest.test.flags.mk>
+
 PROGS_CXX+= ${GTESTS}
 _TESTS+= ${GTESTS}
 .for _T in ${GTESTS}
 BINDIR.${_T}= ${TESTSDIR}
+CXXFLAGS.${_T}+= ${GTESTS_CXXFLAGS}
 MAN.${_T}?= # empty
 SRCS.${_T}?= ${_T}.cc
 TEST_INTERFACE.${_T}= plain
 .endfor
 .endif