<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/863377873a312142d8987205b0bf186f20fd5828">https://github.com/macports/macports-ports/commit/863377873a312142d8987205b0bf186f20fd5828</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 8633778 xraylib: add variants +perl5_30 +python38, default +perl5_28 +python38
</span>8633778 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 863377873a312142d8987205b0bf186f20fd5828
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sun May 10 16:01:57 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> xraylib: add variants +perl5_30 +python38, default +perl5_28 +python38
</span>---
science/xraylib/Portfile | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/xraylib/Portfile b/science/xraylib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 54f3372..efb5058 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/xraylib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/xraylib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,18 +43,20 @@ configure.args --disable-idl \
</span> use_parallel_build no
configure.ccache no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+perl5.require_variant yes
</span> perl5.conflict_variants yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-perl5.branches 5.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+perl5.branches 5.28 5.30
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+perl5.default_branch 5.28
</span> perl5.create_variants ${perl5.branches}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset perl5_28]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset perl5_28] || [variant_isset perl5_30]} {
</span> configure.perl ${perl5.bin}
configure.args-delete --disable-perl
configure.args-append --enable-perl --enable-perl-integration
depends_build-append port:swig-perl
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 description {Python 2.7 bindings} conflicts python37 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python27 description {Python 2.7 bindings} conflicts python37 python38 {
</span> configure.args-append --enable-python --enable-python-integration --enable-python-numpy PYTHON=${prefix}/bin/python2.7
configure.args-delete --disable-python --disable-python-numpy
depends_build-append port:swig-python port:py27-cython
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,7 +66,7 @@ variant python27 description {Python 2.7 bindings} conflicts python37 {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 description {Python 3.7 bindings} conflicts python27 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 description {Python 3.7 bindings} conflicts python27 python38 {
</span> configure.args-append --enable-python --enable-python-integration --enable-python-numpy PYTHON=${prefix}/bin/python3.7
configure.args-delete --disable-python --disable-python-numpy
depends_build-append port:swig-python port:py37-cython
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,6 +76,16 @@ variant python37 description {Python 3.7 bindings} conflicts python27 {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 description {Python 3.8 bindings} conflicts python27 python37 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-python --enable-python-integration --enable-python-numpy PYTHON=${prefix}/bin/python3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable-python --disable-python-numpy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:swig-python port:py38-cython
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python38 port:py38-numpy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/usr/bin/env python|${prefix}/bin/python3.8|g" ${worksrcpath}/python/xraylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant ruby24 description {Ruby 2.4 bindings} conflicts ruby25 ruby26 {
configure.args-append --enable-ruby --enable-ruby-integration RUBY=${prefix}/bin/ruby2.4
configure.args-delete --disable-ruby
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,8 +122,8 @@ if {[fortran_variant_isset]} {
</span> configure.args-replace --disable-fortran2003 --enable-fortran2003
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python27] && ![variant_isset python37]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python27] && ![variant_isset python37] && ![variant_isset python38]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python38
</span> }
test.run yes
</pre><pre style='margin:0'>
</pre>