From 6b4c1e771d0a410f976ca0dcc1e992e86481fe9d Mon Sep 17 00:00:00 2001 From: Pietro Cerutti Date: Mon, 12 Mar 2012 12:23:48 +0000 Subject: [PATCH] - fix plist when building with OSMesa Feature safe: yes --- math/vtk5/Makefile | 2 ++ math/vtk5/pkg-plist | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile index f839a066b8ae..0dbc6eed41a8 100644 --- a/math/vtk5/Makefile +++ b/math/vtk5/Makefile @@ -111,8 +111,10 @@ CMAKE_ARGS+= -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \ -DOSMESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa32.so \ -DOPENGL_gl_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa32.so \ -DOPENGL_glu_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSGLU.so +PLIST_SUB+= X11="@comment " .else USE_GL= yes +PLIST_SUB+= X11="" .endif .if defined(WITH_QT) diff --git a/math/vtk5/pkg-plist b/math/vtk5/pkg-plist index ae6effd4ac5e..2f9b10d170b4 100644 --- a/math/vtk5/pkg-plist +++ b/math/vtk5/pkg-plist @@ -2345,7 +2345,7 @@ include/vtk-%%VER2%%/vtkX3DExporterFIWriter.h include/vtk-%%VER2%%/vtkX3DExporterWriter.h include/vtk-%%VER2%%/vtkX3DExporterXMLWriter.h include/vtk-%%VER2%%/vtkXGMLReader.h -include/vtk-%%VER2%%/vtkXGPUInfoList.h +%%X11%%include/vtk-%%VER2%%/vtkXGPUInfoList.h include/vtk-%%VER2%%/vtkXMLCompositeDataReader.h include/vtk-%%VER2%%/vtkXMLCompositeDataWriter.h include/vtk-%%VER2%%/vtkXMLDataElement.h @@ -2406,8 +2406,8 @@ include/vtk-%%VER2%%/vtkXMLUnstructuredGridWriter.h include/vtk-%%VER2%%/vtkXMLUtilities.h include/vtk-%%VER2%%/vtkXMLWriter.h include/vtk-%%VER2%%/vtkXMLWriterC.h -include/vtk-%%VER2%%/vtkXOpenGLRenderWindow.h -include/vtk-%%VER2%%/vtkXRenderWindowInteractor.h +%%X11%%include/vtk-%%VER2%%/vtkXOpenGLRenderWindow.h +%%X11%%include/vtk-%%VER2%%/vtkXRenderWindowInteractor.h include/vtk-%%VER2%%/vtkXYPlotActor.h include/vtk-%%VER2%%/vtkXYPlotWidget.h include/vtk-%%VER2%%/vtkXYZMolReader.h