Date: Thu, 12 Jul 2018 19:03:54 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474531 - in head/math: . vtk8 vtk8/files Message-ID: <201807121903.w6CJ3sZo023554@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Thu Jul 12 19:03:54 2018 New Revision: 474531 URL: https://svnweb.freebsd.org/changeset/ports/474531 Log: New port: math/vtk8: Visualization toolkit (repocopy of math/vtk6 with modifications) Changes against math/vtk6: * Use DISTVERSION * Update COMMENT * Add to USES * Remove the SHARED option: all libraries should be shared, no need for the option to do otherwise * Remove the PYTHON option: python binding should be a separate port * Modernize the port: use helpers instead of .if/.endif * Use autoplist: too many files with too complex dependencies on options * Update USE_QT to include missing parts Added: head/math/vtk8/ - copied from r474486, head/math/vtk6/ head/math/vtk8/files/patch-Examples_GUI_Qt_GraphicsView_CMakeLists.txt (contents, props changed) head/math/vtk8/files/patch-GUISupport_Qt_CMakeLists.txt (contents, props changed) head/math/vtk8/files/patch-GUISupport_Qt_PluginInstall.cmake.in (contents, props changed) head/math/vtk8/files/patch-IO_EnSight_vtkEnSight6BinaryReader.cxx (contents, props changed) head/math/vtk8/files/patch-IO_EnSight_vtkEnSightGoldBinaryReader.cxx (contents, props changed) head/math/vtk8/files/patch-ThirdParty_libproj4_vtklibproj4_CMakeLists.txt (contents, props changed) head/math/vtk8/files/patch-ThirdParty_verdict_vtkverdict_CMakeLists.txt (contents, props changed) head/math/vtk8/files/patch-Wrapping_Tcl_CMakeLists.txt (contents, props changed) Deleted: head/math/vtk8/files/patch-Examples-GUI-Qt-GraphicsView_CMakeLists.txt head/math/vtk8/files/patch-GUISupport-Qt_CMakeLists.txt head/math/vtk8/files/patch-GUISupport-Qt_PluginInstall.cmake.in head/math/vtk8/files/patch-Rendering_OpenGL_vtkXOpenGLRenderWindow.cxx head/math/vtk8/files/patch-ThirdParty-verdict-vtkverdict_CMakeLists.txt head/math/vtk8/files/patch-Wrapping-Tcl_CMakeLists.txt Modified: head/math/Makefile head/math/vtk8/Makefile head/math/vtk8/distinfo Modified: head/math/Makefile ============================================================================== --- head/math/Makefile Thu Jul 12 18:46:20 2018 (r474530) +++ head/math/Makefile Thu Jul 12 19:03:54 2018 (r474531) @@ -818,6 +818,7 @@ SUBDIR += vtk5 SUBDIR += vtk5-data SUBDIR += vtk6 + SUBDIR += vtk8 SUBDIR += wcalc SUBDIR += wfmath SUBDIR += why3 Modified: head/math/vtk8/Makefile ============================================================================== --- head/math/vtk6/Makefile Thu Jul 12 06:01:25 2018 (r474486) +++ head/math/vtk8/Makefile Thu Jul 12 19:03:54 2018 (r474531) @@ -1,16 +1,14 @@ -# Created by: gahr # $FreeBSD$ PORTNAME= vtk -PORTVERSION= 6.2.0 -PORTREVISION= 6 +DISTVERSION= 8.1.1 CATEGORIES= math graphics MASTER_SITES= http://www.vtk.org/files/release/${VTK_SHORT_VER}/ -PKGNAMESUFFIX= 6 +PKGNAMESUFFIX= 8 DISTNAME= ${PORTNAME:tu}-${PORTVERSION} -MAINTAINER= stephen@FreeBSD.org -COMMENT= The Visualization Toolkit +MAINTAINER= yuri@FreeBSD.org +COMMENT= Visualization toolkit LICENSE= BSD3CLAUSE @@ -19,26 +17,29 @@ LIB_DEPENDS= libtiff.so:graphics/tiff \ libfreetype.so:print/freetype2 \ libexpat.so:textproc/expat2 -# -# TODO -# * VTK Groups +CONFLICTS= vtk5 vtk6 -CONFLICTS= vtk-4* +USES= alias cmake:outsource jpeg localbase USE_LDCONFIG= ${PREFIX}/lib/vtk-${VTK_SHORT_VER} -USE_XORG= xt sm ice x11 xext -USES= alias cmake:outsource jpeg -CXXFLAGS+= -I${LOCALBASE}/include +USE_XORG= ice x11 xt xext sm +CMAKE_ON= BUILD_SHARED_LIBS \ + VTK_INSTALL_NO_DOCUMENTATION VTK_USE_SYSTEM_EXPAT VTK_USE_SYSTEM_TIFF \ + VTK_USE_SYSTEM_PNG VTK_USE_SYSTEM_JPEG VTK_USE_SYSTEM_FREETYPE VTK_USE_SYSTEM_ZLIB \ + Module_vtkTestingCore Module_vtkTestingRendering +CMAKE_ARGS+= -DVTK_INSTALL_LIBRARY_DIR=lib/vtk-${VTK_SHORT_VER} \ + -DVTK_INSTALL_ARCHIVE_DIR=lib/vtk-${VTK_SHORT_VER} \ + -DVTK_INSTALL_QT_DIR=/${QT_LIBDIR_REL}/plugins/designer \ + -DSTAGEDIR=${STAGEDIR} + VTK_SHORT_VER= ${PORTVERSION:R} -PLIST_SUB+= VER2=${VTK_SHORT_VER} DOCSDIR= ${PREFIX}/share/doc/vtk-${VTK_SHORT_VER} DATADIR= ${PREFIX}/share/vtk-${VTK_SHORT_VER} # Options -OPTIONS_DEFINE= DESIGNER DOCS OSMESA EXAMPLES SHARED -OPTIONS_DEFAULT=PYTHON SHARED -#OPTIONS_DEFAULT=MPI Qt JAVA PYTHON TCLTK DESIGNER +OPTIONS_DEFINE= DESIGNER DOCS OSMESA EXAMPLES +#OPTIONS_DEFAULT=MPI Qt JAVA TCLTK DESIGNER OSMESA_DESC= Use Mesa for off-screen rendering DESIGNER_DESC= Build the Qt Designer plugin OPTIONS_SUB= yes @@ -46,7 +47,7 @@ OPTIONS_SUB= yes # Options groups #VTK_GROUPS= Imaging MPI Qt Rendering StandAlone Views VTK_GROUPS= MPI -VTK_WRAPS= JAVA TCLTK PYTHON +VTK_WRAPS= JAVA TCLTK OPTIONS_GROUP= Groups Wrapping OPTIONS_GROUP_Groups=${VTK_GROUPS} OPTIONS_GROUP_Wrapping=${VTK_WRAPS} @@ -64,29 +65,60 @@ Qt_DESC= Qt GUI support QT4_DESC= Qt 4 toolkit support QT5_DESC= Qt 5 toolkit support -CMAKE_ARGS+= -DVTK_INSTALL_LIBRARY_DIR=lib/vtk-${VTK_SHORT_VER} \ - -DVTK_INSTALL_ARCHIVE_DIR=lib/vtk-${VTK_SHORT_VER} \ - -DVTK_INSTALL_NO_DOCUMENTATION=ON \ - -DVTK_INSTALL_QT_DIR=/${QT_LIBDIR_REL}/plugins/designer \ - -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \ - -DVTK_USE_SYSTEM_TIFF:BOOL=ON \ - -DVTK_USE_SYSTEM_PNG:BOOL=ON \ - -DVTK_USE_SYSTEM_JPEG:BOOL=ON \ - -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \ - -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \ - -DSTAGEDIR=${STAGEDIR} \ - -DModule_vtkTestingCore:BOOL=ON \ - -DModule_vtkTestingRendering:BOOL=ON +QT4_USES= qt:4 +QT4_USE= QT=corelib,designer,gui_build,gui_run,network_build,network_run,sql_build,sql_run,moc_build,uic_build,qmake_build,rcc_build,opengl,webkit_build,webkit_run +QT4_CMAKE_ON= -DVTK_QT_VERSION:STRING="4" \ + -DVTK_Group_Qt:BOOL=ON -SHARED_CMAKE_ON= -DBUILD_SHARED_LIBS:BOOL=ON -SHARED_CMAKE_OFF= -DBUILD_SHARED_LIBS:BOOL=OFF +QT5_USES= qt:5 +QT5_USE= QT=core,gui,sql,widgets,x11extras,qmake_build,buildtools_build +QT5_CMAKE_ON= -DVTK_QT_VERSION:STRING="5" \ + -DCMAKE_PREFIX_PATH:STRING=${LOCALBASE}/lib/qt5 \ + -DVTK_Group_Qt:BOOL=ON +DESIGNER_CMAKE_BOOL= QT_DESIGNER_PLUGIN +DESIGNER_USE= QT=designer + +MPI_LIB_DEPENDS= libmpi.so:net/openmpi +MPI_CMAKE_ON= -DMPIEXEC=${LOCALBASE}/mpi/openmpi/bin/mpiexec + +OSMESA_CMAKE_ARGS= -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \ + -DOSMESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \ + -DOSMESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa.so \ + -DOPENGL_gl_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa.so \ + -DVTK_USE_X:BOOL=OFF +OSMESA_LIB_DEPENDS= libOSMesa.so:graphics/libosmesa + +# Wrapping +JAVA_CATEGORIES= java +JAVA_VARS= USE_JAVA=yes +JAVA_CMAKE_BOOL= VTK_WRAP_JAVA Module_vtkWrappingJava +JAVA_CMAKE_ON= -DJAVA_INCLUDE_PATH:PATH=${JAVA_HOME}/include \ + -DJAVA_AWT_LIBRARY:PATH=${JAVA_HOME}/jre/lib/${ARCH}/libjawt.so \ + -DJAVA_JVM_LIBRARY:PATH=${JAVA_HOME}/jre/lib/${ATCH}/libjava.so + +TCLTK_USES= tk +TCLTK_CMAKE_BOOL= VTK_WRAP_TCL VTK_Group_Tk +TCLTK_CMAKE_ON= -DTCL_INCLUDE_PATH:PATH=${TCL_INCLUDEDIR} \ + -DTK_INCLUDE_PATH:PATH=${TK_INCLUDEDIR} \ + -DVTK_INSTALL_TCL_DIR=lib/vtk-${VTK_SHORT_VER} + +DOCS_CMAKE_BOOL= BUILD_DOCUMENTATION +DOCS_BUILD_DEPENDS= doxygen:devel/doxygen + +EXAMPLES_CMAKE_BOOL= BUILD_EXAMPLES + # Mangling so that it will build when science/netcdf is installed. post-patch: - ${MV} ${WRKSRC}/ThirdParty/netcdf/vtknetcdf/include/netcdf.h \ + @${MV} ${WRKSRC}/ThirdParty/netcdf/vtknetcdf/include/netcdf.h \ ${WRKSRC}/ThirdParty/netcdf/vtknetcdf/include/xxxnetcdf.h - ${FIND} ${WRKSRC}/ThirdParty/netcdf -type f | ${XARGS} ${REINPLACE_CMD} \ + @${FIND} ${WRKSRC}/ThirdParty/netcdf -type f | ${XARGS} ${REINPLACE_CMD} \ -E 's/[[:<:]]netcdf\.h[[:>:]]/xxxnetcdf.h/' + @${REINPLACE_CMD} -e "s|reinterpret_cast<const GLvoid \*>(NULL)|nullptr|g" \ + ${WRKSRC}/Rendering/OpenGL2/*.cxx \ + ${WRKSRC}/Rendering/VolumeOpenGL2/vtkOpenGLProjectedTetrahedraMapper.cxx # many files/places, see https://gitlab.kitware.com/vtk/vtk/issues/17179 + @${REINPLACE_CMD} -e "s|static_cast<Window>(NULL)|0|g" \ + ${WRKSRC}/Rendering/OpenGL2/*.cxx # many files/places, see https://gitlab.kitware.com/vtk/vtk/issues/17179 .include <bsd.port.options.mk> @@ -98,127 +130,16 @@ CMAKE_ARGS+= -DVTK_Group_${g}:BOOL=OFF . endif .endfor -.if ${PORT_OPTIONS:MOSMESA} -LIB_DEPENDS+= libOSMesa.so:graphics/libosmesa -CMAKE_ARGS+= -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \ - -DOSMESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \ - -DOSMESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa.so \ - -DOPENGL_gl_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa.so \ - -DVTK_USE_X:BOOL=OFF -PLIST_SUB+= X11="@comment " \ - OSMESA="" -.else +.if !${PORT_OPTIONS:MOSMESA} USE_GL= gl glu -PLIST_SUB+= X11="" \ - OSMESA="@comment " .endif -.if ${PORT_OPTIONS:MEXAMPLES} -CMAKE_ARGS+= -DBUILD_EXAMPLES:BOOL=ON -.endif - -.if ${PORT_OPTIONS:MMPI} -LIB_DEPENDS+= libmpi.so:net/openmpi -CMAKE_ARGS+= -DMPIEXEC=${LOCALBASE}/mpi/openmpi/bin/mpiexec -PLIST_SUB+= MPI="" -.else -PLIST_SUB+= MPI="@comment " -.endif - -.if ${PORT_OPTIONS:MQT4} -USES+= qt:4 -USE_QT= gui_build gui_run network_build network_run sql_build sql_run \ - moc_build uic_build qmake_build rcc_build opengl webkit_build \ - webkit_run -CMAKE_ARGS+= -DVTK_QT_VERSION:STRING="4" -PLIST_SUB+= QTV="qt4" -.endif - -.if ${PORT_OPTIONS:MQT5} -USES+= qt:5 -USE_QT= gui_build gui_run network_build network_run sql_build sql_run \ - qmake_build opengl webkit_build buildtools webkit_run -CMAKE_ARGS+= -DVTK_QT_VERSION:STRING="5" \ - -DCMAKE_PREFIX_PATH:STRING=${LOCALBASE}/lib/qt5 -PLIST_SUB+= QTV="qt5" -.endif - -.if ${PORT_OPTIONS:MQT4} || ${PORT_OPTIONS:MQT5} -CMAKE_ARGS+= -DVTK_Group_Qt:BOOL=ON -PLIST_SUB+= QT="" -.else -PLIST_SUB+= QT="@comment " -CMAKE_ARGS+= -DVTK_Group_Qt:BOOL=OFF -.endif - -.if ${PORT_OPTIONS:MDESIGNER} -.if ${PORT_OPTIONS:MQT5} -USE_QT+= designer -.elif ${PORT_OPTIONS:MQT4} -USE_QT+= designer -.else +.if ${PORT_OPTIONS:MDESIGNER} && !${PORT_OPTIONS:MQT5} && !${PORT_OPTIONS:MQT4} IGNORE= designer requires either QT4 or QT5 .endif -PLIST_SUB+= DESIGNER="" -CMAKE_ARGS+= -DQT_DESIGNER_PLUGIN:BOOL=ON -.else -PLIST_SUB+= DESIGNER="@comment " -CMAKE_ARGS+= -DQT_DESIGNER_PLUGIN:BOOL=OFF -.endif -# Wrapping -.if ${PORT_OPTIONS:MJAVA} -CATEGORIES+= java -USE_JAVA= yes -CMAKE_ARGS+= -DVTK_WRAP_JAVA:BOOL=ON \ - -DJAVA_INCLUDE_PATH:PATH=${JAVA_HOME}/include \ - -DJAVA_AWT_LIBRARY:PATH=${JAVA_HOME}/jre/lib/${ARCH}/libjawt.so \ - -DJAVA_JVM_LIBRARY:PATH=${JAVA_HOME}/jre/lib/${ATCH}/libjava.so -PLIST_SUB+= JAVA="" -.else -CMAKE_ARGS+= -DVTK_WRAP_JAVA:BOOL=OFF \ - -DModule_vtkWrappingJava:BOOL=OFF -PLIST_SUB+= JAVA="@comment " -.endif - -.if ${PORT_OPTIONS:MPYTHON} -USES+= python:2.7 -CMAKE_ARGS+= -DVTK_WRAP_PYTHON:BOOL=ON \ - -DVTK_INSTALL_PYTHON_MODULE_DIR:STRING=${PYTHONPREFIX_SITELIBDIR} \ - -DModule_vtkRenderingMatplotlib:BOOL=ON \ - -DModule_vtkPythonInterpreter:BOOL=ON -PLIST_SUB+= PYTHON="" -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR} -.else -CMAKE_ARGS+= -DVTK_WRAP_PYTHON:BOOL=OFF -PLIST_SUB+= PYTHON="@comment " -.endif - -.if ${PORT_OPTIONS:MTCLTK} -USES+= tk -CMAKE_ARGS+= -DVTK_WRAP_TCL:BOOL=ON \ - -DVTK_Group_Tk:BOOL=ON \ - -DTCL_INCLUDE_PATH:PATH=${TCL_INCLUDEDIR} \ - -DTK_INCLUDE_PATH:PATH=${TK_INCLUDEDIR} \ - -DVTK_INSTALL_TCL_DIR=lib/vtk-${VTK_SHORT_VER} -PLIST_SUB+= TCLTK="" -.else -CMAKE_ARGS+= -DVTK_WRAP_TCL:BOOL=OFF \ - -DVTK_Group_Tk:BOOL=OFF -PLIST_SUB+= TCLTK="@comment " -.endif - -.if ${PORT_OPTIONS:MJAVA} || ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MTCLTK} -PLIST_SUB+= WRAP="" -.else -PLIST_SUB+= WRAP="@comment " -.endif - -.if ${PORT_OPTIONS:MDOCS} -CMAKE_ARGS+= -DBUILD_DOCUMENTATION:BOOL=ON -BUILD_DEPENDS+= doxygen:devel/doxygen -.else -CMAKE_ARGS+= -DBUILD_DOCUMENTATION:BOOL=OFF -.endif +post-install: # autoplist: thousands of files, complex dependencies on options + @cd ${STAGEDIR}${PREFIX} && \ + ${FIND} * -type f -or -type l >> ${TMPPLIST} .include <bsd.port.mk> Modified: head/math/vtk8/distinfo ============================================================================== --- head/math/vtk6/distinfo Thu Jul 12 06:01:25 2018 (r474486) +++ head/math/vtk8/distinfo Thu Jul 12 19:03:54 2018 (r474531) @@ -1,2 +1,3 @@ -SHA256 (VTK-6.2.0.tar.gz) = efa3ddfba118f3988ead08bdaf9441d33f23a4245d78511a6ce7f267b4f13277 -SIZE (VTK-6.2.0.tar.gz) = 30114472 +TIMESTAMP = 1531338278 +SHA256 (VTK-8.1.1.tar.gz) = 71a09b4340f0a9c58559fe946dc745ab68a866cf20636a41d97b6046cb736324 +SIZE (VTK-8.1.1.tar.gz) = 33482287 Added: head/math/vtk8/files/patch-Examples_GUI_Qt_GraphicsView_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/vtk8/files/patch-Examples_GUI_Qt_GraphicsView_CMakeLists.txt Thu Jul 12 19:03:54 2018 (r474531) @@ -0,0 +1,11 @@ +--- Examples/GUI/Qt/GraphicsView/CMakeLists.txt.orig 2018-05-11 14:34:24 UTC ++++ Examples/GUI/Qt/GraphicsView/CMakeLists.txt +@@ -62,7 +62,7 @@ if(VTK_QT_VERSION VERSION_GREATER "4") + add_executable(qtgraphicsview MACOSX_BUNDLE + ${Srcs} ${Hdrs} ${MOC_Hdrs} ${QRC_Srcs}) + qt5_use_modules(qtgraphicsview Core Gui Widgets +- WebKit WebKitWidgets OpenGL OpenGLExtensions) ++ WebKit WebKitWidgets OpenGL) + target_link_libraries(qtgraphicsview ${VTK_LIBRARIES}) + else() + find_package(Qt4 REQUIRED) Added: head/math/vtk8/files/patch-GUISupport_Qt_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/vtk8/files/patch-GUISupport_Qt_CMakeLists.txt Thu Jul 12 19:03:54 2018 (r474531) @@ -0,0 +1,31 @@ +--- GUISupport/Qt/CMakeLists.txt.orig 2018-05-11 14:34:24 UTC ++++ GUISupport/Qt/CMakeLists.txt +@@ -145,7 +145,7 @@ if(VTK_BUILD_QT_DESIGNER_PLUGIN AND add_ + find_package(Qt5 COMPONENTS ${qt_component} REQUIRED QUIET) + add_definitions(${Qt5${qt_component}_DEFINITIONS}) + include_directories(${Qt5${qt_component}_INCLUDE_DIRS}) +- qt5_wrap_cpp(PluginMocSrcs ${PluginMocHeaders} TARGET QVTKWidgetPlugin) ++ qt5_wrap_cpp(PluginMocSrcs ${PluginMocHeaders} TARGET QVTKWidgetPlugin-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}) + set(QT_LIBRARIES Qt5::${qt_component}) + else() + find_package(Qt4 COMPONENTS QtCore QtGui QtDesignerComponents REQUIRED QUIET) +@@ -157,16 +157,16 @@ if(VTK_BUILD_QT_DESIGNER_PLUGIN AND add_ + + # add QVTK plugin from sources + # stand-alone as it doesn't depend on QVTK library +- add_library(QVTKWidgetPlugin ++ add_library(QVTKWidgetPlugin-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION} + SHARED + ${PluginLibSrcs} + ${PluginMocSrcs} + ) + +- set_target_properties(QVTKWidgetPlugin PROPERTIES COMPILE_DEFINITIONS QT_NO_DEBUG) ++ set_target_properties(QVTKWidgetPlugin-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION} PROPERTIES COMPILE_DEFINITIONS QT_NO_DEBUG) + + # link with Qt libs +- vtk_module_link_libraries(QVTKWidgetPlugin ${QT_LIBRARIES}) ++ vtk_module_link_libraries(QVTKWidgetPlugin-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION} ${QT_LIBRARIES}) + + # install rules + Added: head/math/vtk8/files/patch-GUISupport_Qt_PluginInstall.cmake.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/vtk8/files/patch-GUISupport_Qt_PluginInstall.cmake.in Thu Jul 12 19:03:54 2018 (r474531) @@ -0,0 +1,11 @@ +--- GUISupport/Qt/PluginInstall.cmake.in.orig 2017-11-21 08:23:50 UTC ++++ GUISupport/Qt/PluginInstall.cmake.in +@@ -10,7 +10,7 @@ if (WIN32) + set(BUILDTYPE_SUFFIX @CMAKE_RELEASE_POSTFIX@) + endif () + endif () +-set(VTK_INSTALL_QT_PLUGIN_FILE "@CMAKE_SHARED_LIBRARY_PREFIX@QVTKWidgetPlugin${BUILDTYPE_SUFFIX}@CMAKE_SHARED_LIBRARY_SUFFIX@") ++set(VTK_INSTALL_QT_PLUGIN_FILE "@CMAKE_SHARED_LIBRARY_PREFIX@QVTKWidgetPlugin-@VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@${BUILDTYPE_SUFFIX}@CMAKE_SHARED_LIBRARY_SUFFIX@") + set(VTK_CONFIGURATIONS "@CMAKE_CONFIGURATION_TYPES@") + + if(VTK_CONFIGURATIONS) Added: head/math/vtk8/files/patch-IO_EnSight_vtkEnSight6BinaryReader.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/vtk8/files/patch-IO_EnSight_vtkEnSight6BinaryReader.cxx Thu Jul 12 19:03:54 2018 (r474531) @@ -0,0 +1,13 @@ +--- IO/EnSight/vtkEnSight6BinaryReader.cxx.orig 2017-11-21 07:34:56 UTC ++++ IO/EnSight/vtkEnSight6BinaryReader.cxx +@@ -36,8 +36,8 @@ + #if defined(_WIN32) + # define VTK_STAT_STRUCT struct _stat64 + # define VTK_STAT_FUNC _stat64 +-#elif defined _DARWIN_FEATURE_64_BIT_INODE && !defined __FreeBSD__ +-// FreeBSD and OSX now deprecate stat64 ++#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ ++// FreeBSD and OSX use stat + # define VTK_STAT_STRUCT struct stat + # define VTK_STAT_FUNC stat + #else Added: head/math/vtk8/files/patch-IO_EnSight_vtkEnSightGoldBinaryReader.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/vtk8/files/patch-IO_EnSight_vtkEnSightGoldBinaryReader.cxx Thu Jul 12 19:03:54 2018 (r474531) @@ -0,0 +1,13 @@ +--- IO/EnSight/vtkEnSightGoldBinaryReader.cxx.orig 2017-11-21 07:32:21 UTC ++++ IO/EnSight/vtkEnSightGoldBinaryReader.cxx +@@ -37,8 +37,8 @@ + #if defined(_WIN32) + # define VTK_STAT_STRUCT struct _stat64 + # define VTK_STAT_FUNC _stat64 +-#elif defined _DARWIN_FEATURE_64_BIT_INODE && !defined __FreeBSD__ +-// FreeBSD and OSX now deprecate stat64 ++#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ ++// FreeBSD and OSX use stat + # define VTK_STAT_STRUCT struct stat + # define VTK_STAT_FUNC stat + #else Added: head/math/vtk8/files/patch-ThirdParty_libproj4_vtklibproj4_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/vtk8/files/patch-ThirdParty_libproj4_vtklibproj4_CMakeLists.txt Thu Jul 12 19:03:54 2018 (r474531) @@ -0,0 +1,16 @@ +--- ThirdParty/libproj4/vtklibproj4/CMakeLists.txt.orig 2017-08-30 20:55:05 UTC ++++ ThirdParty/libproj4/vtklibproj4/CMakeLists.txt +@@ -50,10 +50,10 @@ find_package (Threads) + + include(CheckIncludeFiles) + include(CheckSymbolExists) +-CHECK_SYMBOL_EXISTS(PTHREAD_MUTEX_RECURSIVE pthread.h HAVE_PTHREAD_MUTEX_RECURSIVE_DEFN) +-if (HAVE_PTHREAD_MUTEX_RECURSIVE_DEFN) ++#CHECK_SYMBOL_EXISTS(PTHREAD_MUTEX_RECURSIVE pthread.h HAVE_PTHREAD_MUTEX_RECURSIVE_DEFN) # test fails, reported upstream: https://gitlab.kitware.com/vtk/vtk/issues/17178 ++#if (HAVE_PTHREAD_MUTEX_RECURSIVE_DEFN) + add_definitions(-DHAVE_PTHREAD_MUTEX_RECURSIVE=1) +-endif() ++#endif() + + # Set a default build type for single-configuration cmake generators if + # no build type is set. Added: head/math/vtk8/files/patch-ThirdParty_verdict_vtkverdict_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/vtk8/files/patch-ThirdParty_verdict_vtkverdict_CMakeLists.txt Thu Jul 12 19:03:54 2018 (r474531) @@ -0,0 +1,25 @@ +--- ThirdParty/verdict/vtkverdict/CMakeLists.txt.orig 2017-08-30 20:55:05 UTC ++++ ThirdParty/verdict/vtkverdict/CMakeLists.txt +@@ -123,14 +123,14 @@ endif () + # Installation stuff + # + IF(NOT verdict_INSTALL_NO_DEVELOPMENT) +- install(FILES +- README +- Verdict.htm +- Verdict.doc +- verdict_test.cpp +- DESTINATION ${verdict_INSTALL_DOC_DIR}/verdict/${verdict_VERSION}/ +- COMPONENT Development +- ) ++# install(FILES ++# README ++# Verdict.htm ++# Verdict.doc ++# verdict_test.cpp ++# DESTINATION ${verdict_INSTALL_DOC_DIR}/verdict/${verdict_VERSION}/ ++# COMPONENT Development ++# ) + + install( + FILES ${verdict_BINARY_DIR}/verdict.h Added: head/math/vtk8/files/patch-Wrapping_Tcl_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/vtk8/files/patch-Wrapping_Tcl_CMakeLists.txt Thu Jul 12 19:03:54 2018 (r474531) @@ -0,0 +1,11 @@ +--- Wrapping/Tcl/CMakeLists.txt.orig 2017-08-30 20:55:05 UTC ++++ Wrapping/Tcl/CMakeLists.txt +@@ -247,7 +247,7 @@ endforeach() + # Configure the Tcl package index file for the install tree. + SET(VTK_TCL_SCRIPT_DIR "[file dirname [info script]]") + IF(UNIX) +- SET(VTK_TCL_LIBRARY_DIR "[file dirname [file dirname [file dirname [info script]]]]") ++ SET(VTK_TCL_LIBRARY_DIR "[file dirname [info script]]") + ELSE() + SET(VTK_TCL_LIBRARY_DIR + "[file join [file dirname [file dirname [file dirname [file dirname [info script]]]]] bin]")
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807121903.w6CJ3sZo023554>