Index: head/games/stockfish/Makefile
===================================================================
--- head/games/stockfish/Makefile	(revision 490271)
+++ head/games/stockfish/Makefile	(revision 490272)
@@ -1,72 +1,74 @@
 # Created by: Gautam Mani <execve@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	stockfish
 DISTVERSION=	10
 DISTVERSIONSUFFIX=	-src
 CATEGORIES=	games
 MASTER_SITES=	http://stockfish.s3.amazonaws.com/
 
 MAINTAINER=	execve@gmail.com
 COMMENT=	Open source chess engine
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/../Copying.txt
 
 NOT_FOR_ARCHS=	sparc64
 BROKEN_aarch64=	Fails to build: cannot detect architecture
 BROKEN_armv6=	Fails to configure: config-sanity: Error 1
 BROKEN_armv7=	Fails to configure: config-sanity: Error 1
 BROKEN_mips64=	Fails to build: cannot detect architecture
 
 USES=		compiler:c++11-lang gmake zip
 
 NO_WRKSUBDIR=	yes
 WRKSRC_SUBDIR=	src
 MYARCH=		${ARCH}
 MYCC=		${CHOSEN_COMPILER_TYPE}
 TGTBLD=		build
 
 LDFLAGS+=	-fuse-ld=lld
 
 PLIST_FILES=	bin/stockfish
 PORTDOCS=	Readme.md
 
 OPTIONS_DEFINE=	DOCS POPCNT
 
 POPCNT_DESC=	Use the POPCNT instruction
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPOPCNT} && ${ARCH} != amd64
 BROKEN=		POPCNT compiles only on amd64
 .endif
 
 # workaround the ARCH usage in the stockfish Makefile
 .if ${ARCH} == "i386"
 MYARCH=		x86-32
 .elif ${ARCH} == "amd64"
 .  if ${PORT_OPTIONS:MPOPCNT}
 MYARCH=		x86-64-modern
 .  else
 MYARCH=		x86-64
 .  endif
 .elif ${ARCH} == powerpc
 MYARCH=		ppc-32
 .elif ${ARCH} == powerpc64
 MYARCH=		ppc-64
 .endif
 
 ALL_TARGET=	${TGTBLD} ARCH=${MYARCH} COMP=${MYCC}
 
 post-patch:
 	@${REINPLACE_CMD} -e "s/^PREFIX =/PREFIX ?=/" ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e "s/CXX=g++/CXX=g++${GCC_DEFAULT}/" \
+		${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/stockfish ${STAGEDIR}${PREFIX}/bin
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/../Readme.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>