On 06/09/17 09:29, Brian Callahan wrote:
Hi ports --
Attached is a diff for devel/scons, bringing it to its latest version.
Changelog is here:
https://bitbucket.org/scons/scons/src/rel_2.5.1/src/CHANGES.txt?at=2.5.1&fileviewer=file-view-default
All its consumers appear happy. I am still waiting for some of the
larger programs to finish building (slow netbook is slow...) but
everything is past the point where I would anticipate build failures
(i.e. they're all running cc and c++ on files right now, not doing the
scons configure dance).
Take maintainer.
~Brian
New diff with the one patch for scons removed, as we now have m4 -E
OK?
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/scons/Makefile,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 Makefile
--- Makefile 1 Jun 2017 19:58:04 -0000 1.25
+++ Makefile 15 Jun 2017 14:02:30 -0000
@@ -2,12 +2,12 @@
COMMENT= Python-based build system
-VERSION = 2.4.1
+VERSION = 2.5.1
DISTNAME= scons-${VERSION}
-REVISION = 0
CATEGORIES= devel
HOMEPAGE= http://www.scons.org/
+MAINTAINER= Brian Callahan <bcal...@openbsd.org>
# MIT
PERMIT_PACKAGE_CDROM= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/scons/distinfo,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 distinfo
--- distinfo 1 Dec 2015 08:26:16 -0000 1.15
+++ distinfo 15 Jun 2017 14:02:30 -0000
@@ -1,2 +1,2 @@
-SHA256 (scons-2.4.1.tar.gz) = j8T0KSjGm8uzPhvpS2RvLHALZZaT+rx3jBktTSL3U6c=
-SIZE (scons-2.4.1.tar.gz) = 638990
+SHA256 (scons-2.5.1.tar.gz) = CyUhiue0apZ9tC8qU3IWRbPUKHSmX5VSrRbOJtMPUfI=
+SIZE (scons-2.5.1.tar.gz) = 620909
Index: patches/patch-engine_SCons_Tool_m4_py
===================================================================
RCS file: patches/patch-engine_SCons_Tool_m4_py
diff -N patches/patch-engine_SCons_Tool_m4_py
--- patches/patch-engine_SCons_Tool_m4_py 21 Dec 2011 17:41:52 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-engine_SCons_Tool_m4_py,v 1.1 2011/12/21 17:41:52 jasper Exp $
-
-XXX: OpenBSD's m4(1) lacks the -E option (needs to be implemented though).
-
---- engine/SCons/Tool/m4.py.orig Wed Dec 21 18:39:51 2011
-+++ engine/SCons/Tool/m4.py Wed Dec 21 18:40:07 2011
-@@ -50,7 +50,6 @@ def generate(env):
- # The src_suffix setup is like so: file.c.m4 -> file.c,
- # file.cpp.m4 -> file.cpp etc.
- env['M4'] = 'm4'
-- env['M4FLAGS'] = SCons.Util.CLVar('-E')
- env['M4COM'] = 'cd ${SOURCE.rsrcdir} && $M4 $M4FLAGS < ${SOURCE.file} > ${TARGET.abspath}'
-
- def exists(env):
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/scons/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 PLIST
--- pkg/PLIST 10 Jul 2015 07:06:07 -0000 1.10
+++ pkg/PLIST 15 Jun 2017 14:02:30 -0000
@@ -1,6 +1,8 @@
@comment $OpenBSD: PLIST,v 1.10 2015/07/10 07:06:07 jasper Exp $
bin/scons
bin/scons-${VERSION}
+bin/scons-configure-cache
+bin/scons-configure-cache-${VERSION}
bin/scons-time
bin/scons-time-${VERSION}
bin/sconsign
@@ -95,6 +97,8 @@ lib/scons-${VERSION}/SCons/Scanner/Prog.
lib/scons-${VERSION}/SCons/Scanner/Prog.pyc
lib/scons-${VERSION}/SCons/Scanner/RC.py
lib/scons-${VERSION}/SCons/Scanner/RC.pyc
+lib/scons-${VERSION}/SCons/Scanner/SWIG.py
+lib/scons-${VERSION}/SCons/Scanner/SWIG.pyc
lib/scons-${VERSION}/SCons/Scanner/__init__.py
lib/scons-${VERSION}/SCons/Scanner/__init__.pyc
lib/scons-${VERSION}/SCons/Script/
@@ -392,20 +396,8 @@ lib/scons-${VERSION}/SCons/__init__.pyc
lib/scons-${VERSION}/SCons/compat/
lib/scons-${VERSION}/SCons/compat/__init__.py
lib/scons-${VERSION}/SCons/compat/__init__.pyc
-lib/scons-${VERSION}/SCons/compat/_scons_builtins.py
-lib/scons-${VERSION}/SCons/compat/_scons_builtins.pyc
-lib/scons-${VERSION}/SCons/compat/_scons_collections.py
-lib/scons-${VERSION}/SCons/compat/_scons_collections.pyc
lib/scons-${VERSION}/SCons/compat/_scons_dbm.py
lib/scons-${VERSION}/SCons/compat/_scons_dbm.pyc
-lib/scons-${VERSION}/SCons/compat/_scons_hashlib.py
-lib/scons-${VERSION}/SCons/compat/_scons_hashlib.pyc
-lib/scons-${VERSION}/SCons/compat/_scons_io.py
-lib/scons-${VERSION}/SCons/compat/_scons_io.pyc
-lib/scons-${VERSION}/SCons/compat/_scons_sets.py
-lib/scons-${VERSION}/SCons/compat/_scons_sets.pyc
-lib/scons-${VERSION}/SCons/compat/_scons_subprocess.py
-lib/scons-${VERSION}/SCons/compat/_scons_subprocess.pyc
lib/scons-${VERSION}/SCons/cpp.py
lib/scons-${VERSION}/SCons/cpp.pyc
lib/scons-${VERSION}/SCons/dblite.py
