git: 9d896e7d8715 - main - devel/scons: drop dependency on gnu M4

[Baptiste Daroussin]

The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9d896e7d87153dcadfe72247d08130b7569e1790

commit 9d896e7d87153dcadfe72247d08130b7569e1790
Author:     Baptiste Daroussin <bapt at FreeBSD.org>
AuthorDate: 2021-04-10 06:54:28 +0000
Commit:     Baptiste Daroussin <bapt at FreeBSD.org>
CommitDate: 2021-04-10 06:59:18 +0000

    devel/scons: drop dependency on gnu M4
    
    Our version of m4 supports the necessary -E switch for 2 years now
---
 devel/scons/Makefile                            |  3 +--
 devel/scons/files/patch-engine_SCons_Tool_m4.py | 11 -----------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/devel/scons/Makefile b/devel/scons/Makefile
index 1cdf97e766d2..9fb8d30cd0cd 100644
--- a/devel/scons/Makefile
+++ b/devel/scons/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	scons
 PORTVERSION=	3.1.2
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
@@ -12,8 +13,6 @@ COMMENT=	Build tool alternative to make
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	gm4:devel/m4
-
 USES=		python:2.7+ shebangfix
 USE_PYTHON=	autoplist concurrent distutils
 
diff --git a/devel/scons/files/patch-engine_SCons_Tool_m4.py b/devel/scons/files/patch-engine_SCons_Tool_m4.py
deleted file mode 100644
index f5783ba4a4d6..000000000000
--- a/devel/scons/files/patch-engine_SCons_Tool_m4.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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}'
-