9 files changed, 10 insertions, 89 deletions

diff --git a/MOVED b/MOVED
index b5b0e0108773..90b5c3338ef8 100644
--- a/MOVED
+++ b/MOVED
@@ -7849,3 +7849,4 @@ print/ghostscript9-nox11|print/ghostscript9-base|2015-08-22|Integrated into prin
 print/ghostscript9-agpl|print/ghostscript9-agpl-base|2015-08-22|Split into print/ghostscript9-agpl-base and print/ghostscript9-agpl-x11
 print/ghostscript9-agpl-nox11|print/ghostscript9-agpl-base|2015-08-22|Integrated into print/ghostscript9-agpl-base
 www/pelican|www/py-pelican|2015-08-29|Rename to match Python naming conventions
+devel/ninja16|devel/ninja|2015-08-29|Use devel/ninja instead
diff --git a/devel/Makefile b/devel/Makefile
index b53a8da83a7c..1ab53527622b 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1486,7 +1486,6 @@
     SUBDIR += nini
     SUBDIR += ninja
     SUBDIR += ninja-ide
-    SUBDIR += ninja16
     SUBDIR += node-thrift
     SUBDIR += notify-sharp
     SUBDIR += noweb
diff --git a/devel/ninja/Makefile b/devel/ninja/Makefile
index 1c092572c418..1dbdafcc2838 100644
--- a/devel/ninja/Makefile
+++ b/devel/ninja/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ninja
-PORTVERSION=	1.5.3
+PORTVERSION=	1.6.0
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	2
 CATEGORIES=	devel
@@ -11,6 +11,7 @@ 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
@@ -19,10 +20,13 @@ CONFLICTS=	irc/ninja-[0-9]*
 USES=		python:build
 
 PLIST_FILES=	bin/ninja
-PORTDOCS=	COPYING HACKING.md README manual.asciidoc
+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)
@@ -31,7 +35,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ninja ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && \
-	    ${INSTALL_DATA} COPYING HACKING.md README doc/manual.asciidoc \
+	    ${INSTALL_DATA} HACKING.md README doc/manual.asciidoc \
 	    ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/devel/ninja/distinfo b/devel/ninja/distinfo
index af3048810c06..d9186971542d 100644
--- a/devel/ninja/distinfo
+++ b/devel/ninja/distinfo
@@ -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
diff --git a/devel/ninja/files/patch-configure.py b/devel/ninja/files/patch-configure.py
deleted file mode 100644
index 61f0af7cc6eb..000000000000
--- a/devel/ninja/files/patch-configure.py
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
- 
-@@ -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',
diff --git a/devel/ninja16/Makefile b/devel/ninja16/Makefile
deleted file mode 100644
index 068f31928298..000000000000
--- a/devel/ninja16/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# Created by: Grzegorz Blach <gblach@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	ninja
-PORTVERSION=	1.6.0
-DISTVERSIONPREFIX=	v
-PORTEPOCH=	1
-CATEGORIES=	devel
-PKGNAMESUFFIX=	16
-
-MAINTAINER=	gblach@FreeBSD.org
-COMMENT=	Ninja is a small build system closest in spirit to Make
-
-LICENSE=	APACHE20
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	martine
-GH_PROJECT=	ninja
-
-CONFLICTS=	irc/ninja-[0-9]*
-USES=		python:build
-
-PLIST_FILES=	bin/ninja16
-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/ninja16
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC} && \
-	    ${INSTALL_DATA} COPYING HACKING.md README doc/manual.asciidoc \
-	    ${STAGEDIR}${DOCSDIR})
-
-.include <bsd.port.mk>
diff --git a/devel/ninja16/distinfo b/devel/ninja16/distinfo
deleted file mode 100644
index d9186971542d..000000000000
--- a/devel/ninja16/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (martine-ninja-v1.6.0_GH0.tar.gz) = b43e88fb068fe4d92a3dfd9eb4d19755dae5c33415db2e9b7b61b4659009cde7
-SIZE (martine-ninja-v1.6.0_GH0.tar.gz) = 174501
diff --git a/devel/ninja16/files/patch-configure.py b/devel/ninja16/files/patch-configure.py
deleted file mode 100644
index f6ade809ce3b..000000000000
--- a/devel/ninja16/files/patch-configure.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.py.orig	2014-11-24 18:37:47.000000000 +0100
-+++ 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',
diff --git a/devel/ninja16/pkg-descr b/devel/ninja16/pkg-descr
deleted file mode 100644
index 63724b70b8ae..000000000000
--- a/devel/ninja16/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-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