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

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e57f9a1dbdbba2405587dd92e49db26ce7fae2a8">https://github.com/macports/macports-ports/commit/e57f9a1dbdbba2405587dd92e49db26ce7fae2a8</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 e57f9a1dbdb cadabra2: use conflicts_build PG
</span>e57f9a1dbdb is described below

<span style='display:block; white-space:pre;color:#808000;'>commit e57f9a1dbdbba2405587dd92e49db26ce7fae2a8
</span>Author: Marius Schamschula <mschamschula@gmail.com>
AuthorDate: Sun Aug 11 16:44:23 2024 -0500

<span style='display:block; white-space:pre;color:#404040;'>    cadabra2: use conflicts_build PG
</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/70528
</span>---
 math/cadabra2/Portfile | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/cadabra2/Portfile b/math/cadabra2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9839aeb18a8..825b2761637 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/cadabra2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/cadabra2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,10 @@
</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:#e0ffe0;'>+PortGroup           boost 1.0
</span> PortGroup           cmake 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           conflicts_build 1.0
</span> PortGroup           github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup           boost 1.0
</span> 
 github.setup        kpeeters cadabra2 2.5.4
 revision            0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,22 +52,8 @@ depends_lib-append  port:adwaita-icon-theme \
</span>                     port:texlive-latex \
                     port:texlive-latex-recommended
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {![file exists ${prefix}/include/nlohmann/json.hpp]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ui_error "
</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;'>-**** cadabra2 uses its own bundled version of nlohmann/json.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-**** The build will fail if the nlohmann-json port is active.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-**** Please deactivate it:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-****     sudo port deactivate nlohmann-json
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-**** You can reactivate it after installing cadabra2:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-****     sudo port activate nlohmann-json
</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;'>-        error "nlohmann-json installed."
</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:#e0ffe0;'>+# cadabra2 uses its own bundled version of nlohmann/json.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts_build     nlohmann-json
</span> 
 configure.args      -DENABLE_MATHEMATICA=OFF \
                     -DPYBIND11_PYTHON_VERSION=${python.branch} \
</pre><pre style='margin:0'>

</pre>