<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e4ffec7a08669ed42b3a0f9434446f0d78132f25">https://github.com/macports/macports-ports/commit/e4ffec7a08669ed42b3a0f9434446f0d78132f25</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e4ffec7a08669ed42b3a0f9434446f0d78132f25
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sun Nov 3 09:43:05 2019 -0500

<span style='display:block; white-space:pre;color:#404040;'>    xraylib: replace python34 variant with python37
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    - switch to GitHub
</span><span style='display:block; white-space:pre;color:#404040;'>    - use perl5.28
</span><span style='display:block; white-space:pre;color:#404040;'>    - clean-up ruby variants; add newer ones, remove obsolete versions
</span><span style='display:block; white-space:pre;color:#404040;'>    - make sure the correct Python executable is used
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/58361
</span>---
 science/xraylib/Portfile | 61 +++++++++++++++++++++++-------------------------
 1 file changed, 29 insertions(+), 32 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 cb880bd..54f3372 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;'>@@ -2,17 +2,18 @@
</span> 
 PortSystem          1.0
 PortGroup           perl5 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           github 1.0
</span> PortGroup           compilers 1.0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name                xraylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version             3.3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        tschoonj xraylib 3.3.0 xraylib-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories          science
 platforms           darwin
 license             BSD
 maintainers         nomaintainer
 
 description         A library for X-ray matter interaction cross sections
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> long_description    ${name} provides an API with over 50 functions designed \
                     to provide convenient access to databases with cross \
                     sections (photoelectric, Compton, Rayleigh, XRF etc.), \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,10 +22,6 @@ long_description    ${name} provides an API with over 50 functions designed \
</span>                     etc. Bindings exist for Perl, Python, Java, Fortran, IDL, \
                     Lua, Ruby, PHP and .NET.
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage            http://ftp.esrf.eu/pub/scisoft/xraylib/readme.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites        http://lvserver.ugent.be/xraylib/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    http://xraylib.s3.amazonaws.com/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> checksums           rmd160  f690e335bcb41df7a5a32a8c717059886d2bfe34 \
                     sha256  a22a73b8d90eb752b034bab1a4cf6abdd81b8c7dc5020bcb22132d2ee7aacd42 \
                     size    7662773
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,63 +36,63 @@ configure.args      --disable-idl \
</span>                     --disable-java \
                     --disable-lua \
                     --disable-ruby \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    --disable-python-numpy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --disable-python-numpy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --disable-php
</span> 
 # to be fixed in later versions of xraylib...
 use_parallel_build  no
 configure.ccache    no
 
 perl5.conflict_variants yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-perl5.branches 5.26 5.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+perl5.branches 5.28
</span> perl5.create_variants ${perl5.branches}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset perl5_26] || [variant_isset perl5_28]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset perl5_28]} {
</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 python34 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python27 description {Python 2.7 bindings} conflicts python37 {
</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
     depends_lib-append port:python27 port:py27-numpy
<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/python2.7|g" ${worksrcpath}/python/xraylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python34 description {Python 3.4 bindings} conflicts python27 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append --enable-python --enable-python-integration --enable-python-numpy PYTHON=${prefix}/bin/python3.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 description {Python 3.7 bindings} conflicts python27 {
</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.7
</span>     configure.args-delete --disable-python --disable-python-numpy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_build-append port:swig-python port:py34-cython
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append port:python34 port:py34-numpy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant ruby18 description {Ruby 1.8.7 bindings} conflicts ruby19 ruby20 ruby21 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append --enable-ruby --enable-ruby-integration RUBY=${prefix}/bin/ruby1.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-delete --disable-ruby
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_build-append port:swig-ruby
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append port:ruby
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_build-append port:swig-python port:py37-cython
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append port:python37 port:py37-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.7|g" ${worksrcpath}/python/xraylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant ruby19 description {Ruby 1.9 bindings} conflicts ruby18 ruby20 ruby21 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append --enable-ruby --enable-ruby-integration RUBY=${prefix}/bin/ruby1.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant ruby24 description {Ruby 2.4 bindings} conflicts ruby25 ruby26 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append --enable-ruby --enable-ruby-integration RUBY=${prefix}/bin/ruby2.4
</span>     configure.args-delete --disable-ruby
     depends_build-append port:swig-ruby
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append port:ruby19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append port:ruby24
</span> }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant ruby20 description {Ruby 2.0 bindings} conflicts ruby18 ruby19 ruby21 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append --enable-ruby --enable-ruby-integration RUBY=${prefix}/bin/ruby2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant ruby25 description {Ruby 2.5 bindings} conflicts ruby24 ruby26 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append --enable-ruby --enable-ruby-integration RUBY=${prefix}/bin/ruby2.5
</span>     configure.args-delete --disable-ruby
     depends_build-append port:swig-ruby
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append port:ruby20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append port:ruby25
</span> }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant ruby21 description {Ruby 2.1 bindings} conflicts ruby18 ruby19 ruby20 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append --enable-ruby --enable-ruby-integration RUBY=${prefix}/bin/ruby2.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant ruby26 description {Ruby 2.6 bindings} conflicts ruby24 ruby25 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append --enable-ruby --enable-ruby-integration RUBY=${prefix}/bin/ruby2.6
</span>     configure.args-delete --disable-ruby
     depends_build-append port:swig-ruby
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append port:ruby21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append port:ruby26
</span> }
 
 variant java description {Java bindings} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,7 +110,7 @@ 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 python34]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python27] &&  ![variant_isset python37]} {
</span>     default_variants    +python27
 }
 
</pre><pre style='margin:0'>

</pre>