Update to 1.6.0. Build tested only, I don't know how to runtest this.

Changes:

I've tagged a new release of Ninja, version v1.6.0

== Release notes

* rules are now scoped to the subninja they're in. See thread
  "RFC: allow scoping rules via subninja"
  (https://groups.google.com/forum/#!topic/ninja-build/q8esdaNErjo)
  for discussion. (#921)
* dupe edges with multiple outputs now uses first edge
  instead of last (#867)
  + can make this warning optionally an error (-w dupbuild=err),
    which will hopefully become the default one day
    (this release is step 1 of #931)
* pools actually work now (#959)
* no longer print "Recompacting..." when recompacting –
  it's very fast in practice anyway
* generators can now run more often than twice if needed (#908)
* unexpected output names now cause a rebuild instead of
   a hard error (#417)

* POSIX-specific changes
  + child processes get detached from terminal (#909)
  + check for SIGINT after ppoll/pselect -> faster Ctrl-C (#893)
  + add an explicit SIGTERM signal handler (#743)

* Windows-specific changes
  + `-t graph` now produces working dot files on Windows
    when files contain backslashes
  + ninja now uses the full width in cmd.exe
    (it was one column short previously)
  + Ctrl-s (or pause key) in cmd.exe now pauses ninja
  + ninja now builds with MSVS2015
  + run more than 34 child processes if there are
    more than 32 cores. (#958)

* Ran ninja under afl-fuzz and fixed all crashes and bugs it found
  (see new afl-fuzz section in HACKING)
  + fix crashes on cyclic graphs with multiple outputs (#875, #867)
  + failing stat() now aborts build (#830, #904)
  + cyclic rule bindings no longer crash (#902)
  + dependency cycles with multiple outputs no longer get
    ninja into a stuck state (#934)

* Tweaks to configure.py
  (only relevant if you compile ninja itself)
  + configure.py now works with Python 3
  + configure.py now has a --verbose mode
  + configure.py now passes -fdiagnostics-color, so ninja's build
    is now colored with both new enough clangs (3.3+)
    and gccs (4.9+)

* Improvements to zsh completion to work better on OS X

* Documentation updates
+ the target^ syntax is now documented
+ the rule scoping change mentioned above is documented

6 files changed, 37 insertions, 74 deletions

diff --git a/devel/ninja-build/Makefile b/devel/ninja-build/Makefile
index 1d2498cf58d..3f2900cf752 100644
--- a/devel/ninja-build/Makefile
+++ b/devel/ninja-build/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2015/07/09 14:09:44 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2015/08/29 06:32:02 wiz Exp $
 
-DISTNAME=	ninja-1.5.1
+DISTNAME=	ninja-1.6.0
 PKGNAME=	${DISTNAME:S/ninja/ninja-build/}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=martine/}
@@ -12,18 +12,20 @@ HOMEPAGE=	http://martine.github.io/ninja/
 COMMENT=	Ninja is a small build system with a focus on speed
 LICENSE=	apache-2.0
 
+BUILD_DEPENDS+=	re2c>=0.11.3:../../devel/re2c
+
 USE_LANGUAGES=	c c++
 
 SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	pre-configure
 SUBST_MESSAGE.prefix=	Fix PREFIX
-SUBST_FILES.prefix=	bootstrap.py
+SUBST_FILES.prefix=	configure.py
 SUBST_VARS.prefix=	PREFIX
 
 INSTALLATION_DIRS=	bin share/doc/ninja share/ninja
 
 do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} ./bootstrap.py --verbose
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} ./configure.py --bootstrap
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ninja \
diff --git a/devel/ninja-build/distinfo b/devel/ninja-build/distinfo
index 4835fa14507..1cd95decac7 100644
--- a/devel/ninja-build/distinfo
+++ b/devel/ninja-build/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.4 2014/09/16 08:44:25 jperkin Exp $
+$NetBSD: distinfo,v 1.5 2015/08/29 06:32:02 wiz Exp $
 
-SHA1 (ninja-1.5.1.tar.gz) = c5a3af39f6d7ee3a30263f34091c046964d442f0
-RMD160 (ninja-1.5.1.tar.gz) = c2bbb37038925a34f0f62bab4893441290b26783
-Size (ninja-1.5.1.tar.gz) = 163437 bytes
-SHA1 (patch-bootstrap.py) = 20448a3a7e96f7ddeec72182d64e237cabc017ab
-SHA1 (patch-platform__helper.py) = 62b7db93bc16fc7862da9fb2c25d507d6630ec95
-SHA1 (patch-src_line__printer.cc) = 648b694ed25baa3fe0805bf4162f3deba67d3920
+SHA1 (ninja-1.6.0.tar.gz) = a6ff055691f6d355234298c21cc18961b4ca2ed9
+RMD160 (ninja-1.6.0.tar.gz) = 99f9c988ca3d788be0fe2efc85d837e7426b3e5b
+Size (ninja-1.6.0.tar.gz) = 174501 bytes
+SHA1 (patch-configure.py) = 5259dcbf779e4e82782d6cb5c72688998c858494
diff --git a/devel/ninja-build/patches/patch-bootstrap.py b/devel/ninja-build/patches/patch-bootstrap.py
deleted file mode 100644
index dc79248c256..00000000000
--- a/devel/ninja-build/patches/patch-bootstrap.py
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-bootstrap.py,v 1.1 2014/09/05 14:51:39 joerg Exp $
-
-* pkgsrc installation
-
---- bootstrap.py.orig	2014-06-27 23:37:05.000000000 +0000
-+++ bootstrap.py
-@@ -58,6 +58,9 @@ ldflags = os.environ.get('LDFLAGS', '').
- if platform.is_freebsd() or platform.is_openbsd() or platform.is_bitrig():
-     cflags.append('-I/usr/local/include')
-     ldflags.append('-L/usr/local/lib')
-+if platform.is_netbsd():
-+    cflags.append('-I@PREFIX@/include')
-+    ldflags.append('-L@PREFIX@/lib')
- 
- print('Building ninja manually...')
- 
diff --git a/devel/ninja-build/patches/patch-configure.py b/devel/ninja-build/patches/patch-configure.py
new file mode 100644
index 00000000000..6d8b801db7f
--- /dev/null
+++ b/devel/ninja-build/patches/patch-configure.py
@@ -0,0 +1,26 @@
+$NetBSD: patch-configure.py,v 1.1 2015/08/29 06:32:02 wiz Exp $
+
+* Add NetBSD support
+
+--- configure.py.orig	2015-06-29 17:21:30.000000000 +0000
++++ configure.py
+@@ -82,6 +82,9 @@ class Platform(object):
+         out, err = popen.communicate()
+         return '/FS ' in str(out)
+ 
++    def is_netbsd(self):
++        return self._platform == 'netbsd'
++
+     def is_windows(self):
+         return self.is_mingw() or self.is_msvc()
+ 
+@@ -330,6 +333,9 @@ else:
+     if platform.uses_usr_local():
+         cflags.append('-I/usr/local/include')
+         ldflags.append('-L/usr/local/lib')
++    if platform.is_netbsd():
++        cflags.append('-I@PREFIX@/include')
++        ldflags.append('-L@PREFIX@/lib')
+ 
+ libs = []
+ 
diff --git a/devel/ninja-build/patches/patch-platform__helper.py b/devel/ninja-build/patches/patch-platform__helper.py
deleted file mode 100644
index 4dbc620c1a8..00000000000
--- a/devel/ninja-build/patches/patch-platform__helper.py
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-platform__helper.py,v 1.1 2014/09/05 14:51:39 joerg Exp $
-
-* Add NetBSD support
-
---- platform_helper.py.orig	2014-06-27 23:37:05.000000000 +0000
-+++ platform_helper.py
-@@ -19,7 +19,7 @@ import sys
- 
- def platforms():
-     return ['linux', 'darwin', 'freebsd', 'openbsd', 'solaris', 'sunos5',
--            'mingw', 'msvc', 'gnukfreebsd', 'bitrig']
-+            'mingw', 'msvc', 'gnukfreebsd', 'bitrig', 'netbsd']
- 
- class Platform(object):
-     def __init__(self, platform):
-@@ -43,6 +43,8 @@ class Platform(object):
-             self._platform = 'msvc'
-         elif self._platform.startswith('bitrig'):
-             self._platform = 'bitrig'
-+        elif self._platform.startswith('netbsd'):
-+            self._platform = 'netbsd'
- 
-     def platform(self):
-         return self._platform
-@@ -81,3 +83,6 @@ class Platform(object):
- 
-     def is_bitrig(self):
-         return self._platform == 'bitrig'
-+
-+    def is_netbsd(self):
-+        return self._platform == 'netbsd'
diff --git a/devel/ninja-build/patches/patch-src_line__printer.cc b/devel/ninja-build/patches/patch-src_line__printer.cc
deleted file mode 100644
index 7fe962845f8..00000000000
--- a/devel/ninja-build/patches/patch-src_line__printer.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_line__printer.cc,v 1.1 2014/09/16 08:44:25 jperkin Exp $
-
-SunOS needs sys/termios.h
-
---- src/line_printer.cc.orig	2014-06-27 23:37:05.000000000 +0000
-+++ src/line_printer.cc
-@@ -21,6 +21,9 @@
- #else
- #include <unistd.h>
- #include <sys/ioctl.h>
-+#ifdef __sun
-+#include <sys/termios.h>
-+#endif
- #include <sys/time.h>
- #endif
-