<pre style='margin:0'>
NicosPavlov pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3cc5fa20e308d06546e675f691981a02385a3f3e">https://github.com/macports/macports-ports/commit/3cc5fa20e308d06546e675f691981a02385a3f3e</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 3cc5fa20e30 scidavis: update to 2.4.0 Use cmake to compile and clean up Portfile accordingly Update python variant to python39
</span>3cc5fa20e30 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 3cc5fa20e308d06546e675f691981a02385a3f3e
</span>Author: Nicolas Pavillon <pavillon.nicolas@gmail.com>
AuthorDate: Thu May 6 02:15:16 2021 +0900

<span style='display:block; white-space:pre;color:#404040;'>    scidavis: update to 2.4.0
</span><span style='display:block; white-space:pre;color:#404040;'>    Use cmake to compile and clean up Portfile accordingly
</span><span style='display:block; white-space:pre;color:#404040;'>    Update python variant to python39
</span>---
 science/scidavis/Portfile | 71 +++++++++++++----------------------------------
 1 file changed, 19 insertions(+), 52 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/scidavis/Portfile b/science/scidavis/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 79261bd1338..690b8e9bae0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/scidavis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/scidavis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 
 PortSystem          1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup           qmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           cmake 1.1
</span> PortGroup           compiler_blacklist_versions 1.0
 
 name                scidavis
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             2.1.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             2.4.0
</span> categories          science
 license             GPL-2+
 maintainers         {nicos @NicosPavlov} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,71 +17,38 @@ long_description    ${description}
</span> platforms           darwin
 homepage            http://scidavis.sourceforge.net
 #The developer keeps changing naming conventions, so we stay hard-coded for now
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites        sourceforge:project/scidavis/SciDAVis/2/2.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#distname            ${name}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites        sourceforge:project/scidavis/SciDAVis/2/2.4
</span> 
 compiler.cxx_standard       2011
 compiler.blacklist-append   *gcc* {clang < 318.0.61}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append    port:doxygen \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        path:bin/cmake:cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append  port:qwt52 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:qwtplot3d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gsl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:boost \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append  port:gsl \
</span>                     port:muparser \
                     port:zlib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:libGLU
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:gl2ps
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  557af96e0bdc10657c4bde213a9863c7ae9b08d7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  99bfe79d55e6e0bd4e93acef2b1a29680cfda7b7f4aafaf47f8eb6f75083f7c4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    9821119
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  3e2870915fd9694dad00bc23f1b489930ef61788 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  16506234115949b3f46ebfadc5add15c0d7d95367a6fb60f5042fcbf1d95e70e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    11887195
</span> 
 universal_variant   no
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles          patch-OriginObj.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-nullComparison.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.pre_args-append   "'CONFIG+=osx_dist noassistant'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append   -DORIGIN_IMPORT="ON"
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|/usr|${prefix}|g" ${worksrcpath}/config.pri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|clang++|${configure.cxx}|g" ${worksrcpath}/config.pri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|/usr|${prefix}|g" ${worksrcpath}/fitPlugins/exp_saturation/exp_saturation.pro
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|/usr|${prefix}|g" ${worksrcpath}/fitPlugins/explin/explin.pro
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|/usr|${prefix}|g" ${worksrcpath}/fitPlugins/fitRational0/fitRational0.pro
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|/usr|${prefix}|g" ${worksrcpath}/fitPlugins/fitRational1/fitRational1.pro
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|/usr|${prefix}|g" ${worksrcpath}/fitPlugins/planck_wavelength/planck_wavelength.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python39 description "add support for python scripting" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append port:python39 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                       port:py39-sip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                       port:py39-pyqt5
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {${prefix} ne "/opt/local"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|/opt/local|${prefix}|g" ${worksrcpath}/config.pri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|/opt/local|${prefix}|g" ${worksrcpath}/mkMacDist.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append   "-DSCRIPTING_PYTHON=ON" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            "-DSIP_FOUND=TRUE" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            "-DSIP_EXECUTABLE=${prefix}/bin/sip-3.9"
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {![variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|CONFIG+=python| |g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${worksrcpath}/config.pri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|find_package( SIP|#find_package( SIP|g" ${worksrcpath}/CMakeLists.txt
</span>     }
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://trac.macports.org/ticket/54372
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string match *clang* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.ldflags-append -stdlib=${configure.cxx_stdlib}
</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;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    #Put the application to the right folder
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    move ${destroot}${prefix}/bin/scidavis.app ${destroot}${applications_dir}/scidavis.app
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 description "add support for python scripting" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append port:python27 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                       port:py27-sip \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                       port:py27-pyqt4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type      sourceforge
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url       http://sourceforge.net/projects/scidavis/files/SciDAVis/2/2.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url       http://sourceforge.net/projects/scidavis/files/SciDAVis/2
</span> #livecheck.regex     (\[0-9.\]+\[A-Z\]+\[0-9.\])
</pre><pre style='margin:0'>

</pre>