Index: head/devel/ninja/Makefile
===================================================================
--- head/devel/ninja/Makefile	(revision 394424)
+++ head/devel/ninja/Makefile	(revision 394425)
@@ -1,37 +1,37 @@
 # Created by: Grzegorz Blach <gblach@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	ninja
-PORTVERSION=	1.5.3
+PORTVERSION=	1.6.0
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	devel
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	Ninja is a small build system closest in spirit to Make
 
 LICENSE=	APACHE20
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	martine
 
 CONFLICTS=	irc/ninja-[0-9]*
 USES=		python:build
 
 PLIST_FILES=	bin/ninja
 PORTDOCS=	COPYING HACKING.md README manual.asciidoc
 
 OPTIONS_DEFINE=	DOCS
 
 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} COPYING HACKING.md README doc/manual.asciidoc \
 	    ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/devel/ninja/distinfo
===================================================================
--- head/devel/ninja/distinfo	(revision 394424)
+++ head/devel/ninja/distinfo	(revision 394425)
@@ -1,2 +1,2 @@
-SHA256 (martine-ninja-v1.5.3_GH0.tar.gz) = 7c953b5a7c26cfcd082882e3f3e2cd08fee8848ad228bb47223b18ea18777ec0
-SIZE (martine-ninja-v1.5.3_GH0.tar.gz) = 168829
+SHA256 (martine-ninja-v1.6.0_GH0.tar.gz) = b43e88fb068fe4d92a3dfd9eb4d19755dae5c33415db2e9b7b61b4659009cde7
+SIZE (martine-ninja-v1.6.0_GH0.tar.gz) = 174501
Index: head/devel/ninja/files/patch-configure.py
===================================================================
--- head/devel/ninja/files/patch-configure.py	(revision 394424)
+++ head/devel/ninja/files/patch-configure.py	(revision 394425)
@@ -1,20 +1,11 @@
 --- configure.py.orig	2014-11-24 18:37:47.000000000 +0100
-+++ configure.py	2015-01-18 21:26:42.000000000 +0100
-@@ -164,7 +164,7 @@
-         """Run a subcommand, quietly.  Prints the full command on error."""
-         try:
-             subprocess.check_call(cmdline, shell=True)
--        except subprocess.CalledProcessError, e:
-+        except subprocess.CalledProcessError:
-             print('when running: ', cmdline)
-             raise
- 
++++ configure.py	2015-01-18 21:26:42.000000000 +0100 
 @@ -297,7 +297,7 @@
          cflags += ['/Ox', '/DNDEBUG', '/GL']
          ldflags += ['/LTCG', '/OPT:REF', '/OPT:ICF']
  else:
 -    cflags = ['-g', '-Wall', '-Wextra',
 +    cflags = ['-Wall', '-Wextra',
                '-Wno-deprecated',
                '-Wno-unused-parameter',
                '-fno-rtti',