<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4e4a95b746238fa9dca05248c69ddbf3e6318363">https://github.com/macports/macports-ports/commit/4e4a95b746238fa9dca05248c69ddbf3e6318363</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 4e4a95b scons: Update to 3.0.1
</span>4e4a95b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4e4a95b746238fa9dca05248c69ddbf3e6318363
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Nov 16 10:07:01 2017 -0600
<span style='display:block; white-space:pre;color:#404040;'> scons: Update to 3.0.1
</span>---
devel/scons/Portfile | 16 +++----
devel/scons/files/manpath.patch | 2 +-
devel/scons/files/print.patch | 83 -----------------------------------
devel/scons/files/python-interp.patch | 10 +++++
4 files changed, 19 insertions(+), 92 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/scons/Portfile b/devel/scons/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2b2c93f..7ed0ec2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/scons/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/scons/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,13 +4,12 @@ PortSystem 1.0
</span> PortGroup python 1.0
name scons
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.0.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.0.1
</span> categories devel python
platforms darwin
supported_archs noarch
license MIT
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ryandesign @ryandesign} openmaintainer
</span>
description A software construction tool
long_description SCons is an Open Source software construction \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,20 +23,21 @@ homepage http://www.scons.org/
</span> python.default_version 27
master_sites sourceforge:project/scons/scons/${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d7da89240522cc18bd415a01acd01a25720ecf2e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0f532f405b98c60b731d231b3c503ab5bf47d89a6f66f70cb62c9249e9f45216
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 9fb29b6bf100da6ee03afff3630af2cf5b312f16 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 24475e38d39c19683bc88054524df018fe6949d70fbd4c69e298d39a0269f173 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 634815
</span>
patchfiles manpath.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- print.patch \
</span> python-interp.patch
post-patch {
reinplace -W ${worksrcpath}/script "s|__PYTHON__|${python.bin}|" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- scons sconsign scons-time
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scons scons-configure-cache scons-time sconsign
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args --install-man \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --no-version-script
</span> post-destroot {
xinstall -m 755 -d \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/man/man1 \
</span> ${destroot}${prefix}/share/doc/${name}
xinstall -m 644 -W ${worksrcpath} \
CHANGES.txt LICENSE.txt README.txt RELEASE.txt \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/scons/files/manpath.patch b/devel/scons/files/manpath.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index ae14306..ab79fc5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/scons/files/manpath.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/scons/files/manpath.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ Index: setup.py
</span> ===================================================================
--- setup.py.orig
+++ setup.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -375,7 +375,7 @@ class install_data(_install_data):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -376,7 +376,7 @@ class install_data(_install_data):
</span> if is_win32:
dir = 'Doc'
else:
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/scons/files/print.patch b/devel/scons/files/print.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ac449a2..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/scons/files/print.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,83 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/SConsProject/scons/commit/2e0de3c55f22b3eaa7767b69740b898f3d2f46bf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CHANGES.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CHANGES.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11,6 +11,9 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - Whatever John Doe did.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ From Thomas Berg:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ - Fixed a regression in scons-3.0.0 where "from __future__ import print_function" was imposed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ on the scope where SConstruct is executed, breaking existing builds using PY 2.7.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RELEASE 3.0.0 - Mon, 18 Sep 2017 08:32:04 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- engine/SCons/Script/SConscript.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ engine/SCons/Script/SConscript.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,8 +5,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--from __future__ import print_function
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # __COPYRIGHT__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ test/print_statement.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,56 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/env python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# __COPYRIGHT__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Permission is hereby granted, free of charge, to any person obtaining
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# a copy of this software and associated documentation files (the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# "Software"), to deal in the Software without restriction, including
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# without limitation the rights to use, copy, modify, merge, publish,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# distribute, sublicense, and/or sell copies of the Software, and to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# permit persons to whom the Software is furnished to do so, subject to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# the following conditions:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# The above copyright notice and this permission notice shall be included
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# in all copies or substantial portions of the Software.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import sys
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import TestSCons
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+test = TestSCons.TestSCons()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+test.write('SConstruct', """\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+print('python 3 style statement')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Exit(0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+""")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+test.run()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+test.write('SConstruct', """\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+print 'python 2 style statement'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Exit(0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+""")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if sys.version_info >= (3,0):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ test.skip_test('Python 2 print statement test, skipping on Python 3.\n')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ test.run()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+test.pass_test()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Local Variables:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# tab-width:4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# indent-tabs-mode:nil
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# End:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# vim: set expandtab tabstop=4 shiftwidth=4:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/scons/files/python-interp.patch b/devel/scons/files/python-interp.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 162b97a..b062cd7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/scons/files/python-interp.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/scons/files/python-interp.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,6 +13,16 @@ Index: script/scons
</span> #
# SCons - a Software Constructor
#
<span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: script/scons-configure-cache
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- script/scons-configure-cache.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ script/scons-configure-cache
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#! /usr/bin/env python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!__PYTHON__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # SCons - a Software Constructor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span> Index: script/scons-time
===================================================================
--- script/scons-time.orig
</pre><pre style='margin:0'>
</pre>