[CGNS|VTK-M|VTK|ParaView] Update ports (#18248)

* [cgns] update to 4.2.0 * [vtk-m] update to 1.6.0 * [vtk] Update to 9.0.1-pv5.9.1 - VTK update to match release version of ParaView * [ParaView] Update to 5.9.1 * version stuff * fix automatic svg linkage in static builds * update qt5-svg * revisit vtk - fix build with vtk-m 1.6 - remove unused patches - remove comments * bump version * remove two commented lines * version stuff * remove old PR version Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
author: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> 2021-08-30 19:03:01 +0200
committer: GitHub <noreply@github.com> 2021-08-30 10:03:01 -0700
commit: 8c7e8df01549e59ac28469193976fbbe08e00f21 (patch)
tree: 75aa5c6942ddd9c58b28a814a4cf4f41c56eceb6
parent: 047e8ef16e2cdb431b9857b79fdfa237b0f038e2 (diff)
download: vcpkg-8c7e8df01549e59ac28469193976fbbe08e00f21.tar.gz
vcpkg-8c7e8df01549e59ac28469193976fbbe08e00f21.zip
38 files changed, 1667 insertions, 1663 deletions
diff --git a/ports/cgns/CONTROL b/ports/cgns/CONTROL
deleted file mode 100644
index 3398bad14..000000000
--- a/ports/cgns/CONTROL
+++ /dev/null
@@ -1,32 +0,0 @@
-Source: cgns
-Version: 3.4.0-1
-Homepage: http://cgns.org/
-Description: The CFD General Notation System (CGNS) provides a standard for recording and recovering computer data associated with the numerical solution of fluid dynamics equations. 
-Default-Features: hdf5, lfsselector
-
-Feature: mpi
-Description: Compile with support for the message passage interface (MPI)
-Build-Depends: hdf5[core,parallel]
-
-Feature: fortran
-Description: Enable fortran support (not yet implemented) 
-
-Feature: tests
-Description: Build tests 
-
-Feature: tools
-Description: Build tools 
-
-Feature: hdf5
-Description: Enable hdf5 support 
-Build-Depends: hdf5[core,tools]
-
-Feature: lfsselector
-Description: Selector for LFS
-Build-Depends: cgns[core,lfs] (!osx)
-
-Feature: lfs
-Description: Enable LFS support 
-
-Feature: legacy
-Description: Enable legacy support 
diff --git a/ports/cgns/defines.patch b/ports/cgns/defines.patch
deleted file mode 100644
index e17d48828..000000000
--- a/ports/cgns/defines.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/cgnstypes.h.in b/src/cgnstypes.h.in
-index 98c4e7fdc..8c6bcea62 100644
---- a/src/cgnstypes.h.in
-+++ b/src/cgnstypes.h.in
-@@ -29,6 +29,11 @@
- #ifndef CGNSTYPES_H
- #define CGNSTYPES_H
- 
-+#define CG_BUILD_HDF5      @BUILDHDF5@
-+#define CG_BUILD_FORTRAN   @BUILDFORTRAN@
-+#define CG_BUILD_PARALLEL  @BUILDPARALLEL@
-+#define CG_BUILD_BASESCOPE @BUILDBASESCOPE@
-+
- #define CG_BUILD_LEGACY @BUILDLEGACY@
- #define CG_BUILD_64BIT  @BUILD64BIT@
- #define CG_BUILD_SCOPE  @BUILDSCOPE@
diff --git a/ports/cgns/hdf5.patch b/ports/cgns/hdf5.patch
index 4de9ee35b..67d08fa2d 100644
--- a/ports/cgns/hdf5.patch
+++ b/ports/cgns/hdf5.patch
@@ -1,25 +1,14 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 58f078fe7..46446da8a 100644
+index d871a9dc8..d2c631023 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -194,71 +194,17 @@ endif (CGNS_ENABLE_FORTRAN AND HAS_FORTRAN)
- option(CGNS_ENABLE_HDF5 "Enable or disable HDF5 interface" "OFF")
- if (CGNS_ENABLE_HDF5)
+@@ -232,46 +232,12 @@ if (CGNS_ENABLE_HDF5)
+      cmake_policy(SET CMP0074 NEW)
+   endif()
  
--  if (CGNS_BUILD_SHARED)
--    set (FIND_HDF_COMPONENTS C shared)
--  else (CGNS_BUILD_SHARED)
--    set (FIND_HDF_COMPONENTS C static)
--  endif (CGNS_BUILD_SHARED)
--  message (STATUS "HDF5 find comps: ${FIND_HDF_COMPONENTS}")
--
--  #set (SEARCH_PACKAGE_NAME ${HDF5_PACKAGE_NAME})
--  set (SEARCH_PACKAGE_NAME "hdf5")
--
 -  find_package (HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS ${FIND_HDF_COMPONENTS})
 -  message (STATUS "HDF5 C libs:${HDF5_FOUND} static:${HDF5_static_C_FOUND} and shared:${HDF5_shared_C_FOUND}")
 -  if (HDF5_FOUND)
--    add_executable (h5dump IMPORTED)
 -    if (NOT HDF5_static_C_FOUND AND NOT HDF5_shared_C_FOUND)
 -      set (FIND_HDF_COMPONENTS C)
 -
@@ -31,40 +20,22 @@ index 58f078fe7..46446da8a 100644
 -      else (HDF5_BUILD_SHARED_LIBS)
 -        add_definitions (-DH5_BUILT_AS_STATIC_LIB)
 -      endif (HDF5_BUILD_SHARED_LIBS)
--      if (BUILD_SHARED_LIBS AND WIN32)
--        set_property (TARGET h5dump PROPERTY IMPORTED_LOCATION "${HDF5_TOOLS_DIR}/h5dumpdll")
--      else (BUILD_SHARED_LIBS AND WIN32)
--        set_property (TARGET h5dump PROPERTY IMPORTED_LOCATION "${HDF5_TOOLS_DIR}/h5dump")
--      endif (BUILD_SHARED_LIBS AND WIN32)
 -    else (NOT HDF5_static_C_FOUND AND NOT HDF5_shared_C_FOUND)
--      if (BUILD_SHARED_LIBS AND HDF5_shared_C_FOUND)
+-      if (CGNS_BUILD_SHARED AND HDF5_shared_C_FOUND)
 -        set (LINK_LIBS ${LINK_LIBS} ${HDF5_C_SHARED_LIBRARY})
--      else (HDF5_static_C_FOUND)
+-      else (CGNS_BUILD_SHARED AND HDF5_shared_C_FOUND)
 -        set (LINK_LIBS ${LINK_LIBS} ${HDF5_C_STATIC_LIBRARY})
--      endif (BUILD_SHARED_LIBS AND HDF5_shared_C_FOUND)
--      set_property (TARGET h5dump PROPERTY IMPORTED_LOCATION "${HDF5_TOOLS_DIR}/h5dump")
+-      endif (CGNS_BUILD_SHARED AND HDF5_shared_C_FOUND)
 -    endif (NOT HDF5_static_C_FOUND AND NOT HDF5_shared_C_FOUND)
-+  find_package(HDF5 CONFIG REQUIRED)
-+  if(TARGET hdf5::hdf5-shared)
-+    set (LINK_LIBS ${LINK_LIBS} hdf5::hdf5-shared)
-+    #add_executable(h5dump ALIAS hdf5::h5dump-shared)
-+    set (HDF5_DUMP_EXECUTABLE $<TARGET_FILE:h5dump-shared>)
-+  else()
-+    set (LINK_LIBS ${LINK_LIBS} hdf5::hdf5-static)
-+    #add_executable(h5dump ALIAS hdf5::h5dump)
-     set (HDF5_DUMP_EXECUTABLE $<TARGET_FILE:h5dump>)
 -
--    set (HDF5_HAVE_H5PUBCONF_H 1)
--    set (HDF5_HAVE_HDF5 1)
--    set (HDF5_HDF5_HEADER "h5pubconf.h")
--    set (HDF5_INCLUDE_DIR_GEN ${HDF5_INCLUDE_DIR})
--    message (STATUS "HDF5-${HDF5_VERSION_STRING} found: INC=${HDF5_INCLUDE_DIR} TOOLS=${HDF5_TOOLS_DIR}")
 -  else (HDF5_FOUND)
 -    find_package (HDF5) # Legacy find
--#Legacy find_package does not set HDF5_TOOLS_DIR, so we set it here
--    set(HDF5_TOOLS_DIR ${HDF5_LIBRARY_DIRS}/../bin)
--#Legacy find_package does not set HDF5_BUILD_SHARED_LIBS, so we set it here
--    if (CGNS_BUILD_SHARED AND EXISTS "${HDF5_LIBRARY_DIRS}/libhdf5${CMAKE_SHARED_LIBRARY_SUFFIX}")
+-    
+-    #Legacy find_package does not set HDF5_TOOLS_DIR, so we set it here
+-    set(HDF5_TOOLS_DIR ${HDF5_LIBRARY}/../bin)
+-    
+-    #Legacy find_package does not set HDF5_BUILD_SHARED_LIBS, so we set it here
+-    if (CGNS_BUILD_SHARED AND EXISTS "${HDF5_LIBRARY}/libhdf5${CMAKE_SHARED_LIBRARY_SUFFIX}")
 -      set (HDF5_BUILD_SHARED_LIBS 1)
 -      add_definitions (-DH5_BUILT_AS_DYNAMIC_LIB)
 -    else ()
@@ -73,36 +44,45 @@ index 58f078fe7..46446da8a 100644
 -    endif ()
 -    set (LINK_LIBS ${LINK_LIBS} ${HDF5_LIBRARIES})
 -
--    add_executable (h5dump IMPORTED)
--    set_property (TARGET h5dump PROPERTY IMPORTED_LOCATION "${HDF5_TOOLS_DIR}/h5dump")
--    set (HDF5_DUMP_EXECUTABLE $<TARGET_FILE:h5dump>)
 -  endif (HDF5_FOUND)
 -  set (HDF5_PACKAGE_NAME ${SEARCH_PACKAGE_NAME})
--
-+  endif()
-+  
++  find_package (HDF5 CONFIG REQUIRED)
++  if (TARGET hdf5::hdf5-shared)
++    set (LINK_LIBS ${LINK_LIBS} hdf5::hdf5-shared)
++  else ()
++    set (LINK_LIBS ${LINK_LIBS} hdf5::hdf5-static)
++  endif ()
+ 
    if (HDF5_FOUND)
-     set (HDF5_HAVE_H5PUBCONF_H 1)
-     set (HDF5_HAVE_HDF5 1)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 66b547ed1..4051f07d4 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -12,13 +12,14 @@ include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR})
- if (CGNS_ENABLE_HDF5)
-   add_definitions(-DBUILD_HDF5)
-   if (WIN32)
--    if (HDF5_LIBRARY)
-+    add_definitions(-DWIN32)
-+    if (HDF5_BUILD_SHARED_LIBS)
-      # file(STRINGS ${HDF5_LIBRARY} HDF5isDLL REGEX "__imp__H5close")
-      # if (HDF5isDLL)
-         # this is only needed when using hdf5 dll libs
--        add_definitions(-DWIN32 -D_HDF5USEDLL_)
-+        add_definitions(-DH5_BUILT_AS_DYNAMIC_LIB)
-      # endif (HDF5isDLL)
--    endif (HDF5_LIBRARY)
-+    endif (HDF5_BUILD_SHARED_LIBS)
-   endif (WIN32)
-   if(HDF5_NEED_MPI AND MPI_INC)
-     include_directories(${MPI_INC})
+     if (NOT DEFINED HDF5_INCLUDE_DIRS)
+@@ -289,20 +255,10 @@ if (CGNS_ENABLE_HDF5)
+   endif (HDF5_FOUND)
+ 
+   set(HDF5_NEED_ZLIB "OFF" CACHE BOOL "Does the HDF5 library require linking to zlib?")
+-  if(HDF5_NEED_ZLIB)
+-    find_library(ZLIB_LIBRARY z)
+-    mark_as_advanced(CLEAR ZLIB_LIBRARY)
+-  else (HDF5_NEED_ZLIB)
+-    mark_as_advanced(FORCE ZLIB_LIBRARY)
+-  endif(HDF5_NEED_ZLIB)
++  set(HDF5_NEED_ZLIB ${HDF5_ENABLE_Z_LIB_SUPPORT} CACHE INTERNAL "" FORCE)
+ 
+   set(HDF5_NEED_SZIP "OFF" CACHE BOOL "Does the HDF5 library require linking to szip?")
+-  if (HDF5_NEED_SZIP)
+-    find_library(SZIP_LIBRARY szip)
+-    mark_as_advanced(CLEAR SZIP_LIBRARY)
+-  else (HDF5_NEED_SZIP)
+-    mark_as_advanced(FORCE SZIP_LIBRARY)
+-  endif (HDF5_NEED_SZIP)
++  set(HDF5_NEED_SZIP ${HDF5_ENABLE_SZIP_SUPPORT} CACHE INTERNAL "" FORCE)
+ 
+   # Check if HDF5 version is 1.8 or greater
+   if (HDF5_VERSION VERSION_LESS "1.8.0")
+@@ -310,6 +266,7 @@ if (CGNS_ENABLE_HDF5)
+   endif (HDF5_VERSION VERSION_LESS "1.8.0")
+ 
+   set(HDF5_NEED_MPI "OFF" CACHE BOOL "Does the HDF5 library require linking to mpi? (Only true if using parallel HDF5)")
++  set(HDF5_NEED_MPI ${HDF5_ENABLE_PARALLEL} CACHE INTERNAL "" FORCE)
+   set(MPI_INC)
+   set(MPI_LIBS)
+   if (HDF5_NEED_MPI)
diff --git a/ports/cgns/portfile.cmake b/ports/cgns/portfile.cmake
index 895446744..bb75a9485 100644
--- a/ports/cgns/portfile.cmake
+++ b/ports/cgns/portfile.cmake
@@ -2,19 +2,16 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO CGNS/CGNS
-    REF 3420e23febf0eb38c1b05af3c157d614d8476557 # v3.4.0
-    SHA512 3fec1c32f1514cd9bc327f12f3f9db6a229df05f514193bd9e913d06b8ae6465664410a3c77a30b0c29f3e999e5efcb1ebed3a8b80e14be92035940c10b1d6d7
+    REF 86b686bce292eef7782cfb56b6acdb5123c96f49 # v4.2.0
+    SHA512 88df741acc1b650724bcbeb82ab0f7e593bf01e0a30c04b14b9915f4ea4331725cc24b87715dd08d93d5a3708660ca7f7874bc0a9c5505b76471802cf033e35d
     HEAD_REF develop
     PATCHES
         hdf5.patch
         linux_lfs.patch
-        zlib_szip_mpi.patch
-        defines.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
    FEATURES
-     mpi     HDF5_NEEDS_MPI
      fortran CGNS_ENABLE_FORTRAN
      tests   CGNS_ENABLE_TESTS
      hdf5    CGNS_ENABLE_HDF5
