Index: head/devel/scons/Makefile
===================================================================
--- head/devel/scons/Makefile	(revision 408026)
+++ head/devel/scons/Makefile	(revision 408027)
@@ -1,29 +1,28 @@
 # Created by: Peter Haight <peterh@sapros.com>
 # $FreeBSD$
 
 PORTNAME=	scons
-PORTVERSION=	2.3.0
-PORTREVISION=	1
+PORTVERSION=	2.4.1
 CATEGORIES=	devel python
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 
-MAINTAINER=	gavin@16degrees.com.au
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Build tool alternative to make
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
 
 PLIST_SUB+=	SCONS_VER=${PORTVERSION}
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's,distutils\.command\.install$$,setuptools\.command\.install,' \
 		-e 's,distutils\.command\.install\.,setuptools\.command\.install\.,' \
 		${WRKSRC}/setup.py
 	@${FIND} ${WRKSRC} -name \*.orig -delete
 
 .include <bsd.port.mk>
Index: head/devel/scons/distinfo
===================================================================
--- head/devel/scons/distinfo	(revision 408026)
+++ head/devel/scons/distinfo	(revision 408027)
@@ -1,2 +1,2 @@
-SHA256 (scons-2.3.0.tar.gz) = 9442069999cf4b2caa94a5886ab4c2c71de1718ed5e9176c18e2b6dbca463b4b
-SIZE (scons-2.3.0.tar.gz) = 599514
+SHA256 (scons-2.4.1.tar.gz) = 8fc4f42928c69bcbb33e1be94b646f2c700b659693fabc778c192d4d22f753a7
+SIZE (scons-2.4.1.tar.gz) = 638990
Index: head/devel/scons/files/patch-engine-SCons-compat-_scons_subprocess.py
===================================================================
--- head/devel/scons/files/patch-engine-SCons-compat-_scons_subprocess.py	(revision 408026)
+++ head/devel/scons/files/patch-engine-SCons-compat-_scons_subprocess.py	(revision 408027)
@@ -1,33 +1,33 @@
 Index: engine/SCons/compat/_scons_subprocess.py
 ===================================================================
---- engine/SCons/compat/_scons_subprocess.py (revision 2695)
-+++ engine/SCons/compat/_scons_subprocess.py (working copy)
-@@ -581,13 +581,19 @@
-     class object:
-         pass
+--- 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
-@@ -655,6 +661,7 @@
+@@ -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):
Index: head/devel/scons/files/patch-engine_SCons_Tool_m4.py
===================================================================
--- head/devel/scons/files/patch-engine_SCons_Tool_m4.py	(revision 408026)
+++ head/devel/scons/files/patch-engine_SCons_Tool_m4.py	(revision 408027)
@@ -1,11 +1,11 @@
---- engine/SCons/Tool/m4.py.orig	2013-03-03 14:48:40.000000000 +0000
+--- engine/SCons/Tool/m4.py.orig	2015-11-09 11:25:09 UTC
 +++ engine/SCons/Tool/m4.py
 @@ -49,7 +49,7 @@ def generate(env):
      # file and run from there.
      # The src_suffix setup is like so: file.c.m4 -> file.c,
      # file.cpp.m4 -> file.cpp etc.
 -    env['M4']      = 'm4'
 +    env['M4']      = 'gm4'
      env['M4FLAGS'] = SCons.Util.CLVar('-E')
      env['M4COM']   = 'cd ${SOURCE.rsrcdir} && $M4 $M4FLAGS < ${SOURCE.file} > ${TARGET.abspath}'
  
Index: head/devel/scons/files/patch-script__scons
===================================================================
--- head/devel/scons/files/patch-script__scons	(revision 408026)
+++ head/devel/scons/files/patch-script__scons	(revision 408027)
@@ -1,8 +1,8 @@
---- ./script/scons.orig	2013-04-19 23:35:11.656613793 -0400
-+++ ./script/scons	2013-04-19 23:35:16.127614561 -0400
+--- script/scons.orig	2015-11-09 11:25:09 UTC
++++ script/scons
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#! /usr/bin/env python2
  #
  # SCons - a Software Constructor
  #