<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/64982630fe743772fe20d95b8c28362e95cb3988">https://github.com/macports/macports-ports/commit/64982630fe743772fe20d95b8c28362e95cb3988</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 6498263 py*-pyqt4: force the SIP directory to be ${python.prefix}/share/sip/PyQt4 .
</span>6498263 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 64982630fe743772fe20d95b8c28362e95cb3988
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Fri Jul 20 21:16:56 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> py*-pyqt4: force the SIP directory to be ${python.prefix}/share/sip/PyQt4 .
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/56841
</span>---
python/py-pyqt4/Portfile | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyqt4/Portfile b/python/py-pyqt4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2ada688..c424f7c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyqt4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyqt4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@ long_description \
</span> homepage http://www.riverbankcomputing.co.uk/software/pyqt/intro
version 4.12.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
set patch [lindex [split ${version} .] 2]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,7 +72,7 @@ if {${name} ne ${subport}} {
</span> PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@MACPORTS_PYTHON_FRAMEWORK@@|${frameworks_dir}/Python.framework/Versions/${python.branch}/Python|" ${worksrcpath}/configure.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@MACPORTS_PYTHON_FRAMEWORK@@|${python.prefix}/Python|" ${worksrcpath}/configure.py
</span>
# fix location of MacPorts'-installed Qt .apps, step 2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,7 +115,8 @@ if {${name} ne ${subport}} {
</span> -e QAxContainer \
-e QtDesigner \
--dbus=${python.include}/dbus-1.0 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --no-qsci-api
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --no-qsci-api \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --sipdir=${python.prefix}/share/sip/PyQt4
</span>
# SIP's configure tools ignore environment variables, so have to
# get important info in in other ways if/as possible; SIP will, by
</pre><pre style='margin:0'>
</pre>