<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7bfaae4237f117a274fe0b12fb6117e2fd139990">https://github.com/macports/macports-ports/commit/7bfaae4237f117a274fe0b12fb6117e2fd139990</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7bfaae4237f117a274fe0b12fb6117e2fd139990
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Tue Dec 17 01:02:38 2019 -0700

<span style='display:block; white-space:pre;color:#404040;'>    openvdb: ensure correct Python version is found
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    No revbump since port either builds correctly or not at all.
</span>---
 graphics/openvdb/Portfile                        |  6 ++---
 graphics/openvdb/files/patch-python_verison.diff | 31 +++++++++++++++---------
 2 files changed, 23 insertions(+), 14 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openvdb/Portfile b/graphics/openvdb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1d4d0cc..6a4a24b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openvdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openvdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,7 +63,7 @@ variant python27 description {Build the Python 2.7 bindings} conflicts python36
</span>         port:python27 \
         port:py27-numpy
     post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|__MACPORTS_PYTHON_VERSION__|2.7|g" ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace s|__MACPORTS_PYTHON_VERSION__|2.7|g ${worksrcpath}/openvdb/python/CMakeLists.txt
</span>     }
     require_active_variants boost python27
 }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +73,7 @@ variant python36 description {Build the Python 3.6 bindings} conflicts python27
</span>         port:python36 \
         port:py36-numpy
     post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|__MACPORTS_PYTHON_VERSION__|3.6|g" ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace s|__MACPORTS_PYTHON_VERSION__|3.6|g ${worksrcpath}/openvdb/python/CMakeLists.txt
</span>     }
     require_active_variants boost python36
 }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,7 +83,7 @@ variant python37 description {Build the Python 3.7 bindings} conflicts python27
</span>         port:python37 \
         port:py37-numpy
     post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|__MACPORTS_PYTHON_VERSION__|3.7|g" ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace s|__MACPORTS_PYTHON_VERSION__|3.7|g ${worksrcpath}/openvdb/python/CMakeLists.txt
</span>     }
     require_active_variants boost python37
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openvdb/files/patch-python_verison.diff b/graphics/openvdb/files/patch-python_verison.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ef7cf1d..4b4796a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openvdb/files/patch-python_verison.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openvdb/files/patch-python_verison.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig    2019-05-07 13:58:35.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2019-06-08 03:00:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -177,7 +177,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   set(MINIMUM_ZLIB_VERSION 1.2.7)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   set(MINIMUM_TBB_VERSION 4.4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  set(MINIMUM_PYTHON_VERSION 2.7)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  set(MINIMUM_PYTHON_VERSION __MACPORTS_PYTHON_VERSION__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   set(MINIMUM_NUMPY_VERSION 1.9.2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   set(MINIMUM_CPPUNIT_VERSION 1.10)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- openvdb/python/CMakeLists.txt.orig     2019-12-16 22:50:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ openvdb/python/CMakeLists.txt  2019-12-16 22:51:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -90,7 +90,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   # Development and NumPy, specify all components at the same time when using
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   # FindPython
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if(USE_NUMPY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    find_package(Python ${MINIMUM_PYTHON_VERSION} REQUIRED COMPONENTS Interpreter Development NumPy)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    find_package(Python __MACPORTS_PYTHON_VERSION__ EXACT REQUIRED COMPONENTS Interpreter Development NumPy)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if(Python_NumPy_VERSION VERSION_LESS MINIMUM_NUMPY_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       message(FATAL_ERROR "Could NOT find NumPy (Required is at least version "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "\"${MINIMUM_NUMPY_VERSION}\")"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -103,7 +103,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     list(APPEND OPENVDB_PYTHON_DEPS Python::NumPy)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    find_package(Python ${MINIMUM_PYTHON_VERSION} REQUIRED COMPONENTS Interpreter Development)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    find_package(Python __MACPORTS_PYTHON_VERSION__ EXACT REQUIRED COMPONENTS Interpreter Development)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   list(APPEND OPENVDB_PYTHON_DEPS Python::Python)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span></pre><pre style='margin:0'>

</pre>