Date: Sun, 26 Apr 2020 23:24:59 +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: r533089 - in head/math/vtk9: . files Message-ID: <202004262324.03QNOxKc062125@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Sun Apr 26 23:24:58 2020 New Revision: 533089 URL: https://svnweb.freebsd.org/changeset/ports/533089 Log: Repocopy math/vtk8 -> math/vtk9 Added: head/math/vtk9/ - copied from r533085, head/math/vtk8/ head/math/vtk9/files/patch-ThirdParty_libproj_vtklibproj_src_pj__mutex.c - copied unchanged from r533086, head/math/vtk8/files/patch-ThirdParty_libproj_vtklibproj_src_pj__mutex.c Replaced: head/math/vtk9/Makefile - copied unchanged from r533086, head/math/vtk8/Makefile head/math/vtk9/distinfo - copied unchanged from r533086, head/math/vtk8/distinfo head/math/vtk9/files/patch-GUISupport_Qt_CMakeLists.txt - copied unchanged from r533086, head/math/vtk8/files/patch-GUISupport_Qt_CMakeLists.txt head/math/vtk9/files/patch-ThirdParty_verdict_vtkverdict_CMakeLists.txt - copied unchanged from r533086, head/math/vtk8/files/patch-ThirdParty_verdict_vtkverdict_CMakeLists.txt Deleted: head/math/vtk9/files/patch-IO_EnSight_vtkEnSight6BinaryReader.cxx head/math/vtk9/files/patch-IO_EnSight_vtkEnSightGoldBinaryReader.cxx head/math/vtk9/files/patch-ThirdParty_hdf5_vtkhdf5_CMakeInstallation.cmake head/math/vtk9/files/patch-ThirdParty_libproj4_vtklibproj4_CMakeLists.txt head/math/vtk9/files/patch-Wrapping_Tcl_CMakeLists.txt Copied: head/math/vtk9/Makefile (from r533086, head/math/vtk8/Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/vtk9/Makefile Sun Apr 26 23:24:58 2020 (r533089, copy of r533086, head/math/vtk8/Makefile) @@ -0,0 +1,132 @@ +# $FreeBSD$ + +PORTNAME= vtk +DISTVERSION= 8.2.0 +CATEGORIES= math graphics +MASTER_SITES= http://www.vtk.org/files/release/${VTK_SHORT_VER}/ +PKGNAMESUFFIX= 8 +DISTNAME= ${PORTNAME:tu}-${PORTVERSION} + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Visualization toolkit + +LICENSE= BSD3CLAUSE + +LIB_DEPENDS= libtiff.so:graphics/tiff \ + libpng.so:graphics/png \ + libfreetype.so:print/freetype2 \ + libexpat.so:textproc/expat2 + +CONFLICTS= vtk5 vtk6 + +USES= alias cmake compiler:c++11-lang gl jpeg localbase xorg +USE_LDCONFIG= ${PREFIX}/lib/vtk-${VTK_SHORT_VER} +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} + +DOCSDIR= ${PREFIX}/share/doc/vtk-${VTK_SHORT_VER} +DATADIR= ${PREFIX}/share/vtk-${VTK_SHORT_VER} + +# Options +OPTIONS_DEFINE= DESIGNER DOCS OSMESA QT5 EXAMPLES +OPTIONS_DEFAULT= MPI QT5 +OSMESA_DESC= Use Mesa for off-screen rendering +DESIGNER_DESC= Build the Qt Designer plugin +OPTIONS_SUB= yes + +# Options groups +#VTK_GROUPS= Imaging MPI Qt Rendering StandAlone Views +VTK_GROUPS= MPI +VTK_WRAPS= JAVA TCLTK +OPTIONS_GROUP= GROUPS WRAPPING +OPTIONS_GROUP_GROUPS=${VTK_GROUPS} +OPTIONS_GROUP_WRAPPING=${VTK_WRAPS} +GROUPS_DESC= Groups +WRAPPING_DESC= Wrapping +.for g in ${VTK_GROUPS} +$g_DESC= Build the $g group +.endfor +.for w in ${VTK_WRAPS} +$w_DESC= $w wrapping +.endfor + +QT5_USES= qt:5 +QT5_USE= QT=core,gui,sql,uiplugin,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 +DESIGNER_IMPLIES= QT5 + +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 \ + ${WRKSRC}/ThirdParty/netcdf/vtknetcdf/include/xxxnetcdf.h + @${FIND} ${WRKSRC}/ThirdParty/netcdf -type f | ${XARGS} ${REINPLACE_CMD} \ + -E 's/[[:<:]]netcdf\.h[[:>:]]/xxxnetcdf.h/' + +.include <bsd.port.options.mk> + +.for g in ${VTK_GROUPS} +. if ${PORT_OPTIONS:M${g}} +CMAKE_ARGS+= -DVTK_Group_${g}:BOOL=ON +. else +CMAKE_ARGS+= -DVTK_Group_${g}:BOOL=OFF +. endif +.endfor + +.if !${PORT_OPTIONS:MOSMESA} +USES+= gl +USE_GL= gl glu +.endif + +post-install: + ## 8.2 installs cmake files into a wrong location + #@cd ${STAGEDIR}${PREFIX} && \ + # ${MV} lib/vtk-${VTK_SHORT_VER}/cmake lib/ + # autoplist: thousands of files, complex dependencies on options + @cd ${STAGEDIR}${PREFIX} && \ + ${FIND} * -type f -or -type l >> ${TMPPLIST} + +.include <bsd.port.mk> Copied: head/math/vtk9/distinfo (from r533086, head/math/vtk8/distinfo) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/vtk9/distinfo Sun Apr 26 23:24:58 2020 (r533089, copy of r533086, head/math/vtk8/distinfo) @@ -0,0 +1,3 @@ +TIMESTAMP = 1587775906 +SHA256 (VTK-8.2.0.tar.gz) = 34c3dc775261be5e45a8049155f7228b6bd668106c72a3c435d95730d17d57bb +SIZE (VTK-8.2.0.tar.gz) = 35511819 Copied: head/math/vtk9/files/patch-GUISupport_Qt_CMakeLists.txt (from r533086, head/math/vtk8/files/patch-GUISupport_Qt_CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/vtk9/files/patch-GUISupport_Qt_CMakeLists.txt Sun Apr 26 23:24:58 2020 (r533089, copy of r533086, head/math/vtk8/files/patch-GUISupport_Qt_CMakeLists.txt) @@ -0,0 +1,28 @@ +--- GUISupport/Qt/CMakeLists.txt.orig 2019-01-30 17:15:13 UTC ++++ GUISupport/Qt/CMakeLists.txt +@@ -128,21 +128,21 @@ if(VTK_BUILD_QT_DESIGNER_PLUGIN AND add_qvtkwidget) + 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}) + + # 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 + Copied: head/math/vtk9/files/patch-ThirdParty_libproj_vtklibproj_src_pj__mutex.c (from r533086, head/math/vtk8/files/patch-ThirdParty_libproj_vtklibproj_src_pj__mutex.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/vtk9/files/patch-ThirdParty_libproj_vtklibproj_src_pj__mutex.c Sun Apr 26 23:24:58 2020 (r533089, copy of r533086, head/math/vtk8/files/patch-ThirdParty_libproj_vtklibproj_src_pj__mutex.c) @@ -0,0 +1,11 @@ +--- ThirdParty/libproj/vtklibproj/src/pj_mutex.c.orig 2020-04-25 01:23:01 UTC ++++ ThirdParty/libproj/vtklibproj/src/pj_mutex.c +@@ -124,7 +124,7 @@ void pj_acquire_lock() + pthread_mutex_lock( &pj_precreated_lock); + + pthread_mutexattr_init(&mutex_attr); +-#ifdef HAVE_PTHREAD_MUTEX_RECURSIVE ++#if defined(HAVE_PTHREAD_MUTEX_RECURSIVE) || defined(__FreeBSD__) + pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE); + #else + pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE_NP); Copied: head/math/vtk9/files/patch-ThirdParty_verdict_vtkverdict_CMakeLists.txt (from r533086, head/math/vtk8/files/patch-ThirdParty_verdict_vtkverdict_CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/vtk9/files/patch-ThirdParty_verdict_vtkverdict_CMakeLists.txt Sun Apr 26 23:24:58 2020 (r533089, copy of r533086, head/math/vtk8/files/patch-ThirdParty_verdict_vtkverdict_CMakeLists.txt) @@ -0,0 +1,25 @@ +--- ThirdParty/verdict/vtkverdict/CMakeLists.txt.orig 2019-01-30 17:15:13 UTC ++++ ThirdParty/verdict/vtkverdict/CMakeLists.txt +@@ -128,14 +128,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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004262324.03QNOxKc062125>