3 files changed, 94 insertions, 3 deletions

diff --git a/science/elmerfem/Makefile b/science/elmerfem/Makefile
index 30a7b9adef4a..186720eed33f 100644
--- a/science/elmerfem/Makefile
+++ b/science/elmerfem/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	elmerfem
 DISTVERSIONPREFIX=	release-
 DISTVERSION=	9.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science
 
 MAINTAINER=	henrik@gulbra.net
@@ -61,7 +61,7 @@ OCC_LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 			libpython${_PYVERSION}.so:lang/python${PYTHON_SUFFIX} \
 			libtiff.so:graphics/tiff \
 			libTKernel.so:cad/opencascade \
-			libvtksys-9.1.so:math/vtk9
+			libvtksys-${VTK_VER}.so:math/vtk${VTK_VER:R}
 OCC_USES=		python
 OCC_CMAKE_BOOL=		WITH_OCC
 OCC_CMAKE_ON=		-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.0 \
@@ -73,6 +73,7 @@ _QT5_LIBS=	buildtools:build concurrent core declarative gui location \
 		network opengl printsupport qmake:build script sensors \
 		sql svg webchannel webkit widgets xml
 
+.include <../../math/vtk9/Makefile.version>
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
diff --git a/science/elmerfem/files/patch-ElmerGUI_Application_cad_cadview.cpp b/science/elmerfem/files/patch-ElmerGUI_Application_cad_cadview.cpp
index 5187c4d8599f..aed35f60ceed 100644
--- a/science/elmerfem/files/patch-ElmerGUI_Application_cad_cadview.cpp
+++ b/science/elmerfem/files/patch-ElmerGUI_Application_cad_cadview.cpp
@@ -1,6 +1,6 @@
 - includes workaround for https://github.com/ElmerCSC/elmerfem/issues/304
 
---- ElmerGUI/Application/cad/cadview.cpp.orig	2021-11-10 14:49:01 UTC
+--- ElmerGUI/Application/cad/cadview.cpp.orig	2020-11-10 19:52:44 UTC
 +++ ElmerGUI/Application/cad/cadview.cpp
 @@ -74,7 +74,7 @@
  #include <BRepAdaptor_Curve2d.hxx>
@@ -11,6 +11,34 @@
  #include <BRepTools.hxx>
  #include <BRep_Builder.hxx>
  #include <BRep_Tool.hxx>
