<pre style='margin:0'>
Leonardo Brondani Schenkel (lbschenkel) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1986b1b0bc3fc8fe21c2b55402fc4b436d7f36c5">https://github.com/macports/macports-ports/commit/1986b1b0bc3fc8fe21c2b55402fc4b436d7f36c5</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 1986b1b ntpsec: Fixes build when default Python is old.
</span>1986b1b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1986b1b0bc3fc8fe21c2b55402fc4b436d7f36c5
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Fri Mar 30 16:11:00 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> ntpsec: Fixes build when default Python is old.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> A Python program used as a build helper was being run with the
</span><span style='display:block; white-space:pre;color:#404040;'> system default Python, and failing when that was too old. This
</span><span style='display:block; white-space:pre;color:#404040;'> fix (possibly acceptable upstream) causes it to use the same
</span><span style='display:block; white-space:pre;color:#404040;'> Python as is being used to run waf, which is already forced to
</span><span style='display:block; white-space:pre;color:#404040;'> be the MacPorts Python 2.7.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> TESTED:
</span><span style='display:block; white-space:pre;color:#404040;'> On both MacPro/10.9 and PowerBook/10.5, with python_select set to
</span><span style='display:block; white-space:pre;color:#404040;'> python25-apple, verified that the build failed without this fix
</span><span style='display:block; white-space:pre;color:#404040;'> and succeeded with it. Also tested with the usual python27.
</span>---
sysutils/ntpsec/Portfile | 3 ++-
sysutils/ntpsec/files/patch-OldPython.diff | 20 ++++++++++++++++++++
2 files changed, 22 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/ntpsec/Portfile b/sysutils/ntpsec/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6108ab2..ffc5bb1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/ntpsec/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/ntpsec/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,8 @@ checksums rmd160 65e6f3a2339b98ffa0b0cdf7310dd850cd3082a6 \
</span> depends_build port:bison
depends_lib path:lib/libssl.dylib:openssl port:python${python.version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-PreHighSierra.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-PreHighSierra.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-OldPython.diff
</span>
post-patch {
foreach f {ntpdig ntpkeygen ntploggps ntplogtemp ntpmon ntpq ntpsnmpd ntpsweep ntptrace ntpviz ntpwait} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/ntpsec/files/patch-OldPython.diff b/sysutils/ntpsec/files/patch-OldPython.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c6e72a8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/ntpsec/files/patch-OldPython.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pylib/wscript.orig 2018-03-14 20:28:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pylib/wscript 2018-03-30 16:01:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,7 +36,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ctx(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ before=['pyc', 'pyo'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cwd=srcnode,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rule='${SRC} >${TGT}',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rule='${PYTHON} ${SRC} >${TGT}',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ source=["../wafhelpers/pythonize-header", "../include/ntp_control.h"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target=target1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,7 +44,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ctx(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ before=['pyc', 'pyo'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cwd=srcnode,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rule='${SRC} >${TGT}',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rule='${PYTHON} ${SRC} >${TGT}',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ source=["../wafhelpers/pythonize-header", "../include/ntp.h"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target=target2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span></pre><pre style='margin:0'>
</pre>