<pre style='margin:0'>
Mark Moll (mamoll) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6482d9ab383a726caaad41a6fe56a8c6439ff427">https://github.com/macports/macports-ports/commit/6482d9ab383a726caaad41a6fe56a8c6439ff427</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 6482d9a science/ompl: fix dependency handling, put optional spot dependency into a variant
</span>6482d9a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6482d9ab383a726caaad41a6fe56a8c6439ff427
</span>Author: Mark Moll <mmoll@macports.org>
AuthorDate: Fri Aug 24 08:40:19 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> science/ompl: fix dependency handling, put optional spot dependency into a variant
</span>---
science/ompl/Portfile | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ompl/Portfile b/science/ompl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2627240..6be507b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ompl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ompl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ cmake.out_of_source yes
</span>
name ompl
version 1.4.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories science
maintainers {mmoll @mamoll}
description The Open Motion Planning Library (OMPL)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,9 +21,12 @@ checksums rmd160 3af4801ac53ef34ffbec202de2bd5adf9405ba56 \
</span> sha256 da8c273a2ed946fbcd7b721649a4767fdc1433e257bdc9a3d6c689b81261cc4f \
size 22772134
depends_build-append port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:boost-numpy port:ode port:flann port:triangle port:eigen3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:boost port:ode port:flann port:triangle port:eigen3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DOMPL_BUILD_DEMOS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOMPL_BUILD_TESTS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_DISABLE_FIND_PACKAGE_spot=ON
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DOMPL_BUILD_DEMOS=OFF -DOMPL_BUILD_TESTS=OFF
</span> # generate the extra C++ code needed for Python bindings. This code seems
# somewhat dependent on compiler and/or boost version, so we can't
# pre-generate them and make them available as an extra download.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +70,12 @@ http://ompl.kavrakilab.org/license.html#ricelicense"
</span> "
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set pythons_suffixes {27 34 35 36}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant spot description {Include support for automaton generation from LTL specifications using Spot} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete -DCMAKE_DISABLE_FIND_PACKAGE_spot=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:spot
</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;'>+set pythons_suffixes {27 34 35 36 37}
</span>
set pythons_ports {}
foreach s ${pythons_suffixes} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,7 +100,7 @@ foreach s ${pythons_suffixes} {
</span> set c [lreplace ${pythons_ports} ${i} ${i}]
variant ${p} description "Use Python ${v} for python bindings" conflicts {*}${c} debug "
depends_build-append port:py${s}-pyplusplus
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${p}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${p} port:boost-numpy
</span> configure.args-append -DPYTHON_EXEC=${prefix}/bin/python${v}
# the python bindings rely on Boost.Python, so make sure it is installed.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,7 +119,8 @@ foreach s ${pythons_suffixes} {
</span> port:py${s}-opengl \
port:py${s}-flask \
port:py${s}-celery \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${s}-redis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${s}-redis \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:redis
</span> post-destroot {
reinplace \"s|broker=rabbitmq|broker=redis|g\" \
${destroot}${prefix}/share/ompl/ompl.conf
</pre><pre style='margin:0'>
</pre>