+@@ -104,7 +104,7 @@ static void pickEventHandler(vtkObject* caller, unsign
+   QVTKWidget* qvtkWidget = cadView->GetQVTKWidget();
+ #endif
+ 
+-  vtkAbstractPicker* picker = qvtkWidget->GetInteractor()->GetPicker();
++  vtkAbstractPicker* picker = qvtkWidget->interactor()->GetPicker();
+   vtkPropPicker* propPicker = vtkPropPicker::SafeDownCast(picker);
+   vtkActor* actor = propPicker->GetActor();
+ 
+@@ -146,15 +146,15 @@ CadView::CadView(QWidget *parent) : QMainWindow(parent
+ 
+   renderer = vtkRenderer::New();
+   renderer->SetBackground(1, 1, 1);
+-  qVTKWidget->GetRenderWindow()->AddRenderer(renderer);
++  qVTKWidget->renderWindow()->AddRenderer(renderer);
+   renderer->GetRenderWindow()->Render();
+ 
+   vtkPropPicker *propPicker = vtkPropPicker::New();
+   vtkCallbackCommand *cbcPick = vtkCallbackCommand::New();
+-  qVTKWidget->GetInteractor()->SetPicker(propPicker);
++  qVTKWidget->interactor()->SetPicker(propPicker);
+   cbcPick->SetClientData(this);
+   cbcPick->SetCallback(pickEventHandler);
+-  qVTKWidget->GetInteractor()->GetPicker()->AddObserver(vtkCommand::PickEvent,
++  qVTKWidget->interactor()->GetPicker()->AddObserver(vtkCommand::PickEvent,
+                                                         cbcPick);
+   propPicker->Delete();
+   cbcPick->Delete();
 @@ -343,9 +343,6 @@ bool CadView::readFile(QString fileName) {
  
      const gp_Trsf &Transformation = Location.Transformation();
@@ -62,3 +90,12 @@
      }
  
      partGrid->SetPoints(partPoints);
+@@ -490,7 +487,7 @@ bool CadView::readFile(QString fileName) {
+   // Draw:
+   //------
+   renderer->ResetCamera();  
+-  qVTKWidget->GetRenderWindow()->Render();
++  qVTKWidget->renderWindow()->Render();
+ 
+   QCoreApplication::processEvents();
+ 
diff --git a/science/elmerfem/files/patch-ElmerGUI_Application_vtkpost_vtkpost.cpp b/science/elmerfem/files/patch-ElmerGUI_Application_vtkpost_vtkpost.cpp
new file mode 100644
index 000000000000..77962f421b0e
--- /dev/null
+++ b/science/elmerfem/files/patch-ElmerGUI_Application_vtkpost_vtkpost.cpp
@@ -0,0 +1,53 @@
+--- ElmerGUI/Application/vtkpost/vtkpost.cpp.orig	2020-11-10 19:52:44 UTC
++++ ElmerGUI/Application/vtkpost/vtkpost.cpp
+@@ -124,6 +124,8 @@
+ 
+ using namespace std;
+ 
++#define GetRenderWindow renderWindow // renaming for VTK-9.2.2
++
+ // Custom print for QtScript:
+ //----------------------------
+ #if QT_VERSION >= 0x040403
+@@ -171,7 +173,7 @@ static void pEventHandler(vtkObject* caller, unsigned 
+   QVTKWidget* qvtkWidget = vtkPost->GetQVTKWidget();
+ #endif
+ 
+-  vtkAbstractPicker* picker = qvtkWidget->GetInteractor()->GetPicker();
++  vtkAbstractPicker* picker = qvtkWidget->interactor()->GetPicker();
+   vtkPropPicker* propPicker = vtkPropPicker::SafeDownCast(picker);
+ 
+   vtkActor* actor = propPicker->GetActor();
+@@ -382,14 +384,14 @@ VtkPost::VtkPost(QWidget *parent)
+   // Create a cell picker and set the callback & observer:
+   //------------------------------------------------------
+   vtkPropPicker* propPicker = vtkPropPicker::New();
+-  qvtkWidget->GetInteractor()->SetPicker(propPicker);
++  qvtkWidget->interactor()->SetPicker(propPicker);
+   propPicker->Delete();
+ 
+   vtkCallbackCommand* cbcPick = vtkCallbackCommand::New();
+   cbcPick->SetClientData(this);
+   cbcPick->SetCallback(pEventHandler);
+ 
+-  vtkAbstractPicker* picker = qvtkWidget->GetInteractor()->GetPicker();
++  vtkAbstractPicker* picker = qvtkWidget->interactor()->GetPicker();
+   picker->AddObserver(vtkCommand::EndPickEvent, cbcPick);
+   cbcPick->Delete();
+ 
+@@ -402,7 +404,7 @@ VtkPost::VtkPost(QWidget *parent)
+   cbcPlane->SetCallback(iEventHandler);
+ 
+   planeWidget = vtkImplicitPlaneWidget::New();
+-  planeWidget->SetInteractor(qvtkWidget->GetInteractor());
++  planeWidget->SetInteractor(qvtkWidget->interactor());
+   planeWidget->AddObserver(vtkCommand::InteractionEvent, cbcPlane);
+   cbcPlane->Delete();
+ 
+@@ -3519,4 +3521,4 @@ void VtkPost::viewZXmPlaneSlot(){
+   renderer->GetActiveCamera()->SetViewUp(1,0,0);
+   renderer->ResetCamera();
+   redrawSlot();
+-}
+\ No newline at end of file
++}