--- Mk/Uses/ninja.mk	(revision 555235)
+++ Mk/Uses/ninja.mk	(working copy)
@@ -14,16 +14,19 @@ 
 IGNORE=	Incorrect 'USES+= ninja:${ninja_ARGS}' ninja takes no arguments
 .endif
 
-MAKE_ARGS+=	-v
-
 BUILD_DEPENDS+=	ninja:devel/ninja
 
 CMAKE_ARGS+=	-GNinja
-MAKEFILE=
-MAKE_CMD=	ninja
-MAKE_FLAGS=
-# Set a minimal job of 1
-_MAKE_JOBS=	-j${MAKE_JOBS_NUMBER}
+# Intended to be used to pass options to ninja
+NINJA_FLAGS?=
+DO_MAKE_BUILD=	${SETENV} ${MAKE_ENV} ninja -v -j${MAKE_JOBS_NUMBER} ${NINJA_FLAGS}
+DO_MAKE_TEST=	${SETENV} ${TEST_ENV} ninja -v -j${MAKE_JOBS_NUMBER} ${NINJA_FLAGS}
 _DESTDIR_VIA_ENV=	yes
 
+.if !target(do-install) && !defined(NO_INSTALL)
+do-install:
+	@(cd ${INSTALL_WRKSRC} && \
+	${SETENV} ${MAKE_ENV} ${FAKEROOT} ninja -v -j${MAKE_JOBS_NUMBER} ${INSTALL_TARGET} ${NINJA_FLAGS})
 .endif
+
+.endif