<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/197ddb7c813b2947f966ab5758e04bd81d53cd3c">https://github.com/macports/macports-ports/commit/197ddb7c813b2947f966ab5758e04bd81d53cd3c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 197ddb7c813b2947f966ab5758e04bd81d53cd3c
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Nov 4 06:12:18 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qscintilla2: change code order and comments
</span>---
devel/qscintilla2/Portfile | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qscintilla2/Portfile b/devel/qscintilla2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 34bcd08..2199b8c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qscintilla2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qscintilla2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,29 +75,27 @@ foreach pver ${python_versions} {
</span> port:py${pver}-sip \
port:py${pver}-pyqt5
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # allow configure.py to respect --sip=... argument
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # allow configure.py to respect --spec=... argument
</span> patchfiles-append patch-configure.py.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set pbranch [string range ${pver} 0 end-1].[string index ${pver} end]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python${pbranch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_ver_dot [join [split ${pver} ""] "."]
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # --disable-dependency-tracking is not recognized
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_args-delete --disable-dependency-tracking
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cmd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${configure.python} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python${python_ver_dot}
</span>
# --prefix is not recognized
configure.pre_args
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cmd ${configure.python} configure.py
</span> configure.args-append \
--pyqt=PyQt5 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --qmake=${qt_qmake_cmd} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --sip=${prefix}/bin/sip-${pbranch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --sip=${prefix}/bin/sip-${python_ver_dot} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --qmake=${qt_qmake_cmd}
</span>
qt5.spec_cmd --spec=
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # --disable-dependency-tracking is not recognized
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_args-delete --disable-dependency-tracking
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
move \
${destroot}${qt_data_dir}/qsci/api/python/QScintilla2.api \
</pre><pre style='margin:0'>
</pre>