Upgrade from 2.4.1 to 2.5.0. The change-log is here:

	http://download.sourceforge.net/project/scons/scons/2.5.0/CHANGES.txt

The compatibility wrapper for subprocess, in particular, has been removed as
unnecessary for Python above 2.7.

Notified by:	portscout

3 files changed, 3 insertions, 36 deletions

diff --git a/devel/scons/Makefile b/devel/scons/Makefile
index a2bb5de70635..073779a14cc8 100644
--- a/devel/scons/Makefile
+++ b/devel/scons/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	scons
-PORTVERSION=	2.4.1
+PORTVERSION=	2.5.0
 CATEGORIES=	devel python
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 
diff --git a/devel/scons/distinfo b/devel/scons/distinfo
index 5d344412fe42..0c480eb745a8 100644
--- a/devel/scons/distinfo
+++ b/devel/scons/distinfo
@@ -1,2 +1,2 @@
-SHA256 (scons-2.4.1.tar.gz) = 8fc4f42928c69bcbb33e1be94b646f2c700b659693fabc778c192d4d22f753a7
-SIZE (scons-2.4.1.tar.gz) = 638990
+SHA256 (scons-2.5.0.tar.gz) = eb296b47f23c20aec7d87d35cfa386d3508e01d1caa3040ea6f5bbab2292ace9
+SIZE (scons-2.5.0.tar.gz) = 619991
diff --git a/devel/scons/files/patch-engine-SCons-compat-_scons_subprocess.py b/devel/scons/files/patch-engine-SCons-compat-_scons_subprocess.py
deleted file mode 100644
index 9707e21e8ed1..000000000000
--- a/devel/scons/files/patch-engine-SCons-compat-_scons_subprocess.py
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: engine/SCons/compat/_scons_subprocess.py
-===================================================================
---- engine/SCons/compat/_scons_subprocess.py.orig	2015-11-09 11:25:09 UTC
-+++ engine/SCons/compat/_scons_subprocess.py
-@@ -569,13 +569,19 @@ def list2cmdline(seq):
- 
-     return ''.join(result)
- 
-+import thread
-+lock = thread.allocate_lock()
-+
- class Popen(object):
-     def __init__(self, args, bufsize=0, executable=None,
-                  stdin=None, stdout=None, stderr=None,
-                  preexec_fn=None, close_fds=False, shell=False,
-                  cwd=None, env=None, universal_newlines=False,
-                  startupinfo=None, creationflags=0):
--        """Create new Popen instance."""
-+        """Create new Popen instance.
-+        Popen is not thread-safe and is therefore protected with a lock.
-+        """
-+        lock.acquire()
-         _cleanup()
- 
-         self._child_created = False
-@@ -643,6 +649,7 @@ class Popen(object):
-                 self.stderr = os.fdopen(errread, 'rU', bufsize)
-             else:
-                 self.stderr = os.fdopen(errread, 'rb', bufsize)
-+        lock.release()
- 
- 
-     def _translate_newlines(self, data):