svn commit: r395165 - in head/devel: . ninja ninja/files ninja16

[Grzegorz Blach]

Author: gblach
Date: Mon Aug 24 11:10:17 2015
New Revision: 395165
URL: https://svnweb.freebsd.org/changeset/ports/395165

Log:
  - Copy devel/ninja to devel/ninja16
  - Downgrade devel/ninja to 1.5.3 to fix building of the graphics/darktable

Added:
  head/devel/ninja16/
     - copied from r395164, head/devel/ninja/
Modified:
  head/devel/Makefile
  head/devel/ninja/Makefile
  head/devel/ninja/distinfo
  head/devel/ninja/files/patch-configure.py
  head/devel/ninja16/Makefile

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Mon Aug 24 10:03:14 2015	(r395164)
+++ head/devel/Makefile	Mon Aug 24 11:10:17 2015	(r395165)
@@ -1485,6 +1485,7 @@
     SUBDIR += nini
     SUBDIR += ninja
     SUBDIR += ninja-ide
+    SUBDIR += ninja16
     SUBDIR += node-thrift
     SUBDIR += notify-sharp
     SUBDIR += noweb

Modified: head/devel/ninja/Makefile
==============================================================================
--- head/devel/ninja/Makefile	Mon Aug 24 10:03:14 2015	(r395164)
+++ head/devel/ninja/Makefile	Mon Aug 24 11:10:17 2015	(r395165)
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	ninja
-PORTVERSION=	1.6.0
+PORTVERSION=	1.5.3
 DISTVERSIONPREFIX=	v
-PORTEPOCH=	1
+PORTEPOCH=	2
 CATEGORIES=	devel
 
 MAINTAINER=	gblach at FreeBSD.org

Modified: head/devel/ninja/distinfo
==============================================================================
--- head/devel/ninja/distinfo	Mon Aug 24 10:03:14 2015	(r395164)
+++ head/devel/ninja/distinfo	Mon Aug 24 11:10:17 2015	(r395165)
@@ -1,2 +1,2 @@
-SHA256 (martine-ninja-v1.6.0_GH0.tar.gz) = b43e88fb068fe4d92a3dfd9eb4d19755dae5c33415db2e9b7b61b4659009cde7
-SIZE (martine-ninja-v1.6.0_GH0.tar.gz) = 174501
+SHA256 (martine-ninja-v1.5.3_GH0.tar.gz) = 7c953b5a7c26cfcd082882e3f3e2cd08fee8848ad228bb47223b18ea18777ec0
+SIZE (martine-ninja-v1.5.3_GH0.tar.gz) = 168829

Modified: head/devel/ninja/files/patch-configure.py
==============================================================================
--- head/devel/ninja/files/patch-configure.py	Mon Aug 24 10:03:14 2015	(r395164)
+++ head/devel/ninja/files/patch-configure.py	Mon Aug 24 11:10:17 2015	(r395165)
@@ -1,5 +1,14 @@
 --- configure.py.orig	2014-11-24 18:37:47.000000000 +0100
-+++ configure.py	2015-01-18 21:26:42.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']

Modified: head/devel/ninja16/Makefile
==============================================================================
--- head/devel/ninja/Makefile	Mon Aug 24 10:03:14 2015	(r395164)
+++ head/devel/ninja16/Makefile	Mon Aug 24 11:10:17 2015	(r395165)
@@ -1,7 +1,7 @@
 # Created by: Grzegorz Blach <gblach at FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	ninja
+PORTNAME=	ninja16
 PORTVERSION=	1.6.0
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
@@ -14,11 +14,12 @@ LICENSE=	APACHE20
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	martine
+GH_PROJECT=	ninja
 
 CONFLICTS=	irc/ninja-[0-9]*
 USES=		python:build
 
-PLIST_FILES=	bin/ninja
+PLIST_FILES=	bin/ninja16
 PORTDOCS=	COPYING HACKING.md README manual.asciidoc
 
 OPTIONS_DEFINE=	DOCS
@@ -28,7 +29,7 @@ do-build:
 		CXX="${CXX}" CFLAGS="${CXXFLAGS}" ${PYTHON_CMD} configure.py --bootstrap)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ninja ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/ninja ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && \
 	    ${INSTALL_DATA} COPYING HACKING.md README doc/manual.asciidoc \