@@ -45,7 +42,7 @@ vcpkg_install_cmake()
 file(INSTALL ${CURRENT_PACKAGES_DIR}/include/cgnsBuild.defs DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
 file(REMOVE ${CURRENT_PACKAGES_DIR}/include/cgnsBuild.defs ${CURRENT_PACKAGES_DIR}/include/cgnsconfig.h)
 
-file(INSTALL ${CURRENT_PORT_DIR}/cgnsconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) # we patched the config and the include is all that is needed
+file(INSTALL ${CURRENT_PORT_DIR}/cgnsconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) # the include is all that is needed
 
 set(TOOLS cgnscheck cgnscompress cgnsconvert cgnsdiff cgnslist cgnsnames)
 
diff --git a/ports/cgns/vcpkg.json b/ports/cgns/vcpkg.json
new file mode 100644
index 000000000..c738b9a3b
--- /dev/null
+++ b/ports/cgns/vcpkg.json
@@ -0,0 +1,64 @@
+{
+  "name": "cgns",
+  "version-semver": "4.2.0",
+  "description": "The CFD General Notation System (CGNS) provides a standard for recording and recovering computer data associated with the numerical solution of fluid dynamics equations.",
+  "homepage": "http://cgns.org/",
+  "default-features": [
+    "hdf5",
+    "lfsselector"
+  ],
+  "features": {
+    "fortran": {
+      "description": "Enable fortran support (not yet implemented)"
+    },
+    "hdf5": {
+      "description": "Enable hdf5 support",
+      "dependencies": [
+        {
+          "name": "hdf5",
+          "default-features": false,
+          "features": [
+            "tools"
+          ]
+        }
+      ]
+    },
+    "legacy": {
+      "description": "Enable legacy support"
+    },
+    "lfs": {
+      "description": "Enable LFS support"
+    },
+    "lfsselector": {
+      "description": "Selector for LFS",
+      "dependencies": [
+        {
+          "name": "cgns",
+          "default-features": false,
+          "features": [
+            "lfs"
+          ],
+          "platform": "!osx"
+        }
+      ]
+    },
+    "mpi": {
+      "description": "Enable MPI support",
+      "dependencies": [
+        {
+          "name": "hdf5",
+          "default-features": false,
+          "features": [
+            "parallel"
+          ]
+        }
+      ]
+    },
+    "tests": {
+      "description": "Build tests"
+    },
+    "tools": {
+      "description": "Build tools"
+    }
+  }
+}
diff --git a/ports/cgns/zlib_szip_mpi.patch b/ports/cgns/zlib_szip_mpi.patch
deleted file mode 100644
index 4f6608cf4..000000000
--- a/ports/cgns/zlib_szip_mpi.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 46446da8a..cd05cf51a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -219,20 +221,10 @@ if (CGNS_ENABLE_HDF5)
-   endif (HDF5_FOUND)
- 
-   set(HDF5_NEED_ZLIB "OFF" CACHE BOOL "Does the HDF5 library require linking to zlib?")
--  if(HDF5_NEED_ZLIB)
--    find_library(ZLIB_LIBRARY z)
--    mark_as_advanced(CLEAR ZLIB_LIBRARY)
--  else (HDF5_NEED_ZLIB)
--    mark_as_advanced(FORCE ZLIB_LIBRARY)
--  endif(HDF5_NEED_ZLIB)
-+  set(HDF5_NEED_ZLIB ${HDF5_ENABLE_Z_LIB_SUPPORT} CACHE INTERNAL "" FORCE)
- 
-   set(HDF5_NEED_SZIP "OFF" CACHE BOOL "Does the HDF5 library require linking to zlib?")
--  if (HDF5_NEED_SZIP)
--    find_library(SZIP_LIBRARY szip)
--    mark_as_advanced(CLEAR SZIP_LIBRARY)
--  else (HDF5_NEED_SZIP)
--    mark_as_advanced(FORCE SZIP_LIBRARY)
--  endif (HDF5_NEED_SZIP)
-+  set(HDF5_NEED_SZIP ${HDF5_ENABLE_SZIP_SUPPORT} CACHE INTERNAL "" FORCE)
- 
-   # Check if HDF5 version is 1.8 or greater
-   if (HDF5_VERSION VERSION_LESS "1.8.0")
-@@ -240,6 +231,7 @@ if (CGNS_ENABLE_HDF5)
-   endif (HDF5_VERSION VERSION_LESS "1.8.0")
- 
-   set(HDF5_NEED_MPI "OFF" CACHE BOOL "Does the HDF5 library require linking to mpi? (Only true if using parallel HDF5)")
-+  set(HDF5_NEED_MPI ${HDF5_ENABLE_PARALLEL} CACHE INTERNAL "" FORCE)
-   set(MPI_INC)
-   set(MPI_LIBS)
-   if (HDF5_NEED_MPI)
diff --git a/ports/paraview/CONTROL b/ports/paraview/CONTROL
deleted file mode 100644
index d40b55adc..000000000
--- a/ports/paraview/CONTROL
+++ /dev/null
@@ -1,29 +0,0 @@
-Source: paraview
-Version: 5.8.0
-Port-Version: 3
-Homepage: https://www.paraview.org/
-Description: VTK-based Data Analysis and Visualization Application
-Build-Depends: vtk[core,paraview], protobuf, cgns, boost-core, boost-format, boost-algorithm
-
-Feature: vtkm
-Description: enables vtkm for the build of paraview
-Build-Depends: vtk[core,vtkm]
-
-Feature: python
-Description: enables the build of python wrappers
-Build-Depends: vtk[core,python]
-
-Feature: cuda
-Description: enables cuda within paraview
-Build-Depends: cuda, vtk[core, cuda]
-
-Feature: mpi
-Description: enables cuda within paraview
-Build-Depends: hdf5[core,parallel], vtk[core, mpi]
-
-Feature: tools
-Description: Build paraview tools
-
-Feature: all_modules
-Description: enables the build of all paraview modules
-Build-Depends: gdal, pdal, ffmpeg, laszip
diff --git a/ports/paraview/VisIt_Build.patch b/ports/paraview/VisIt_Build.patch
deleted file mode 100644
index fb676a737..000000000
--- a/ports/paraview/VisIt_Build.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff --git a/databases/readers/CEAucd/vtkCEAucdReader.C b/databases/readers/CEAucd/vtkCEAucdReader.C
-index 0ad9a828a..cf37beb86 100644
---- a/databases/readers/CEAucd/vtkCEAucdReader.C
-+++ b/databases/readers/CEAucd/vtkCEAucdReader.C
-@@ -172,7 +172,7 @@ const char *vtkCEAucdReader::GetByteOrderAsString()
-    }
- }
- 
--void vtkCEAucdReader::SetFileStream( ifstream* istr )
-+void vtkCEAucdReader::SetFileStream( std::ifstream* istr )
- {
-    if( istr == this->FileStream ) return;
- 
-@@ -311,9 +311,9 @@ int vtkCEAucdReader::RequestInformation(
-    {
-       vtkDebugMacro(<<"Open file "<<this->FileName<<"\n");
- #ifdef _WIN32
--      this->FileStream = new ifstream(this->FileName, ios::in | ios::binary);
-+      this->FileStream = new std::ifstream(this->FileName, std::ios::in | std::ios::binary);
- #else
--      this->FileStream = new ifstream(this->FileName, ios::in);
-+      this->FileStream = new std::ifstream(this->FileName, std::ios::in);
- #endif
-    }
- 
-@@ -340,7 +340,7 @@ int vtkCEAucdReader::RequestInformation(
-          vtkDebugMacro(<<"Re-open file "<<this->FileName<<" in ASCII mode");
-          delete this->FileStream; // close file to reopen it later
-          this->FileStream = NULL;
--         this->FileStream = new ifstream(this->FileName, ios::in);
-+         this->FileStream = new std::ifstream(this->FileName, std::ios::in);
-       }
-       
-       char c='\0', buf[100];
-diff --git a/databases/readers/CEAucd/vtkCEAucdReader.h b/databases/readers/CEAucd/vtkCEAucdReader.h
-index c3a86c16b..434556488 100644
---- a/databases/readers/CEAucd/vtkCEAucdReader.h
-+++ b/databases/readers/CEAucd/vtkCEAucdReader.h
-@@ -49,7 +49,7 @@ class vtkCEAucdReader : public vtkUnstructuredGridAlgorithm
-    public:
-       static vtkCEAucdReader *New();
-       vtkTypeMacro(vtkCEAucdReader,vtkUnstructuredGridAlgorithm);
--      void PrintSelf(ostream& os, vtkIndent indent) override;
-+      void PrintSelf(std::ostream& os, vtkIndent indent) override;
-       
-      // Description:
-      // Specify file name of CEA UCD datafile to read
-@@ -120,7 +120,7 @@ class vtkCEAucdReader : public vtkUnstructuredGridAlgorithm
-       vtkSetStringMacro(ActivePointArray);
-       vtkGetStringMacro(ActivePointArray);
-       
--      void SetFileStream( ifstream* istr );
-+      void SetFileStream( std::ifstream* istr );
- 
-      // Description:
-      // The following methods allow selective reading of solutions fields.  by
-@@ -173,7 +173,7 @@ class vtkCEAucdReader : public vtkUnstructuredGridAlgorithm
-       vtkIdType * PointsInMaterial;
-       vtkIdType * CellIndexInMaterial;
-       
--      ifstream *FileStream;
-+      std::ifstream *FileStream;
-       long GlobalOffset;
-       long FileSize;
-       bool OwnStream;
-diff --git a/databases/readers/Image/vtkStimulateReader.C b/databases/readers/Image/vtkStimulateReader.C
-index be91dc91e..aeec88891 100644
---- a/databases/readers/Image/vtkStimulateReader.C
-+++ b/databases/readers/Image/vtkStimulateReader.C
-@@ -104,7 +104,6 @@ int vtkStimulateReader::OpenFile(void)
-   // Close file from any previous image
-   if (this->File)
-     {
--    this->File->close();
-     delete this->File;
-     this->File = NULL;
-     }
-@@ -122,9 +121,9 @@ int vtkStimulateReader::OpenFile(void)
-   if ( !FileFunctions::VisItStat( sdt_name, &fs) )
-     {
- #ifdef _WIN32
--    this->File = new ifstream(sdt_name, ios::in | ios::binary);
-+    this->File = new std::ifstream(sdt_name, std::ios::in | std::ios::binary);
- #else
--    this->File = new ifstream(sdt_name, ios::in);
-+    this->File = new std::ifstream(sdt_name, std::ios::in);
- #endif
-     }
-   if (! this->File || this->File->fail())
-@@ -246,7 +245,7 @@ int vtkStimulateReader::CanReadFile(const char* fname)
-     return 0;
-     }
-   
--  ifstream sdt_file(sdt_name);
-+  std::ifstream sdt_file(sdt_name);
-   if (sdt_file.fail())
-     {
-     vtkErrorMacro(<<"Cannot read file: invalid sdt_file " << sdt_name);
-@@ -266,7 +265,7 @@ bool vtkStimulateReader::ReadSPRFile(const char *spr_name)
-   haveReadSPRFile = true;
-   validSPRFile = false;
- 
--  ifstream spr_file(spr_name);
-+  std::ifstream spr_file(spr_name);
-   if (spr_file.fail())
-     {
-     vtkErrorMacro(<<"Unable to read SPR file " << spr_name << ": file "
diff --git a/ports/paraview/catalyst_install.patch b/ports/paraview/catalyst_install.patch
new file mode 100644
index 000000000..e52802fbe
--- /dev/null
+++ b/ports/paraview/catalyst_install.patch
@@ -0,0 +1,24 @@
+diff --git a/Clients/InSitu/CMakeLists.txt b/Clients/InSitu/CMakeLists.txt
+index 159aa8ffc..f9bfc7dfe 100644
+--- a/Clients/InSitu/CMakeLists.txt
++++ b/Clients/InSitu/CMakeLists.txt
+@@ -86,5 +86,5 @@ _vtk_module_apply_properties(catalyst)
+ # Update install locations
+ catalyst_library(
+   TARGET catalyst
+-  LIBRARY_DESTINATION "${_vtk_build_LIBRARY_DESTINATION}"
++  #LIBRARY_DESTINATION "${_vtk_build_LIBRARY_DESTINATION}"
+   INSTALL_EXPORT_DEFAULT)
+diff --git a/Remoting/Views/vtkGeometryRepresentationInternal.h b/Remoting/Views/vtkGeometryRepresentationInternal.h
+index 86eb383af..cc204fba2 100644
+--- a/Remoting/Views/vtkGeometryRepresentationInternal.h
++++ b/Remoting/Views/vtkGeometryRepresentationInternal.h
+@@ -22,7 +22,7 @@
+ // serial backend.
+ #ifndef __VTK_WRAP__
+ #if VTK_MODULE_ENABLE_VTK_vtkm
+-#include "vtkmConfigFilters.h" // for VTKM_ENABLE_TBB
++//#include "vtkmConfigFilters.h" // for VTKM_ENABLE_TBB
+ #endif
+ 
+ #if defined(VTKM_ENABLE_TBB) && VTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters
diff --git a/ports/paraview/external_vtk.patch b/ports/paraview/external_vtk.patch
new file mode 100644
index 000000000..0df160d6a
--- /dev/null
+++ b/ports/paraview/external_vtk.patch
@@ -0,0 +1,150 @@
+diff --git a/CMake/ParaViewClient.cmake b/CMake/ParaViewClient.cmake
+index b0dea2b32..b035a9dc3 100644
+--- a/CMake/ParaViewClient.cmake
++++ b/CMake/ParaViewClient.cmake
+@@ -516,6 +516,7 @@ function (paraview_client_documentation)
+     NAMES xmlpatterns-qt5 xmlpatterns
+     HINTS "${Qt5_DIR}/../../../bin"
+           "${Qt5_DIR}/../../../libexec/qt5/bin"
++          "${Qt5_DIR}/../../../tools/qt5/bin"
+     DOC   "Path to xmlpatterns")
+   mark_as_advanced(qt_xmlpatterns_executable)
+ 
+diff --git a/CMake/ParaViewOptions.cmake b/CMake/ParaViewOptions.cmake
+index f544a7c06..c51278931 100644
+--- a/CMake/ParaViewOptions.cmake
++++ b/CMake/ParaViewOptions.cmake
+@@ -88,7 +88,7 @@ endif()
+ #========================================================================
+ 
+ # XXX(VTK): External VTK is not yet actually supported.
+-if (FALSE)
++if (TRUE)
+ option(PARAVIEW_USE_EXTERNAL_VTK "Use an external VTK." OFF)
+ mark_as_advanced(PARAVIEW_USE_EXTERNAL_VTK)
+ else ()
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1af77d164..bebcb83ee 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -72,7 +72,8 @@ if (NOT CMAKE_INSTALL_LICENSEDIR)
+ endif ()
+ 
+ set(paraview_cmake_dir "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
+-set(vtk_cmake_dir "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake")
++set(vtk_cmake_dir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/vtk")
++message(STATUS "vtk_cmake_dir:${vtk_cmake_dir}")
+ if (NOT IS_DIRECTORY "${vtk_cmake_dir}")
+   message(FATAL_ERROR
+     "Failed to find the VTK CMake directory. Did you forget to initialize the "
+@@ -383,9 +384,73 @@ endif ()
+ 
+ if (PARAVIEW_USE_EXTERNAL_VTK)
+   if (paraview_required_modules OR paraview_unrecognized_modules)
+-    message(FATAL_ERROR
+-      "The following modules were requested or required, but not found: "
+-      "${paraview_required_modules};${paraview_unrecognized_modules}.")
++    message(STATUS "REQUIRED:${paraview_required_modules}")
++    foreach(mod ${paraview_required_modules})
++        if(NOT TARGET ${mod})
++            message(STATUS "REQUIRED TARGET not defined: ${mod}")
++            list(APPEND modules_notarget ${mod})
++        endif()
++        if(${mod} MATCHES "VTK::") # For better debugging
++            message(STATUS "VTK TARGET found: ${mod}")
++            list(APPEND vtk_modules ${mod})
++        endif()
++    endforeach()
++    foreach(mod ${paraview_unrecognized_modules})
++        if(NOT TARGET ${mod})
++            message(STATUS "UNREC TARGET not defined: ${mod}")
++            list(FIND paraview_rejected_modules ${mod} _found_mod)
++            if(_found_mod GREATER_EQUAL 0)
++                message(STATUS "MODULE ${mod} not necessary; Removing from unrecognized")
++                list(APPEND _to_remove ${mod})
++            endif()
++        else()
++            list(APPEND _to_remove ${mod})
++            #list(APPEND vtk_modules ${mod}) #probably do not need to add unrecognized_modules to the wrapper
++        endif()
++    endforeach()
++    message(STATUS "UNRECOGNIZED:${paraview_unrecognized_modules}")
++    list(REMOVE_ITEM paraview_unrecognized_modules ${_to_remove})
++    message(STATUS "REJECTED MODULES: ${paraview_rejected_modules}")
++    message(STATUS "UNRECOGNIZED WITHOUT REJECTED AND KNOWN TARGETS: ${paraview_unrecognized_modules}")
++    message(STATUS "ALL PROVIDED MODULES: ${paraview_modules}")
++    set(_unnecessary_moduls ${paraview_modules})
++    list(REMOVE_ITEM _unnecessary_moduls ${paraview_required_modules})
++    message(STATUS "Unnecessary MODULES: ${_unnecessary_moduls}")
++    if(modules_notarget)
++        message(FATAL_ERROR
++          "The following modules were requested or required, but not found: "
++          "${modules_notarget}")
++    endif()
++    list(REMOVE_DUPLICATES vtk_modules)
++    macro(search_dependent_targets)
++        set(vtk_mod_dep_list)
++        foreach(vtk_targ ${ARGN})
++            get_target_property(vtk_mod_dep ${vtk_targ} "INTERFACE_vtk_module_depends")
++            if(vtk_mod_dep)
++                list(APPEND vtk_mod_dep_list ${vtk_mod_dep})
++            endif()
++            get_target_property(vtk_mod_pdep ${vtk_targ} "INTERFACE_vtk_module_private_depends")
++            if(vtk_mod_pdep)
++                list(APPEND vtk_mod_dep_list ${vtk_mod_pdep})
++            endif()
++            get_target_property(vtk_mod_odep ${vtk_targ} "INTERFACE_vtk_module_opional_depends")
++            if(vtk_mod_odep)
++                list(APPEND vtk_mod_dep_list ${vtk_mod_odep})
++            endif()
++            if(vtk_mod_dep_list)
++                message(STATUS "Target ${vtk_targ} depends on ${vtk_mod_dep_list}")
++                list(REMOVE_ITEM vtk_mod_dep_list ${vtk_modules})
++                if(vtk_mod_dep_list)
++                    message(STATUS "Newly discovered modules: ${vtk_mod_dep_list}")
++                    list(APPEND vtk_modules ${vtk_mod_dep_list})
++                    search_dependent_targets(${vtk_mod_dep_list})
++                else()
++                    message(STATUS "No new modules discovered!")
++                endif()
++            endif()
++        endforeach()
++    endmacro()
++    search_dependent_targets(${vtk_modules})
+   endif ()
+ 
+   if (PARAVIEW_USE_PYTHON)
+@@ -459,7 +524,7 @@ else ()
+   endif()
+ 
+   # Set up these variables now so that modules may acess them
+-  if (NOT PARAVIEW_USE_EXTERNAL_VTK AND PARAVIEW_INSTALL_DEVELOPMENT_FILES)
++  if (PARAVIEW_INSTALL_DEVELOPMENT_FILES)
+     set(vtk_cmake_dir
+       "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake")
+     set(vtk_cmake_destination
+@@ -558,6 +623,9 @@ set(_paraview_add_tests_default_data_directory
+ set(_paraview_add_tests_default_test_data_target
+   "ParaViewData")
+ 
++list(REMOVE_DUPLICATES vtk_modules) # Missed this somewhere
++list(REMOVE_DUPLICATES paraview_modules) # probably not needed
++
+ vtk_module_build(
+   MODULES             ${paraview_modules}
+   KITS                ${paraview_kits}
+@@ -596,9 +664,11 @@ vtk_module_build(
+   TEST_OUTPUT_DATA_DIRECTORY  "${paraview_test_data_directory_output}")
+ 
+ include(vtkModuleJson)
+-vtk_module_json(
+-  MODULES ${vtk_modules}
+-  OUTPUT "vtk-modules.json")
++if(NOT PARAVIEW_USE_EXTERNAL_VTK)
++  vtk_module_json(
++    MODULES ${vtk_modules}
++    OUTPUT "vtk-modules.json")
++endif()
+ vtk_module_json(
+   MODULES ${paraview_modules}
+   OUTPUT "paraview-modules.json")
diff --git a/ports/paraview/paraview_build.patch b/ports/paraview/paraview_build.patch
deleted file mode 100644
index 042bbe6b5..000000000
--- a/ports/paraview/paraview_build.patch
+++ /dev/null
@@ -1,745 +0,0 @@
-diff --git a/CMake/ParaViewClient.cmake b/CMake/ParaViewClient.cmake
-index 7dadad937..dd271739d 100644
---- a/CMake/ParaViewClient.cmake
-+++ b/CMake/ParaViewClient.cmake
-@@ -516,6 +516,7 @@ function (paraview_client_documentation)
-     NAMES xmlpatterns-qt5 xmlpatterns
-     HINTS "${Qt5_DIR}/../../../bin"
-           "${Qt5_DIR}/../../../libexec/qt5/bin"
-+          "${Qt5_DIR}/../../../tools/qt5/bin"
-     DOC   "Path to xmlpatterns")
-   mark_as_advanced(qt_xmlpatterns_executable)
- 
-diff --git a/CMake/ParaViewOptions.cmake b/CMake/ParaViewOptions.cmake
-index 5e402e9fc..ccb553e8f 100644
---- a/CMake/ParaViewOptions.cmake
-+++ b/CMake/ParaViewOptions.cmake
-@@ -88,7 +88,7 @@ endif()
- #========================================================================
- 
- # XXX(VTK): External VTK is not yet actually supported.
--if (FALSE)
-+if (TRUE)
- option(PARAVIEW_USE_EXTERNAL_VTK "Use an external VTK." OFF)
- mark_as_advanced(PARAVIEW_USE_EXTERNAL_VTK)
- else ()
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d7e8f1dfe..8b0e7a8c6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -73,7 +73,9 @@ if (NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
- endif ()
- 
- set(paraview_cmake_dir "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
--set(vtk_cmake_dir "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake")
-+set(vtk_cmake_dir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/vtk")
-+string(REPLACE "/debug" "" vtk_cmake_dir "${vtk_cmake_dir}")
-+message(STATUS "vtk_cmake_dir:${vtk_cmake_dir}")
- list(APPEND CMAKE_MODULE_PATH
-   "${paraview_cmake_dir}"
-   "${vtk_cmake_dir}")
-@@ -214,6 +216,7 @@ if (NOT WIN32)
-   endif ()
- endif ()
- 
-+message(STATUS "PARAVIEW_USE_EXTERNAL_VTK:${PARAVIEW_USE_EXTERNAL_VTK}")
- if (PARAVIEW_USE_EXTERNAL_VTK)
-   find_package(VTK REQUIRED)
- else ()
-@@ -369,9 +372,73 @@ endif ()
- 
- if (PARAVIEW_USE_EXTERNAL_VTK)
-   if (paraview_required_modules OR paraview_unrecognized_modules)
--    message(FATAL_ERROR
--      "The following modules were requested or required, but not found: "
--      "${paraview_required_modules};${paraview_unrecognized_modules}.")
-+    message(STATUS "REQUIRED:${paraview_required_modules}")
-+    foreach(mod ${paraview_required_modules})
-+        if(NOT TARGET ${mod})
-+            message(STATUS "REQUIRED TARGET not defined: ${mod}")
-+            list(APPEND modules_notarget ${mod})
-+        endif()
-+        if(${mod} MATCHES "VTK::") # For better debugging
-+            message(STATUS "VTK TARGET found: ${mod}")
-+            list(APPEND vtk_modules ${mod})
-+        endif()
-+    endforeach()
-+    foreach(mod ${paraview_unrecognized_modules})
-+        if(NOT TARGET ${mod})
-+            message(STATUS "UNREC TARGET not defined: ${mod}")
-+            list(FIND paraview_rejected_modules ${mod} _found_mod)
-+            if(_found_mod GREATER_EQUAL 0)
-+                message(STATUS "MODULE ${mod} not necessary; Removing from unrecognized")
-+                list(APPEND _to_remove ${mod})
-+            endif()
-+        else()
-+            list(APPEND _to_remove ${mod})
-+            #list(APPEND vtk_modules ${mod}) #probably do not need to add unrecognized_modules to the wrapper
-+        endif()
-+    endforeach()
-+    message(STATUS "UNRECOGNIZED:${paraview_unrecognized_modules}")
-+    list(REMOVE_ITEM paraview_unrecognized_modules ${_to_remove})
-+    message(STATUS "REJECTED MODULES: ${paraview_rejected_modules}")
-+    message(STATUS "UNRECOGNIZED WITHOUT REJECTED AND KNOWN TARGETS: ${paraview_unrecognized_modules}")
-+    message(STATUS "ALL PROVIDED MODULES: ${paraview_modules}")
-+    set(_unnecessary_moduls ${paraview_modules})
-+    list(REMOVE_ITEM _unnecessary_moduls ${paraview_required_modules})
-+    message(STATUS "Unnecessary MODULES: ${_unnecessary_moduls}")
-+    if(modules_notarget)
-+        message(FATAL_ERROR
-+          "The following modules were requested or required, but not found: "
-+          "${modules_notarget}")
-+    endif()
-+    list(REMOVE_DUPLICATES vtk_modules)
-+    macro(search_dependent_targets)
-+        set(vtk_mod_dep_list)
-+        foreach(vtk_targ ${ARGN})
-+            get_target_property(vtk_mod_dep ${vtk_targ} "INTERFACE_vtk_module_depends")
-+            if(vtk_mod_dep)
-+                list(APPEND vtk_mod_dep_list ${vtk_mod_dep})
-+            endif()
-+            get_target_property(vtk_mod_pdep ${vtk_targ} "INTERFACE_vtk_module_private_depends")
-+            if(vtk_mod_pdep)
-+                list(APPEND vtk_mod_dep_list ${vtk_mod_pdep})
-+            endif()
-+            get_target_property(vtk_mod_odep ${vtk_targ} "INTERFACE_vtk_module_opional_depends")
-+            if(vtk_mod_odep)
-+                list(APPEND vtk_mod_dep_list ${vtk_mod_odep})
-+            endif()
-+            if(vtk_mod_dep_list)
-+                message(STATUS "Target ${vtk_targ} depends on ${vtk_mod_dep_list}")
-+                list(REMOVE_ITEM vtk_mod_dep_list ${vtk_modules})
-+                if(vtk_mod_dep_list)
-+                    message(STATUS "Newly discovered modules: ${vtk_mod_dep_list}")
-+                    list(APPEND vtk_modules ${vtk_mod_dep_list})
-+                    search_dependent_targets(${vtk_mod_dep_list})
-+                else()
-+                    message(STATUS "No new modules discovered!")
-+                endif()
-+            endif()
-+        endforeach()
-+    endmacro()
-+    search_dependent_targets(${vtk_modules})
-   endif ()
- 
-   if (PARAVIEW_USE_PYTHON)
-@@ -498,7 +565,7 @@ else ()
-     TEST_INPUT_DATA_DIRECTORY   "${CMAKE_CURRENT_SOURCE_DIR}/VTK/Testing"
-     TEST_OUTPUT_DATA_DIRECTORY  "${CMAKE_CURRENT_BINARY_DIR}/ExternalData/VTK/Testing")
- 
--  if (NOT PARAVIEW_USE_EXTERNAL_VTK AND PARAVIEW_INSTALL_DEVELOPMENT_FILES)
-+  if (PARAVIEW_INSTALL_DEVELOPMENT_FILES)
-     set(vtk_cmake_dir
-       "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake")
-     set(vtk_cmake_destination
-@@ -543,9 +610,11 @@ vtk_module_build(
-   TEST_OUTPUT_DATA_DIRECTORY  "${paraview_test_data_directory_output}")
- 
- include(vtkModuleJson)
--vtk_module_json(
--  MODULES "${vtk_modules}"
--  OUTPUT "vtk-modules.json")
-+if(NOT PARAVIEW_USE_EXTERNAL_VTK)
-+    vtk_module_json(
-+      MODULES "${vtk_modules}"
-+      OUTPUT "vtk-modules.json")
-+endif()
- vtk_module_json(
-   MODULES "${paraview_modules}"
-   OUTPUT "paraview-modules.json")
-diff --git a/Plugins/AnalyzeNIfTIReaderWriter/NIfTIIO/vtkAnalyzeReader.cxx b/Plugins/AnalyzeNIfTIReaderWriter/NIfTIIO/vtkAnalyzeReader.cxx
-index be318d6d4..80187dd69 100644
---- a/Plugins/AnalyzeNIfTIReaderWriter/NIfTIIO/vtkAnalyzeReader.cxx
-+++ b/Plugins/AnalyzeNIfTIReaderWriter/NIfTIIO/vtkAnalyzeReader.cxx
-@@ -1381,8 +1381,8 @@ int vtkAnalyzeReader::CanReadFile(const char* fname)
-     return false;
-   }
- 
--  ifstream local_InputStream;
--  local_InputStream.open(HeaderFileName.c_str(), ios::in | ios::binary);
-+  std::ifstream local_InputStream;
-+  local_InputStream.open(HeaderFileName.c_str(), std::ios::in | std::ios::binary);
-   if (local_InputStream.fail())
-   {
-     return false;
-diff --git a/Plugins/AnalyzeNIfTIReaderWriter/NIfTIIO/vtkNIfTIReader.cxx b/Plugins/AnalyzeNIfTIReaderWriter/NIfTIIO/vtkNIfTIReader.cxx
-index e7df3dacc..1bae5ae22 100644
---- a/Plugins/AnalyzeNIfTIReaderWriter/NIfTIIO/vtkNIfTIReader.cxx
-+++ b/Plugins/AnalyzeNIfTIReaderWriter/NIfTIIO/vtkNIfTIReader.cxx
-@@ -1277,8 +1277,8 @@ int vtkNIfTIReader::CanReadFile(const char* fname)
-     return false;
-   }
- 
--  ifstream local_InputStream;
--  local_InputStream.open(HeaderFileName.c_str(), ios::in | ios::binary);
-+  std::ifstream local_InputStream;
-+  local_InputStream.open(HeaderFileName.c_str(), std::ios::in | std::ios::binary);
-   if (local_InputStream.fail())
-   {
-     return false;
-diff --git a/Qt/Components/pqCustomFilterManager.cxx b/Qt/Components/pqCustomFilterManager.cxx
-index 4c6911ac8..b04828168 100644
---- a/Qt/Components/pqCustomFilterManager.cxx
-+++ b/Qt/Components/pqCustomFilterManager.cxx
-@@ -214,7 +214,7 @@ void pqCustomFilterManager::exportSelected(const QStringList& files)
-   QStringList::ConstIterator jter = files.begin();
-   for (; jter != files.end(); ++jter)
-   {
--    ofstream os((*jter).toLocal8Bit().data(), ios::out);
-+    std::ofstream os((*jter).toLocal8Bit().data(), std::ios::out);
-     root->PrintXML(os, vtkIndent());
-   }
- 
-diff --git a/Qt/Components/pqPresetDialog.cxx b/Qt/Components/pqPresetDialog.cxx
-index 411480e3e..af0195763 100644
---- a/Qt/Components/pqPresetDialog.cxx
-+++ b/Qt/Components/pqPresetDialog.cxx
-@@ -952,7 +952,7 @@ void pqPresetDialog::exportPresets()
-   }
-   assert(presetCollection.size() > 0);
- 
--  ofstream outfs;
-+  std::ofstream outfs;
-   outfs.open(filename.toStdString().c_str());
-   if (!outfs.is_open())
-   {
-diff --git a/Qt/Core/pqCoreTestUtility.cxx b/Qt/Core/pqCoreTestUtility.cxx
-index 95c7df5b6..00f61e2f8 100644
---- a/Qt/Core/pqCoreTestUtility.cxx
-+++ b/Qt/Core/pqCoreTestUtility.cxx
-@@ -45,7 +45,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include "QtTestingConfigure.h"
- 
- #include "QVTKOpenGLNativeWidget.h"
--#include "QVTKOpenGLWidget.h"
-+#include "QVTKOpenGLStereoWidget.h"
- #include "pqApplicationCore.h"
- #include "pqCollaborationEventPlayer.h"
- #include "pqColorButtonEventPlayer.h"
-@@ -309,13 +309,13 @@ bool pqCoreTestUtility::CompareImage(QWidget* widget, const QString& referenceIm
-   }
- 
-   // try to recover the render window directly
--  QVTKOpenGLWidget* glWidget = qobject_cast<QVTKOpenGLWidget*>(widget);
-+  QVTKOpenGLStereoWidget* glWidget = qobject_cast<QVTKOpenGLStereoWidget*>(widget);
-   if (glWidget)
-   {
-     vtkRenderWindow* rw = glWidget->renderWindow();
-     if (rw)
-     {
--      cout << "Using QVTKOpenGLWidget RenderWindow API for capture" << endl;
-+      cout << "Using QVTKOpenGLStereoWidget RenderWindow API for capture" << endl;
-       return pqCoreTestUtility::CompareImage(
-         rw, referenceImage, threshold, std::cerr, tempDirectory, size);
-     }
-diff --git a/Qt/Core/pqQVTKWidgetBase.h b/Qt/Core/pqQVTKWidgetBase.h
-index 5f11871de..c6b7dbcbb 100644
---- a/Qt/Core/pqQVTKWidgetBase.h
-+++ b/Qt/Core/pqQVTKWidgetBase.h
-@@ -43,8 +43,8 @@ using pqQVTKWidgetBase = QVTKOpenGLNativeWidget;
- #define PARAVIEW_USING_QVTKOPENGLNATIVEWIDGET 1
- #define PARAVIEW_USING_QVTKOPENGLWIDGET 0
- #else
--#include "QVTKOpenGLWidget.h"
--using pqQVTKWidgetBase = QVTKOpenGLWidget;
-+#include "QVTKOpenGLStereoWidget.h"
-+using pqQVTKWidgetBase = QVTKOpenGLStereoWidget;
- #define PARAVIEW_USING_QVTKOPENGLNATIVEWIDGET 0
- #define PARAVIEW_USING_QVTKOPENGLWIDGET 1
- #endif
-diff --git a/Qt/Core/pqQVTKWidgetEventPlayer.cxx b/Qt/Core/pqQVTKWidgetEventPlayer.cxx
-index 105796d8a..63c0bde5f 100644
---- a/Qt/Core/pqQVTKWidgetEventPlayer.cxx
-+++ b/Qt/Core/pqQVTKWidgetEventPlayer.cxx
-@@ -37,7 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include <QtDebug>
- 
- #include "QVTKOpenGLNativeWidget.h"
--#include "QVTKOpenGLWidget.h"
-+#include "QVTKOpenGLStereoWidget.h"
- #include "QVTKOpenGLWindow.h"
- #include "pqEventDispatcher.h"
- 
-@@ -49,7 +49,7 @@ pqQVTKWidgetEventPlayer::pqQVTKWidgetEventPlayer(QObject* p)
- bool pqQVTKWidgetEventPlayer::playEvent(
-   QObject* Object, const QString& Command, const QString& Arguments, bool& Error)
- {
--  QVTKOpenGLWidget* qvtkWidget = qobject_cast<QVTKOpenGLWidget*>(Object);
-+  QVTKOpenGLStereoWidget* qvtkWidget = qobject_cast<QVTKOpenGLStereoWidget*>(Object);
-   QVTKOpenGLNativeWidget* qvtkNativeWidget = qobject_cast<QVTKOpenGLNativeWidget*>(Object);
-   if (qvtkWidget || qvtkNativeWidget)
-   {
-@@ -92,7 +92,7 @@ bool pqQVTKWidgetEventPlayer::playEvent(
- 
-         if (qvtkWidget != nullptr)
-         {
--          // Due to QTBUG-61836 (see QVTKOpenGLWidget::testingEvent()), events should
-+          // Due to QTBUG-61836 (see QVTKOpenGLStereoWidget::testingEvent()), events should
-           // be propagated back to the internal QVTKOpenGLWindow when being fired
-           // explicitly on the widget instance. We have to use a custom event
-           // callback in this case to ensure that events are passed to the window.
-diff --git a/Qt/Core/pqQVTKWidgetEventTranslator.cxx b/Qt/Core/pqQVTKWidgetEventTranslator.cxx
-index f79d5c4e5..77950a0d1 100644
---- a/Qt/Core/pqQVTKWidgetEventTranslator.cxx
-+++ b/Qt/Core/pqQVTKWidgetEventTranslator.cxx
-@@ -44,7 +44,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include <QMouseEvent>
- 
- #include "QVTKOpenGLNativeWidget.h"
--#include "QVTKOpenGLWidget.h"
-+#include "QVTKOpenGLStereoWidget.h"
- #include "QVTKOpenGLWindow.h"
- 
- pqQVTKWidgetEventTranslator::pqQVTKWidgetEventTranslator(QObject* p)
-@@ -70,7 +70,7 @@ bool pqQVTKWidgetEventTranslator::translateEvent(
-   // Look for a render window in the possible widget types.
-   vtkRenderWindow* rw = nullptr;
- 
--  if (QVTKOpenGLWidget* const qvtkWidget = qobject_cast<QVTKOpenGLWidget*>(Object))
-+  if (QVTKOpenGLStereoWidget* const qvtkWidget = qobject_cast<QVTKOpenGLStereoWidget*>(Object))
-   {
-     rw = qvtkWidget->embeddedOpenGLWindow() ? qvtkWidget->renderWindow() : nullptr;
-   }
-diff --git a/Remoting/ClientServerStream/vtkClientServerInterpreter.cxx b/Remoting/ClientServerStream/vtkClientServerInterpreter.cxx
-index 487b5ad60..c6c24d81d 100644
---- a/Remoting/ClientServerStream/vtkClientServerInterpreter.cxx
-+++ b/Remoting/ClientServerStream/vtkClientServerInterpreter.cxx
-@@ -184,7 +184,7 @@ void vtkClientServerInterpreter::SetLogFile(const char* name)
-   // If a non-empty name was given, open a new log file.
-   if (name && name[0])
-   {
--    this->LogFileStream = new ofstream(name);
-+    this->LogFileStream = new std::ofstream(name);
-     if (this->LogFileStream && *this->LogFileStream)
-     {
-       this->LogStream = this->LogFileStream;
-diff --git a/Remoting/ClientServerStream/vtkClientServerInterpreter.h b/Remoting/ClientServerStream/vtkClientServerInterpreter.h
-index 1eafb27f3..1371ef727 100644
---- a/Remoting/ClientServerStream/vtkClientServerInterpreter.h
-+++ b/Remoting/ClientServerStream/vtkClientServerInterpreter.h
-@@ -195,8 +195,8 @@ protected:
-   ~vtkClientServerInterpreter() override;
- 
-   // A stream to which a log is written.
--  ostream* LogStream;
--  ofstream* LogFileStream;
-+  std::ostream* LogStream;
-+  std::ofstream* LogFileStream;
- 
-   // Internal message processing functions.
-   int ProcessCommandNew(const vtkClientServerStream& css, int midx);
-diff --git a/Remoting/Core/vtkPVPluginLoader.cxx b/Remoting/Core/vtkPVPluginLoader.cxx
-index 5b04b2f00..447d9d63a 100644
---- a/Remoting/Core/vtkPVPluginLoader.cxx
-+++ b/Remoting/Core/vtkPVPluginLoader.cxx
-@@ -73,12 +73,12 @@ public:
-     vtkPVXMLOnlyPlugin* instance = new vtkPVXMLOnlyPlugin();
-     instance->PluginName = vtksys::SystemTools::GetFilenameWithoutExtension(xmlfile);
- 
--    ifstream is;
--    is.open(xmlfile, ios::binary);
-+    std::ifstream is;
-+    is.open(xmlfile, std::ios::binary);
-     // get length of file:
--    is.seekg(0, ios::end);
-+    is.seekg(0, std::ios::end);
-     size_t length = is.tellg();
--    is.seekg(0, ios::beg);
-+    is.seekg(0, std::ios::beg);
- 
-     // allocate memory:
-     char* buffer = new char[length + 1];
-diff --git a/Remoting/ServerManager/vtkPVSessionCore.cxx b/Remoting/ServerManager/vtkPVSessionCore.cxx
-index 8d36fad37..6ff043967 100644
---- a/Remoting/ServerManager/vtkPVSessionCore.cxx
-+++ b/Remoting/ServerManager/vtkPVSessionCore.cxx
-@@ -293,7 +293,7 @@ vtkPVSessionCore::vtkPVSessionCore()
-       {
-         filename << this->ParallelController->GetLocalProcessId();
-       }
--      this->LogStream = new ofstream(filename.str().c_str());
-+      this->LogStream = new std::ofstream(filename.str().c_str());
-       LOG("Log for " << options->GetArgv0() << " (" << this->ParallelController->GetLocalProcessId()
-                      << ")");
-     }
-diff --git a/Remoting/ServerManager/vtkSMSessionProxyManager.cxx b/Remoting/ServerManager/vtkSMSessionProxyManager.cxx
-index 8525457e5..05bdfd723 100644
---- a/Remoting/ServerManager/vtkSMSessionProxyManager.cxx
-+++ b/Remoting/ServerManager/vtkSMSessionProxyManager.cxx
-@@ -1261,7 +1261,7 @@ void vtkSMSessionProxyManager::LoadXMLState(
- bool vtkSMSessionProxyManager::SaveXMLState(const char* filename)
- {
-   vtkPVXMLElement* rootElement = this->SaveXMLState();
--  ofstream os(filename, ios::out);
-+  std::ofstream os(filename, std::ios::out);
-   if (!os.is_open())
-   {
-     return false;
-diff --git a/Remoting/Views/vtkPVRenderView.cxx b/Remoting/Views/vtkPVRenderView.cxx
-index de9c50ab3..d7f739192 100644
---- a/Remoting/Views/vtkPVRenderView.cxx
-+++ b/Remoting/Views/vtkPVRenderView.cxx
-@@ -2514,11 +2514,11 @@ void vtkPVRenderView::UpdateSkybox()
-     this->CubeMap->SetInputTexture(vtkOpenGLTexture::SafeDownCast(texture));
-     this->CubeMap->InterpolateOn();
-     this->GetRenderer()->AddActor(this->Skybox);
--    this->GetRenderer()->SetEnvironmentCubeMap(this->CubeMap, true);
-+    this->GetRenderer()->SetEnvironmentTexture(this->CubeMap, true);
-   }
-   else
-   {
--    this->GetRenderer()->SetEnvironmentCubeMap(nullptr);
-+    this->GetRenderer()->SetEnvironmentTexture(nullptr);
-   }
- }
- 
-diff --git a/Remoting/Views/vtkSMTransferFunctionPresets.cxx b/Remoting/Views/vtkSMTransferFunctionPresets.cxx
-index 1151ce58f..21e5a28b7 100644
---- a/Remoting/Views/vtkSMTransferFunctionPresets.cxx
-+++ b/Remoting/Views/vtkSMTransferFunctionPresets.cxx
-@@ -142,7 +142,7 @@ public:
-     Json::CharReaderBuilder builder;
-     builder["collectComments"] = false;
-     Json::Value root;
--    ifstream file;
-+    std::ifstream file;
-     file.open(filename);
-     if (!file)
-     {
-@@ -456,7 +456,7 @@ bool vtkSMTransferFunctionPresets::ImportPresets(const char* filename)
-   if (vtksys::SystemTools::LowerCase(vtksys::SystemTools::GetFilenameLastExtension(filename)) ==
-     ".xml")
-   {
--    ifstream in(filename);
-+    std::ifstream in(filename);
-     if (in)
-     {
-       std::ostringstream contents;
-diff --git a/Remoting/Views/vtkSMTransferFunctionProxy.cxx b/Remoting/Views/vtkSMTransferFunctionProxy.cxx
-index efa8e9341..2023ca41b 100644
---- a/Remoting/Views/vtkSMTransferFunctionProxy.cxx
-+++ b/Remoting/Views/vtkSMTransferFunctionProxy.cxx
-@@ -273,7 +273,7 @@ bool vtkSMTransferFunctionProxy::ExportTransferFunction(
- 
-   exportCollection.append(transferFunction);
- 
--  ofstream outfs;
-+  std::ofstream outfs;
-   outfs.open(filename);
-   if (!outfs.is_open())
-   {
-@@ -1370,7 +1370,7 @@ bool vtkSMTransferFunctionProxy::ConvertLegacyColorMapsToJSON(
-     return false;
-   }
- 
--  ofstream file;
-+  std::ofstream file;
-   file.open(outjsonfile);
-   if (file)
-   {
-diff --git a/ThirdParty/protobuf/CMakeLists.txt b/ThirdParty/protobuf/CMakeLists.txt
-index 0502ca2d9..25b2e778f 100644
---- a/ThirdParty/protobuf/CMakeLists.txt
-+++ b/ThirdParty/protobuf/CMakeLists.txt
-@@ -42,7 +42,8 @@ vtk_module_third_party(
-     PACKAGE Protobuf
-     VERSION "3.4"
-     TARGETS protobuf::libprotobuf
--    STANDARD_INCLUDE_DIRS)
-+    STANDARD_INCLUDE_DIRS
-+    CONFIG_MODE)
- 
- if (VTK_MODULE_USE_EXTERNAL_ParaView_protobuf)
-   # promote protobuf::protoc to GLOBAL to allow to call protobuf_generate from other directories
-diff --git a/VTKExtensions/CGNSReader/vtkFileSeriesHelper.cxx b/VTKExtensions/CGNSReader/vtkFileSeriesHelper.cxx
-index 66a7d6972..9d314b8ce 100644
---- a/VTKExtensions/CGNSReader/vtkFileSeriesHelper.cxx
-+++ b/VTKExtensions/CGNSReader/vtkFileSeriesHelper.cxx
-@@ -211,7 +211,7 @@ bool vtkFileSeriesHelper::ReadMetaFile(const char* metafilename)
-   }
- 
-   // Open the metafile.
--  ifstream metafile(metafilename);
-+  std::ifstream metafile(metafilename);
-   if (metafile.bad())
-   {
-     // vtkErrorMacro("Failed to open meta-file: " << metafilename);
-diff --git a/VTKExtensions/IOCore/vtkCSVWriter.cxx b/VTKExtensions/IOCore/vtkCSVWriter.cxx
-index 11f777c1a..a1773600c 100644
---- a/VTKExtensions/IOCore/vtkCSVWriter.cxx
-+++ b/VTKExtensions/IOCore/vtkCSVWriter.cxx
-@@ -97,7 +97,7 @@ namespace
- //-----------------------------------------------------------------------------
- template <class iterT>
- void vtkCSVWriterGetDataString(
--  iterT* iter, vtkIdType tupleIndex, ofstream& stream, vtkCSVWriter* writer, bool* first)
-+  iterT* iter, vtkIdType tupleIndex, std::ofstream& stream, vtkCSVWriter* writer, bool* first)
- {
-   int numComps = iter->GetNumberOfComponents();
-   vtkIdType index = tupleIndex * numComps;
-@@ -118,7 +118,7 @@ void vtkCSVWriterGetDataString(
- //-----------------------------------------------------------------------------
- template <>
- void vtkCSVWriterGetDataString(vtkArrayIteratorTemplate<vtkStdString>* iter, vtkIdType tupleIndex,
--  ofstream& stream, vtkCSVWriter* writer, bool* first)
-+  std::ofstream& stream, vtkCSVWriter* writer, bool* first)
- {
-   int numComps = iter->GetNumberOfComponents();
-   vtkIdType index = tupleIndex * numComps;
-@@ -139,7 +139,7 @@ void vtkCSVWriterGetDataString(vtkArrayIteratorTemplate<vtkStdString>* iter, vtk
- //-----------------------------------------------------------------------------
- template <>
- void vtkCSVWriterGetDataString(vtkArrayIteratorTemplate<char>* iter, vtkIdType tupleIndex,
--  ofstream& stream, vtkCSVWriter* writer, bool* first)
-+  std::ofstream& stream, vtkCSVWriter* writer, bool* first)
- {
-   int numComps = iter->GetNumberOfComponents();
-   vtkIdType index = tupleIndex * numComps;
-@@ -160,7 +160,7 @@ void vtkCSVWriterGetDataString(vtkArrayIteratorTemplate<char>* iter, vtkIdType t
- //-----------------------------------------------------------------------------
- template <>
- void vtkCSVWriterGetDataString(vtkArrayIteratorTemplate<unsigned char>* iter, vtkIdType tupleIndex,
--  ofstream& stream, vtkCSVWriter* writer, bool* first)
-+  std::ofstream& stream, vtkCSVWriter* writer, bool* first)
- {
-   int numComps = iter->GetNumberOfComponents();
-   vtkIdType index = tupleIndex * numComps;
-@@ -190,7 +190,7 @@ void vtkCSVWriterGetDataString(vtkArrayIteratorTemplate<unsigned char>* iter, vt
- 
- class vtkCSVWriter::CSVFile
- {
--  ofstream Stream;
-+  std::ofstream Stream;
-   std::vector<std::pair<std::string, int> > ColumnInfo;
-   double Time = vtkMath::Nan();
- 
-diff --git a/VTKExtensions/IOCore/vtkFileSeriesReader.cxx b/VTKExtensions/IOCore/vtkFileSeriesReader.cxx
-index f2448f2b8..7d84bc1ab 100644
---- a/VTKExtensions/IOCore/vtkFileSeriesReader.cxx
-+++ b/VTKExtensions/IOCore/vtkFileSeriesReader.cxx
-@@ -783,7 +783,7 @@ int vtkFileSeriesReader::ReadMetaDataFile(const char* metafilename, vtkStringArr
-   std::vector<double>& timeValues, int maxFilesToRead /*= VTK_INT_MAX*/)
- {
-   // Open the metafile.
--  ifstream metafile(metafilename);
-+  std::ifstream metafile(metafilename);
-   if (metafile.bad())
-   {
-     return 0;
-diff --git a/VTKExtensions/IOEnSight/vtkPEnSightGoldBinaryReader.cxx b/VTKExtensions/IOEnSight/vtkPEnSightGoldBinaryReader.cxx
-index 8370e21e3..ff90a0421 100644
---- a/VTKExtensions/IOEnSight/vtkPEnSightGoldBinaryReader.cxx
-+++ b/VTKExtensions/IOEnSight/vtkPEnSightGoldBinaryReader.cxx
-@@ -50,7 +50,6 @@ vtkPEnSightGoldBinaryReader::~vtkPEnSightGoldBinaryReader()
- {
-   if (this->IFile)
-   {
--    this->IFile->close();
-     delete this->IFile;
-     this->IFile = NULL;
-   }
-@@ -72,7 +71,6 @@ int vtkPEnSightGoldBinaryReader::OpenFile(const char* filename)
-   // Close file from any previous image
-   if (this->IFile)
-   {
--    this->IFile->close();
-     delete this->IFile;
-     this->IFile = NULL;
-   }
-@@ -86,9 +84,9 @@ int vtkPEnSightGoldBinaryReader::OpenFile(const char* filename)
-     this->FileSize = (long)(fs.st_size);
- 
- #ifdef _WIN32
--    this->IFile = new ifstream(filename, ios::in | ios::binary);
-+    this->IFile = new std::ifstream(filename, std::ios::in | std::ios::binary);
- #else
--    this->IFile = new ifstream(filename, ios::in);
-+    this->IFile = new std::ifstream(filename, std::ios::in);
- #endif
-   }
-   else
-diff --git a/VTKExtensions/IOEnSight/vtkPEnSightGoldBinaryReader.h b/VTKExtensions/IOEnSight/vtkPEnSightGoldBinaryReader.h
-index c5a5551d5..9c871e4a1 100644
---- a/VTKExtensions/IOEnSight/vtkPEnSightGoldBinaryReader.h
-+++ b/VTKExtensions/IOEnSight/vtkPEnSightGoldBinaryReader.h
-@@ -204,7 +204,7 @@ protected:
-   int ElementIdsListed;
-   int Fortran;
- 
--  ifstream* IFile;
-+  std::ifstream* IFile;
-   // The size of the file could be used to choose byte order.
-   long FileSize;
- 
-diff --git a/VTKExtensions/IOEnSight/vtkPEnSightGoldReader.cxx b/VTKExtensions/IOEnSight/vtkPEnSightGoldReader.cxx
-index b433bc57a..b5cdc2672 100644
---- a/VTKExtensions/IOEnSight/vtkPEnSightGoldReader.cxx
-+++ b/VTKExtensions/IOEnSight/vtkPEnSightGoldReader.cxx
-@@ -91,7 +91,7 @@ int vtkPEnSightGoldReader::ReadGeometryFile(
- 
-   // Opening the text file as binary. If not, the reader fails to read
-   // files with Unix line endings on Windows machines.
--  this->IS = new ifstream(sfilename.c_str(), ios::in | ios::binary);
-+  this->IS = new std::ifstream(sfilename.c_str(), std::ios::in | std::ios::binary);
-   if (this->IS->fail())
-   {
-     vtkErrorMacro("Unable to open file: " << sfilename.c_str());
-@@ -291,7 +291,7 @@ int vtkPEnSightGoldReader::ReadMeasuredGeometryFile(
-     sfilename = fileName;
-   }
- 
--  this->IS = new ifstream(sfilename.c_str(), ios::in | ios::binary);
-+  this->IS = new std::ifstream(sfilename.c_str(), std::ios::in | std::ios::binary);
-   if (this->IS->fail())
-   {
-     vtkErrorMacro("Unable to open file: " << sfilename.c_str());
-@@ -455,7 +455,7 @@ int vtkPEnSightGoldReader::ReadScalarsPerNode(const char* fileName, const char*
-     sfilename = fileName;
-   }
- 
--  this->IS = new ifstream(sfilename.c_str(), ios::in | ios::binary);
-+  this->IS = new std::ifstream(sfilename.c_str(), std::ios::in | std::ios::binary);
-   if (this->IS->fail())
-   {
-     vtkErrorMacro("Unable to open file: " << sfilename.c_str());
-@@ -675,7 +675,7 @@ int vtkPEnSightGoldReader::ReadVectorsPerNode(const char* fileName, const char*
-     sfilename = fileName;
-   }
- 
--  this->IS = new ifstream(sfilename.c_str(), ios::in | ios::binary);
-+  this->IS = new std::ifstream(sfilename.c_str(), std::ios::in | std::ios::binary);
-   if (this->IS->fail())
-   {
-     vtkErrorMacro("Unable to open file: " << sfilename.c_str());
-@@ -854,7 +854,7 @@ int vtkPEnSightGoldReader::ReadTensorsPerNode(const char* fileName, const char*
-     sfilename = fileName;
-   }
- 
--  this->IS = new ifstream(sfilename.c_str(), ios::in | ios::binary);
-+  this->IS = new std::ifstream(sfilename.c_str(), std::ios::in | std::ios::binary);
-   if (this->IS->fail())
-   {
-     vtkErrorMacro("Unable to open file: " << sfilename.c_str());
-@@ -980,7 +980,7 @@ int vtkPEnSightGoldReader::ReadScalarsPerElement(const char* fileName, const cha
-     sfilename = fileName;
-   }
- 
--  this->IS = new ifstream(sfilename.c_str(), ios::in | ios::binary);
-+  this->IS = new std::ifstream(sfilename.c_str(), std::ios::in | std::ios::binary);
-   if (this->IS->fail())
-   {
-     vtkErrorMacro("Unable to open file: " << sfilename.c_str());
-@@ -1187,7 +1187,7 @@ int vtkPEnSightGoldReader::ReadVectorsPerElement(const char* fileName, const cha
-     sfilename = fileName;
-   }
- 
--  this->IS = new ifstream(sfilename.c_str(), ios::in | ios::binary);
-+  this->IS = new std::ifstream(sfilename.c_str(), std::ios::in | std::ios::binary);
-   if (this->IS->fail())
-   {
-     vtkErrorMacro("Unable to open file: " << sfilename.c_str());
-@@ -1356,7 +1356,7 @@ int vtkPEnSightGoldReader::ReadTensorsPerElement(const char* fileName, const cha
-     sfilename = fileName;
-   }
- 
--  this->IS = new ifstream(sfilename.c_str(), ios::in | ios::binary);
-+  this->IS = new std::ifstream(sfilename.c_str(), std::ios::in | ios::binary);
-   if (this->IS->fail())
-   {
-     vtkErrorMacro("Unable to open file: " << sfilename.c_str());
-diff --git a/VTKExtensions/IOEnSight/vtkPEnSightReader.cxx b/VTKExtensions/IOEnSight/vtkPEnSightReader.cxx
-index 4f4840f5c..dd515e5ca 100644
---- a/VTKExtensions/IOEnSight/vtkPEnSightReader.cxx
-+++ b/VTKExtensions/IOEnSight/vtkPEnSightReader.cxx
-@@ -1319,7 +1319,7 @@ int vtkPEnSightReader::ReadCaseFile()
-     sfilename = this->CaseFileName;
-   }
- 
--  this->IS = new ifstream(sfilename.c_str(), ios::in);
-+  this->IS = new std::ifstream(sfilename.c_str(), ios::in);
-   if (this->IS->fail())
-   {
-     vtkErrorMacro("Unable to open file: " << sfilename.c_str());
-diff --git a/VTKExtensions/IOEnSight/vtkPVEnSightMasterServerReader.cxx b/VTKExtensions/IOEnSight/vtkPVEnSightMasterServerReader.cxx
-index 5768eb32f..8bbc582ae 100644
---- a/VTKExtensions/IOEnSight/vtkPVEnSightMasterServerReader.cxx
-+++ b/VTKExtensions/IOEnSight/vtkPVEnSightMasterServerReader.cxx
-@@ -429,7 +429,7 @@ int vtkPVEnSightMasterServerReader::ParseMasterServerFile()
-   }
- 
-   // Open the file for reading.
--  ifstream fin(sfilename.c_str(), ios::in);
-+  std::ifstream fin(sfilename.c_str(), std::ios::in);
-   if (!fin)
-   {
-     vtkErrorMacro("Unable to open file: " << sfilename.c_str());
-diff --git a/VTKExtensions/IOEnSight/vtkPVEnSightMasterServerReader2.cxx b/VTKExtensions/IOEnSight/vtkPVEnSightMasterServerReader2.cxx
-index e7701d458..a358b9df0 100644
---- a/VTKExtensions/IOEnSight/vtkPVEnSightMasterServerReader2.cxx
-+++ b/VTKExtensions/IOEnSight/vtkPVEnSightMasterServerReader2.cxx
-@@ -512,7 +512,7 @@ int vtkPVEnSightMasterServerReader2::ParseMasterServerFile()
-   }
- 
-   // Open the file for reading.
--  ifstream fin(sfilename.c_str(), ios::in);
-+  std::ifstream fin(sfilename.c_str(), std::ios::in);
-   if (!fin)
-   {
-     vtkErrorMacro("Unable to open file: " << sfilename.c_str());
-diff --git a/VTKExtensions/IOSPCTH/vtkSpyPlotReader.cxx b/VTKExtensions/IOSPCTH/vtkSpyPlotReader.cxx
-index 1af09a68e..4aba88655 100644
---- a/VTKExtensions/IOSPCTH/vtkSpyPlotReader.cxx
-+++ b/VTKExtensions/IOSPCTH/vtkSpyPlotReader.cxx
-@@ -1289,7 +1289,7 @@ int vtkSpyPlotReader::MergeVectors(vtkDataSetAttributes* da, vtkDataArray* a1, v
- //-----------------------------------------------------------------------------
- int vtkSpyPlotReader::CanReadFile(const char* fname)
- {
--  ifstream ifs(fname, ios::binary | ios::in);
-+  std::ifstream ifs(fname, std::ios::binary | std::ios::in);
-   if (!ifs)
-   {
-     return 0;
-diff --git a/VTKExtensions/IOSPCTH/vtkSpyPlotReaderMap.cxx b/VTKExtensions/IOSPCTH/vtkSpyPlotReaderMap.cxx
-index c7e1bac87..157768255 100644
---- a/VTKExtensions/IOSPCTH/vtkSpyPlotReaderMap.cxx
-+++ b/VTKExtensions/IOSPCTH/vtkSpyPlotReaderMap.cxx
-@@ -83,7 +83,7 @@ bool vtkSpyPlotReaderMap::Initialize(const char* filename)
- {
-   this->Clean(NULL);
- 
--  ifstream ifs(filename);
-+  std::ifstream ifs(filename);
-   if (!ifs)
-   {
-     vtkGenericWarningMacro("Error opening file " << filename);
-@@ -238,7 +238,7 @@ bool vtkSpyPlotReaderMap::InitializeFromSpyFile(const char* filename)
- bool vtkSpyPlotReaderMap::InitializeFromCaseFile(const char* filename)
- {
-   // Setup the filemap and spcth structures
--  ifstream ifs(filename);
-+  std::ifstream ifs(filename);
-   if (!ifs)
-   {
-     vtkGenericWarningMacro("Error opening file " << filename);
-diff --git a/VTKExtensions/IOSPCTH/vtkSpyPlotUniReader.cxx b/VTKExtensions/IOSPCTH/vtkSpyPlotUniReader.cxx
-index 7dfe451c9..f4ea91928 100644
---- a/VTKExtensions/IOSPCTH/vtkSpyPlotUniReader.cxx
-+++ b/VTKExtensions/IOSPCTH/vtkSpyPlotUniReader.cxx
-@@ -212,7 +212,7 @@ int vtkSpyPlotUniReader::MakeCurrent()
-   }
- 
-   std::vector<unsigned char> arrayBuffer;
--  ifstream ifs(this->FileName, ios::binary | ios::in);
-+  std::ifstream ifs(this->FileName, std::ios::binary | std::ios::in);
-   vtkSpyPlotIStream spis;
-   spis.SetStream(&ifs);
-   int dump;
-@@ -1358,7 +1358,7 @@ int vtkSpyPlotUniReader::ReadInformation()
-     vtkErrorMacro("FileName not specified");
-     return 0;
-   }
--  ifstream ifs(this->FileName, ios::binary | ios::in);
-+  std::ifstream ifs(this->FileName, std::ios::binary | std::ios::in);
-   if (!ifs)
-   {
-     vtkErrorMacro("Cannot open file: " << this->FileName);
diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake
index ab64ef34a..784efa6be 100644
--- a/ports/paraview/portfile.cmake
+++ b/ports/paraview/portfile.cmake
@@ -1,4 +1,6 @@
-set(VERSION 5.8)
+file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _vcpkg_json)
+string(JSON _ver_string GET "${_vcpkg_json}" "version-semver")
+string(REGEX MATCH "^[0-9]+\.[0-9]+" VERSION "${_ver_string}")
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     "cuda"         PARAVIEW_USE_CUDA            #untested; probably only affects internal VTK build so it does nothing here 
@@ -12,16 +14,16 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Kitware/ParaView
-    REF 56631fdd9a31f4acdfe5fce2c3be3c4fb6e6800f # v5.8.0
-    SHA512  1cdf4065428debc301c98422233524cdafc843495c54569b0854bf53f6ffeba1e83acf60497450779d493e56051557cd377902325d6ece89ad1b98ae6ba831be
+    REF aad4b6f1e92154879209102edfab8367f1e7d191 # v5.9.1
+    SHA512  330fcb8525bdee9b02e06f05d4e91cc4d631d03df99c30f82bb97da5e06b5a2a6ff4ecee807b6f6c7110d2f53db1c17e4670d6078ae1cc89cfd7089b67d05bdb
     HEAD_REF master
     PATCHES
-        paraview_build.patch
-        remove_duplicates.patch # Missed something in the above patch
+        external_vtk.patch
         cgns.patch
         python_include.patch
         python_wrapper.patch
         add-tools-option.patch
+        catalyst_install.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
@@ -36,11 +38,9 @@ vcpkg_from_gitlab(
     OUT_SOURCE_PATH VISITIT_SOURCE_PATH
     GITLAB_URL https://gitlab.kitware.com/
     REPO paraview/visitbridge
-    REF c2605b5c3115bc4869c76a0d8bfdd8939b59f283
-    SHA512 6d2c1d6e1cd345547926938451755e7a8be5dabd89e18a2ceb419db16c5b29f354554a5130eb365b7e522d655370fd4766953813ff530c06e4851fe26104ce58
+    REF 42fce8ad6863ca2c1308741955cca1d0cf570d22
+    SHA512 03a6254989d3e286a462683af92caba1e90decbdcfb2e729f2d7e1116b04d63a05c28d02c4615d780fdd0d33e2719f96617233d6e0602410cc6d894f92fe6ee3
     PATCHES 
-        VisIt_Build.patch        
-        #removeunusedsymbols.patch # These also get remove in master of ParaView
         ${VisItPatches}
 )
 #Get QtTesting Plugin
@@ -48,12 +48,23 @@ vcpkg_from_gitlab(
     OUT_SOURCE_PATH QTTESTING_SOURCE_PATH
     GITLAB_URL https://gitlab.kitware.com/
     REPO paraview/qttesting
-    REF f2429588feb839e0d8f9f3ee73bfa8a032a3f178
-    SHA512  752b13ff79095a14faa2edc134a64497ff0426da3aa6b1a5951624816fb4f113a26fbe559cedf495ebb775d782c9a1851421a88dd299a79f27cbebb730ea227e
+    REF 72290689c7c55622d729bf95c97e7627026a234e
+    SHA512  fb18c6745b784b294f01d5391ba4cdcaa109443a193eb35fbf1553fdb3a4f7217f784fd4893fab72784cec5bd3fc821bf1e766e943d0f562c5917788800599b0
 )
 
+#Get Catalyst
+vcpkg_from_gitlab(
+    OUT_SOURCE_PATH CATALYST_SOURCE_PATH
+    GITLAB_URL https://gitlab.kitware.com/
+    REPO paraview/catalyst
+    REF e36e4a5f3c67011c97c335cce23d2bc3abc0d086
+    SHA512  9926c272ab8785997f9c98cfaf696943081b0ddb0e9e343602722671b6f3eaef5b8de5dd049ca783b6844c7e328a96e1b09c8b24c16f001eeeed2d154d290480
+)
+
+
 file(COPY ${VISITIT_SOURCE_PATH}/ DESTINATION ${SOURCE_PATH}/Utilities/VisItBridge)
 file(COPY ${QTTESTING_SOURCE_PATH}/ DESTINATION ${SOURCE_PATH}/ThirdParty/QtTesting/vtkqttesting)
+file(COPY ${CATALYST_SOURCE_PATH}/ DESTINATION ${SOURCE_PATH}/ThirdParty/catalyst/vtkcatalyst/catalyst)
 
 if("python" IN_LIST FEATURES)
     vcpkg_find_acquire_program(PYTHON3)
diff --git a/ports/paraview/remove_duplicates.patch b/ports/paraview/remove_duplicates.patch
deleted file mode 100644
index 4ea223e3f..000000000
--- a/ports/paraview/remove_duplicates.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b7101666c..ebac50016 100644
---- a/CMakeLists.txt	
-+++ b/CMakeLists.txt
-@@ -592,6 +592,9 @@ set(_paraview_add_tests_default_data_directory
- set(_paraview_add_tests_default_test_data_target
-   "ParaViewData")
- 
-+list(REMOVE_DUPLICATES vtk_modules)    # Missed this somewhere
-+list(REMOVE_DUPLICATES paraview_modules) # probably not needed
-+
- vtk_module_build(
-   MODULES             ${paraview_modules}
-   KITS                ${paraview_kits}
diff --git a/ports/paraview/vcpkg.json b/ports/paraview/vcpkg.json
new file mode 100644
index 000000000..85570e754
--- /dev/null
+++ b/ports/paraview/vcpkg.json
@@ -0,0 +1,90 @@
+{
+  "name": "paraview",
+  "version-semver": "5.9.1",
+  "description": "VTK-based Data Analysis and Visualization Application",
+  "homepage": "https://www.paraview.org/",
+  "dependencies": [
+    "boost-algorithm",
+    "boost-core",
+    "boost-format",
+    "cgns",
+    "protobuf",
+    {
+      "name": "vtk",
+      "default-features": false,
+      "features": [
+        "paraview"
+      ]
+    }
+  ],
+  "features": {
+    "all-modules": {
+      "description": "enables the build of all paraview modules",
+      "dependencies": [
+        "ffmpeg",
+        "gdal",
+        "laszip",
+        "pdal"
+      ]
+    },
+    "cuda": {
+      "description": "enables cuda within paraview",
+      "dependencies": [
+        "cuda",
+        {
+          "name": "vtk",
+          "default-features": false,
+          "features": [
+            "cuda"
+          ]
+        }
+      ]
+    },
+    "mpi": {
+      "description": "enables cuda within paraview",
+      "dependencies": [
+        {
+          "name": "hdf5",
+          "default-features": false,
+          "features": [
+            "parallel"
+          ]
+        },
+        {
+          "name": "vtk",
+          "default-features": false,
+          "features": [
+            "mpi"
+          ]
+        }
+      ]
+    },
+    "python": {
+      "description": "enables the build of python wrappers",
+      "dependencies": [
+        {
+          "name": "vtk",
+          "default-features": false,
+          "features": [
+            "python"
+          ]
+        }
+      ]
+    },
+    "tools": {
+      "description": "Build paraview tools"
+    },
+    "vtkm": {
+      "description": "enables vtkm for the build of paraview",
+      "dependencies": [
+        {
+          "name": "vtk",
+          "default-features": false,
+          "features": [
+            "vtkm"
+          ]
+        }
+      ]
+    }
+  }
+}
diff --git a/ports/qt5-svg/CONTROL b/ports/qt5-svg/CONTROL
index 4e9fa8fcc..1b182ea18 100644
--- a/ports/qt5-svg/CONTROL
+++ b/ports/qt5-svg/CONTROL
@@ -1,4 +1,5 @@
 Source: qt5-svg
 Version: 5.15.2
+Port-Version: 1
 Description: Qt5 SVG Module - provides classes for displaying the contents of SVG files
 Build-Depends:  qt5-base[core]
diff --git a/ports/qt5-svg/portfile.cmake b/ports/qt5-svg/portfile.cmake
index 214726759..ca67a6846 100644
--- a/ports/qt5-svg/portfile.cmake
+++ b/ports/qt5-svg/portfile.cmake
@@ -1,2 +1,2 @@
 include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
-qt_submodule_installation()
-\ No newline at end of file
+qt_submodule_installation(PATCHES "static_svg_link_fix.patch")
+\ No newline at end of file
diff --git a/ports/qt5-svg/static_svg_link_fix.patch b/ports/qt5-svg/static_svg_link_fix.patch
new file mode 100644
index 000000000..c6d21e83a
--- /dev/null
+++ b/ports/qt5-svg/static_svg_link_fix.patch
@@ -0,0 +1,24 @@
+diff --git a/src/plugins/iconengines/svgiconengine/svgiconengine.pro b/src/plugins/iconengines/svgiconengine/svgiconengine.pro
+index bfc739fa8..c0df08194 100644
+--- a/src/plugins/iconengines/svgiconengine/svgiconengine.pro
++++ b/src/plugins/iconengines/svgiconengine/svgiconengine.pro
+@@ -8,6 +8,6 @@ OTHER_FILES += qsvgiconengine-nocompress.json
+ QT += svg core-private gui-private
+ 
+ PLUGIN_TYPE = iconengines
+-PLUGIN_EXTENDS = svg
++PLUGIN_EXTENDS = gui
+ PLUGIN_CLASS_NAME = QSvgIconPlugin
+ load(qt_plugin)
+diff --git a/src/plugins/imageformats/svg/svg.pro b/src/plugins/imageformats/svg/svg.pro
+index 9db6a9ab0..dcfc4b555 100644
+--- a/src/plugins/imageformats/svg/svg.pro
++++ b/src/plugins/imageformats/svg/svg.pro
+@@ -6,6 +6,6 @@ SOURCES += main.cpp \
+ QT += svg
+ 
+ PLUGIN_TYPE = imageformats
+-PLUGIN_EXTENDS = svg
++PLUGIN_EXTENDS = gui
+ PLUGIN_CLASS_NAME = QSvgPlugin
+ load(qt_plugin)
diff --git a/ports/vtk-m/CONTROL b/ports/vtk-m/CONTROL
deleted file mode 100644
index e221eecce..000000000
--- a/ports/vtk-m/CONTROL
+++ /dev/null
@@ -1,24 +0,0 @@
-Source: vtk-m
-Version: 1.5.0
-Port-Version: 1
-Homepage: https://gitlab.kitware.com/vtk/vtk-m/
-Description: VTK-m is a toolkit of scientific visualization algorithms for emerging processor architectures.
-Supports: x64 & !uwp
-
-Feature: cuda
-Description: Use the NVIDIA CUDA device adapter.
-Build-Depends: cuda
-
-Feature: omp
-Description: Use the OpenMP device adapter.
-
-Feature: tbb
-Description: Use the Intel TBB device adapter.
-Build-Depends: tbb
-
-Feature: mpi
-Description: Use the MPI controller.
-Build-Depends: mpi
-
-Feature: double
-Description: Use double precision in floating point calculations
diff --git a/ports/vtk-m/portfile.cmake b/ports/vtk-m/portfile.cmake
index c33eb065f..b8e90bc98 100644
--- a/ports/vtk-m/portfile.cmake
+++ b/ports/vtk-m/portfile.cmake
@@ -40,20 +40,17 @@ list(APPEND OPTIONS -DBUILD_TESTING=OFF)
 vcpkg_from_gitlab(GITLAB_URL "https://gitlab.kitware.com" 
                   OUT_SOURCE_PATH SOURCE_PATH 
                   REPO vtk/vtk-m 
-                  REF f2aa6ad5be1a97e3fb41ef4680ee2c76c3434ac0 # v1.5.0 Version is strongly locked to VTK 9.0. Upgrading will most likly brake the VTK build
-                  SHA512 35e8a2c0ad6cd3c1f02a71a50d781c89f93909ad27030b406fd69f4fea5c1862c48a6e541fd07562947322c3a69bdfdb54206ae51bb86ef7a710f9e9898e9638
+                  REF 13a117e0e8935eef3f320b5a1cd71d9911ad9853 # v1.6.0 Version is strongly locked to VTK 9.0. Upgrading will most likly brake the VTK build
+                  SHA512 54f7f52ab4ee7954b6a303ffd3b8bcb18105b5d2fd8ed54b4e487fce2ebfbc51507e632189f775c79eea22ad24bd56bca401ddd679fc03d787342dd33d2ba18b
                   FILE_DISAMBIGUATOR 1)
-                  # For people only wanting vtk-m and not VTK 
-                  #REF 74ffad9bd0679d061bc87e544a728f1c3c926269 # v1.5.1
-                  #SHA512 c9e1c18432b6c11ae086445255acf9477fe4c888122a2b2a9713dc63a40d2e4c2375742157526b5f0869f14c62a4ad66d81ee58d6cc75a1d53a1d615525a03c9)
 vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} 
                       PREFER_NINJA 
                       OPTIONS ${OPTIONS})
 vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/vtkm-1.5 TARGET_PATH share/vtkm)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/vtkm-1.6 TARGET_PATH share/vtkm)
 
 file(READ ${CURRENT_PACKAGES_DIR}/share/vtkm/VTKmConfig.cmake _contents)
-string(REPLACE [[set_and_check(VTKm_CONFIG_DIR "${PACKAGE_PREFIX_DIR}/lib/cmake/vtkm-1.5")]] [[set_and_check(VTKm_CONFIG_DIR "${PACKAGE_PREFIX_DIR}/share/vtkm")]] _contents ${_contents})
+string(REPLACE [[set_and_check(VTKm_CONFIG_DIR "${PACKAGE_PREFIX_DIR}/lib/cmake/vtkm-1.6")]] [[set_and_check(VTKm_CONFIG_DIR "${PACKAGE_PREFIX_DIR}/share/vtkm")]] _contents ${_contents})
 file(WRITE ${CURRENT_PACKAGES_DIR}/share/vtkm/VTKmConfig.cmake ${_contents})
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
diff --git a/ports/vtk-m/vcpkg.json b/ports/vtk-m/vcpkg.json
new file mode 100644
index 000000000..0b5c4fcc6
--- /dev/null
+++ b/ports/vtk-m/vcpkg.json
@@ -0,0 +1,33 @@
+{
+  "name": "vtk-m",
+  "version-semver": "1.6.0",
+  "description": "VTK-m is a toolkit of scientific visualization algorithms for emerging processor architectures.",
+  "homepage": "https://gitlab.kitware.com/vtk/vtk-m/",
+  "supports": "x64 & !uwp",
+  "features": {
+    "cuda": {
+      "description": "Use the NVIDIA CUDA device adapter.",
+      "dependencies": [
+        "cuda"
+      ]
+    },
+    "double": {
+      "description": "Use double precision in floating point calculations"
+    },
+    "mpi": {
+      "description": "Use the MPI controller.",
+      "dependencies": [
+        "mpi"
+      ]
+    },
+    "omp": {
+      "description": "Use the OpenMP device adapter."
+    },
+    "tbb": {
+      "description": "Use the Intel TBB device adapter.",
+      "dependencies": [
+        "tbb"
+      ]
+    }
+  }
+}
diff --git a/ports/vtk/0002-Qt-enforce-QT_NO_KEYWORDS-builds-by-VTK-itself.patch b/ports/vtk/0002-Qt-enforce-QT_NO_KEYWORDS-builds-by-VTK-itself.patch
deleted file mode 100644
index 56472dbff..000000000
--- a/ports/vtk/0002-Qt-enforce-QT_NO_KEYWORDS-builds-by-VTK-itself.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 20dd0370d7ad685b7fbdb1625ffec60c940980f3 Mon Sep 17 00:00:00 2001
-From: Ben Boeckel <ben.boeckel@kitware.com>
-Date: Fri, 17 Apr 2020 15:02:15 -0400
-Subject: [PATCH 2/2] Qt: enforce QT_NO_KEYWORDS builds by VTK itself
-
----
- GUISupport/Qt/CMakeLists.txt | 1 +
- Views/Qt/CMakeLists.txt      | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/GUISupport/Qt/CMakeLists.txt b/GUISupport/Qt/CMakeLists.txt
-index bfa63a94f1..3fc6fe4bd9 100644
---- a/GUISupport/Qt/CMakeLists.txt
-+++ b/GUISupport/Qt/CMakeLists.txt
-@@ -47,4 +47,5 @@ vtk_module_add_module(VTK::GUISupportQt
-   HEADERS ${headers}
-   PRIVATE_HEADERS ${private_headers})
- 
-+vtk_module_definitions(VTK::GUISupportQt PRIVATE QT_NO_KEYWORDS)
- vtk_module_link(VTK::GUISupportQt PUBLIC Qt5::Widgets)
-diff --git a/Views/Qt/CMakeLists.txt b/Views/Qt/CMakeLists.txt
-index 7684118e40..b697571dd2 100644
---- a/Views/Qt/CMakeLists.txt
-+++ b/Views/Qt/CMakeLists.txt
-@@ -17,4 +17,5 @@ set(CMAKE_AUTOMOC 1)
- vtk_module_add_module(VTK::ViewsQt
-   CLASSES ${classes})
- 
-+vtk_module_definitions(VTK::ViewsQt PRIVATE QT_NO_KEYWORDS)
- vtk_module_link(VTK::ViewsQt PRIVATE Qt5::Widgets)
--- 
-2.30.0.windows.1
-
diff --git a/ports/vtk/156fb524.patch b/ports/vtk/156fb524.patch
new file mode 100644
index 000000000..716fd5c7e
--- /dev/null
+++ b/ports/vtk/156fb524.patch
@@ -0,0 +1,393 @@
+diff --git a/Accelerators/Vtkm/Filters/CMakeLists.txt b/Accelerators/Vtkm/Filters/CMakeLists.txt
+index 14e84f1dd6e8b9da275045fe5d80868b2e52ad5a..3a41bc4d2bffca8c3df79da218443b90f8ceb7d3 100644
+--- a/Accelerators/Vtkm/Filters/CMakeLists.txt
++++ b/Accelerators/Vtkm/Filters/CMakeLists.txt
+@@ -46,6 +46,10 @@ foreach (class IN LISTS impl_classes)
+   list(APPEND headers "${class}.h")
+ endforeach ()
+ 
++list(APPEND sources
++  "vtkmClipInstantiationsWithField.cxx"
++  "vtkmClipInstantiationsWithImplicitFunction.cxx")
++
+ configure_file(
+   "${CMAKE_CURRENT_SOURCE_DIR}/vtkmConfigFilters.h.in"
+   "${CMAKE_CURRENT_BINARY_DIR}/vtkmConfigFilters.h"
+diff --git a/Accelerators/Vtkm/Filters/vtkmClip.cxx b/Accelerators/Vtkm/Filters/vtkmClip.cxx
+index 0b1dc86d3bedd425d4846f524818a68ada052ce9..65fec3110ebb6522900cbc965c5298031921e1e4 100644
+--- a/Accelerators/Vtkm/Filters/vtkmClip.cxx
++++ b/Accelerators/Vtkm/Filters/vtkmClip.cxx
+@@ -14,6 +14,7 @@
+ =========================================================================*/
+ 
+ #include "vtkmClip.h"
++#include "vtkmClipInternals.h"
+ 
+ #include "vtkCellIterator.h"
+ #include "vtkDataArray.h"
+@@ -36,11 +37,9 @@
+ 
+ #include "vtkmFilterPolicy.h"
+ 
++#include <vtkm/cont/DataSet.h>
+ #include <vtkm/cont/RuntimeDeviceTracker.h>
+ 
+-#include <vtkm/filter/ClipWithField.h>
+-#include <vtkm/filter/ClipWithImplicitFunction.h>
+-
+ #include <algorithm>
+ 
+ vtkStandardNewMacro(vtkmClip);
+@@ -50,19 +49,17 @@ void vtkmClip::PrintSelf(std::ostream& os, vtkIndent indent)
+ {
+   this->Superclass::PrintSelf(os, indent);
+ 
+-  os << indent << "ClipValue: " << this->ClipValue << "\n";
++  os << indent << "ClipValue: " << this->GetClipValue() << "\n";
+   os << indent << "ClipFunction: \n";
+-  this->ClipFunction->PrintSelf(os, indent.GetNextIndent());
+-  os << indent << "ComputeScalars: " << this->ComputeScalars << "\n";
++  this->GetClipFunction()->PrintSelf(os, indent.GetNextIndent());
++  os << indent << "ComputeScalars: " << this->GetComputeScalars() << "\n";
+ }
+ 
+ //------------------------------------------------------------------------------
+ vtkmClip::vtkmClip()
+-  : ClipValue(0.)
+-  , ComputeScalars(true)
+-  , ClipFunction(nullptr)
+-  , ClipFunctionConverter(new tovtkm::ImplicitFunctionConverter)
++  : Internals(new vtkmClip::internals)
+ {
++  this->Internals->ClipFunctionConverter.reset(new tovtkm::ImplicitFunctionConverter());
+   // Clip active point scalars by default
+   this->SetInputArrayToProcess(
+     0, 0, 0, vtkDataObject::FIELD_ASSOCIATION_POINTS, vtkDataSetAttributes::SCALARS);
+@@ -75,24 +72,54 @@ vtkmClip::~vtkmClip() = default;
+ vtkMTimeType vtkmClip::GetMTime()
+ {
+   vtkMTimeType mTime = this->Superclass::GetMTime();
+-  if (this->ClipFunction)
++  if (this->GetClipFunction())
+   {
+-    mTime = std::max(mTime, this->ClipFunction->GetMTime());
++    mTime = std::max(mTime, this->GetClipFunction()->GetMTime());
+   }
+   return mTime;
+ }
+ 
++//------------------------------------------------------------------------------
++double vtkmClip::GetClipValue()
++{
++  return this->Internals->ClipValue;
++}
++
++//------------------------------------------------------------------------------
++void vtkmClip::SetClipValue(double val)
++{
++  this->Internals->ClipValue = val;
++}
++
++//------------------------------------------------------------------------------
++bool vtkmClip::GetComputeScalars()
++{
++  return this->Internals->ComputeScalars;
++}
++
++//------------------------------------------------------------------------------
++void vtkmClip::SetComputeScalars(bool val)
++{
++  this->Internals->ComputeScalars = val;
++}
++
+ //------------------------------------------------------------------------------
+ void vtkmClip::SetClipFunction(vtkImplicitFunction* clipFunction)
+ {
+-  if (this->ClipFunction != clipFunction)
++  if (this->GetClipFunction() != clipFunction)
+   {
+-    this->ClipFunction = clipFunction;
+-    this->ClipFunctionConverter->Set(clipFunction);
++    this->Internals->ClipFunction = clipFunction;
++    this->Internals->ClipFunctionConverter->Set(clipFunction);
+     this->Modified();
+   }
+ }
+ 
++//------------------------------------------------------------------------------
++vtkImplicitFunction* vtkmClip::GetClipFunction()
++{
++  return this->Internals->ClipFunction;
++}
++
+ //------------------------------------------------------------------------------
+ int vtkmClip::RequestData(
+   vtkInformation*, vtkInformationVector** inInfoVec, vtkInformationVector* outInfoVec)
+@@ -111,7 +138,7 @@ int vtkmClip::RequestData(
+   // Find the scalar array:
+   int assoc = this->GetInputArrayAssociation(0, inInfoVec);
+   vtkDataArray* scalars = this->GetInputArrayToProcess(0, inInfoVec);
+-  if (!this->ClipFunction &&
++  if (!this->GetClipFunction() &&
+     (assoc != vtkDataObject::FIELD_ASSOCIATION_POINTS || scalars == nullptr ||
+       scalars->GetName() == nullptr || scalars->GetName()[0] == '\0'))
+   {
+@@ -129,37 +156,18 @@ int vtkmClip::RequestData(
+   {
+     // Convert inputs to vtkm objects:
+     auto fieldsFlag =
+-      this->ComputeScalars ? tovtkm::FieldsFlag::PointsAndCells : tovtkm::FieldsFlag::None;
++      this->GetComputeScalars() ? tovtkm::FieldsFlag::PointsAndCells : tovtkm::FieldsFlag::None;
+     auto in = tovtkm::Convert(input, fieldsFlag);
+ 
+     // Run filter:
+     vtkm::cont::DataSet result;
+-    if (this->ClipFunction)
++    if (this->GetClipFunction())
+     {
+-      vtkm::filter::ClipWithImplicitFunction functionFilter;
+-      auto function = this->ClipFunctionConverter->Get();
+-      if (function.GetValid())
+-      {
+-        functionFilter.SetImplicitFunction(function);
+-        result = functionFilter.Execute(in);
+-      }
++      result = this->Internals->ExecuteClipWithImplicitFunction(in);
+     }
+     else
+     {
+-      vtkm::filter::ClipWithField fieldFilter;
+-      if (!this->ComputeScalars)
+-      {
+-        // explicitly convert just the field we need
+-        auto inField = tovtkm::Convert(scalars, assoc);
+-        in.AddField(inField);
+-        // don't pass this field
+-        fieldFilter.SetFieldsToPass(
+-          vtkm::filter::FieldSelection(vtkm::filter::FieldSelection::MODE_NONE));
+-      }
+-
+-      fieldFilter.SetActiveField(scalars->GetName(), vtkm::cont::Field::Association::POINTS);
+-      fieldFilter.SetClipValue(this->ClipValue);
+-      result = fieldFilter.Execute(in);
++      result = this->Internals->ExecuteClipWithField(in, scalars, assoc);
+     }
+ 
+     // Convert result to output:
+@@ -169,7 +177,7 @@ int vtkmClip::RequestData(
+       return 0;
+     }
+ 
+-    if (!this->ClipFunction && this->ComputeScalars)
++    if (!this->GetClipFunction() && this->GetComputeScalars())
+     {
+       output->GetPointData()->SetActiveScalars(scalars->GetName());
+     }
+@@ -189,8 +197,8 @@ int vtkmClip::RequestData(
+                       << "Falling back to serial implementation.");
+ 
+       vtkNew<vtkTableBasedClipDataSet> filter;
+-      filter->SetClipFunction(this->ClipFunction);
+-      filter->SetValue(this->ClipValue);
++      filter->SetClipFunction(this->GetClipFunction());
++      filter->SetValue(this->GetClipValue());
+       filter->SetInputData(input);
+       filter->Update();
+       output->ShallowCopy(filter->GetOutput());
+diff --git a/Accelerators/Vtkm/Filters/vtkmClip.h b/Accelerators/Vtkm/Filters/vtkmClip.h
+index edb3cebfadc9ebeddf3c5030716ba532c0e149fe..6f33d36460d72de340eb81bb321ee868d70e6b5b 100644
+--- a/Accelerators/Vtkm/Filters/vtkmClip.h
++++ b/Accelerators/Vtkm/Filters/vtkmClip.h
+@@ -32,13 +32,6 @@
+ 
+ class vtkImplicitFunction;
+ 
+-namespace tovtkm
+-{
+-
+-class ImplicitFunctionConverter;
+-
+-} // namespace tovtkm
+-
+ class VTKACCELERATORSVTKMFILTERS_EXPORT vtkmClip : public vtkUnstructuredGridAlgorithm
+ {
+ public:
+@@ -50,15 +43,15 @@ public:
+    * The scalar value to use when clipping the dataset. Values greater than
+    * ClipValue are preserved in the output dataset. Default is 0.
+    */
+-  vtkGetMacro(ClipValue, double);
+-  vtkSetMacro(ClipValue, double);
++  double GetClipValue();
++  void SetClipValue(double);
+ 
+   /**
+    * If true, all input point data arrays will be mapped onto the output
+    * dataset. Default is true.
+    */
+-  vtkGetMacro(ComputeScalars, bool);
+-  vtkSetMacro(ComputeScalars, bool);
++  bool GetComputeScalars();
++  void SetComputeScalars(bool);
+ 
+   /**
+    * Set the implicit function with which to perform the clipping. If set,
+@@ -66,7 +59,7 @@ public:
+    * function.
+    */
+   void SetClipFunction(vtkImplicitFunction*);
+-  vtkGetObjectMacro(ClipFunction, vtkImplicitFunction);
++  vtkImplicitFunction* GetClipFunction();
+ 
+   vtkMTimeType GetMTime() override;
+ 
+@@ -87,17 +80,13 @@ protected:
+   ~vtkmClip() override;
+ 
+   int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override;
+-
+   int FillInputPortInformation(int port, vtkInformation* info) override;
+ 
+-  double ClipValue;
+-  bool ComputeScalars;
+-
+-  vtkImplicitFunction* ClipFunction;
+-  std::unique_ptr<tovtkm::ImplicitFunctionConverter> ClipFunctionConverter;
+-
+   vtkTypeBool ForceVTKm = false;
+ 
++  struct internals;
++  std::unique_ptr<internals> Internals;
++
+ private:
+   vtkmClip(const vtkmClip&) = delete;
+   void operator=(const vtkmClip&) = delete;
+diff --git a/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithField.cxx b/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithField.cxx
+new file mode 100644
+index 0000000000000000000000000000000000000000..e81b5cdab62a436ef09afac33ffa0599cb9dd2a8
+--- /dev/null
++++ b/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithField.cxx
+@@ -0,0 +1,39 @@
++/*=========================================================================
++
++  Program:   Visualization Toolkit
++  Module:    vtkmClipInstantiationsWithField.cxx
++
++  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
++  All rights reserved.
++  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
++
++     This software is distributed WITHOUT ANY WARRANTY; without even
++     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
++     PURPOSE.  See the above copyright notice for more information.
++
++=========================================================================*/
++
++#include "vtkmClipInternals.h"
++#include "vtkmlib/DataSetConverters.h"
++
++#include <vtkm/filter/ClipWithField.h>
++
++//------------------------------------------------------------------------------
++vtkm::cont::DataSet vtkmClip::internals::ExecuteClipWithField(
++  vtkm::cont::DataSet& in, vtkDataArray* scalars, int assoc)
++{
++  vtkm::filter::ClipWithField fieldFilter;
++  if (!this->ComputeScalars)
++  {
++    // explicitly convert just the field we need
++    auto inField = tovtkm::Convert(scalars, assoc);
++    in.AddField(inField);
++    // don't pass this field
++    fieldFilter.SetFieldsToPass(
++      vtkm::filter::FieldSelection(vtkm::filter::FieldSelection::MODE_NONE));
++  }
++
++  fieldFilter.SetActiveField(scalars->GetName(), vtkm::cont::Field::Association::POINTS);
++  fieldFilter.SetClipValue(this->ClipValue);
++  return fieldFilter.Execute(in);
++}
+diff --git a/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx b/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx
+new file mode 100644
+index 0000000000000000000000000000000000000000..04a637a92d487b019742bbf81884750c48ba105d
+--- /dev/null
++++ b/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx
+@@ -0,0 +1,35 @@
++/*=========================================================================
++
++  Program:   Visualization Toolkit
++  Module:    vtkmClipInstantiationsWithImplicitFunction.cxx
++
++  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
++  All rights reserved.
++  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
++
++     This software is distributed WITHOUT ANY WARRANTY; without even
++     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
++     PURPOSE.  See the above copyright notice for more information.
++
++=========================================================================*/
++
++#include "vtkmClipInternals.h"
++#include "vtkmlib/DataSetConverters.h"
++
++#include <vtkm/filter/ClipWithImplicitFunction.h>
++
++//------------------------------------------------------------------------------
++vtkm::cont::DataSet vtkmClip::internals::ExecuteClipWithImplicitFunction(vtkm::cont::DataSet& in)
++{
++  auto function = this->ClipFunctionConverter->Get();
++
++  vtkm::cont::DataSet result;
++  if (function.GetValid())
++  {
++    vtkm::filter::ClipWithImplicitFunction functionFilter;
++    functionFilter.SetImplicitFunction(function);
++    result = functionFilter.Execute(in);
++  }
++
++  return result;
++}
+diff --git a/Accelerators/Vtkm/Filters/vtkmClipInternals.h b/Accelerators/Vtkm/Filters/vtkmClipInternals.h
+new file mode 100644
+index 0000000000000000000000000000000000000000..5384347bf9d48f04f5d2847753c92b64fc82346e
+--- /dev/null
++++ b/Accelerators/Vtkm/Filters/vtkmClipInternals.h
+@@ -0,0 +1,37 @@
++/*=========================================================================
++
++  Program:   Visualization Toolkit
++  Module:    vtkmClipInternals.h
++
++  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
++  All rights reserved.
++  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
++
++     This software is distributed WITHOUT ANY WARRANTY; without even
++     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
++     PURPOSE.  See the above copyright notice for more information.
++
++=========================================================================*/
++
++#ifndef vtkmClipInternals_h
++#define vtkmClipInternals_h
++
++#include "vtkDataArray.h"
++#include "vtkmClip.h"
++#include "vtkmlib/ImplicitFunctionConverter.h"
++
++#include <vtkm/cont/DataSet.h>
++
++struct vtkmClip::internals
++{
++  double ClipValue = .0;
++  bool ComputeScalars = true;
++
++  vtkImplicitFunction* ClipFunction = nullptr;
++  std::unique_ptr<tovtkm::ImplicitFunctionConverter> ClipFunctionConverter;
++
++  vtkm::cont::DataSet ExecuteClipWithImplicitFunction(vtkm::cont::DataSet&);
++  vtkm::cont::DataSet ExecuteClipWithField(vtkm::cont::DataSet&, vtkDataArray*, int);
++};
++
++#endif
diff --git a/ports/vtk/1f00a0c9.patch b/ports/vtk/1f00a0c9.patch
new file mode 100644
index 000000000..4cd8f1963
--- /dev/null
+++ b/ports/vtk/1f00a0c9.patch
@@ -0,0 +1,185 @@
+diff --git a/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx b/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx
+index da8f2e6498c2a08165500fc458eb3c9c7dc0b7e6..147c3c6e175dbd342095805750bfc4fee81735dc 100644
+--- a/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx
++++ b/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx
+@@ -265,7 +265,7 @@ vtkIdType vtkmDataSet::FindPoint(double x[3])
+     std::lock_guard<std::mutex> lock(locator.lock);
+     if (locator.buildTime < this->GetMTime())
+     {
+-      locator.control.reset(new vtkm::cont::PointLocatorUniformGrid);
++      locator.control.reset(new vtkm::cont::PointLocatorSparseGrid);
+       locator.control->SetCoordinates(this->Internals->Coordinates);
+       locator.control->Update();
+       locator.buildTime = this->GetMTime();
+diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/DataSetConverters.cxx b/Accelerators/Vtkm/DataModel/vtkmlib/DataSetConverters.cxx
+index f311f90e17814a05d082a0df67108f242018bb69..7ecfa50e4aa9922987fd33f7b29eb1bf4be3577a 100644
+--- a/Accelerators/Vtkm/DataModel/vtkmlib/DataSetConverters.cxx
++++ b/Accelerators/Vtkm/DataModel/vtkmlib/DataSetConverters.cxx
+@@ -240,11 +240,11 @@ bool Convert(const vtkm::cont::DataSet& vtkmOut, vtkRectilinearGrid* output, vtk
+   auto coordsArray = vtkm::cont::Cast<coordType>(vtkmOut.GetCoordinateSystem().GetData());
+ 
+   vtkSmartPointer<vtkDataArray> xArray =
+-    Convert(vtkm::cont::make_FieldPoint("xArray", coordsArray.GetStorage().GetFirstArray()));
++    Convert(vtkm::cont::make_FieldPoint("xArray", coordsArray.GetFirstArray()));
+   vtkSmartPointer<vtkDataArray> yArray =
+-    Convert(vtkm::cont::make_FieldPoint("yArray", coordsArray.GetStorage().GetSecondArray()));
++    Convert(vtkm::cont::make_FieldPoint("yArray", coordsArray.GetSecondArray()));
+   vtkSmartPointer<vtkDataArray> zArray =
+-    Convert(vtkm::cont::make_FieldPoint("zArray", coordsArray.GetStorage().GetThirdArray()));
++    Convert(vtkm::cont::make_FieldPoint("zArray", coordsArray.GetThirdArray()));
+ 
+   if (!xArray || !yArray || !zArray)
+   {
+diff --git a/Accelerators/Vtkm/Filters/vtkmAverageToCells.cxx b/Accelerators/Vtkm/Filters/vtkmAverageToCells.cxx
+index 334ec1219dd269e323ae11e61a5a68e9e6e3d2e7..ed9d58fe91713a12e7b2588471275e694f71f618 100644
+--- a/Accelerators/Vtkm/Filters/vtkmAverageToCells.cxx
++++ b/Accelerators/Vtkm/Filters/vtkmAverageToCells.cxx
+@@ -27,7 +27,6 @@
+ #include "vtkmFilterPolicy.h"
+ 
+ #include <vtkm/filter/CellAverage.h>
+-#include <vtkm/filter/CellAverage.hxx>
+ 
+ vtkStandardNewMacro(vtkmAverageToCells);
+ 
+diff --git a/Accelerators/Vtkm/Filters/vtkmAverageToPoints.cxx b/Accelerators/Vtkm/Filters/vtkmAverageToPoints.cxx
+index 1003f88c4d4e1dcf0be24b7f9f4e6d58e4e735f0..00c722f3162ebb042fb3973bb28a3c1c2fb48c45 100644
+--- a/Accelerators/Vtkm/Filters/vtkmAverageToPoints.cxx
++++ b/Accelerators/Vtkm/Filters/vtkmAverageToPoints.cxx
+@@ -28,7 +28,6 @@
+ #include "vtkmFilterPolicy.h"
+ 
+ #include <vtkm/filter/PointAverage.h>
+-#include <vtkm/filter/PointAverage.hxx>
+ 
+ vtkStandardNewMacro(vtkmAverageToPoints);
+ 
+diff --git a/Accelerators/Vtkm/Filters/vtkmCleanGrid.cxx b/Accelerators/Vtkm/Filters/vtkmCleanGrid.cxx
+index 98f0fdb70a296a8dd97df56f706f11e0aca20f32..0cfde7e99f8f07289b08310675ee16f438bc61be 100644
+--- a/Accelerators/Vtkm/Filters/vtkmCleanGrid.cxx
++++ b/Accelerators/Vtkm/Filters/vtkmCleanGrid.cxx
+@@ -30,7 +30,6 @@
+ #include "vtkmFilterPolicy.h"
+ 
+ #include <vtkm/filter/CleanGrid.h>
+-#include <vtkm/filter/CleanGrid.hxx>
+ 
+ vtkStandardNewMacro(vtkmCleanGrid);
+ 
+diff --git a/Accelerators/Vtkm/Filters/vtkmClip.cxx b/Accelerators/Vtkm/Filters/vtkmClip.cxx
+index 2649b2da024310f58159574758d278318e23f4b9..0b1dc86d3bedd425d4846f524818a68ada052ce9 100644
+--- a/Accelerators/Vtkm/Filters/vtkmClip.cxx
++++ b/Accelerators/Vtkm/Filters/vtkmClip.cxx
+@@ -39,9 +39,7 @@
+ #include <vtkm/cont/RuntimeDeviceTracker.h>
+ 
+ #include <vtkm/filter/ClipWithField.h>
+-#include <vtkm/filter/ClipWithField.hxx>
+ #include <vtkm/filter/ClipWithImplicitFunction.h>
+-#include <vtkm/filter/ClipWithImplicitFunction.hxx>
+ 
+ #include <algorithm>
+ 
+diff --git a/Accelerators/Vtkm/Filters/vtkmContour.cxx b/Accelerators/Vtkm/Filters/vtkmContour.cxx
+index c9d35a544641a629ee4fb4f54c4d8245be8e6fd5..eae3a03398ffeef8b0f8ec449f89163f8c275122 100644
+--- a/Accelerators/Vtkm/Filters/vtkmContour.cxx
++++ b/Accelerators/Vtkm/Filters/vtkmContour.cxx
+@@ -33,7 +33,6 @@
+ 
+ #include <vtkm/cont/RuntimeDeviceTracker.h>
+ #include <vtkm/filter/Contour.h>
+-#include <vtkm/filter/Contour.hxx>
+ 
+ vtkStandardNewMacro(vtkmContour);
+ 
+diff --git a/Accelerators/Vtkm/Filters/vtkmExternalFaces.cxx b/Accelerators/Vtkm/Filters/vtkmExternalFaces.cxx
+index 58969b5707aab56e6fcd6300ca650c9b2d88e32f..3661060164d738eb9055316fd6c0b023b09ef72f 100644
+--- a/Accelerators/Vtkm/Filters/vtkmExternalFaces.cxx
++++ b/Accelerators/Vtkm/Filters/vtkmExternalFaces.cxx
+@@ -33,7 +33,6 @@
+ #include "vtkmFilterPolicy.h"
+ 
+ #include <vtkm/filter/ExternalFaces.h>
+-#include <vtkm/filter/ExternalFaces.hxx>
+ 
+ vtkStandardNewMacro(vtkmExternalFaces);
+ 
+diff --git a/Accelerators/Vtkm/Filters/vtkmExtractVOI.cxx b/Accelerators/Vtkm/Filters/vtkmExtractVOI.cxx
+index 3606f28de2229436afbcb8b0cf3ed61430055b8e..32bf94f630931a0d052cf5880d950df4588046cb 100644
+--- a/Accelerators/Vtkm/Filters/vtkmExtractVOI.cxx
++++ b/Accelerators/Vtkm/Filters/vtkmExtractVOI.cxx
+@@ -27,7 +27,6 @@
+ #include "vtkmFilterPolicy.h"
+ 
+ #include "vtkm/filter/ExtractStructured.h"
+-#include "vtkm/filter/ExtractStructured.hxx"
+ 
+ vtkStandardNewMacro(vtkmExtractVOI);
+ 
+diff --git a/Accelerators/Vtkm/Filters/vtkmGradient.cxx b/Accelerators/Vtkm/Filters/vtkmGradient.cxx
+index 9b79c9e5a5e434ae810df73b51bc6bf52cefa829..6aa284878c88e2fcaf243f6721477536891f002f 100644
+--- a/Accelerators/Vtkm/Filters/vtkmGradient.cxx
++++ b/Accelerators/Vtkm/Filters/vtkmGradient.cxx
+@@ -31,7 +31,6 @@
+ 
+ #include <vtkm/filter/Gradient.h>
+ #include <vtkm/filter/PointAverage.h>
+-#include <vtkm/filter/PointAverage.hxx>
+ 
+ vtkStandardNewMacro(vtkmGradient);
+ 
+diff --git a/Accelerators/Vtkm/Filters/vtkmHistogram.cxx b/Accelerators/Vtkm/Filters/vtkmHistogram.cxx
+index ed09a73d938997fe0dab1ae7eb4338f4914bad15..c13fd742477686e2dd51e95c4757628630788a77 100644
+--- a/Accelerators/Vtkm/Filters/vtkmHistogram.cxx
++++ b/Accelerators/Vtkm/Filters/vtkmHistogram.cxx
+@@ -32,7 +32,6 @@
+ #include "vtkSmartPointer.h"
+ 
+ #include "vtkmFilterPolicy.h"
+-#include <vtkm/cont/ArrayRangeCompute.hxx>
+ #include <vtkm/filter/Histogram.h>
+ 
+ vtkStandardNewMacro(vtkmHistogram);
+diff --git a/Accelerators/Vtkm/Filters/vtkmLevelOfDetail.cxx b/Accelerators/Vtkm/Filters/vtkmLevelOfDetail.cxx
+index 04ccdce35f14b708c111302c759b5d328225cdef..db8d3f64b5e9b96f9b3e491f044056b14ae1bcdd 100644
+--- a/Accelerators/Vtkm/Filters/vtkmLevelOfDetail.cxx
++++ b/Accelerators/Vtkm/Filters/vtkmLevelOfDetail.cxx
+@@ -33,7 +33,6 @@
+ #include <vtkm/filter/VertexClustering.h>
+ // To handle computing custom coordinate sets bounds we need to include
+ // the following
+-#include <vtkm/cont/ArrayRangeCompute.hxx>
+ 
+ vtkStandardNewMacro(vtkmLevelOfDetail);
+ 
+diff --git a/Accelerators/Vtkm/Filters/vtkmPointTransform.cxx b/Accelerators/Vtkm/Filters/vtkmPointTransform.cxx
+index 9906573f18312cb803e5ab2bce30218e4f95772c..685fb618764fc62969b5373cd922aaea7d1311e3 100644
+--- a/Accelerators/Vtkm/Filters/vtkmPointTransform.cxx
++++ b/Accelerators/Vtkm/Filters/vtkmPointTransform.cxx
+@@ -33,7 +33,6 @@
+ 
+ #include "vtkm/cont/Error.h"
+ #include "vtkm/filter/PointTransform.h"
+-#include "vtkm/filter/PointTransform.hxx"
+ 
+ #include "vtkmFilterPolicy.h"
+ 
+diff --git a/Accelerators/Vtkm/Filters/vtkmThreshold.cxx b/Accelerators/Vtkm/Filters/vtkmThreshold.cxx
+index 7604acd333978a72b1e34584d14640e097b34292..647514050c42771cda57b439280d238de72911e2 100644
+--- a/Accelerators/Vtkm/Filters/vtkmThreshold.cxx
++++ b/Accelerators/Vtkm/Filters/vtkmThreshold.cxx
+@@ -31,7 +31,6 @@
+ #include "vtkmFilterPolicy.h"
+ 
+ #include <vtkm/filter/Threshold.h>
+-#include <vtkm/filter/Threshold.hxx>
+ 
+ vtkStandardNewMacro(vtkmThreshold);
+ 
+diff --git a/ThirdParty/vtkm/vtkvtkm/vtk-m b/ThirdParty/vtkm/vtkvtkm/vtk-m
+index 0457427ed7b4d21e1a8e33e96713414ca11a42fc..ff7de5a72e917eac39f9a3c3a0002da5fa26c3f7 160000
+--- a/ThirdParty/vtkm/vtkvtkm/vtk-m
++++ b/ThirdParty/vtkm/vtkvtkm/vtk-m
+@@ -1 +1 @@
+-Subproject commit 0457427ed7b4d21e1a8e33e96713414ca11a42fc
++Subproject commit ff7de5a72e917eac39f9a3c3a0002da5fa26c3f7
diff --git a/ports/vtk/6811.patch b/ports/vtk/6811.patch
deleted file mode 100644
index 86dca7ea0..000000000
--- a/ports/vtk/6811.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 34b9d59acb1688f4a9f38908760d5756a0e05ee4 Mon Sep 17 00:00:00 2001
-From: Julien Schueller <schueller@phimeca.com>
-Date: Fri, 24 Apr 2020 08:28:23 -0400
-Subject: [PATCH] vtk_hdf5: Stick to 1.10.x API
-
-Closes #17866
----
- ThirdParty/hdf5/vtk_hdf5.h.in | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/ThirdParty/hdf5/vtk_hdf5.h.in b/ThirdParty/hdf5/vtk_hdf5.h.in
-index 1d802937ba..c4738b2cbf 100644
---- a/ThirdParty/hdf5/vtk_hdf5.h.in
-+++ b/ThirdParty/hdf5/vtk_hdf5.h.in
-@@ -18,6 +18,8 @@
- /* Use the hdf5 library configured for VTK.  */
- #cmakedefine01 VTK_MODULE_USE_EXTERNAL_vtkhdf5
- 
-+#define H5_USE_110_API
-+
- #if VTK_MODULE_USE_EXTERNAL_vtkhdf5
- #cmakedefine01 vtkhdf5_is_parallel
- #if vtkhdf5_is_parallel
--- 
-GitLab
-
diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL
deleted file mode 100644
index 64ca10961..000000000
--- a/ports/vtk/CONTROL
+++ /dev/null
@@ -1,50 +0,0 @@
-Source: vtk
-Version: 9.0.1
-Port-Version: 7
-Description: Software system for 3D computer graphics, image processing, and visualization
-Homepage: https://github.com/Kitware/VTK
-Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5[core], libjpeg-turbo, proj4, lz4, liblzma, libtheora, eigen3, double-conversion, pugixml, libharu[notiffsymbols], sqlite3, netcdf-c, utfcpp, libogg, pegtl-2
-
-Feature: vtkm
-Description: Build with vtk-m accelerator and module.
-Build-Depends:  vtk-m[core]
-
-Feature: openvr
-Description: OpenVR functionality for VTK
-Build-Depends: sdl2, openvr
-
-Feature: qt
-Description: Qt functionality for VTK
-Build-Depends: qt5-xmlpatterns, qt5-tools, qt5-imageformats, qt5-x11extras (linux)
-
-Feature: mpi
-Description: MPI functionality for VTK
-Build-Depends: mpi, hdf5[core, parallel], vtk-m[core,mpi]
-
-Feature: python
-Description: Python functionality for VTK
-Build-Depends: python3
-
-Feature: atlmfc
-Description: Mfc functionality for vtk on Windows
-Build-Depends: atlmfc (windows)
-
-Feature: paraview
-Description: Build vtk modules required by paraview
-Build-Depends: vtk[core, qt], vtk[core, atlmfc] (windows)
-
-Feature: cuda
-Description: Support CUDA compilation
-Build-Depends: cuda
-
-Feature: opengl
-Description: All opengl related modules
-Build-Depends: vtk[core]
-
-Feature: utf8
-Description: Enables vtk reader/writer with utf-8 path support
-Build-Depends: vtk[core]
-
-Feature: all
-Description: Build all vtk modules
-Build-Depends: libmysql, ffmpeg, gdal, vtk[core, qt, python, mpi], vtk[core, atlmfc, utf8] (windows)
diff --git a/ports/vtk/FindPostgreSQL.cmake b/ports/vtk/FindPostgreSQL.cmake
deleted file mode 100644
index 913c8b9ae..000000000
--- a/ports/vtk/FindPostgreSQL.cmake
+++ /dev/null
@@ -1,269 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#[=======================================================================[.rst:
-FindPostgreSQL
---------------
-
-Find the PostgreSQL installation.
-
-IMPORTED Targets
-^^^^^^^^^^^^^^^^
-
-This module defines :prop_tgt:`IMPORTED` target ``PostgreSQL::PostgreSQL``
-if PostgreSQL has been found.
-
-Result Variables
-^^^^^^^^^^^^^^^^
-
-This module will set the following variables in your project:
-
-``PostgreSQL_FOUND``
-  True if PostgreSQL is found.
-``PostgreSQL_LIBRARIES``
-  the PostgreSQL libraries needed for linking
-``PostgreSQL_INCLUDE_DIRS``
-  the directories of the PostgreSQL headers
-``PostgreSQL_LIBRARY_DIRS``
-  the link directories for PostgreSQL libraries
-``PostgreSQL_VERSION_STRING``
-  the version of PostgreSQL found
-#]=======================================================================]
-
-# ----------------------------------------------------------------------------
-# History:
-# This module is derived from the module originally found in the VTK source tree.
-#
-# ----------------------------------------------------------------------------
-# Note:
-# PostgreSQL_ADDITIONAL_VERSIONS is a variable that can be used to set the
-# version number of the implementation of PostgreSQL.
-# In Windows the default installation of PostgreSQL uses that as part of the path.
-# E.g C:\Program Files\PostgreSQL\8.4.
-# Currently, the following version numbers are known to this module:
-# "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0"
-#
-# To use this variable just do something like this:
-# set(PostgreSQL_ADDITIONAL_VERSIONS "9.2" "8.4.4")
-# before calling find_package(PostgreSQL) in your CMakeLists.txt file.
-# This will mean that the versions you set here will be found first in the order
-# specified before the default ones are searched.
-#
-# ----------------------------------------------------------------------------
-# You may need to manually set:
-#  PostgreSQL_INCLUDE_DIR  - the path to where the PostgreSQL include files are.
-#  PostgreSQL_LIBRARY_DIR  - The path to where the PostgreSQL library files are.
-# If FindPostgreSQL.cmake cannot find the include files or the library files.
-#
-# ----------------------------------------------------------------------------
-# The following variables are set if PostgreSQL is found:
-#  PostgreSQL_FOUND         - Set to true when PostgreSQL is found.
-#  PostgreSQL_INCLUDE_DIRS  - Include directories for PostgreSQL
-#  PostgreSQL_LIBRARY_DIRS  - Link directories for PostgreSQL libraries
-#  PostgreSQL_LIBRARIES     - The PostgreSQL libraries.
-#
-# The ``PostgreSQL::PostgreSQL`` imported target is also created.
-#
-# ----------------------------------------------------------------------------
-# If you have installed PostgreSQL in a non-standard location.
-# (Please note that in the following comments, it is assumed that <Your Path>
-# points to the root directory of the include directory of PostgreSQL.)
-# Then you have three options.
-# 1) After CMake runs, set PostgreSQL_INCLUDE_DIR to <Your Path>/include and
-#    PostgreSQL_LIBRARY_DIR to wherever the library pq (or libpq in windows) is
-# 2) Use CMAKE_INCLUDE_PATH to set a path to <Your Path>/PostgreSQL<-version>. This will allow find_path()
-#    to locate PostgreSQL_INCLUDE_DIR by utilizing the PATH_SUFFIXES option. e.g. In your CMakeLists.txt file
-#    set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "<Your Path>/include")
-# 3) Set an environment variable called ${PostgreSQL_ROOT} that points to the root of where you have
-#    installed PostgreSQL, e.g. <Your Path>.
-#
-# ----------------------------------------------------------------------------
-
-set(PostgreSQL_INCLUDE_PATH_DESCRIPTION "top-level directory containing the PostgreSQL include directories. E.g /usr/local/include/PostgreSQL/8.4 or C:/Program Files/PostgreSQL/8.4/include")
-set(PostgreSQL_INCLUDE_DIR_MESSAGE "Set the PostgreSQL_INCLUDE_DIR cmake cache entry to the ${PostgreSQL_INCLUDE_PATH_DESCRIPTION}")
-set(PostgreSQL_LIBRARY_PATH_DESCRIPTION "top-level directory containing the PostgreSQL libraries.")
-set(PostgreSQL_LIBRARY_DIR_MESSAGE "Set the PostgreSQL_LIBRARY_DIR cmake cache entry to the ${PostgreSQL_LIBRARY_PATH_DESCRIPTION}")
-set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to where PostgreSQL is found on the machine E.g C:/Program Files/PostgreSQL/8.4")
-
-
-set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
-    "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
-
-# Define additional search paths for root directories.
-set( PostgreSQL_ROOT_DIRECTORIES
-   ENV PostgreSQL_ROOT
-   ${PostgreSQL_ROOT}
-)
-foreach(suffix ${PostgreSQL_KNOWN_VERSIONS})
-  if(WIN32)
-    list(APPEND PostgreSQL_LIBRARY_ADDITIONAL_SEARCH_SUFFIXES
-        "PostgreSQL/${suffix}/lib")
-    list(APPEND PostgreSQL_INCLUDE_ADDITIONAL_SEARCH_SUFFIXES
-        "PostgreSQL/${suffix}/include")
-    list(APPEND PostgreSQL_TYPE_ADDITIONAL_SEARCH_SUFFIXES
-        "PostgreSQL/${suffix}/include/server")
-  endif()
-  if(UNIX)
-    list(APPEND PostgreSQL_LIBRARY_ADDITIONAL_SEARCH_SUFFIXES
-        "pgsql-${suffix}/lib")
-    list(APPEND PostgreSQL_INCLUDE_ADDITIONAL_SEARCH_SUFFIXES
-        "pgsql-${suffix}/include")
-    list(APPEND PostgreSQL_TYPE_ADDITIONAL_SEARCH_SUFFIXES
-        "postgresql/${suffix}/server"
-        "pgsql-${suffix}/include/server")
-  endif()
-endforeach()
-
-#
-# Look for an installation.
-#
-find_path(PostgreSQL_INCLUDE_DIR
-  NAMES libpq-fe.h
-  PATHS
-   # Look in other places.
-   ${PostgreSQL_ROOT_DIRECTORIES}
-  PATH_SUFFIXES
-    pgsql
-    postgresql
-    include
-    ${PostgreSQL_INCLUDE_ADDITIONAL_SEARCH_SUFFIXES}
-  # Help the user find it if we cannot.
-  DOC "The ${PostgreSQL_INCLUDE_DIR_MESSAGE}"
-)
-
-find_path(PostgreSQL_TYPE_INCLUDE_DIR
-  NAMES catalog/pg_type.h
-  PATHS
-   # Look in other places.
-   ${PostgreSQL_ROOT_DIRECTORIES}
-  PATH_SUFFIXES
-    postgresql
-    pgsql/server
-    postgresql/server
-    include/server
-    ${PostgreSQL_TYPE_ADDITIONAL_SEARCH_SUFFIXES}
-  # Help the user find it if we cannot.
-  DOC "The ${PostgreSQL_INCLUDE_DIR_MESSAGE}"
-)
-
-# The PostgreSQL library.
-set (PostgreSQL_LIBRARY_TO_FIND pq)
-# Setting some more prefixes for the library
-set (PostgreSQL_LIB_PREFIX "")
-if ( WIN32 )
-  set (PostgreSQL_LIB_PREFIX ${PostgreSQL_LIB_PREFIX} "lib")
-  set (PostgreSQL_LIBRARY_TO_FIND ${PostgreSQL_LIB_PREFIX}${PostgreSQL_LIBRARY_TO_FIND})
-endif()
-
-function(__postgresql_find_library _name)
-  find_library(${_name}
-   NAMES ${ARGN}
-   PATHS
-     ${PostgreSQL_ROOT_DIRECTORIES}
-   PATH_SUFFIXES
-     lib
-     ${PostgreSQL_LIBRARY_ADDITIONAL_SEARCH_SUFFIXES}
-   # Help the user find it if we cannot.
-   DOC "The ${PostgreSQL_LIBRARY_DIR_MESSAGE}"
-  )
-endfunction()
-
-# For compatibility with versions prior to this multi-config search, honor
-# any PostgreSQL_LIBRARY that is already specified and skip the search.
-if(PostgreSQL_LIBRARY)
-  set(PostgreSQL_LIBRARIES "${PostgreSQL_LIBRARY}")
-  get_filename_component(PostgreSQL_LIBRARY_DIR "${PostgreSQL_LIBRARY}" PATH)
-else()
-  __postgresql_find_library(PostgreSQL_LIBRARY_RELEASE ${PostgreSQL_LIBRARY_TO_FIND})
-  __postgresql_find_library(PostgreSQL_LIBRARY_DEBUG ${PostgreSQL_LIBRARY_TO_FIND}d)
-  include(SelectLibraryConfigurations)
-  select_library_configurations(PostgreSQL)
-  mark_as_advanced(PostgreSQL_LIBRARY_RELEASE PostgreSQL_LIBRARY_DEBUG)
-  if(PostgreSQL_LIBRARY_RELEASE)
-    get_filename_component(PostgreSQL_LIBRARY_DIR "${PostgreSQL_LIBRARY_RELEASE}" PATH)
-  elseif(PostgreSQL_LIBRARY_DEBUG)
-    get_filename_component(PostgreSQL_LIBRARY_DIR "${PostgreSQL_LIBRARY_DEBUG}" PATH)
-  else()
-    set(PostgreSQL_LIBRARY_DIR "")
-  endif()
-endif()
-
-if (PostgreSQL_INCLUDE_DIR)
-  # Some platforms include multiple pg_config.hs for multi-lib configurations
-  # This is a temporary workaround.  A better solution would be to compile
-  # a dummy c file and extract the value of the symbol.
-  file(GLOB _PG_CONFIG_HEADERS "${PostgreSQL_INCLUDE_DIR}/pg_config*.h")
-  foreach(_PG_CONFIG_HEADER ${_PG_CONFIG_HEADERS})
-    if(EXISTS "${_PG_CONFIG_HEADER}")
-      file(STRINGS "${_PG_CONFIG_HEADER}" pgsql_version_str
-           REGEX "^#define[\t ]+PG_VERSION_NUM[\t ]+.*")
-      if(pgsql_version_str)
-        string(REGEX REPLACE "^#define[\t ]+PG_VERSION_NUM[\t ]+([0-9]*).*"
-               "\\1" _PostgreSQL_VERSION_NUM "${pgsql_version_str}")
-        break()
-      endif()
-    endif()
-  endforeach()
-  if (_PostgreSQL_VERSION_NUM)
-    math(EXPR _PostgreSQL_major_version "${_PostgreSQL_VERSION_NUM} / 10000")
-    math(EXPR _PostgreSQL_minor_version "${_PostgreSQL_VERSION_NUM} % 10000")
-    set(PostgreSQL_VERSION_STRING "${_PostgreSQL_major_version}.${_PostgreSQL_minor_version}")
-    unset(_PostgreSQL_major_version)
-    unset(_PostgreSQL_minor_version)
-  else ()
-    foreach(_PG_CONFIG_HEADER ${_PG_CONFIG_HEADERS})
-      if(EXISTS "${_PG_CONFIG_HEADER}")
-        file(STRINGS "${_PG_CONFIG_HEADER}" pgsql_version_str
-             REGEX "^#define[\t ]+PG_VERSION[\t ]+\".*\"")
-        if(pgsql_version_str)
-          string(REGEX REPLACE "^#define[\t ]+PG_VERSION[\t ]+\"([^\"]*)\".*"
-                 "\\1" PostgreSQL_VERSION_STRING "${pgsql_version_str}")
-          break()
-        endif()
-      endif()
-    endforeach()
-  endif ()
-  unset(_PostgreSQL_VERSION_NUM)
-  unset(pgsql_version_str)
-endif()
-
-# Did we find anything?
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(PostgreSQL
-                                  REQUIRED_VARS PostgreSQL_LIBRARY PostgreSQL_INCLUDE_DIR PostgreSQL_TYPE_INCLUDE_DIR
-                                  VERSION_VAR PostgreSQL_VERSION_STRING)
-set(PostgreSQL_FOUND  ${POSTGRESQL_FOUND})
-
-function(__postgresql_import_library _target _var _config)
-  if(_config)
-    set(_config_suffix "_${_config}")
-  else()
-    set(_config_suffix "")
-  endif()
-
-  set(_lib "${${_var}${_config_suffix}}")
-  if(EXISTS "${_lib}")
-    if(_config)
-      set_property(TARGET ${_target} APPEND PROPERTY
-        IMPORTED_CONFIGURATIONS ${_config})
-    endif()
-    set_target_properties(${_target} PROPERTIES
-      IMPORTED_LOCATION${_config_suffix} "${_lib}")
-  endif()
-endfunction()
-
-# Now try to get the include and library path.
-if(PostgreSQL_FOUND)
-  if (NOT TARGET PostgreSQL::PostgreSQL)
-    add_library(PostgreSQL::PostgreSQL UNKNOWN IMPORTED)
-    set_target_properties(PostgreSQL::PostgreSQL PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES "${PostgreSQL_INCLUDE_DIR};${PostgreSQL_TYPE_INCLUDE_DIR}")
-    __postgresql_import_library(PostgreSQL::PostgreSQL PostgreSQL_LIBRARY "")
-    __postgresql_import_library(PostgreSQL::PostgreSQL PostgreSQL_LIBRARY "RELEASE")
-    __postgresql_import_library(PostgreSQL::PostgreSQL PostgreSQL_LIBRARY "DEBUG")
-  endif ()
-  set(PostgreSQL_INCLUDE_DIRS ${PostgreSQL_INCLUDE_DIR} ${PostgreSQL_TYPE_INCLUDE_DIR} )
-  set(PostgreSQL_LIBRARY_DIRS ${PostgreSQL_LIBRARY_DIR} )
-endif()
-
-mark_as_advanced(PostgreSQL_INCLUDE_DIR PostgreSQL_TYPE_INCLUDE_DIR)
diff --git a/ports/vtk/d107698a.patch b/ports/vtk/d107698a.patch
new file mode 100644
index 000000000..1a7ac0877
--- /dev/null
+++ b/ports/vtk/d107698a.patch
@@ -0,0 +1,291 @@
+diff --git a/Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.h b/Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.h
+index 0b3f1a963063cdf5f1685dbde55deaaea7a77d2f..24198dada846d6d81fb9f1c155e5a6612e1e7055 100644
+--- a/Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.h
++++ b/Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.h
+@@ -25,6 +25,7 @@
+ 
+ #include <vtkm/cont/ArrayHandleSOA.h>
+ #include <vtkm/cont/Field.h>
++#include <vtkm/cont/VariantArrayHandle.h>
+ 
+ #include <type_traits> // for std::underlying_type
+ 
+diff --git a/Accelerators/Vtkm/DataModel/Testing/Cxx/TestVTKMDataSet.cxx b/Accelerators/Vtkm/DataModel/Testing/Cxx/TestVTKMDataSet.cxx
+index ec41b18b60db354a8c4a1532eb5cedfd70ce7534..2493ae5b03cf29c5dfc90614489a8049fc623715 100644
+--- a/Accelerators/Vtkm/DataModel/Testing/Cxx/TestVTKMDataSet.cxx
++++ b/Accelerators/Vtkm/DataModel/Testing/Cxx/TestVTKMDataSet.cxx
+@@ -274,18 +274,19 @@ vtkm::cont::testing::MakeTestDataSet Maker;
+ void TestUniformDataSet()
+ {
+   auto dataset = Maker.Make3DUniformDataSet0();
+-  auto coords =
+-    dataset.GetCoordinateSystem().GetData().Cast<vtkm::cont::ArrayHandleUniformPointCoordinates>();
++  auto coords = dataset.GetCoordinateSystem()
++                  .GetData()
++                  .AsArrayHandle<vtkm::cont::ArrayHandleUniformPointCoordinates>();
+   auto portal = coords.ReadPortal();
+   auto dims = portal.GetDimensions();
+   auto origin = portal.GetOrigin();
+   auto spacing = portal.GetSpacing();
+ 
+   vtkNew<vtkFloatArray> pointField, cellField;
+-  FieldCopy(dataset.GetField("pointvar").GetData().Cast<vtkm::cont::ArrayHandle<float>>(),
++  FieldCopy(dataset.GetField("pointvar").GetData().AsArrayHandle<vtkm::cont::ArrayHandle<float>>(),
+     "pointvar", pointField);
+-  FieldCopy(dataset.GetField("cellvar").GetData().Cast<vtkm::cont::ArrayHandle<float>>(), "cellvar",
+-    cellField);
++  FieldCopy(dataset.GetField("cellvar").GetData().AsArrayHandle<vtkm::cont::ArrayHandle<float>>(),
++    "cellvar", cellField);
+ 
+   vtkNew<vtkImageData> imageData;
+   imageData->SetDimensions(dims[0], dims[1], dims[2]);
+@@ -315,10 +316,10 @@ void TestCurvilinearDataSet()
+   CoordsCopy(dataset.GetCoordinateSystem(), points);
+ 
+   vtkNew<vtkFloatArray> pointField, cellField;
+-  FieldCopy(dataset.GetField("pointvar").GetData().Cast<vtkm::cont::ArrayHandle<float>>(),
++  FieldCopy(dataset.GetField("pointvar").GetData().AsArrayHandle<vtkm::cont::ArrayHandle<float>>(),
+     "pointvar", pointField);
+-  FieldCopy(dataset.GetField("cellvar").GetData().Cast<vtkm::cont::ArrayHandle<float>>(), "cellvar",
+-    cellField);
++  FieldCopy(dataset.GetField("cellvar").GetData().AsArrayHandle<vtkm::cont::ArrayHandle<float>>(),
++    "cellvar", cellField);
+ 
+   vtkNew<vtkStructuredGrid> dsVtk;
+   dsVtk->SetDimensions(dims[0], dims[1], dims[2]);
+@@ -357,10 +358,10 @@ void TestExplicitDataSet()
+   }
+ 
+   vtkNew<vtkFloatArray> pointField, cellField;
+-  FieldCopy(dataset.GetField("pointvar").GetData().Cast<vtkm::cont::ArrayHandle<float>>(),
++  FieldCopy(dataset.GetField("pointvar").GetData().AsArrayHandle<vtkm::cont::ArrayHandle<float>>(),
+     "pointvar", pointField);
+-  FieldCopy(dataset.GetField("cellvar").GetData().Cast<vtkm::cont::ArrayHandle<float>>(), "cellvar",
+-    cellField);
++  FieldCopy(dataset.GetField("cellvar").GetData().AsArrayHandle<vtkm::cont::ArrayHandle<float>>(),
++    "cellvar", cellField);
+ 
+   vtkNew<vtkUnstructuredGrid> dsVtk;
+   dsVtk->SetPoints(points);
+diff --git a/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx b/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx
+index 147c3c6e175dbd342095805750bfc4fee81735dc..f1ef72ffae91ca843ca56bdc305ab68bbc955157 100644
+--- a/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx
++++ b/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx
+@@ -35,8 +35,7 @@
+ #include <vtkm/cont/CellLocatorGeneral.h>
+ #include <vtkm/cont/DataSet.h>
+ #include <vtkm/cont/Invoker.h>
+-#include <vtkm/cont/PointLocator.h>
+-#include <vtkm/cont/PointLocatorUniformGrid.h>
++#include <vtkm/cont/PointLocatorSparseGrid.h>
+ #include <vtkm/worklet/ScatterPermutation.h>
+ 
+ #include <mutex>
+@@ -62,8 +61,8 @@ struct vtkmDataSet::DataMembers
+   vtkm::cont::CoordinateSystem Coordinates;
+   vtkNew<vtkGenericCell> Cell;
+ 
+-  VtkmLocator<vtkm::cont::PointLocator> PointLocator;
+-  VtkmLocator<vtkm::cont::CellLocator> CellLocator;
++  VtkmLocator<vtkm::cont::PointLocatorSparseGrid> PointLocator;
++  VtkmLocator<vtkm::cont::CellLocatorGeneral> CellLocator;
+ };
+ 
+ //------------------------------------------------------------------------------
+@@ -172,7 +171,7 @@ void vtkmDataSet::GetCellBounds(vtkIdType cellId, double bounds[6])
+     this->Internals->CellSet.IsType<vtkm::cont::CellSetStructured<3>>())
+   {
+     auto portal = this->Internals->Coordinates.GetData()
+-                    .Cast<vtkm::cont::ArrayHandleUniformPointCoordinates>()
++                    .AsArrayHandle<vtkm::cont::ArrayHandleUniformPointCoordinates>()
+                     .ReadPortal();
+ 
+     vtkm::internal::ConnectivityStructuredInternals<3> helper;
+@@ -279,7 +278,7 @@ vtkIdType vtkmDataSet::FindPoint(double x[3])
+   vtkm::Id pointId = -1;
+   vtkm::FloatDefault d2 = 0;
+   // exec object created for the Serial device can be called directly
+-  execLocator->FindNearestNeighbor(point, pointId, d2);
++  execLocator.FindNearestNeighbor(point, pointId, d2);
+   return pointId;
+ }
+ 
+@@ -316,7 +315,7 @@ vtkIdType vtkmDataSet::FindCell(double x[3], vtkCell*, vtkGenericCell*, vtkIdTyp
+   vtkm::Vec<vtkm::FloatDefault, 3> pc;
+   vtkm::Id cellId = -1;
+   // exec object created for the Serial device can be called directly
+-  execLocator->FindCell(point, cellId, pc);
++  execLocator.FindCell(point, cellId, pc);
+ 
+   if (cellId >= 0)
+   {
+diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/ImageDataConverter.cxx b/Accelerators/Vtkm/DataModel/vtkmlib/ImageDataConverter.cxx
+index 351c0d5ce169cf455d2d3c0a1307ba8e60510371..c7ecff3c9fc5eafecb9dd11d9dbea15cbd44bd3d 100644
+--- a/Accelerators/Vtkm/DataModel/vtkmlib/ImageDataConverter.cxx
++++ b/Accelerators/Vtkm/DataModel/vtkmlib/ImageDataConverter.cxx
+@@ -121,7 +121,7 @@ bool Convert(
+     return false;
+   }
+ 
+-  auto points = cs.GetData().Cast<vtkm::cont::ArrayHandleUniformPointCoordinates>();
++  auto points = cs.GetData().AsArrayHandle<vtkm::cont::ArrayHandleUniformPointCoordinates>();
+   auto portal = points.ReadPortal();
+ 
+   auto origin = portal.GetOrigin();
+@@ -156,7 +156,7 @@ bool Convert(const vtkm::cont::DataSet& voutput, vtkImageData* output, vtkDataSe
+     return false;
+   }
+ 
+-  auto points = cs.GetData().Cast<vtkm::cont::ArrayHandleUniformPointCoordinates>();
++  auto points = cs.GetData().AsArrayHandle<vtkm::cont::ArrayHandleUniformPointCoordinates>();
+   auto portal = points.ReadPortal();
+ 
+   auto dim = portal.GetDimensions();
+diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.cxx b/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.cxx
+index f2411d0e70505435cd312ee23b3cb2e653eb28d8..814af43cc168b4c3b44107b0c19e68cc1b42538d 100644
+--- a/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.cxx
++++ b/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.cxx
+@@ -52,8 +52,7 @@ void ImplicitFunctionConverter::Set(vtkImplicitFunction* function)
+     box->GetXMin(xmin);
+     box->GetXMax(xmax);
+ 
+-    auto b = new vtkm::Box(MakeFVec3(xmin), MakeFVec3(xmax));
+-    this->OutFunction.Reset(b, true);
++    this->OutFunction = vtkm::Box(MakeFVec3(xmin), MakeFVec3(xmax));
+   }
+   else if ((cylinder = vtkCylinder::SafeDownCast(function)))
+   {
+@@ -62,9 +61,8 @@ void ImplicitFunctionConverter::Set(vtkImplicitFunction* function)
+     cylinder->GetAxis(axis);
+     radius = cylinder->GetRadius();
+ 
+-    auto c = new vtkm::Cylinder(
+-      MakeFVec3(center), MakeFVec3(axis), static_cast<vtkm::FloatDefault>(radius));
+-    this->OutFunction.Reset(c, true);
++    this->OutFunction =
++      vtkm::Cylinder(MakeFVec3(center), MakeFVec3(axis), static_cast<vtkm::FloatDefault>(radius));
+   }
+   else if ((plane = vtkPlane::SafeDownCast(function)))
+   {
+@@ -72,8 +70,7 @@ void ImplicitFunctionConverter::Set(vtkImplicitFunction* function)
+     plane->GetOrigin(origin);
+     plane->GetNormal(normal);
+ 
+-    auto p = new vtkm::Plane(MakeFVec3(origin), MakeFVec3(normal));
+-    this->OutFunction.Reset(p, true);
++    this->OutFunction = vtkm::Plane(MakeFVec3(origin), MakeFVec3(normal));
+   }
+   else if ((sphere = vtkSphere::SafeDownCast(function)))
+   {
+@@ -81,8 +78,7 @@ void ImplicitFunctionConverter::Set(vtkImplicitFunction* function)
+     sphere->GetCenter(center);
+     radius = sphere->GetRadius();
+ 
+-    auto s = new vtkm::Sphere(MakeFVec3(center), static_cast<vtkm::FloatDefault>(radius));
+-    this->OutFunction.Reset(s, true);
++    this->OutFunction = vtkm::Sphere(MakeFVec3(center), static_cast<vtkm::FloatDefault>(radius));
+   }
+   else
+   {
+@@ -95,7 +91,7 @@ void ImplicitFunctionConverter::Set(vtkImplicitFunction* function)
+   this->InFunction = function;
+ }
+ 
+-const vtkm::cont::ImplicitFunctionHandle& ImplicitFunctionConverter::Get() const
++const vtkm::ImplicitFunctionGeneral& ImplicitFunctionConverter::Get()
+ {
+   if (this->InFunction && (this->MTime < this->InFunction->GetMTime()))
+   {
+@@ -110,9 +106,7 @@ const vtkm::cont::ImplicitFunctionHandle& ImplicitFunctionConverter::Get() const
+       box->GetXMin(xmin);
+       box->GetXMax(xmax);
+ 
+-      auto b = static_cast<vtkm::Box*>(this->OutFunction.Get());
+-      b->SetMinPoint(MakeFVec3(xmin));
+-      b->SetMaxPoint(MakeFVec3(xmax));
++      this->OutFunction = vtkm::Box(MakeFVec3(xmin), MakeFVec3(xmax));
+     }
+     else if ((cylinder = vtkCylinder::SafeDownCast(this->InFunction)))
+     {
+@@ -121,10 +115,8 @@ const vtkm::cont::ImplicitFunctionHandle& ImplicitFunctionConverter::Get() const
+       cylinder->GetAxis(axis);
+       radius = cylinder->GetRadius();
+ 
+-      auto c = static_cast<vtkm::Cylinder*>(this->OutFunction.Get());
+-      c->SetCenter(MakeFVec3(center));
+-      c->SetAxis(MakeFVec3(axis));
+-      c->SetRadius(static_cast<vtkm::FloatDefault>(radius));
++      this->OutFunction =
++        vtkm::Cylinder(MakeFVec3(center), MakeFVec3(axis), static_cast<vtkm::FloatDefault>(radius));
+     }
+     else if ((plane = vtkPlane::SafeDownCast(this->InFunction)))
+     {
+@@ -132,9 +124,7 @@ const vtkm::cont::ImplicitFunctionHandle& ImplicitFunctionConverter::Get() const
+       plane->GetOrigin(origin);
+       plane->GetNormal(normal);
+ 
+-      auto p = static_cast<vtkm::Plane*>(this->OutFunction.Get());
+-      p->SetOrigin(MakeFVec3(origin));
+-      p->SetNormal(MakeFVec3(normal));
++      this->OutFunction = vtkm::Plane(MakeFVec3(origin), MakeFVec3(normal));
+     }
+     else if ((sphere = vtkSphere::SafeDownCast(this->InFunction)))
+     {
+@@ -142,9 +132,7 @@ const vtkm::cont::ImplicitFunctionHandle& ImplicitFunctionConverter::Get() const
+       sphere->GetCenter(center);
+       radius = sphere->GetRadius();
+ 
+-      auto s = static_cast<vtkm::Sphere*>(this->OutFunction.Get());
+-      s->SetCenter(MakeFVec3(center));
+-      s->SetRadius(static_cast<vtkm::FloatDefault>(radius));
++      this->OutFunction = vtkm::Sphere(MakeFVec3(center), static_cast<vtkm::FloatDefault>(radius));
+     }
+ 
+     this->MTime = this->InFunction->GetMTime();
+diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.h b/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.h
+index 10e2ae99ae819ca86516bf7ab5a0988c75b6323e..a1a571c93d44a7d62f79afc86aab05d1f359af82 100644
+--- a/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.h
++++ b/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.h
+@@ -20,7 +20,7 @@
+ #include "vtkType.h"             // For vtkMTimeType
+ #include "vtkmConfigDataModel.h" //required for general vtkm setup
+ 
+-#include "vtkm/cont/ImplicitFunctionHandle.h"
++#include "vtkm/ImplicitFunction.h"
+ 
+ class vtkImplicitFunction;
+ 
+@@ -33,11 +33,11 @@ public:
+   ImplicitFunctionConverter();
+ 
+   void Set(vtkImplicitFunction*);
+-  const vtkm::cont::ImplicitFunctionHandle& Get() const;
++  const vtkm::ImplicitFunctionGeneral& Get();
+ 
+ private:
+   vtkImplicitFunction* InFunction;
+-  vtkm::cont::ImplicitFunctionHandle OutFunction;
++  vtkm::ImplicitFunctionGeneral OutFunction;
+   mutable vtkMTimeType MTime;
+ };
+ 
+diff --git a/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx b/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx
+index 04a637a92d487b019742bbf81884750c48ba105d..674d9b6e0dfe36edd787e519e70ec0bf46602c81 100644
+--- a/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx
++++ b/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx
+@@ -24,12 +24,9 @@ vtkm::cont::DataSet vtkmClip::internals::ExecuteClipWithImplicitFunction(vtkm::c
+   auto function = this->ClipFunctionConverter->Get();
+ 
+   vtkm::cont::DataSet result;
+-  if (function.GetValid())
+-  {
+-    vtkm::filter::ClipWithImplicitFunction functionFilter;
+-    functionFilter.SetImplicitFunction(function);
+-    result = functionFilter.Execute(in);
+-  }
++  vtkm::filter::ClipWithImplicitFunction functionFilter;
++  functionFilter.SetImplicitFunction(function);
++  result = functionFilter.Execute(in);
+ 
+   return result;
+ }
diff --git a/ports/vtk/fix-freetype.patch b/ports/vtk/fix-freetype.patch
deleted file mode 100644
index aaaf35174..000000000
--- a/ports/vtk/fix-freetype.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/Rendering/FreeType/vtkFreeTypeTools.cxx b/Rendering/FreeType/vtkFreeTypeTools.cxx
-index c54289dc..e6d9b14f 100644
---- a/Rendering/FreeType/vtkFreeTypeTools.cxx
-+++ b/Rendering/FreeType/vtkFreeTypeTools.cxx
-@@ -378,7 +378,7 @@ FTC_CMapCache* vtkFreeTypeTools::GetCMapCache()
- }
- 
- //----------------------------------------------------------------------------
--FT_CALLBACK_DEF(FT_Error)
-+FT_Error
- vtkFreeTypeToolsFaceRequester(
-   FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face)
- {
-diff --git a/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx b/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx
-index 5c1908cf..41ed97e7 100644
---- a/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx
-+++ b/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx
-@@ -29,7 +29,7 @@ vtkStandardNewMacro(vtkFontConfigFreeTypeTools);
- namespace
- {
- // The FreeType face requester callback:
--FT_CALLBACK_DEF(FT_Error)
-+static FT_Error
- vtkFontConfigFreeTypeToolsFaceRequester(
-   FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face)
- {
diff --git a/ports/vtk/module-name-mangling.patch b/ports/vtk/module-name-mangling.patch
deleted file mode 100644
index d1bc96c39..000000000
--- a/ports/vtk/module-name-mangling.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMake/vtkModule.cmake
-+++ b/CMake/vtkModule.cmake
-@@ -4409,6 +4409,15 @@ endif ()\n\n")
-   foreach (_vtk_export_module IN LISTS _vtk_export_MODULES)
-     get_property(_vtk_export_target_name GLOBAL
-       PROPERTY "_vtk_module_${_vtk_export_module}_target_name")
-+    # Use the export name of the target if it has one set.
-+    get_property(_vtk_export_target_has_export_name
-+      TARGET    "${_vtk_export_target_name}"
-+      PROPERTY  EXPORT_NAME SET)
-+    if (_vtk_export_target_has_export_name)
-+      get_property(_vtk_export_target_name
-+        TARGET    "${_vtk_export_target_name}"
-+        PROPERTY  EXPORT_NAME)
-+    endif ()
-     set(_vtk_export_base "_vtk_module_find_package_${_vtk_export_module}")
-     get_property(_vtk_export_packages GLOBAL
-       PROPERTY "${_vtk_export_base}")
diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake
index 79dec0b47..b9af50ad8 100644
--- a/ports/vtk/portfile.cmake
+++ b/ports/vtk/portfile.cmake
@@ -25,7 +25,9 @@ if("atlmfc" IN_LIST FEATURES)
 endif()
 if("vtkm" IN_LIST FEATURES)
     list(APPEND ADDITIONAL_OPTIONS
-        -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKm=YES
+        -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmCore=YES
+        -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmDataModel=YES
+        -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters=YES
         -DVTK_MODULE_ENABLE_VTK_vtkm=YES
     )
 endif()
@@ -37,8 +39,10 @@ if("python" IN_LIST FEATURES)
         -DVTK_PYTHON_VERSION=3
         -DPython3_FIND_REGISTRY=NEVER
         "-DPython3_EXECUTABLE:PATH=${PYTHON3}"
+        -DVTK_MODULE_ENABLE_VTK_Python=YES
+        -DVTK_MODULE_ENABLE_VTK_PythonContext2D=YES
+        -DVTK_MODULE_ENABLE_VTK_PythonInterpreter=YES
     )
-
     #VTK_PYTHON_SITE_PACKAGES_SUFFIX should be set to the install dir of the site-packages
 endif()
 
@@ -56,7 +60,9 @@ if("paraview" IN_LIST FEATURES)
         -DVTK_MODULE_ENABLE_VTK_IOVPIC=YES
         -DVTK_MODULE_ENABLE_VTK_RenderingLICOpenGL2=YES
         -DVTK_MODULE_ENABLE_VTK_RenderingAnnotation=YES
+        -DVTK_MODULE_ENABLE_VTK_DomainsChemistry=YES
         -DVTK_MODULE_ENABLE_VTK_DomainsChemistryOpenGL2=YES
+        -DVTK_MODULE_ENABLE_VTK_FiltersParallelDIY2=YES
     )
     if("python" IN_LIST FEATURES)
         list(APPEND ADDITIONAL_OPTIONS
@@ -123,42 +129,34 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 # =============================================================================
 # Clone & patch
 
-# This patch is huge, we prefer to download it on demand
-vcpkg_download_distfile(QT_NO_KEYWORDS_PATCH
-  URLS "https://github.com/Kitware/VTK/commit/64265c5fd1a8e26a6a81241284dea6b3272f6db6.diff"
-  FILENAME 64265c5fd1a8e26a6a81241284dea6b3272f6db6.diff
-  SHA512 08991f07b30b893b14e906017b77fb700a8298a3a8906086a0c4b67688c1c0431b3d6bf890df70bd3ebf963cbb9c035b5dbcb9d7593e8c716c3a594ccb9a0fc7
-)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Kitware/VTK
-    REF 96e6fa9b3ff245e4d51d49f23d40e9ad8774e85e # v9.0.1
-    SHA512 0efb1845053b6143e5ee7fa081b8be98f6825262c59051e88b2be02497e23362055067b2f811eff82e93eb194e5a9afd2a12e3878a252eb4011a5dab95127a6f
+    REF 2959413ff190bc6e3ff40f5b6c1342edd2e5233f # v9.0.x used by ParaView 5.9.1
+    SHA512 16229c107ed904e8fa6850c3814b8bdcdf9700ef44f6ff5b3a77e7d793ce19954fc2c7b1219a0162cf588def6e990883cd3f808c316a4db6e65bd6cd1769dd3f
     HEAD_REF master
     PATCHES
-        6811.patch
-        FindLZMA.patch    # Will be fixed in 9.1?
+        FindLZMA.patch
         FindLZ4.patch
         Findproj.patch
-        vtkm.patch # To include an external VTKm build (v.1.5 required)
         pegtl.patch
         pythonwrapper.patch # Required by ParaView to Wrap required classes
         NoUndefDebug.patch # Required to link against correct Python library depending on build type.
         python_debug.patch
         fix-using-hdf5.patch
-        module-name-mangling.patch
+        # CHECK: module-name-mangling.patch
         # Last patch TODO: Patch out internal loguru
         FindExpat.patch # The find_library calls are taken care of by vcpkg-cmake-wrapper.cmake of expat
-        fix-freetype.patch # Should be fixed next version, !7367 + !7434
-        # Remove these 2 official patches in the next update
-        ${QT_NO_KEYWORDS_PATCH}
-        0002-Qt-enforce-QT_NO_KEYWORDS-builds-by-VTK-itself.patch
+        # upstream vtkm patches to make it work with vtkm 1.6
+        vtkm.patch # To include an external VTKm build
+        1f00a0c9.patch
+        156fb524.patch
+        d107698a.patch
 )
 
 # =============================================================================
 #Overwrite outdated modules if they have not been patched:
-file(COPY "${CURRENT_PORT_DIR}/FindPostgreSQL.cmake" DESTINATION "${SOURCE_PATH}/CMake") # will be backported from CMake in VTK in a future release
 file(COPY "${CURRENT_PORT_DIR}/FindHDF5.cmake" DESTINATION "${SOURCE_PATH}/CMake/patches/99") # due to usage of targets in netcdf-c
 # =============================================================================
 
@@ -173,11 +171,6 @@ vcpkg_configure_cmake(
         -DBUILD_TESTING=OFF
         -DVTK_BUILD_TESTING=OFF
         -DVTK_BUILD_EXAMPLES=OFF
-        -DVTK_INSTALL_INCLUDE_DIR=include
-        -DVTK_INSTALL_DATA_DIR=share/vtk/data
-        -DVTK_INSTALL_DOC_DIR=share/vtk/doc
-        -DVTK_INSTALL_PACKAGE_DIR=share/vtk
-        -DVTK_INSTALL_RUNTIME_DIR=bin
         -DVTK_FORBID_DOWNLOADS=ON
         -DVTK_ENABLE_REMOTE_MODULES=OFF
         # VTK groups to enable
@@ -199,44 +192,18 @@ vcpkg_copy_pdbs()
 # Fixup target files
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/vtk-9.0)
 
-# TODO: Check if the following is still required
-# For some reason the references to the XDMF libraries in the target files do not end up
-# correctly, so we fix them here.
-# if(VTK_WITH_ALL_MODULES)
-    # file(READ ${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-release.cmake VTK_TARGETS_RELEASE_CONTENT)
-    # string(REPLACE "lib/../XdmfCore.lib" "lib/XdmfCore.lib" VTK_TARGETS_RELEASE_CONTENT "${VTK_TARGETS_RELEASE_CONTENT}")
-    # string(REPLACE "bin/../XdmfCore.dll" "bin/XdmfCore.dll" VTK_TARGETS_RELEASE_CONTENT "${VTK_TARGETS_RELEASE_CONTENT}")
-    # string(REPLACE "lib/../vtkxdmf3.lib" "lib/vtkxdmf3.lib" VTK_TARGETS_RELEASE_CONTENT "${VTK_TARGETS_RELEASE_CONTENT}")
-    # string(REPLACE "bin/../vtkxdmf3.dll" "bin/vtkxdmf3.dll" VTK_TARGETS_RELEASE_CONTENT "${VTK_TARGETS_RELEASE_CONTENT}")
-    # file(WRITE ${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-release.cmake "${VTK_TARGETS_RELEASE_CONTENT}")
-
-    # file(READ ${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-debug.cmake VTK_TARGETS_DEBUG_CONTENT)
-    # string(REPLACE "lib/../XdmfCore.lib" "lib/XdmfCore.lib" VTK_TARGETS_DEBUG_CONTENT "${VTK_TARGETS_DEBUG_CONTENT}")
-    # string(REPLACE "bin/../XdmfCore.dll" "bin/XdmfCore.dll" VTK_TARGETS_DEBUG_CONTENT "${VTK_TARGETS_DEBUG_CONTENT}")
-    # string(REPLACE "lib/../vtkxdmf3.lib" "lib/vtkxdmf3.lib" VTK_TARGETS_DEBUG_CONTENT "${VTK_TARGETS_DEBUG_CONTENT}")
-    # string(REPLACE "bin/../vtkxdmf3.dll" "bin/vtkxdmf3.dll" VTK_TARGETS_DEBUG_CONTENT "${VTK_TARGETS_DEBUG_CONTENT}")
-    # file(WRITE ${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-debug.cmake "${VTK_TARGETS_DEBUG_CONTENT}")
-# endif()
-# =============================================================================
-# Remove other files and directories that are not valid for vcpkg
-# if(VTK_WITH_ALL_MODULES)
-    # file(REMOVE ${CURRENT_PACKAGES_DIR}/XdmfConfig.cmake)
-    # file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/XdmfConfig.cmake)
-# endif()
-
 # =============================================================================
 # Clean-up other directories
 
-
 # Delete the debug binary TOOL_NAME that is not required
 function(_vtk_remove_debug_tool TOOL_NAME)
-    set(filename ${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME}${VCPKG_TARGET_EXECUTABLE_SUFFIX})
-    if(EXISTS ${filename})
-        file(REMOVE ${filename})
+    set(filename "${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME}${VCPKG_TARGET_EXECUTABLE_SUFFIX}")
+    if(EXISTS "${filename}")
+        file(REMOVE "${filename}")
     endif()
-    set(filename ${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME}d${VCPKG_TARGET_EXECUTABLE_SUFFIX})
-    if(EXISTS ${filename})
-        file(REMOVE ${filename})
+    set(filename "${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME}d${VCPKG_TARGET_EXECUTABLE_SUFFIX}")
+    if(EXISTS "${filename}")
+        file(REMOVE "${filename}")
     endif()
     if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug)
         # we also have to bend the lines referencing the tools in VTKTargets-debug.cmake
@@ -251,9 +218,9 @@ endfunction()
 # Move the release binary TOOL_NAME from bin to tools
 function(_vtk_move_release_tool TOOL_NAME)
     set(old_filename "${CURRENT_PACKAGES_DIR}/bin/${TOOL_NAME}${VCPKG_TARGET_EXECUTABLE_SUFFIX}")
-    if(EXISTS ${old_filename})
-        file(INSTALL ${old_filename} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/vtk" USE_SOURCE_PERMISSIONS)
-        file(REMOVE ${old_filename})
+    if(EXISTS "${old_filename}")
+        file(INSTALL "${old_filename}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/vtk" USE_SOURCE_PERMISSIONS)
+        file(REMOVE "${old_filename}")
     endif()
 
     if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release)
@@ -290,36 +257,31 @@ foreach(TOOL_NAME IN LISTS VTK_TOOLS)
 endforeach()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin"
+                        "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/vtk")
 
 ## Files Modules needed by ParaView
 if("paraview" IN_LIST FEATURES)
     set(VTK_CMAKE_NEEDED vtkCompilerChecks vtkCompilerPlatformFlags vtkCompilerExtraFlags vtkInitializeBuildType
-                         vtkSupportMacros vtkDirectories vtkVersion FindPythonModules vtkModuleDebugging vtkExternalData)
+                         vtkSupportMacros vtkVersion FindPythonModules vtkModuleDebugging vtkExternalData)
     foreach(module ${VTK_CMAKE_NEEDED})
         file(INSTALL "${SOURCE_PATH}/CMake/${module}.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/vtk")
     endforeach()
 
     ## Check List on UPDATE !!
     file(INSTALL "${SOURCE_PATH}/CMake/vtkRequireLargeFilesSupport.cxx" DESTINATION "${CURRENT_PACKAGES_DIR}/share/vtk")
+    file(INSTALL "${SOURCE_PATH}/Rendering/Volume/vtkBlockSortHelper.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") # this should get installed by VTK
+    file(INSTALL "${SOURCE_PATH}/Filters/ParallelDIY2/vtkDIYKdTreeUtilities.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}")
+    file(INSTALL "${SOURCE_PATH}/Parallel/DIY/vtkDIYUtilities.txx" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}")
 
-    file(INSTALL "${SOURCE_PATH}/GUISupport/Qt/QVTKOpenGLWidget.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") # Legacy header
-
-    file(INSTALL "${SOURCE_PATH}/Common/Core/vtkRange.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") # this should get installed by VTK
-    file(INSTALL "${SOURCE_PATH}/Common/Core/vtkRangeIterableTraits.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") # this should get installed by VTK
-    file(INSTALL "${SOURCE_PATH}/Common/DataModel/vtkCompositeDataSetNodeReference.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") # this should get installed by VTK
-    #ParaView requires some internal headers
-    file(INSTALL "${SOURCE_PATH}/Rendering/Annotation/vtkScalarBarActorInternal.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}")
-    file(INSTALL "${SOURCE_PATH}/Filters/Statistics/vtkStatisticsAlgorithmPrivate.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}")
-    file(INSTALL "${SOURCE_PATH}/Rendering/OpenGL2/vtkCompositePolyDataMapper2Internal.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}")
     file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Rendering/OpenGL2/vtkTextureObjectVS.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}")
+
 endif()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
@@ -346,4 +308,4 @@ endforeach()
 
 # =============================================================================
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/Copyright.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright")
diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json
new file mode 100644
index 000000000..725ace01d
--- /dev/null
+++ b/ports/vtk/vcpkg.json
@@ -0,0 +1,174 @@
+{
+  "name": "vtk",
+  "version-semver": "9.0.3-pv5.9.1",
+  "description": "Software system for 3D computer graphics, image processing, and visualization",
+  "homepage": "https://github.com/Kitware/VTK",
+  "dependencies": [
+    "double-conversion",
+    "eigen3",
+    "expat",
+    "freetype",
+    "glew",
+    {
+      "name": "hdf5",
+      "default-features": false
+    },
+    "jsoncpp",
+    {
+      "name": "libharu",
+      "features": [
+        "notiffsymbols"
+      ]
+    },
+    "libjpeg-turbo",
+    "liblzma",
+    "libogg",
+    "libpng",
+    "libtheora",
+    "libxml2",
+    "lz4",
+    "netcdf-c",
+    "pegtl-2",
+    "proj4",
+    "pugixml",
+    "sqlite3",
+    "tiff",
+    "utfcpp",
+    "zlib"
+  ],
+  "features": {
+    "all": {
+      "description": "Build all vtk modules",
+      "dependencies": [
+        "ffmpeg",
+        "gdal",
+        "libmysql",
+        {
+          "name": "vtk",
+          "default-features": false,
+          "features": [
+            "mpi",
+            "python",
+            "qt"
+          ]
+        },
+        {
+          "name": "vtk",
+          "default-features": false,
+          "features": [
+            "atlmfc",
+            "utf8"
+          ],
+          "platform": "windows"
+        }
+      ]
+    },
+    "atlmfc": {
+      "description": "Mfc functionality for vtk on Windows",
+      "dependencies": [
+        {
+          "name": "atlmfc",
+          "platform": "windows"
+        }
+      ]
+    },
+    "cuda": {
+      "description": "Support CUDA compilation",
+      "dependencies": [
+        "cuda"
+      ]
+    },
+    "mpi": {
+      "description": "MPI functionality for VTK",
+      "dependencies": [
+        {
+          "name": "hdf5",
+          "default-features": false,
+          "features": [
+            "parallel"
+          ]
+        },
+        "mpi",
+        {
+          "name": "vtk-m",
+          "default-features": false,
+          "features": [
+            "mpi"
+          ]
+        }
+      ]
+    },
+    "opengl": {
+      "description": "All opengl related modules",
+      "dependencies": [
+        {
+          "name": "vtk",
+          "default-features": false
+        }
+      ]
+    },
+    "openvr": {
+      "description": "OpenVR functionality for VTK",
+      "dependencies": [
+        "openvr",
+        "sdl2"
+      ]
+    },
+    "paraview": {
+      "description": "Build vtk modules required by paraview",
+      "dependencies": [
+        {
+          "name": "vtk",
+          "default-features": false,
+          "features": [
+            "qt"
+          ]
+        },
+        {
+          "name": "vtk",
+          "default-features": false,
+          "features": [
+            "atlmfc"
+          ],
+          "platform": "windows"
+        }
+      ]
+    },
+    "python": {
+      "description": "Python functionality for VTK",
+      "dependencies": [
+        "python3"
+      ]
+    },
+    "qt": {
+      "description": "Qt functionality for VTK",
+      "dependencies": [
+        "qt5-imageformats",
+        "qt5-tools",
+        {
+          "name": "qt5-x11extras",
+          "platform": "linux"
+        },
+        "qt5-xmlpatterns"
+      ]
+    },
+    "utf8": {
+      "description": "Enables vtk reader/writer with utf-8 path support",
+      "dependencies": [
+        {
+          "name": "vtk",
+          "default-features": false
+        }
+      ]
+    },
+    "vtkm": {
+      "description": "Build with vtk-m accelerator and module.",
+      "dependencies": [
+        {
+          "name": "vtk-m",
+          "default-features": false
+        }
+      ]
+    }
+  }
+}
diff --git a/ports/vtk/vtkm.patch b/ports/vtk/vtkm.patch
index 27b7f4094..72c8ce2bd 100644
--- a/ports/vtk/vtkm.patch
+++ b/ports/vtk/vtkm.patch
@@ -1,63 +1,110 @@
-diff --git a/Accelerators/Vtkm/CMakeLists.txt b/Accelerators/Vtkm/CMakeLists.txt
-index 4297575bd..643df6fd5 100644
---- a/Accelerators/Vtkm/CMakeLists.txt
-+++ b/Accelerators/Vtkm/CMakeLists.txt
-@@ -14,8 +14,10 @@
+diff --git a/Accelerators/Vtkm/Core/CMakeLists.txt b/Accelerators/Vtkm/Core/CMakeLists.txt
+index b889a771f..317d83f75 100644
+--- a/Accelerators/Vtkm/Core/CMakeLists.txt
++++ b/Accelerators/Vtkm/Core/CMakeLists.txt
+@@ -14,8 +14,9 @@
+ ##
+ ##=============================================================================
+ 
+-list(INSERT 0 CMAKE_MODULE_PATH
+-  "${VTK_SOURCE_DIR}/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake")
++find_package(VTKm CONFIG REQUIRED)
++#list(INSERT 0 CMAKE_MODULE_PATH
++#  "${VTK_SOURCE_DIR}/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake")
+ 
+ set(private_headers
+   vtkmlib/DataArrayConverters.hxx
+@@ -77,9 +78,9 @@ vtkm_add_target_information(${vtkm_accel_target}
+                             MODIFY_CUDA_FLAGS
+                             DEVICE_SOURCES ${sources})
+ 
+-vtk_module_set_property(VTK::AcceleratorsVTKmCore
+-  PROPERTY  JOB_POOL_COMPILE
+-  VALUE     vtkm_pool)
++#vtk_module_set_property(VTK::AcceleratorsVTKmCore
++#  PROPERTY  JOB_POOL_COMPILE
++#  VALUE     vtkm_pool)
+ 
+ if (TARGET vtkm::cuda)
+   vtk_module_set_property(VTK::AcceleratorsVTKmCore
+diff --git a/Accelerators/Vtkm/DataModel/CMakeLists.txt b/Accelerators/Vtkm/DataModel/CMakeLists.txt
+index 56307be8d..30fff98e8 100644
+--- a/Accelerators/Vtkm/DataModel/CMakeLists.txt
++++ b/Accelerators/Vtkm/DataModel/CMakeLists.txt
+@@ -14,8 +14,9 @@
  ##
  ##=============================================================================
  
 -list(INSERT 0 CMAKE_MODULE_PATH
 -  "${VTK_SOURCE_DIR}/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake")
 +find_package(VTKm CONFIG REQUIRED)
-+
 +#list(INSERT 0 CMAKE_MODULE_PATH
 +#  "${VTK_SOURCE_DIR}/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake")
  
  set(sources
    vtkmlib/ArrayConvertersReal.cxx
-diff --git a/Accelerators/Vtkm/CMakeLists.txt b/Accelerators/Vtkm/CMakeLists.txt
-index a01a6bda3..889c87ebb 100644
---- a/Accelerators/Vtkm/CMakeLists.txt	
-+++ b/Accelerators/Vtkm/CMakeLists.txt
-@@ -126,9 +126,9 @@ vtkm_add_target_information(${vtkm_accel_target}
+@@ -85,9 +86,9 @@ vtkm_add_target_information(${vtkm_accel_target}
                              MODIFY_CUDA_FLAGS
                              DEVICE_SOURCES ${sources})
  
--vtk_module_set_property(VTK::AcceleratorsVTKm
+-vtk_module_set_property(VTK::AcceleratorsVTKmDataModel
 -  PROPERTY  JOB_POOL_COMPILE
 -  VALUE     vtkm_pool)
-+#vtk_module_set_property(VTK::AcceleratorsVTKm
++#vtk_module_set_property(VTK::AcceleratorsVTKmDataModel
 +#  PROPERTY  JOB_POOL_COMPILE
 +#  VALUE     vtkm_pool)
- vtk_module_link(VTK::AcceleratorsVTKm
-   PRIVATE
-     vtkm_worklet
-diff --git a/CMake/FindVTKm.cmake b/CMake/FindVTKm.cmake
-new file mode 100644
-index 000000000..c0fe00c0e
---- /dev/null
-+++ b/CMake/FindVTKm.cmake
-@@ -0,0 +1 @@
+ 
+ if (TARGET vtkm::cuda)
+   vtk_module_set_property(VTK::AcceleratorsVTKmDataModel
+diff --git a/Accelerators/Vtkm/Filters/CMakeLists.txt b/Accelerators/Vtkm/Filters/CMakeLists.txt
+index 14e84f1dd..0a931285d 100644
+--- a/Accelerators/Vtkm/Filters/CMakeLists.txt
++++ b/Accelerators/Vtkm/Filters/CMakeLists.txt
+@@ -14,8 +14,9 @@
+ ##
+ ##=============================================================================
+ 
+-list(INSERT 0 CMAKE_MODULE_PATH
+-  "${VTK_SOURCE_DIR}/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake")
 +find_package(VTKm CONFIG REQUIRED)
-\ No newline at end of file
-diff --git a/CMake/vtkCompilerPlatformFlags.cmake b/CMake/vtkCompilerPlatformFlags.cmake
-index b0bdba1e6..69c570a25 100644
---- a/CMake/vtkCompilerPlatformFlags.cmake
-+++ b/CMake/vtkCompilerPlatformFlags.cmake
-@@ -107,7 +107,7 @@ if(MSVC)
-   if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
-     STRING(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-   else()
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
-+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /bigobj")
-   endif()
- endif()
++#list(INSERT 0 CMAKE_MODULE_PATH
++#  "${VTK_SOURCE_DIR}/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake")
+ 
+ set(impl_classes
+   vtkmAverageToCells
+@@ -80,9 +81,9 @@ vtkm_add_target_information(${vtkm_accel_target}
+                             MODIFY_CUDA_FLAGS
+                             DEVICE_SOURCES ${sources})
  
+-vtk_module_set_property(VTK::AcceleratorsVTKmFilters
+-  PROPERTY  JOB_POOL_COMPILE
+-  VALUE     vtkm_pool)
++#vtk_module_set_property(VTK::AcceleratorsVTKmFilters
++#  PROPERTY  JOB_POOL_COMPILE
++#  VALUE     vtkm_pool)
+ vtk_module_link(VTK::AcceleratorsVTKmFilters
+   PRIVATE
+     vtkm_worklet
+diff --git a/CMake/vtk-config.cmake.in b/CMake/vtk-config.cmake.in
+index 5a5e8b8df..96413875f 100644
+--- a/CMake/vtk-config.cmake.in
++++ b/CMake/vtk-config.cmake.in
+@@ -121,9 +121,7 @@ set("${CMAKE_FIND_PACKAGE_NAME}_AVAILABLE_COMPONENTS" "@vtk_all_components@")
+ unset("${CMAKE_FIND_PACKAGE_NAME}_FOUND")
+ set("${CMAKE_FIND_PACKAGE_NAME}_HAS_VTKm" "@vtk_has_vtkm@")
+ if (${CMAKE_FIND_PACKAGE_NAME}_HAS_VTKm)
+-  find_package(VTKm
+-    PATHS "${CMAKE_CURRENT_LIST_DIR}/vtkm"
+-    NO_DEFAULT_PATH)
++  find_package(VTKm CONFIG REQUIRED)
+   if (NOT VTKm_FOUND)
+     set("${CMAKE_FIND_PACKAGE_NAME}_FOUND" 0)
+   endif ()
 diff --git a/ThirdParty/vtkm/CMakeLists.txt b/ThirdParty/vtkm/CMakeLists.txt
-index 5817d42f8..bc5a33d93 100644
+index 5817d42f8..f21d17da8 100644
 --- a/ThirdParty/vtkm/CMakeLists.txt
 +++ b/ThirdParty/vtkm/CMakeLists.txt
-@@ -1,6 +1,47 @@
+@@ -1,6 +1,41 @@
 -vtk_module_third_party_internal(
 -  LICENSE_FILES "vtkvtkm/vtk-m/LICENSE.txt"
 -  VERSION       "master"
@@ -80,7 +127,6 @@ index 5817d42f8..bc5a33d93 100644
 +        message(STATUS "INCLUDE: ${VTKm_INCLUDE_DIRS}")
 +        get_target_property(VTKm_DIY_INCLUDE_DIRS vtkm_diy INTERFACE_INCLUDE_DIRECTORIES)
 +        get_target_property(VTKm_OPTION_INCLUDE_DIRS vtkm_optionparser INTERFACE_INCLUDE_DIRECTORIES)
-+        get_target_property(VTKm_TAO_INCLUDE_DIRS vtkm_taotuple INTERFACE_INCLUDE_DIRECTORIES)
 +        if(MSVC)
 +            set(VTKm_DEFINITIONS /bigobj)
 +        endif()
@@ -104,13 +150,9 @@ index 5817d42f8..bc5a33d93 100644
 +    PACKAGE VTKm
 +    TARGETS vtkm_cont vtkm_filter vtkm_diy vtkm_optionparser vtkm_taotuple
 +    #LIBRARIES vtkm_cont vtkm_filter vtkm_diy vtkm_optionparser vtkm_taotuple
-+    INCLUDE_DIRS VTKm_INCLUDE_DIRS VTKm_DIY_INCLUDE_DIRS VTKm_OPTION_INCLUDE_DIRS VTKm_TAO_INCLUDE_DIRS)
-+# configure_file(
-+  # "${CMAKE_CURRENT_SOURCE_DIR}/vtk_utf8.h.in"
-+  # "${CMAKE_CURRENT_BINARY_DIR}/vtk_utf8.h")
-+
-+# vtk_module_install_headers(
-+  # FILES "${CMAKE_CURRENT_BINARY_DIR}/vtk_utf8.h")
++    INCLUDE_DIRS VTKm_INCLUDE_DIRS VTKm_DIY_INCLUDE_DIRS VTKm_OPTION_INCLUDE_DIRS
++)
+\ No newline at end of file
 diff --git a/ThirdParty/vtkm/vtk.module b/ThirdParty/vtkm/vtk.module
 index a8e4dad0f..c7bbbf0e8 100644
 --- a/ThirdParty/vtkm/vtk.module
@@ -124,18 +166,3 @@ index a8e4dad0f..c7bbbf0e8 100644
 +LIBRARY_NAME
 +  VTKm
  THIRD_PARTY
-diff --git a/CMake/vtk-config.cmake.in b/CMake/vtk-config.cmake.in
-index 1ecfde326..ae5576e66 100644
---- a/CMake/vtk-config.cmake.in	
-+++ b/CMake/vtk-config.cmake.in
-@@ -114,9 +114,7 @@ set("${CMAKE_FIND_PACKAGE_NAME}_AVAILABLE_COMPONENTS" "@vtk_all_components@")
- unset("${CMAKE_FIND_PACKAGE_NAME}_FOUND")
- set("${CMAKE_FIND_PACKAGE_NAME}_HAS_VTKm" "@vtk_has_vtkm@")
- if (${CMAKE_FIND_PACKAGE_NAME}_HAS_VTKm)
--  find_package(VTKm
--    PATHS "${CMAKE_CURRENT_LIST_DIR}/vtkm"
--    NO_DEFAULT_PATH)
-+  find_package(VTKm CONFIG REQUIRED)
-   if (NOT VTKm_FOUND)
-     set("${CMAKE_FIND_PACKAGE_NAME}_FOUND" 0)
-   endif ()
diff --git a/versions/baseline.json b/versions/baseline.json
index 9a0efc8c4..2a81975f9 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1221,7 +1221,7 @@
       "port-version": 0
     },
     "cgns": {
-      "baseline": "3.4.0-1",
+      "baseline": "4.2.0",
       "port-version": 0
     },
     "chaiscript": {
@@ -4845,8 +4845,8 @@
       "port-version": 0
     },
     "paraview": {
-      "baseline": "5.8.0",
-      "port-version": 3
+      "baseline": "5.9.1",
+      "port-version": 0
     },
     "parmetis": {
       "baseline": "4.0.3",
@@ -5314,7 +5314,7 @@
     },
     "qt5-svg": {
       "baseline": "5.15.2",
-      "port-version": 0
+      "port-version": 1
     },
     "qt5-tools": {
       "baseline": "5.15.2",
@@ -6677,16 +6677,16 @@
       "port-version": 1
     },
     "vtk": {
-      "baseline": "9.0.1",
-      "port-version": 7
+      "baseline": "9.0.3-pv5.9.1",
+      "port-version": 0
     },
     "vtk-dicom": {
       "baseline": "0.8.12-1",
       "port-version": 0
     },
     "vtk-m": {
-      "baseline": "1.5.0",
-      "port-version": 1
+      "baseline": "1.6.0",
+      "port-version": 0
     },
     "vulkan": {
       "baseline": "1.1.82.1-1",
diff --git a/versions/c-/cgns.json b/versions/c-/cgns.json
index 6a9a059d3..bc33d2bd9 100644
--- a/versions/c-/cgns.json
+++ b/versions/c-/cgns.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "9d33908ce58fbfa6e823c937716e57d84d1cb2a5",
+      "version-semver": "4.2.0",
+      "port-version": 0
+    },
+    {
       "git-tree": "cc70f3fcc3f4ff2dad2712400208181dc7bb280d",
       "version-string": "3.4.0-1",
       "port-version": 0
diff --git a/versions/p-/paraview.json b/versions/p-/paraview.json
index ad9e156d9..c90ffe0d8 100644
--- a/versions/p-/paraview.json
+++ b/versions/p-/paraview.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "a43b7d1bc53e7bdafcb4b73c3e9d84b9f80ecc22",
+      "version-semver": "5.9.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "9fb60c7a190e19963cb1811d3987da1e057ba6ad",
       "version-string": "5.8.0",
       "port-version": 3
diff --git a/versions/q-/qt5-svg.json b/versions/q-/qt5-svg.json
index 012188db5..385bc8882 100644
--- a/versions/q-/qt5-svg.json
+++ b/versions/q-/qt5-svg.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "84778600522df34a9db6d62f0c217c5d29346492",
+      "version-string": "5.15.2",
+      "port-version": 1
+    },
+    {
       "git-tree": "4cdec015d18a0bf66a77ea27006346f0fe382c64",
       "version-string": "5.15.2",
       "port-version": 0
diff --git a/versions/v-/vtk-m.json b/versions/v-/vtk-m.json
index 88cc6fdc2..87391760f 100644
--- a/versions/v-/vtk-m.json
+++ b/versions/v-/vtk-m.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "bb3404a3ff10cfdc6bfabc198b44d711b752fd6e",
+      "version-semver": "1.6.0",
+      "port-version": 0
+    },
+    {
       "git-tree": "38b6b6e37b4b027d7fb92207edbe8e8b97631faf",
       "version-string": "1.5.0",
       "port-version": 1
diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json
index 092bac462..7cb9e0621 100644
--- a/versions/v-/vtk.json
+++ b/versions/v-/vtk.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "87526609113852b1b1c4a1fdc40c96a61b7c0b47",
+      "version-semver": "9.0.3-pv5.9.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "4a64bbb016d5ecf20be3df3bf850748f9f885502",
       "version-string": "9.0.1",
       "port-version": 7
author	Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>	2021-08-30 19:03:01 +0200
committer	GitHub <noreply@github.com>	2021-08-30 10:03:01 -0700
commit	8c7e8df01549e59ac28469193976fbbe08e00f21 (patch)
tree	75aa5c6942ddd9c58b28a814a4cf4f41c56eceb6
parent	047e8ef16e2cdb431b9857b79fdfa237b0f038e2 (diff)
download	vcpkg-8c7e8df01549e59ac28469193976fbbe08e00f21.tar.gz vcpkg-8c7e8df01549e59ac28469193976fbbe08e00f21.zip