Index: branches/2017Q2/devel/protobuf/Makefile
===================================================================
--- branches/2017Q2/devel/protobuf/Makefile	(revision 440507)
+++ branches/2017Q2/devel/protobuf/Makefile	(revision 440508)
@@ -1,37 +1,38 @@
 # Created by: vanilla
 # $FreeBSD$
 
 PORTNAME=	protobuf
 PORTVERSION=	3.2.0
 PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Data interchange format library
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 TEST_DEPENDS=	googlemock>=0:devel/googlemock \
 		googletest>=0:devel/googletest
 
 BROKEN_sparc64=	fails to compile: no atomic ops available
 
 CFLAGS+=	-DGOOGLE_PROTOBUF_NO_RTTI
+CONFIGURE_ENV=	CXX_FOR_BUILD=c++
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 TEST_ARGS=	${MAKE_ARGS} ${_MAKE_JOBS}
 TEST_TARGET=	check
 USE_CSTD=	c99	# for audio/clementine-player support
 USE_LDCONFIG=	yes
 USES=		autoreconf compiler:c++11-lang gmake libtool localbase pathfix pkgconfig
 
 GH_ACCOUNT=	google
 USE_GITHUB=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^check-local:|disabled-&|' ${WRKSRC}/Makefile.am
 	@${REINPLACE_CMD} -Ee '/gtest|mock/ s|[^ ]*lib(.*)\.la|-l\1|' ${WRKSRC}/src/Makefile.am
 
 .include <bsd.port.mk>
Index: branches/2017Q2
===================================================================
--- branches/2017Q2	(revision 440507)
+++ branches/2017Q2	(revision 440508)

Property changes on: branches/2017Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r440430