Here's an update to the latest ninja.
Will go in a bulk build before commit...
Ciao!
David
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/ninja/Makefile,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 Makefile
--- Makefile 5 Apr 2015 13:31:13 -0000 1.16
+++ Makefile 2 Oct 2015 14:35:27 -0000
@@ -7,12 +7,11 @@ NOT_FOR_ARCHS= m88k
COMMENT = small build system with a focus on speed
-V = 1.5.3
+V = 1.6.0
GH_ACCOUNT = martine
GH_PROJECT = ninja
GH_TAGNAME = v$V
DISTNAME = ${GH_PROJECT}-$V
-REVISION = 0
CATEGORIES = devel
HOMEPAGE = http://martine.github.io/ninja/
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/ninja/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo 29 Dec 2014 21:22:34 -0000 1.6
+++ distinfo 2 Oct 2015 14:35:27 -0000
@@ -1,2 +1,2 @@
-SHA256 (ninja-1.5.3.tar.gz) = fJU7Wnwmz80IKILj8+LNCP7ohIrSKLtHIjsY6hh3fsA=
-SIZE (ninja-1.5.3.tar.gz) = 168829
+SHA256 (ninja-1.6.0.tar.gz) = tD6I+waP5NkqPf2etNGXVdrlwzQV2y6be2G0ZZAJzec=
+SIZE (ninja-1.6.0.tar.gz) = 174501
Index: patches/patch-configure_py
===================================================================
RCS file: patches/patch-configure_py
diff -N patches/patch-configure_py
--- patches/patch-configure_py 9 Feb 2015 12:56:20 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,71 +0,0 @@
-$OpenBSD: patch-configure_py,v 1.2 2015/02/09 12:56:20 dcoppa Exp $
-
-commit 54d82356d8317a62f076eefdbe1ab62c88d1e6a6
-Author: Ben Boeckel <maths...@gmail.com>
-Date: Wed Dec 10 23:09:38 2014 -0500
-
-configure: add a verbose mode
-
-Required for Fedora infrastructure so that the commands used to build
-ninja are logged.
-
---- configure.py.orig Mon Nov 24 11:37:47 2014
-+++ configure.py Mon Feb 9 06:13:50 2015
-@@ -106,8 +106,9 @@ class Bootstrap:
- It also proxies all calls to an underlying ninja_syntax.Writer, to
- behave like non-bootstrap mode.
- """
-- def __init__(self, writer):
-+ def __init__(self, writer, verbose=False):
- self.writer = writer
-+ self.verbose = verbose
- # Map of variable name => expanded variable value.
- self.vars = {}
- # Map of rule name => dict of rule attributes.
-@@ -163,6 +164,8 @@ class Bootstrap:
- def _run_command(self, cmdline):
- """Run a subcommand, quietly. Prints the full command on error."""
- try:
-+ if self.verbose:
-+ print(cmdline)
- subprocess.check_call(cmdline, shell=True)
- except subprocess.CalledProcessError, e:
- print('when running: ', cmdline)
-@@ -173,6 +176,8 @@ parser = OptionParser()
- profilers = ['gmon', 'pprof']
- parser.add_option('--bootstrap', action='store_true',
- help='bootstrap a ninja binary from nothing')
-+parser.add_option('--verbose', action='store_true',
-+ help='enable verbose build')
- parser.add_option('--platform',
- help='target platform (' +
- '/'.join(Platform.known_platforms()) + ')',
-@@ -217,7 +222,7 @@ if options.bootstrap:
- # Wrap ninja_writer with the Bootstrapper, which also executes the
- # commands.
- print('bootstrapping ninja...')
-- n = Bootstrap(n)
-+ n = Bootstrap(n, verbose=options.verbose)
-
- n.comment('This file is used to build ninja itself.')
- n.comment('It is generated by ' + os.path.basename(__file__) + '.')
-@@ -602,6 +607,10 @@ n.build('all', 'phony', all_targets)
- n.close()
- print('wrote %s.' % BUILD_FILENAME)
-
-+verbose = ''
-+if options.verbose:
-+ verbose = ' -v'
-+
- if options.bootstrap:
- print('bootstrap complete. rebuilding...')
- if platform.is_windows():
-@@ -609,6 +618,6 @@ if options.bootstrap:
- if os.path.exists(bootstrap_exe):
- os.unlink(bootstrap_exe)
- os.rename('ninja.exe', bootstrap_exe)
-- subprocess.check_call('ninja.bootstrap.exe', shell=True)
-+ subprocess.check_call('ninja.bootstrap.exe%s' % verbose, shell=True)
- else:
-- subprocess.check_call('./ninja', shell=True)
-+ subprocess.check_call('./ninja%s' % verbose, shell=True)
Index: patches/patch-src_graph_cc
===================================================================
RCS file: patches/patch-src_graph_cc
diff -N patches/patch-src_graph_cc
--- patches/patch-src_graph_cc 9 Feb 2015 12:56:20 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-src_graph_cc,v 1.1 2015/02/09 12:56:20 dcoppa Exp $
-
-commit 6ffb66d171a6962c2a7dad0492dffc42e65d666e
-Author: tzik <t...@google.com>
-Date: Fri Feb 6 19:45:42 2015 +0900
-
-Typo fix in graph.cc
-
---- src/graph.cc.orig Mon Feb 9 06:48:04 2015
-+++ src/graph.cc Mon Feb 9 06:48:13 2015
-@@ -439,7 +439,7 @@ bool ImplicitDepLoader::LoadDepsFromLog(Edge* edge, st
-
- // Deps are invalid if the output is newer than the deps.
- if (output->mtime() > deps->mtime) {
-- EXPLAIN("stored deps info out of date for for '%s' (%d vs %d)",
-+ EXPLAIN("stored deps info out of date for '%s' (%d vs %d)",
- output->path().c_str(), deps->mtime, output->mtime());
- return false;
- }
