Index: branches/2019Q2/games/billardgl/Makefile
===================================================================
--- branches/2019Q2/games/billardgl/Makefile	(revision 497858)
+++ branches/2019Q2/games/billardgl/Makefile	(revision 497859)
@@ -1,52 +1,53 @@
 # Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	billardgl
 PORTVERSION=	1.75
 PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/BillardGL%20${PORTVERSION}
 DISTNAME=	BillardGL-${PORTVERSION}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	OpenGL pool billiard simulation
 
 LICENSE=	GPLv2 # from website
 
 WRKSRC_SUBDIR=	src
 
-USES=		dos2unix
+USES=		compiler dos2unix
 DOS2UNIX_FILES=	Makefile bmp.cpp
 USE_GL=		gl glu glut
 USE_XORG=	x11 xext xmu xi
 
 PORTDOCS=	README
 PORTDATA=	*
 PLIST_FILES=	bin/billardgl \
 		share/pixmaps/billardgl.bmp
 
-CXXFLAGS+=	-Wno-c++11-narrowing
+CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
+CXXFLAGS_clang=	-Wno-c++11-narrowing
 
 DESKTOP_ENTRIES="${PORTNAME}" \
 		"" \
 		"${PREFIX}/share/pixmaps/${PORTNAME}.bmp" \
 		"${PORTNAME}" \
 		"Game;Simulation;" \
 		""
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share/BillardGL/|${DATADIR}/|' ${WRKSRC}/Namen.h
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/BillardGL ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "Texturen lang" ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/Texturen/1/dreizehn.bmp ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.bmp
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: branches/2019Q2/games/brainparty/Makefile
===================================================================
--- branches/2019Q2/games/brainparty/Makefile	(revision 497858)
+++ branches/2019Q2/games/brainparty/Makefile	(revision 497859)
@@ -1,44 +1,45 @@
 # Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	brainparty
 PORTVERSION=	0.61
 PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	https://launchpad.net/brainparty/trunk/${PORTVERSION}/+download/ \
 		http://mirror.amdmi3.ru/distfiles/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Family-friendly set of 36 puzzle games
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gmake
+USES=		compiler gmake
 USE_SDL=	sdl mixer ttf gfx image
 USE_GL=		gl glu
 
