<pre style='margin:0'>
Lawrence Velázquez (larryv) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9646b62612e21ef837465f361751b35380d6bab8">https://github.com/macports/macports-ports/commit/9646b62612e21ef837465f361751b35380d6bab8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9646b62612e21ef837465f361751b35380d6bab8
</span>Author: Lawrence Velázquez <larryv@macports.org>
AuthorDate: Fri Dec 2 00:40:02 2016 -0500

<span style='display:block; white-space:pre;color:#404040;'>    scons: Rework patches
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    - Combine patches that do the same thing in different files.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    - Insert python.bin instead of hardcoding "python2.7" into the patch.
</span>---
 devel/scons/Portfile                               | 12 +++-----
 .../scons/files/{patch-setup.py => manpath.patch}  | 13 ++++++--
 devel/scons/files/patch-scons                      |  8 -----
 devel/scons/files/patch-scons-time                 |  8 -----
 devel/scons/files/patch-sconsign                   |  8 -----
 devel/scons/files/python-interp.patch              | 35 ++++++++++++++++++++++
 6 files changed, 49 insertions(+), 35 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 7d2e5de..c7560c9 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;'>@@ -26,15 +26,11 @@ master_sites        sourceforge:project/scons/scons/${version}
</span> checksums           rmd160  0fd9476f4d623a4d08a848e332f505d506d476f5 \
                     sha256  8fc4f42928c69bcbb33e1be94b646f2c700b659693fabc778c192d4d22f753a7
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles          patch-setup.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-scons \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-sconsign \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-scons-time
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          manpath.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    python-interp.patch
</span> post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|@@PREFIX@@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${worksrcpath}/script/scons \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${worksrcpath}/script/sconsign \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${worksrcpath}/script/scons-time
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace -W ${worksrcpath}/script "s|__PYTHON__|${python.bin}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        scons sconsign scons-time
</span> }
 
 post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/scons/files/patch-setup.py b/devel/scons/files/manpath.patch
</span>similarity index 52%
rename from devel/scons/files/patch-setup.py
rename to devel/scons/files/manpath.patch
<span style='display:block; white-space:pre;color:#808080;'>index c5734b9..ae14306 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/scons/files/patch-setup.py
</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;'>@@ -1,6 +1,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig  2012-08-05 10:38:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py       2012-08-12 12:33:04.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -354,7 +354,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+scons: Use MacPorts' location for man pages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream-Status: Inappropriate [configuration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Lawrence Velázquez <larryv@macports.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -375,7 +375,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/patch-scons b/devel/scons/files/patch-scons
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c9dc5d1..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/scons/files/patch-scons
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- script/scons.orig      2005-09-08 07:15:22.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ script/scons   2006-01-31 01:20:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#! /usr/bin/env python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!@@PREFIX@@/bin/python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # SCons - a Software Constructor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/scons/files/patch-scons-time b/devel/scons/files/patch-scons-time
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2104225..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/scons/files/patch-scons-time
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- script/scons-time.orig 2008-12-20 23:59:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ script/scons-time      2009-09-20 23:13:30.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!@@PREFIX@@/bin/python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # scons-time - run SCons timings and collect statistics
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/scons/files/patch-sconsign b/devel/scons/files/patch-sconsign
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 602be15..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/scons/files/patch-sconsign
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- script/sconsign.orig   2005-09-08 07:15:22.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ script/sconsign        2006-01-31 01:20:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#! /usr/bin/env python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!@@PREFIX@@/bin/python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # SCons - a Software Constructor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..162b97a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+scons: Use MacPorts' Python interpreter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream-Status: Inappropriate [configuration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Lawrence Velázquez <larryv@macports.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: script/scons
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- script/scons.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ script/scons
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: script/scons-time
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- script/scons-time.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ script/scons-time
</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-time - run SCons timings and collect statistics
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: script/sconsign
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- script/sconsign.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ script/sconsign
</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></pre><pre style='margin:0'>

</pre>