<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/16fa972ebbde4a2bda7e31e78557d78767e9f8a4">https://github.com/macports/macports-ports/commit/16fa972ebbde4a2bda7e31e78557d78767e9f8a4</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 16fa972 vtk: Bump version and prefer system deps where possible
</span>16fa972 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 16fa972ebbde4a2bda7e31e78557d78767e9f8a4
</span>Author: Ruben Di Battista <rubendibattista@gmail.com>
AuthorDate: Sun Mar 17 20:11:51 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> vtk: Bump version and prefer system deps where possible
</span>---
graphics/vtk/Portfile | 72 +++++++++++++++++++++++++++++++++++++++++----------
1 file changed, 58 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vtk/Portfile b/graphics/vtk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1dd5c84..039f406 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/vtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/vtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,8 @@ PortGroup mpi 1.0
</span> PortGroup muniversal 1.0
name vtk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 8.1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 8.1.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories graphics devel
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,14 +27,24 @@ master_sites http://www.vtk.org/files/release/${branch}
</span>
distname VTK-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 aa711fbd3e7e8a60b300b0045233fdfe0110d7d7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 71a09b4340f0a9c58559fe946dc745ab68a866cf20636a41d97b6046cb736324 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 33482287
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6e9b3d00602cb1e34483f4f68cc5f7a522516102 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0995fb36857dd76ccfb8bb07350c214d9f9099e80b1e66b4a8909311f24ff0db \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 33479307
</span>
cmake.out_of_source yes
mpi.setup
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-python37.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:expat \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:freetype \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:hdf5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jsoncpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtheora \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lz4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:netcdf-cxx \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tiff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span>
configure.args-delete \
-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +56,11 @@ configure.args-append \
</span> -DVTK_WRAP_PYTHON:BOOL=OFF \
-DVTK_WRAP_JAVA:BOOL=OFF \
-DVTK_WRAP_TCL:BOOL=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVTK_USE_COCOA=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVTK_USE_SYSTEM_LIBRARIES:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVTK_USE_SYSTEM_LIBPROJ4:BOOL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVTK_USE_SYSTEM_GL2PS:BOOL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVTK_USE_SYSTEM_LIBHARU:BOOL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVTK_USE_COCOA:BOOL=ON
</span>
# As proposed at #46890
if {${os.major} <= 10} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,6 +68,12 @@ if {${os.major} <= 10} {
</span> -DIOKit:FILEPATH=/System/Library/Frameworks/IOKit.framework
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant ffmpeg description {Add support for ffmpeg} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:ffmpeg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DModule_vtkIOFFMPEG:BOOL=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # As proposed at #46853
variant qt4 description {Add Qt4 support.} {
PortGroup qt4 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,6 +94,12 @@ variant python27 conflicts python35 python36 python37 description {Add Python 2.
</span> -DVTK_WRAP_PYTHON:BOOL=ON \
-DPYTHON_EXECUTABLE:STRING=${prefix}/bin/python2.7 \
-DVTK_INSTALL_PYTHON_MODULE_DIR=${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[mpi_variant_isset]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py27-mpi4py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVTK_USE_SYSTEM_MPI4PY:BOOL=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
variant python35 conflicts python27 python36 python37 description {Add Python 3.5 support.} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,6 +110,11 @@ variant python35 conflicts python27 python36 python37 description {Add Python 3.
</span> -DVTK_WRAP_PYTHON:BOOL=ON \
-DPYTHON_EXECUTABLE:STRING=${prefix}/bin/python3.5 \
-DVTK_INSTALL_PYTHON_MODULE_DIR=${frameworks_dir}/Python.framework/Versions/3.5/lib/python3.5/site-packages
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[mpi_variant_isset]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py35-mpi4py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVTK_USE_SYSTEM_MPI4PY:BOOL=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant python36 conflicts python27 python35 python37 description {Add Python 3.6 support.} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,6 +125,12 @@ variant python36 conflicts python27 python35 python37 description {Add Python 3.
</span> -DVTK_WRAP_PYTHON:BOOL=ON \
-DPYTHON_EXECUTABLE:STRING=${prefix}/bin/python3.6 \
-DVTK_INSTALL_PYTHON_MODULE_DIR=${frameworks_dir}/Python.framework/Versions/3.6/lib/python3.6/site-packages
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[mpi_variant_isset]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py36-mpi4py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVTK_USE_SYSTEM_MPI4PY:BOOL=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant python37 conflicts python27 python35 python36 description {Add Python 3.7 support.} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,13 +141,21 @@ variant python37 conflicts python27 python35 python36 description {Add Python 3.
</span> -DVTK_WRAP_PYTHON:BOOL=ON \
-DPYTHON_EXECUTABLE:STRING=${prefix}/bin/python3.7 \
-DVTK_INSTALL_PYTHON_MODULE_DIR=${frameworks_dir}/Python.framework/Versions/3.7/lib/python3.7/site-packages
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[mpi_variant_isset]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py37-mpi4py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVTK_USE_SYSTEM_MPI4PY:BOOL=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant hdf5 description {Add hdf5 readers} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:hdf5 port:boost port:netcdf-cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:boost
</span> configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVTK_USE_SYSTEM_HDF5=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVTK_USE_SYSTEM_NETCDF=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVTK_USE_SYSTEM_HDF5:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVTK_USE_SYSTEM_NETCDF:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVTK_USE_SYSTEM_XDMF2:BOOL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVTK_USE_SYSTEM_XDMF3:BOOL=OFF \
</span> -DNETCDF_DIR=${prefix} \
-DBOOST_ROOT=${prefix} \
-DModule_vtkIOXdmf2:BOOL=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,11 +167,10 @@ variant hdf5 description {Add hdf5 readers} {
</span> }
if {[mpi_variant_isset]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DVTK_Group_MPI:BOOL=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVTK_Group_MPI:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVTK_USE_SYSTEM_DIY2:BOOL=OFF
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python35] && ![variant_isset python36] && ![variant_isset python37]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python27
</span> }
livecheck.type regex
</pre><pre style='margin:0'>
</pre>