-CXXFLAGS+=	-Wno-c++11-narrowing
+CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
+CXXFLAGS_clang=	-Wno-c++11-narrowing
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	*
 PORTDATA=	*
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|Content/|${DATADIR}/|' ${WRKSRC}/*.cpp
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/Content/* ${STAGEDIR}${DATADIR}/
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CREDITS ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
Index: branches/2019Q2/games/einstein/Makefile
===================================================================
--- branches/2019Q2/games/einstein/Makefile	(revision 497858)
+++ branches/2019Q2/games/einstein/Makefile	(revision 497859)
@@ -1,27 +1,29 @@
 # Created by: edwin@mavetju.org
 # $FreeBSD$
 
 PORTNAME=	einstein
 PORTVERSION=	2.0
 PORTREVISION=	10
 CATEGORIES=	games
 MASTER_SITES=	http://games.flowix.com/files/einstein/ \
 		http://mirror.amdmi3.ru/distfiles/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Remake of old DOS game Sherlock, which was inspired by Albert Einstein's puzzle
 
 LICENSE=	GPLv2+ # (now dead) website mentions GPL
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2
 
+USES=		compiler
 USE_SDL=	sdl ttf mixer
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-CXXFLAGS+=	-Wno-c++11-narrowing
+CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
+CXXFLAGS_clang=	-Wno-c++11-narrowing
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/einstein
 
 .include <bsd.port.mk>
Index: branches/2019Q2/games/kobodeluxe/Makefile
===================================================================
--- branches/2019Q2/games/kobodeluxe/Makefile	(revision 497858)
+++ branches/2019Q2/games/kobodeluxe/Makefile	(revision 497859)
@@ -1,60 +1,61 @@
 # Created by: Amar Takhar <verm@drunkmonk.net>
 # $FreeBSD$
 
 PORTNAME=	kobodeluxe
 PORTVERSION=	0.5.1
 PORTREVISION=	13
 CATEGORIES=	games
 MASTER_SITES=	http://olofson.net/kobodl/download/ \
 		http://mirror.amdmi3.ru/distfiles/
 DISTNAME=	KoboDeluxe-${DISTVERSION}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	SDL port of the scrolling game XKobo
 
-USES=		tar:bzip2
+USES=		compiler tar:bzip2
 USE_SDL=	image sdl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sharedstatedir=${SCOREDIR} --enable-oss
 
-CXXFLAGS+=	-Wno-reserved-user-defined-literal
+CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
+CXXFLAGS_clang=	-Wno-reserved-user-defined-literal
 
 SCOREDIR=	/var/games/${PORTNAME}
 
 SUB_FILES=	pkg-deinstall pkg-install
 SUB_LIST=	SCOREDIR="${SCOREDIR}"
 
 DATADIR=	${PREFIX}/share/kobo-deluxe
 PORTDOCS=	*
 PORTDATA=	*
 
 OPTIONS_DEFINE=	DOCS OPENGL
 OPTIONS_DEFAULT=OPENGL
 
 OPENGL_USE=	GL=gl
 OPENGL_CONFIGURE_ENABLE=	opengl
 
 post-extract:
 	@cd ${WRKSRC} && ${TAR} -xzf icons.tar.gz
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$(datadir)/games/kobo-deluxe|${DATADIR}|; \
 		s|$$(prefix)/games/kobo-deluxe/scores|${SCOREDIR}|; \
 		s|-lSDL$$||; s|SDL/SDL|SDL|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|$$(datadir)/games/kobo-deluxe|${DATADIR}|' \
 		${WRKSRC}/data/Makefile.in
 	@${REINPLACE_CMD} -e 's|pipe2|kobopipe2|g' ${WRKSRC}/enemies.h \
 		${WRKSRC}/enemy.cpp
 
 post-install:
 	@${RM} -r ${STAGEDIR}/var
 	${INSTALL_DATA} ${WRKSRC}/icons/Ubuntu/kobodeluxe.desktop \
 		${STAGEDIR}${PREFIX}/share/applications/
 	${INSTALL_DATA} ${WRKSRC}/icons/Ubuntu/kobo-icon.xpm \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: branches/2019Q2/games/nxengine/Makefile
===================================================================
--- branches/2019Q2/games/nxengine/Makefile	(revision 497858)
+++ branches/2019Q2/games/nxengine/Makefile	(revision 497859)
@@ -1,50 +1,51 @@
 # $FreeBSD$
 
 PORTNAME=	nxengine
 PORTVERSION=	2.6.3
 DISTVERSIONPREFIX=	v
 PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES+=	https://www.cavestory.org/downloads/:data \
 		SF/lifanov-ports-distfiles/games/${PORTNAME}/:icons
 DISTFILES+=	${PORTNAME}.png:icons \
 		cavestoryen.zip:data
 EXTRACT_ONLY=	${DISTFILES:[2..3]:S/:data//}
 
 MAINTAINER=	lifanov@FreeBSD.org
 COMMENT=	Engine-rewrite of the classic platformer Cave Story
 
 LICENSE=	GPLv3 FREEWARE
 LICENSE_COMB=	multi
 LICENSE_NAME_FREEWARE=	Cave Story freeware license
 LICENSE_FILE_GPLv3=	${WRKSRC}/LICENSE
 LICENSE_FILE_FREEWARE=	${WRKDIR}/CaveStory/Readme.txt
 LICENSE_PERMS_FREEWARE=	dist-mirror pkg-mirror auto-accept
 LICENSE_DISTFILES_GPLv3=	${DISTFILES:[3]}
 LICENSE_DISTFILES_FREEWARE=	${DISTFILES:[2]:S/:data//}
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		cmake compiler:c++11-lang
 
 USE_SDL=	mixer2 sdl2
 SUB_FILES=	${PORTNAME}
-CXXFLAGS+=	-Wno-error-narrowing
+CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
+CXXFLAGS_clang=	-Wno-error-narrowing
 
 USE_GITHUB=	yes
 GH_PROJECT=	${PORTNAME}-evo
 
 DESKTOP_ENTRIES="NXEngine" "" "${PORTNAME}" \
 		"${PORTNAME}" "Game;AdventureGame;" ""
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/nx ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/nxengine ${STAGEDIR}${PREFIX}/bin
 	(cd ${WRKSRC}/data; ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/data)
 	(cd ${WRKDIR}/CaveStory; ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps
 	(cd ${STAGEDIR}${DATADIR}; ${WRKSRC}/bin/extract)
 
 .include <bsd.port.mk>
Index: branches/2019Q2/games/pouetchess/Makefile
===================================================================
--- branches/2019Q2/games/pouetchess/Makefile	(revision 497858)
+++ branches/2019Q2/games/pouetchess/Makefile	(revision 497859)
@@ -1,49 +1,50 @@
 # $FreeBSD$
 
 PORTNAME=	pouetchess
 PORTVERSION=	0.1.1
 PORTREVISION=	14
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/0.11
 DISTNAME=	pouetChess_0.11_src
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Open-source 3D chess game
 
 LICENSE=	GPLv2  # from sourceforge page
 
-USES=		dos2unix gmake
+USES=		compiler dos2unix gmake
 USE_SDL=	sdl image
 USE_GL=		gl glu
 DOS2UNIX_GLOB=	*.cpp *.h Makefile config.ini
 
-CXXFLAGS+=	-Wno-reserved-user-defined-literal
+CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
+CXXFLAGS_clang=	-Wno-reserved-user-defined-literal
 
 WRKSRC=		${WRKDIR}/pouetChess_0.11
 
 PORTDATA=	*
 
 DESKTOP_ENTRIES="pouetChess" \
 		"Play chess" \
 		"${DATADIR}/textures/1.png" \
 		"pouetChess" \
 		"Game;BoardGame;" \
 		false
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e '/^LIBS/ s|$$| -L${LOCALBASE}/lib|' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e '/CXX	/ d' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e '/CXXFLAGS.*+=/ d' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e '/^CXXFLAGS/ s|:=|+=|' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e '/^CXXFLAGS/ s|$$| -I${LOCALBASE}/include|' ${WRKSRC}/Makefile
 
 	@${REINPLACE_CMD} -e 's|config\.ini|${PREFIX}/etc/pouetChess.conf|' ${WRKSRC}/src/globalInfos.cpp
 	@${REINPLACE_CMD} -e 's|data/|${DATADIR}/|' ${WRKSRC}/src/globalInfos.h
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/pouetChess ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKSRC}/bin/config.ini ${STAGEDIR}${PREFIX}/etc/pouetChess.conf.sample
 	@cd ${WRKSRC}/bin/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/
 
 .include <bsd.port.mk>
Index: branches/2019Q2/games/powder/Makefile
===================================================================
--- branches/2019Q2/games/powder/Makefile	(revision 497858)
+++ branches/2019Q2/games/powder/Makefile	(revision 497859)
@@ -1,44 +1,45 @@
 # Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	powder
 PORTVERSION=	115
 PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.zincland.com/powder/release/ \
 		http://mirror.amdmi3.ru/distfiles/
 DISTNAME=	${PORTNAME}${PORTVERSION}_src
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Graphical dungeon crawling game
 
-USES=		gmake
+USES=		compiler gmake
 USE_SDL=	sdl
 MAKE_JOBS_UNSAFE=yes
 
 BUILD_WRKSRC=	${WRKSRC}/port/linux
 
-CXXFLAGS+=	-Wno-c++11-narrowing
+CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
+CXXFLAGS_clang=	-Wno-c++11-narrowing
 
 PLIST_FILES=	bin/powder
 PORTDOCS=	README.TXT LICENSE.TXT CREDITS.TXT
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|bin/bash|bin/sh|' \
 		${WRKSRC}/rooms/buildrooms.bash \
 		${WRKSRC}/gfx/rebuild.sh
 	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' \
 		${BUILD_WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/powder ${STAGEDIR}${PREFIX}/bin/
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
 .endfor
 
 .include <bsd.port.mk>
Index: branches/2019Q2/games/scourge/Makefile
===================================================================
--- branches/2019Q2/games/scourge/Makefile	(revision 497858)
+++ branches/2019Q2/games/scourge/Makefile	(revision 497859)
@@ -1,41 +1,42 @@
 # Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
 # $FreeBSD$
 
 PORTNAME=	scourge
 PORTVERSION=	0.21.1
 PORTREVISION=	13
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/$/.src/}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Rogue-like game
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2
 RUN_DEPENDS=	${LOCALBASE}/${DATADIR_REL}/config/scourge.cfg:games/scourge-data
 
-USES=		autoreconf gettext gmake localbase
+USES=		autoreconf compiler gettext gmake localbase
 GNU_CONFIGURE=	yes
 USE_GL=		gl
 USE_SDL=	sdl image mixer net ttf
 
-CXXFLAGS+=	-Wno-c++11-narrowing
+CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
+CXXFLAGS_clang=	-Wno-c++11-narrowing
 
 CONFIGURE_ARGS=	--with-data-dir=${DATADIR}
 
 SUB_FILES=	pkg-message
 PLIST_FILES=	bin/${PORTNAME}
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 OPTIONS_DEFINE=	DEBUG
 DEBUG_CONFIGURE_ENABLE=	debug
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|GLvoid|void|g' ${WRKSRC}/src/sdlhandler.cpp ${WRKSRC}/src/sdlhandler.h
 	@${REINPLACE_CMD} -e 's|\([^a-z_]\)type(|\1squirrel_type(|g' ${WRKSRC}/src/squirrel/*.cpp ${WRKSRC}/src/squirrel/*.h
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
Index: branches/2019Q2
===================================================================
--- branches/2019Q2	(revision 497858)
+++ branches/2019Q2	(revision 497859)

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