Date: Sun, 15 Jul 2018 01:34:09 +0000 From: "Montgomery-Smith, Stephen" <stephen@missouri.edu> To: Yuri Victorovich <yuri@FreeBSD.org>, "ports-committers@freebsd.org" <ports-committers@freebsd.org>, "svn-ports-all@freebsd.org" <svn-ports-all@freebsd.org>, "svn-ports-head@freebsd.org" <svn-ports-head@freebsd.org> Subject: Re: svn commit: r474531 - in head/math: . vtk8 vtk8/files Message-ID: <9b2aedc329c44f129d4414c602650fd1@missouri.edu> In-Reply-To: <201807121903.w6CJ3sZo023554@repo.freebsd.org> References: <201807121903.w6CJ3sZo023554@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Thanks for doing this. ________________________________ From: owner-ports-committers@freebsd.org <owner-ports-committers@freebsd.or= g> on behalf of Yuri Victorovich <yuri@FreeBSD.org> Sent: Thursday, July 12, 2018 2:03:54 PM 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 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 mo= difications) Changes against math/vtk6: * Use DISTVERSION * Update COMMENT * Add to USES * Remove the SHARED option: all libraries should be shared, no need for t= he 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, prop= s changed) head/math/vtk8/files/patch-GUISupport_Qt_PluginInstall.cmake.in (conten= ts, props changed) head/math/vtk8/files/patch-IO_EnSight_vtkEnSight6BinaryReader.cxx (cont= ents, props changed) head/math/vtk8/files/patch-IO_EnSight_vtkEnSightGoldBinaryReader.cxx (c= ontents, 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- 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 +=3D vtk5 SUBDIR +=3D vtk5-data SUBDIR +=3D vtk6 + SUBDIR +=3D vtk8 SUBDIR +=3D wcalc SUBDIR +=3D wfmath SUBDIR +=3D why3 Modified: head/math/vtk8/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- 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=3D vtk -PORTVERSION=3D 6.2.0 -PORTREVISION=3D 6 +DISTVERSION=3D 8.1.1 CATEGORIES=3D math graphics MASTER_SITES=3D http://www.vtk.org/files/release/${VTK_SHORT_VER}/ -PKGNAMESUFFIX=3D 6 +PKGNAMESUFFIX=3D 8 DISTNAME=3D ${PORTNAME:tu}-${PORTVERSION} -MAINTAINER=3D stephen@FreeBSD.org -COMMENT=3D The Visualization Toolkit +MAINTAINER=3D yuri@FreeBSD.org +COMMENT=3D Visualization toolkit LICENSE=3D BSD3CLAUSE @@ -19,26 +17,29 @@ LIB_DEPENDS=3D libtiff.so:graphics/tiff \ libfreetype.so:print/freetype2 \ libexpat.so:textproc/expat2 -# -# TODO -# * VTK Groups +CONFLICTS=3D vtk5 vtk6 -CONFLICTS=3D vtk-4* +USES=3D alias cmake:outsource jpeg localbase USE_LDCONFIG=3D ${PREFIX}/lib/vtk-${VTK_SHORT_VER} -USE_XORG=3D xt sm ice x11 xext -USES=3D alias cmake:outsource jpeg -CXXFLAGS+=3D -I${LOCALBASE}/include +USE_XORG=3D ice x11 xt xext sm +CMAKE_ON=3D BUILD_SHARED_LIBS \ + VTK_INSTALL_NO_DOCUMENTATION VTK_USE_SYSTEM_EXPAT VTK_USE_S= YSTEM_TIFF \ + VTK_USE_SYSTEM_PNG VTK_USE_SYSTEM_JPEG VTK_USE_SYSTEM_FREET= YPE VTK_USE_SYSTEM_ZLIB \ + Module_vtkTestingCore Module_vtkTestingRendering +CMAKE_ARGS+=3D -DVTK_INSTALL_LIBRARY_DIR=3Dlib/vtk-${VTK_SHORT_VER} \ + -DVTK_INSTALL_ARCHIVE_DIR=3Dlib/vtk-${VTK_SHORT_VER} \ + -DVTK_INSTALL_QT_DIR=3D/${QT_LIBDIR_REL}/plugins/designer \ + -DSTAGEDIR=3D${STAGEDIR} + VTK_SHORT_VER=3D ${PORTVERSION:R} -PLIST_SUB+=3D VER2=3D${VTK_SHORT_VER} DOCSDIR=3D ${PREFIX}/share/doc/vtk-${VTK_SHORT_VER} DATADIR=3D ${PREFIX}/share/vtk-${VTK_SHORT_VER} # Options -OPTIONS_DEFINE=3D DESIGNER DOCS OSMESA EXAMPLES SHARED -OPTIONS_DEFAULT=3DPYTHON SHARED -#OPTIONS_DEFAULT=3DMPI Qt JAVA PYTHON TCLTK DESIGNER +OPTIONS_DEFINE=3D DESIGNER DOCS OSMESA EXAMPLES +#OPTIONS_DEFAULT=3DMPI Qt JAVA TCLTK DESIGNER OSMESA_DESC=3D Use Mesa for off-screen rendering DESIGNER_DESC=3D Build the Qt Designer plugin OPTIONS_SUB=3D yes @@ -46,7 +47,7 @@ OPTIONS_SUB=3D yes # Options groups #VTK_GROUPS=3D Imaging MPI Qt Rendering StandAlone Views VTK_GROUPS=3D MPI -VTK_WRAPS=3D JAVA TCLTK PYTHON +VTK_WRAPS=3D JAVA TCLTK OPTIONS_GROUP=3D Groups Wrapping OPTIONS_GROUP_Groups=3D${VTK_GROUPS} OPTIONS_GROUP_Wrapping=3D${VTK_WRAPS} @@ -64,29 +65,60 @@ Qt_DESC=3D Qt GUI support QT4_DESC=3D Qt 4 toolkit support QT5_DESC=3D Qt 5 toolkit support -CMAKE_ARGS+=3D -DVTK_INSTALL_LIBRARY_DIR=3Dlib/vtk-${VTK_SHORT_VER} \ - -DVTK_INSTALL_ARCHIVE_DIR=3Dlib/vtk-${VTK_SHORT_VER} \ - -DVTK_INSTALL_NO_DOCUMENTATION=3DON \ - -DVTK_INSTALL_QT_DIR=3D/${QT_LIBDIR_REL}/plugins/designer \ - -DVTK_USE_SYSTEM_EXPAT:BOOL=3DON \ - -DVTK_USE_SYSTEM_TIFF:BOOL=3DON \ - -DVTK_USE_SYSTEM_PNG:BOOL=3DON \ - -DVTK_USE_SYSTEM_JPEG:BOOL=3DON \ - -DVTK_USE_SYSTEM_FREETYPE:BOOL=3DON \ - -DVTK_USE_SYSTEM_ZLIB:BOOL=3DON \ - -DSTAGEDIR=3D${STAGEDIR} \ - -DModule_vtkTestingCore:BOOL=3DON \ - -DModule_vtkTestingRendering:BOOL=3DON +QT4_USES=3D qt:4 +QT4_USE=3D QT=3Dcorelib,designer,gui_build,gui_run,network_b= uild,network_run,sql_build,sql_run,moc_build,uic_build,qmake_build,rcc_buil= d,opengl,webkit_build,webkit_run +QT4_CMAKE_ON=3D -DVTK_QT_VERSION:STRING=3D"4" \ + -DVTK_Group_Qt:BOOL=3DON -SHARED_CMAKE_ON=3D -DBUILD_SHARED_LIBS:BOOL=3DON -SHARED_CMAKE_OFF=3D -DBUILD_SHARED_LIBS:BOOL=3DOFF +QT5_USES=3D qt:5 +QT5_USE=3D QT=3Dcore,gui,sql,widgets,x11extras,qmake_build,b= uildtools_build +QT5_CMAKE_ON=3D -DVTK_QT_VERSION:STRING=3D"5" \ + -DCMAKE_PREFIX_PATH:STRING=3D${LOCALBASE}/lib/qt5 \ + -DVTK_Group_Qt:BOOL=3DON +DESIGNER_CMAKE_BOOL=3D QT_DESIGNER_PLUGIN +DESIGNER_USE=3D QT=3Ddesigner + +MPI_LIB_DEPENDS=3D libmpi.so:net/openmpi +MPI_CMAKE_ON=3D -DMPIEXEC=3D${LOCALBASE}/mpi/openmpi/bin/mpiexec + +OSMESA_CMAKE_ARGS=3D -DVTK_OPENGL_HAS_OSMESA:BOOL=3DON \ + -DOSMESA_INCLUDE_DIR:PATH=3D${LOCALBASE}/include/Me= sa \ + -DOSMESA_LIBRARY:FILEPATH=3D${LOCALBASE}/lib/libOSM= esa.so \ + -DOPENGL_gl_LIBRARY:FILEPATH=3D${LOCALBASE}/lib/lib= OSMesa.so \ + -DVTK_USE_X:BOOL=3DOFF +OSMESA_LIB_DEPENDS=3D libOSMesa.so:graphics/libosmesa + +# Wrapping +JAVA_CATEGORIES=3D java +JAVA_VARS=3D USE_JAVA=3Dyes +JAVA_CMAKE_BOOL=3D VTK_WRAP_JAVA Module_vtkWrappingJava +JAVA_CMAKE_ON=3D -DJAVA_INCLUDE_PATH:PATH=3D${JAVA_HOME}/include \ + -DJAVA_AWT_LIBRARY:PATH=3D${JAVA_HOME}/jre/lib/${AR= CH}/libjawt.so \ + -DJAVA_JVM_LIBRARY:PATH=3D${JAVA_HOME}/jre/lib/${AT= CH}/libjava.so + +TCLTK_USES=3D tk +TCLTK_CMAKE_BOOL=3D VTK_WRAP_TCL VTK_Group_Tk +TCLTK_CMAKE_ON=3D -DTCL_INCLUDE_PATH:PATH=3D${TCL_INCLUDEDI= R} \ + -DTK_INCLUDE_PATH:PATH=3D${TK_INCLUDEDIR} \ + -DVTK_INSTALL_TCL_DIR=3Dlib/vtk-${VTK_SHORT_VER} + +DOCS_CMAKE_BOOL=3D BUILD_DOCUMENTATION +DOCS_BUILD_DEPENDS=3D doxygen:devel/doxygen + +EXAMPLES_CMAKE_BOOL=3D 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)|nul= lptr|g" \ + ${WRKSRC}/Rendering/OpenGL2/*.cxx \ + ${WRKSRC}/Rendering/VolumeOpenGL2/vtkOpenGLProjectedTetrahe= draMapper.cxx # many files/places, see https://gitlab.kitware.com/vtk/vtk/i= ssues/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+=3D -DVTK_Group_${g}:BOOL=3DOFF . endif .endfor -.if ${PORT_OPTIONS:MOSMESA} -LIB_DEPENDS+=3D libOSMesa.so:graphics/libosmesa -CMAKE_ARGS+=3D -DVTK_OPENGL_HAS_OSMESA:BOOL=3DON \ - -DOSMESA_INCLUDE_DIR:PATH=3D${LOCALBASE}/include/Mesa \ - -DOSMESA_LIBRARY:FILEPATH=3D${LOCALBASE}/lib/libOSMesa.so \ - -DOPENGL_gl_LIBRARY:FILEPATH=3D${LOCALBASE}/lib/libOSMesa.s= o \ - -DVTK_USE_X:BOOL=3DOFF -PLIST_SUB+=3D X11=3D"@comment " \ - OSMESA=3D"" -.else +.if !${PORT_OPTIONS:MOSMESA} USE_GL=3D gl glu -PLIST_SUB+=3D X11=3D"" \ - OSMESA=3D"@comment " .endif -.if ${PORT_OPTIONS:MEXAMPLES} -CMAKE_ARGS+=3D -DBUILD_EXAMPLES:BOOL=3DON -.endif - -.if ${PORT_OPTIONS:MMPI} -LIB_DEPENDS+=3D libmpi.so:net/openmpi -CMAKE_ARGS+=3D -DMPIEXEC=3D${LOCALBASE}/mpi/openmpi/bin/mpiexec -PLIST_SUB+=3D MPI=3D"" -.else -PLIST_SUB+=3D MPI=3D"@comment " -.endif - -.if ${PORT_OPTIONS:MQT4} -USES+=3D qt:4 -USE_QT=3D gui_build gui_run network_build network_run sql_b= uild sql_run \ - moc_build uic_build qmake_build rcc_build opengl webkit_bui= ld \ - webkit_run -CMAKE_ARGS+=3D -DVTK_QT_VERSION:STRING=3D"4" -PLIST_SUB+=3D QTV=3D"qt4" -.endif - -.if ${PORT_OPTIONS:MQT5} -USES+=3D qt:5 -USE_QT=3D gui_build gui_run network_build network_run sql_b= uild sql_run \ - qmake_build opengl webkit_build buildtools webkit_run -CMAKE_ARGS+=3D -DVTK_QT_VERSION:STRING=3D"5" \ - -DCMAKE_PREFIX_PATH:STRING=3D${LOCALBASE}/lib/qt5 -PLIST_SUB+=3D QTV=3D"qt5" -.endif - -.if ${PORT_OPTIONS:MQT4} || ${PORT_OPTIONS:MQT5} -CMAKE_ARGS+=3D -DVTK_Group_Qt:BOOL=3DON -PLIST_SUB+=3D QT=3D"" -.else -PLIST_SUB+=3D QT=3D"@comment " -CMAKE_ARGS+=3D -DVTK_Group_Qt:BOOL=3DOFF -.endif - -.if ${PORT_OPTIONS:MDESIGNER} -.if ${PORT_OPTIONS:MQT5} -USE_QT+=3D designer -.elif ${PORT_OPTIONS:MQT4} -USE_QT+=3D designer -.else +.if ${PORT_OPTIONS:MDESIGNER} && !${PORT_OPTIONS:MQT5} && !${PORT_OPTIONS:= MQT4} IGNORE=3D designer requires either QT4 or QT5 .endif -PLIST_SUB+=3D DESIGNER=3D"" -CMAKE_ARGS+=3D -DQT_DESIGNER_PLUGIN:BOOL=3DON -.else -PLIST_SUB+=3D DESIGNER=3D"@comment " -CMAKE_ARGS+=3D -DQT_DESIGNER_PLUGIN:BOOL=3DOFF -.endif -# Wrapping -.if ${PORT_OPTIONS:MJAVA} -CATEGORIES+=3D java -USE_JAVA=3D yes -CMAKE_ARGS+=3D -DVTK_WRAP_JAVA:BOOL=3DON \ - -DJAVA_INCLUDE_PATH:PATH=3D${JAVA_HOME}/include \ - -DJAVA_AWT_LIBRARY:PATH=3D${JAVA_HOME}/jre/lib/${ARCH}/libj= awt.so \ - -DJAVA_JVM_LIBRARY:PATH=3D${JAVA_HOME}/jre/lib/${ATCH}/libj= ava.so -PLIST_SUB+=3D JAVA=3D"" -.else -CMAKE_ARGS+=3D -DVTK_WRAP_JAVA:BOOL=3DOFF \ - -DModule_vtkWrappingJava:BOOL=3DOFF -PLIST_SUB+=3D JAVA=3D"@comment " -.endif - -.if ${PORT_OPTIONS:MPYTHON} -USES+=3D python:2.7 -CMAKE_ARGS+=3D -DVTK_WRAP_PYTHON:BOOL=3DON \ - -DVTK_INSTALL_PYTHON_MODULE_DIR:STRING=3D${PYTHONPREFIX_SIT= ELIBDIR} \ - -DModule_vtkRenderingMatplotlib:BOOL=3DON \ - -DModule_vtkPythonInterpreter:BOOL=3DON -PLIST_SUB+=3D PYTHON=3D"" -RUN_DEPENDS+=3D ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matpl= otlib@${PY_FLAVOR} -.else -CMAKE_ARGS+=3D -DVTK_WRAP_PYTHON:BOOL=3DOFF -PLIST_SUB+=3D PYTHON=3D"@comment " -.endif - -.if ${PORT_OPTIONS:MTCLTK} -USES+=3D tk -CMAKE_ARGS+=3D -DVTK_WRAP_TCL:BOOL=3DON \ - -DVTK_Group_Tk:BOOL=3DON \ - -DTCL_INCLUDE_PATH:PATH=3D${TCL_INCLUDEDIR} \ - -DTK_INCLUDE_PATH:PATH=3D${TK_INCLUDEDIR} \ - -DVTK_INSTALL_TCL_DIR=3Dlib/vtk-${VTK_SHORT_VER} -PLIST_SUB+=3D TCLTK=3D"" -.else -CMAKE_ARGS+=3D -DVTK_WRAP_TCL:BOOL=3DOFF \ - -DVTK_Group_Tk:BOOL=3DOFF -PLIST_SUB+=3D TCLTK=3D"@comment " -.endif - -.if ${PORT_OPTIONS:MJAVA} || ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MTC= LTK} -PLIST_SUB+=3D WRAP=3D"" -.else -PLIST_SUB+=3D WRAP=3D"@comment " -.endif - -.if ${PORT_OPTIONS:MDOCS} -CMAKE_ARGS+=3D -DBUILD_DOCUMENTATION:BOOL=3DON -BUILD_DEPENDS+=3D doxygen:devel/doxygen -.else -CMAKE_ARGS+=3D -DBUILD_DOCUMENTATION:BOOL=3DOFF -.endif +post-install: # autoplist: thousands of files, complex dependencies on opt= ions + @cd ${STAGEDIR}${PREFIX} && \ + ${FIND} * -type f -or -type l >> ${TMPPLIST} .include <bsd.port.mk> Modified: head/math/vtk8/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- 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) =3D efa3ddfba118f3988ead08bdaf9441d33f23a4245d78= 511a6ce7f267b4f13277 -SIZE (VTK-6.2.0.tar.gz) =3D 30114472 +TIMESTAMP =3D 1531338278 +SHA256 (VTK-8.1.1.tar.gz) =3D 71a09b4340f0a9c58559fe946dc745ab68a866cf2063= 6a41d97b6046cb736324 +SIZE (VTK-8.1.1.tar.gz) =3D 33482287 Added: head/math/vtk8/files/patch-Examples_GUI_Qt_GraphicsView_CMakeLists.t= xt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- /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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- /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 QVTKWidgetPlugi= n) ++ qt5_wrap_cpp(PluginMocSrcs ${PluginMocHeaders} TARGET QVTKWidgetPlugi= n-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}) + set(QT_LIBRARIES Qt5::${qt_component}) + else() + find_package(Qt4 COMPONENTS QtCore QtGui QtDesignerComponents REQUIRE= D 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 Q= T_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_M= INOR_VERSION} ${QT_LIBRARIES}) + + # install rules + Added: head/math/vtk8/files/patch-GUISupport_Qt_PluginInstall.cmake.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- /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@QVTKWidgetPl= ugin${BUILDTYPE_SUFFIX}@CMAKE_SHARED_LIBRARY_SUFFIX@") ++set(VTK_INSTALL_QT_PLUGIN_FILE "@CMAKE_SHARED_LIBRARY_PREFIX@QVTKWidgetPl= ugin-@VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@${BUILDTYPE_SUFFIX}@CMAKE_SHARE= D_LIBRARY_SUFFIX@") + set(VTK_CONFIGURATIONS "@CMAKE_CONFIGURATION_TYPES@") + + if(VTK_CONFIGURATIONS) Added: head/math/vtk8/files/patch-IO_EnSight_vtkEnSight6BinaryReader.cxx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- /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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- /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_CMakeList= s.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/vtk8/files/patch-ThirdParty_libproj4_vtklibproj4_CMakeLists.t= xt 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.co= m/vtk/vtk/issues/17178 ++#if (HAVE_PTHREAD_MUTEX_RECURSIVE_DEFN) + add_definitions(-DHAVE_PTHREAD_MUTEX_RECURSIVE=3D1) +-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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- /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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- /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 [inf= o 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?9b2aedc329c44f129d4414c602650fd1>