Index: head/devel/ninja/Makefile
===================================================================
--- head/devel/ninja/Makefile	(revision 422214)
+++ head/devel/ninja/Makefile	(revision 422215)
@@ -1,41 +1,45 @@
 # Created by: Grzegorz Blach <gblach@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	ninja
 PORTVERSION=	1.7.1
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	devel
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	Ninja is a small build system closest in spirit to Make
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	martine
+GH_ACCOUNT=	ninja-build
 
 CONFLICTS=	irc/ninja-[0-9]*
-USES=		python:build
+USES=		python
 
 PLIST_FILES=	bin/ninja
 PORTDOCS=	HACKING.md README manual.asciidoc
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} "s/'-g', //" ${WRKSRC}/configure.py
 
 do-build:
 	@(cd ${WRKSRC} && \
 		CXX="${CXX}" CFLAGS="${CXXFLAGS}" ${PYTHON_CMD} configure.py --bootstrap)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ninja ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && \
 	    ${INSTALL_DATA} HACKING.md README doc/manual.asciidoc \
 	    ${STAGEDIR}${DOCSDIR})
+
+do-test: build
+	cd ${WRKSRC} && ./ninja ninja_test && ./ninja_test
 
 .include <bsd.port.mk>
Index: head/devel/ninja/distinfo
===================================================================
--- head/devel/ninja/distinfo	(revision 422214)
+++ head/devel/ninja/distinfo	(revision 422215)
@@ -1,2 +1,3 @@
-SHA256 (martine-ninja-v1.7.1_GH0.tar.gz) = 51581de53cf4705b89eb6b14a85baa73288ad08bff256e7d30d529155813be19
-SIZE (martine-ninja-v1.7.1_GH0.tar.gz) = 179717
+TIMESTAMP = 1473955296
+SHA256 (ninja-build-ninja-v1.7.1_GH0.tar.gz) = 51581de53cf4705b89eb6b14a85baa73288ad08bff256e7d30d529155813be19
+SIZE (ninja-build-ninja-v1.7.1_GH0.tar.gz) = 179717
Index: head/devel/ninja/pkg-descr
===================================================================
--- head/devel/ninja/pkg-descr	(revision 422214)
+++ head/devel/ninja/pkg-descr	(revision 422215)
@@ -1,11 +1,11 @@
 Ninja is yet another build system. It takes as input the interdependencies
 of files (typically source code and output executables) and orchestrates
 building them, quickly.
 
 Ninja joins a sea of other build systems. Its distinguishing goal is to be
 fast. It is born from my work on the Chromium browser project, which has
 over 30,000 source files and whose other build systems (including one built
 from custom non-recursive Makefiles) can take ten seconds to start building
 after changing one file. Ninja is under a second.
 
-WWW: https://github.com/martine/ninja
+WWW: https://ninja-build.org/