Index: head/devel/scons/Makefile
===================================================================
--- head/devel/scons/Makefile	(revision 363084)
+++ head/devel/scons/Makefile	(revision 363085)
@@ -1,26 +1,30 @@
 # Created by: Peter Haight <peterh@sapros.com>
 # $FreeBSD$
 
 PORTNAME=	scons
 PORTVERSION=	2.3.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	gavin@16degrees.com.au
 COMMENT=	Build tool alternative to make
 
 LICENSE=	MIT
 
+RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+
 USE_PYTHON=		2
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
 
 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/files/patch-engine_SCons_Tool_m4.py
===================================================================
--- head/devel/scons/files/patch-engine_SCons_Tool_m4.py	(nonexistent)
+++ head/devel/scons/files/patch-engine_SCons_Tool_m4.py	(revision 363085)
@@ -0,0 +1,11 @@
+--- engine/SCons/Tool/m4.py.orig	2013-03-03 14:48:40.000000000 +0000
++++ 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}'
+ 

Property changes on: head/devel/scons/files/patch-engine_SCons_Tool_m4.py
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property