[Midnightbsd-cvs] mports [19723] trunk/devel/ninja: ninja 1.5.3

[laffer1 at midnightbsd.org]

Revision: 19723
          http://svnweb.midnightbsd.org/mports/?rev=19723
Author:   laffer1
Date:     2015-08-11 19:40:59 -0400 (Tue, 11 Aug 2015)
Log Message:
-----------
ninja 1.5.3

Modified Paths:
--------------
    trunk/devel/ninja/Makefile
    trunk/devel/ninja/distinfo
    trunk/devel/ninja/files/patch-configure.py

Removed Paths:
-------------
    trunk/devel/ninja/files/patch-platform_helper.py

Modified: trunk/devel/ninja/Makefile
===================================================================
--- trunk/devel/ninja/Makefile	2015-08-11 23:38:11 UTC (rev 19722)
+++ trunk/devel/ninja/Makefile	2015-08-11 23:40:59 UTC (rev 19723)
@@ -1,7 +1,9 @@
 # $MidnightBSD$
 
 PORTNAME=	ninja
-PORTVERSION=	1.5.1
+PORTVERSION=	1.5.3
+DISTVERSIONPREFIX=	v
+PORTEPOCH=	1
 CATEGORIES=	devel
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -11,8 +13,7 @@
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	martine
-GH_TAGNAME=	v${PORTVERSION}
-GH_COMMIT=	85e13c1
+WRKSRC=		${WRKDIR}/ninja-${PORTVERSION}
 
 CONFLICTS=	irc/ninja-[0-9]*
 USES=		python:build
@@ -24,7 +25,7 @@
 
 do-build:
 	@(cd ${WRKSRC} && \
-		CXX="${CXX}" CFLAGS="${CXXFLAGS}" ${PYTHON_CMD} bootstrap.py --verbose)
+		CXX="${CXX}" CFLAGS="${CXXFLAGS}" ${PYTHON_CMD} configure.py --bootstrap)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ninja ${PREFIX}/bin

Modified: trunk/devel/ninja/distinfo
===================================================================
--- trunk/devel/ninja/distinfo	2015-08-11 23:38:11 UTC (rev 19722)
+++ trunk/devel/ninja/distinfo	2015-08-11 23:40:59 UTC (rev 19723)
@@ -1,2 +1,2 @@
-SHA256 (ninja-1.5.1.tar.gz) = 945c1c3f5db1384c68b36b83f60f3ce21a60812467a7343b13c99c4f3e04ee26
-SIZE (ninja-1.5.1.tar.gz) = 163495
+SHA256 (ninja-v1.5.3_GH0.tar.gz) = 7c953b5a7c26cfcd082882e3f3e2cd08fee8848ad228bb47223b18ea18777ec0
+SIZE (ninja-v1.5.3_GH0.tar.gz) = 168829

Modified: trunk/devel/ninja/files/patch-configure.py
===================================================================
--- trunk/devel/ninja/files/patch-configure.py	2015-08-11 23:38:11 UTC (rev 19722)
+++ trunk/devel/ninja/files/patch-configure.py	2015-08-11 23:40:59 UTC (rev 19723)
@@ -1,6 +1,15 @@
---- configure.py.orig	2012-06-26 19:09:41.000000000 +0200
-+++ configure.py	2012-06-26 19:09:54.000000000 +0200
-@@ -117,7 +117,7 @@
+--- 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:

Deleted: trunk/devel/ninja/files/patch-platform_helper.py
===================================================================
--- trunk/devel/ninja/files/patch-platform_helper.py	2015-08-11 23:38:11 UTC (rev 19722)
+++ trunk/devel/ninja/files/patch-platform_helper.py	2015-08-11 23:40:59 UTC (rev 19723)
@@ -1,30 +0,0 @@
---- platform_helper.py.orig	2014-06-27 19:37:05.000000000 -0400
-+++ platform_helper.py	2014-10-14 20:53:44.000000000 -0400
-@@ -19,7 +19,7 @@
- 
- def platforms():
-     return ['linux', 'darwin', 'freebsd', 'openbsd', 'solaris', 'sunos5',
--            'mingw', 'msvc', 'gnukfreebsd', 'bitrig']
-+            'mingw', 'msvc', 'gnukfreebsd', 'bitrig', 'midnightbsd']
- 
- class Platform(object):
-     def __init__(self, platform):
-@@ -33,6 +33,8 @@
-             self._platform = 'freebsd'
-         elif self._platform.startswith('gnukfreebsd'):
-             self._platform = 'freebsd'
-+        elif self._platform.startswith('midnightbsd'):
-+            self._platform = 'midnightbsd'
-         elif self._platform.startswith('openbsd'):
-             self._platform = 'openbsd'
-         elif self._platform.startswith('solaris'):
-@@ -73,6 +75,9 @@
-     def is_freebsd(self):
-         return self._platform == 'freebsd'
- 
-+    def is_midnightbsd(self):
-+        return self._platform == 'midnightbsd'
-+
-     def is_openbsd(self):
-         return self._platform == 'openbsd'
-