<pre style='margin:0'>
Kurt Hindenburg (kurthindenburg) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cbe1af14c8bbc121fb354c3642ce4793eaf6e19f">https://github.com/macports/macports-ports/commit/cbe1af14c8bbc121fb354c3642ce4793eaf6e19f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit cbe1af14c8bbc121fb354c3642ce4793eaf6e19f
</span>Author: Kurt Hindenburg <khindenburg@macports.org>
AuthorDate: Wed Jul 29 09:14:20 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> LyX: add python38 and make it the default
</span>---
aqua/LyX/Portfile | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/LyX/Portfile b/aqua/LyX/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 37950d0e999..cbe839b9889 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/LyX/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/LyX/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup cxx11 1.1
</span> name LyX
conflicts LyX1
version 2.3.5.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories aqua
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,26 +59,31 @@ if {![variant_isset qt4]} {
</span> default_variants +qt5
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# boost currently pulls in python27; change default when boost does
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python36] && ![variant_isset python37]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Make the default match boost's default.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python27] && ![variant_isset python36] && ![variant_isset python37]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +python38
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 conflicts python36 python37 description {Use python27} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python27 conflicts python36 python37 python38 description {Use python27} {
</span> depends_build-append port:python27
configure.python ${prefix}/bin/python2.7
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python36 conflicts python27 python37 description {Use python36} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python36 conflicts python27 python37 python38 description {Use python36} {
</span> depends_build-append port:python36
configure.python ${prefix}/bin/python3.6
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 conflicts python27 python36 description {Use python37} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 conflicts python27 python36 python38 description {Use python37} {
</span> depends_build-append port:python37
configure.python ${prefix}/bin/python3.7
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 conflicts python27 python36 python37 description {Use python38} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:python38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant qt4 conflicts qt5 description {Use Qt4} {
PortGroup qt4 1.0
</pre><pre style='margin:0'>
</pre>