Index: branches/2019Q2/games/valyriatear/Makefile
===================================================================
--- branches/2019Q2/games/valyriatear/Makefile	(revision 498288)
+++ branches/2019Q2/games/valyriatear/Makefile	(revision 498289)
@@ -1,53 +1,55 @@
 # Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	valyriatear
 PORTVERSION=	1.0.0
 PORTREVISION=	8
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Open Source J-RPG based on the Hero of Allacrost engine
 
 # Valyria Tear underwent a licensing audit.
 # The main game is GPLv2 but artwork/music/fonts are a variety of licenses:
 # GPLv2, GPLv3 (with font exception), OFL-1.1, CC0, CC-BY-3, and CC-BY-SA-3.
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libvorbis.so:audio/libvorbis \
 		libpng.so:graphics/png
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Bertram25
 GH_PROJECT=	ValyriaTear
 GH_TAGNAME=	${PORTVERSION}-gcc5 # contains relevant tolua++ fixes
 
-USES=		alias cmake gettext-tools iconv lua:51 openal
+USES=		alias cmake compiler gettext-tools gl iconv lua:51 \
+		openal
 CMAKE_ARGS=	-DUSE_PCH_COMPILATION=OFF
 USE_SDL=	sdl image ttf
 USE_GL=		gl glu
 USE_XORG=	x11 xext sm ice
 INSTALLS_ICONS=	yes
 LLD_UNSAFE=	yes
 
-CXXFLAGS+=	-Wno-reserved-user-defined-literal
+CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
+CXXFLAGS_clang=	-Wno-reserved-user-defined-literal
 
 PORTDOCS=	*
 PORTDATA=	*
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
 NLS_CMAKE_OFF=	-DDISABLE_TRANSLATIONS:BOOL=OFF
 NLS_USES=	gettext
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/CMake/Modules/*.cmake
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/MANUAL ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
Index: branches/2019Q2
===================================================================
--- branches/2019Q2	(revision 498288)
+++ branches/2019Q2	(revision 498289)

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