Index: head/emulators/ppsspp/Makefile
===================================================================
--- head/emulators/ppsspp/Makefile	(revision 424135)
+++ head/emulators/ppsspp/Makefile	(revision 424136)
@@ -1,95 +1,95 @@
 # $FreeBSD$
 
 PORTNAME=	ppsspp
 DISTVERSIONPREFIX=	v
 DISTVERSION?=	1.3
 PORTREVISION?=	2
 CATEGORIES=	emulators
 # XXX Get from Debian once #697821 lands
 MASTER_SITES=	https://bazaar.launchpad.net/~sergio-br2/${PORTNAME}/debian-sdl/download/5/${PORTNAME}.1-20140802045408-dd26dik367ztj5xg-8/:manpage
 DISTFILES=	${PORTNAME}.1:manpage
 EXTRACT_ONLY=	${DISTFILES:N*\:manpage:C/:.*//}
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	PSP emulator in C++ with dynarec JIT for x86, ARM, MIPS
 
 LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libzip.so:archivers/libzip \
 		libsnappy.so:archivers/snappy \
 		libavcodec.so:multimedia/ffmpeg
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hrydgard
 GH_TUPLE?=	hrydgard:${PORTNAME}-lang:cdf4a8d:lang/lang \
 		Kingcom:armips:1ffab37:armips/ext/armips
 
 CONFLICTS_INSTALL=	${PORTNAME}-*
 
 USES=		compiler:c++11-lib localbase:ldflags pkgconfig
 EXCLUDE=	glew snappy libzip zlib
 EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,}
 USE_GL=		glew glu
 USE_SDL=	sdl2 # joystick
 CMAKE_ARGS=	-DUSE_SYSTEM_FFMPEG=on
 QMAKE_SOURCE_PATH=	${WRKSRC}/Qt/PPSSPPQt.pro
 QMAKE_ARGS=	CONFIG+="system_ffmpeg" LREL_TOOL="${LRELEASE}"
 NO_INSTALL=	yes # ports/202949
 
 DESKTOP_ENTRIES="PPSSPP" \
 		"" \
 		"${PORTNAME}" \
 		"${PORTNAME} %f" \
 		"Game;Emulator;" \
 		""
 
 OPTIONS_SINGLE=	GUI
 OPTIONS_SINGLE_GUI=	QT4 QT5 SDL
 OPTIONS_SLAVE?=	SDL
 OPTIONS_EXCLUDE:=	${OPTIONS_SINGLE_GUI}
 
 QT4_USES=	qmake:outsource
 QT4_USE=	QT4=qmake_build,moc_build,rcc_build,uic_build,linguisttools_build,gui,opengl
 QT5_USES=	qmake:outsource
 QT5_USE=	QT5=qmake_build,buildtools_build,linguisttools_build,gui,opengl,widgets
-SDL_USES=	cmake:outsource ninja
+SDL_USES=	cmake:outsource
 SDL_BUILD_DEPENDS=	png>=1.6:graphics/png
 SDL_LIB_DEPENDS=	libpng.so:graphics/png
 SDL_VARS=	PORTDATA+="assets ${PORTNAME}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,' \
 		${WRKSRC}/UI/NativeApp.cpp
 	@${REINPLACE_CMD} -e 's,/usr,${LOCALBASE},' \
 		${WRKSRC}/Qt/*.pr*
 	@${REINPLACE_CMD} \
 		-e 's/"unknown"/"${GH_TAGNAME}"/' \
 		-e 's/^\(VERSION =\).*/\1 ${GH_TAGNAME}/' \
 		${WRKSRC}/git-version.cmake \
 		${WRKSRC}/Qt/Settings.pri
 
 do-install-SDL-on:
 # cmake doesn't pack assets into the app unlike qmake
 # XXX Convert to ${PORTDATA:N${PORTNAME}} once fmake is EOL
 	(cd ${INSTALL_WRKSRC} && ${COPYTREE_SHARE} \
 		"${PORTDATA:Nppsspp}" ${STAGEDIR}${DATADIR})
 # Install the app alongside assets to avoid warnings with GetExeDirectory()
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME:tu}* \
 		${STAGEDIR}${DATADIR}/${PORTNAME}
 	${LN} -sf ${DATADIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 do-install-SDL-off:
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin
 
 post-install:
 	${INSTALL_MAN} ${_DISTDIR}/${PORTNAME}.1 \
 		${STAGEDIR}${MAN1PREFIX}/man/man1
 	(cd ${WRKSRC}/assets/unix-icons && ${COPYTREE_SHARE} \
 		"hicolor" ${STAGEDIR}${PREFIX}/share/icons)
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 	${INSTALL_DATA} ${WRKSRC}/assets/unix-icons/icon-512.svg \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}.svg
 
 .include <bsd.port.mk>
Index: head/games/aquaria/Makefile
===================================================================
--- head/games/aquaria/Makefile	(revision 424135)
+++ head/games/aquaria/Makefile	(revision 424136)
@@ -1,65 +1,65 @@
 # $FreeBSD$
 
 PORTNAME=	aquaria
 DISTVERSIONPREFIX=	OSE-v
 DISTVERSION=	1.002-22
 DISTVERSIONSUFFIX=	-g84366ad
 CATEGORIES=	games
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Underwater 2D fantasy action-adventure (game engine)
 
 LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:math/glm
 LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis \
 		libftgl.so:graphics/ftgl \
 		libpng.so:graphics/png \
 		libtinyxml2.so:textproc/tinyxml2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	AquariaOSE
 GH_PROJECT=	Aquaria
 
-USES=		cmake lua:51 ninja openal pkgconfig
+USES=		cmake lua:51 openal pkgconfig
 EXCLUDE=	AL FTGL GL SDL* freetype2 glm glpng/png glpng/zlib \
 		libogg-* libvorbis-* lua-* tinyxml2*
 EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ExternalLibs/,}
 CMAKE_ARGS+=	-DAQUARIA_DEFAULT_DATA_DIR="${DATADIR}" \
 		-DAQUARIA_INTERNAL_FREETYPE=off \
 		-DAQUARIA_INTERNAL_FTGL=off \
 		-DAQUARIA_INTERNAL_LUA=off \
 		-DAQUARIA_INTERNAL_OGGVORBIS=off \
 		-DAQUARIA_INTERNAL_OPENAL=off \
 		-DAQUARIA_INTERNAL_PNG=off \
 		-DAQUARIA_INTERNAL_SDL=off \
 		-DAQUARIA_INTERNAL_TINYXML2=off \
 		-DAQUARIA_INTERNAL_ZLIB=off
 LDFLAGS+=	-Wl,--as-needed # avoid overlinking (vorbis deps)
 SUB_FILES=	pkg-message
 PLIST_FILES=	bin/aquaria
 PORTDATA=	*
 
 DESKTOP_ENTRIES="${GH_PROJECT}" \
 		"" \
 		"${DATADIR}/${PORTNAME}.png" \
 		"${PORTNAME}" \
 		"Game;ArcadeGame;" \
 		""
 
 OPTIONS_DEFINE=	DEBUG SDL2
 OPTIONS_DEFAULT=SDL2
 
 SDL2_DESC=	Use SDL 2.x instead of SDL 1.2.x
 SDL2_CMAKE_ON=	-DAQUARIA_USE_SDL2=on
 SDL2_USE=	SDL=sdl2
 SDL2_USE_OFF=	SDL=sdl
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 .for d in game_scripts files
 	(cd ${WRKSRC}/${d} && ${COPYTREE_SHARE} \
 		"." ${STAGEDIR}${DATADIR}/override)
 .endfor
 
 .include <bsd.port.mk>