Index: head/devel/scons/Makefile
===================================================================
--- head/devel/scons/Makefile	(revision 513617)
+++ head/devel/scons/Makefile	(revision 513618)
@@ -1,31 +1,30 @@
 # Created by: Peter Haight <peterh@sapros.com>
 # $FreeBSD$
 
 PORTNAME=	scons
-PORTVERSION=	3.0.1
+PORTVERSION=	3.1.1
 CATEGORIES=	devel python
 MASTER_SITES=	SF
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Build tool alternative to make
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	gm4:devel/m4
 
 USES=		python:2.7 shebangfix
-SHEBANG_FILES=	script/scons*
-USE_PYTHON=	distutils autoplist
+USE_PYTHON=	autoplist distutils
+
 NO_ARCH=	yes
 
 PLIST_SUB=	SCONS_VER=${PORTVERSION}
 
+SHEBANG_FILES=	script/scons*
+
 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
+	@${REINPLACE_CMD} -e 's|distutils\(\.command\.install\)$$|setuptools\1|; s|distutils\(\.command\.install\.\)|setuptools\1|' ${WRKSRC}/setup.py
+	@${FIND} ${WRKSRC} -name '*.orig' -delete
 
 .include <bsd.port.mk>
Index: head/devel/scons/distinfo
===================================================================
--- head/devel/scons/distinfo	(revision 513617)
+++ head/devel/scons/distinfo	(revision 513618)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1512777361
-SHA256 (scons-3.0.1.tar.gz) = 24475e38d39c19683bc88054524df018fe6949d70fbd4c69e298d39a0269f173
-SIZE (scons-3.0.1.tar.gz) = 634815
+TIMESTAMP = 1565351399
+SHA256 (scons-3.1.1.tar.gz) = 4cea417fdd7499a36f407923d03b4b7000b0f9e8fd7b31b316b9ce7eba9143a5
+SIZE (scons-3.1.1.tar.gz) = 663878