Index: head/graphics/pcl-pointclouds/Makefile =================================================================== --- head/graphics/pcl-pointclouds/Makefile (revision 533085) +++ head/graphics/pcl-pointclouds/Makefile (revision 533086) @@ -1,65 +1,65 @@ # $FreeBSD$ PORTNAME= pcl DISTVERSIONPREFIX= ${PORTNAME}- DISTVERSION= 1.10.1 CATEGORIES= graphics math PKGNAMESUFFIX= -pointclouds MAINTAINER= yuri@FreeBSD.org COMMENT= Point Cloud Library LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt BROKEN_i386= undefined reference to `__atomic_load' NOT_FOR_ARCHS= armv6 armv7 NOT_FOR_ARCHS_REASON= common/include/pcl/pcl_macros.h:420:4: error: aligned_malloc not supported on your platform LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libexpat.so:textproc/expat2 \ libflann_cpp.so:math/flann \ libfreetype.so:print/freetype2 \ libpcap.so:net/libpcap \ libtiff.so:graphics/tiff USES= cmake compiler:c++14-lang eigen:3 jpeg python xorg LLD_UNSAFE= yes USE_GITHUB= yes GH_ACCOUNT= PointCloudLibrary USE_XORG= x11 xext xt ice sm USE_LDCONFIG= yes PLIST_SUB= SHL3=${DISTVERSION} SHL2=${DISTVERSION:R} DATADIR= ${PREFIX}/share/${PORTNAME}-${DISTVERSION:R} # match the directory where the project installs .cmake files OPTIONS_DEFINE= OPENGL PNG QHULL QT5 VTK OPTIONS_DEFAULT= PNG QHULL OPTIONS_SUB= yes OPENGL_CMAKE_BOOL= WITH_OPENGL # it finds OpenGL, but no binaries are linked with it: https://github.com/PointCloudLibrary/pcl/issues/2641 OPENGL_USES= gl OPENGL_USE= GL=gl,glu PNG_CMAKE_BOOL= WITH_PNG PNG_LIB_DEPENDS= libpng.so:graphics/png QHULL_DESC= Include convex-hull operations QHULL_CMAKE_BOOL= WITH_QHULL QHULL_LIB_DEPENDS= libqhull.so:math/qhull5 QT5_CMAKE_BOOL= WITH_QT QT5_BROKEN= WITH_QT doesn't do anything, should be used by apps, but apps is also broken: see https://github.com/PointCloudLibrary/pcl/issues/2642 VTK_DESC= Build VTK-Visualizations VTK_CMAKE_BOOL= WITH_VTK -VTK_LIB_DEPENDS= libvtkCommonCore-8.1.so:math/vtk8 +VTK_LIB_DEPENDS= libvtkCommonCore-8.2.so:math/vtk8 VTK_BROKEN= VTK has missing ompxx symbols: https://gitlab.kitware.com/vtk/vtk/issues/17444 .include post-patch: # 10 doesn't have std::sqrt, switching to ::sqrt from math.h @${GREP} -rl std::sqrt ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e 's|::std::sqrt|::sqrt|g ; s|std::sqrt|::sqrt|g' .include Index: head/graphics/vv/Makefile =================================================================== --- head/graphics/vv/Makefile (revision 533085) +++ head/graphics/vv/Makefile (revision 533086) @@ -1,39 +1,41 @@ # $FreeBSD$ PORTNAME= vv DISTVERSIONPREFIX= v DISTVERSION= 1.4.0-377 DISTVERSIONSUFFIX= -g7c3a1ed4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org COMMENT= Fast and simple 4D image viewer LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= googletest>0:devel/googletest # error: unable to find library -lGTest::GTest, see https://github.com/open-vv/vv/issues/74 LIB_DEPENDS= libexpat.so:textproc/expat2 \ libfreetype.so:print/freetype2 \ libgdcmCommon.so:devel/gdcm \ libhdf5_cpp.so:science/hdf5 \ libITKLabelMap-5.0.so:science/InsightToolkit \ libpng.so:graphics/png \ libsz.so:science/szip \ libtiff.so:graphics/tiff \ - libvtkIOSQL-8.1.so:math/vtk8 + libvtkIOSQL-8.2.so:math/vtk8 USES= cmake compiler:c++11-lang eigen:3 jpeg qt:5 xorg USE_GITHUB= yes GH_ACCOUNT= open-vv USE_QT= core designer gui network sql widgets xml buildtools_build qmake_build USE_XORG= ice sm x11 xext xt USE_CXXSTD= c++11 + +CMAKE_ARGS= -DVTK_DIR:PATH=${LOCALBASE}/lib/vtk-8.2/cmake/vtk-8.2 PLIST_FILES= bin/vv post-configure: # workaround for "error: unable to find library -lGTest::GTest", see https://github.com/open-vv/vv/issues/74 @${REINPLACE_CMD} -E 's/ -lGTest::(GTest|Main) / /g' ${BUILD_WRKSRC}/build.ninja .include Index: head/math/vtk8/Makefile =================================================================== --- head/math/vtk8/Makefile (revision 533085) +++ head/math/vtk8/Makefile (revision 533086) @@ -1,129 +1,132 @@ # $FreeBSD$ PORTNAME= vtk -DISTVERSION= 8.1.2 -PORTREVISION= 6 +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 .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: # autoplist: thousands of files, complex dependencies on options +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 Index: head/math/vtk8/distinfo =================================================================== --- head/math/vtk8/distinfo (revision 533085) +++ head/math/vtk8/distinfo (revision 533086) @@ -1,3 +1,3 @@ -TIMESTAMP = 1541961840 -SHA256 (VTK-8.1.2.tar.gz) = 0995fb36857dd76ccfb8bb07350c214d9f9099e80b1e66b4a8909311f24ff0db -SIZE (VTK-8.1.2.tar.gz) = 33479307 +TIMESTAMP = 1587775906 +SHA256 (VTK-8.2.0.tar.gz) = 34c3dc775261be5e45a8049155f7228b6bd668106c72a3c435d95730d17d57bb +SIZE (VTK-8.2.0.tar.gz) = 35511819 Index: head/math/vtk8/files/patch-IO_EnSight_vtkEnSight6BinaryReader.cxx =================================================================== --- head/math/vtk8/files/patch-IO_EnSight_vtkEnSight6BinaryReader.cxx (revision 533085) +++ head/math/vtk8/files/patch-IO_EnSight_vtkEnSight6BinaryReader.cxx (nonexistent) @@ -1,13 +0,0 @@ ---- 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 Property changes on: head/math/vtk8/files/patch-IO_EnSight_vtkEnSight6BinaryReader.cxx ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/vtk8/files/patch-ThirdParty_hdf5_vtkhdf5_CMakeInstallation.cmake =================================================================== --- head/math/vtk8/files/patch-ThirdParty_hdf5_vtkhdf5_CMakeInstallation.cmake (revision 533085) +++ head/math/vtk8/files/patch-ThirdParty_hdf5_vtkhdf5_CMakeInstallation.cmake (nonexistent) @@ -1,16 +0,0 @@ -So that this port doesn't clash with science/paraview: - ---- ThirdParty/hdf5/vtkhdf5/CMakeInstallation.cmake.orig 2017-01-20 17:51:20 UTC -+++ ThirdParty/hdf5/vtkhdf5/CMakeInstallation.cmake -@@ -105,11 +105,6 @@ configure_file ( - ${HDF5_RESOURCES_DIR}/libhdf5.settings.cmake.in - ${HDF5_BINARY_DIR}/libhdf5.settings @ONLY - ) --install ( -- FILES ${HDF5_BINARY_DIR}/libhdf5.settings -- DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/${HDF5_PACKAGE} -- COMPONENT libraries --) - - #----------------------------------------------------------------------------- - # Configure the HDF518_Examples.cmake file and the examples Property changes on: head/math/vtk8/files/patch-ThirdParty_hdf5_vtkhdf5_CMakeInstallation.cmake ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/vtk8/files/patch-IO_EnSight_vtkEnSightGoldBinaryReader.cxx =================================================================== --- head/math/vtk8/files/patch-IO_EnSight_vtkEnSightGoldBinaryReader.cxx (revision 533085) +++ head/math/vtk8/files/patch-IO_EnSight_vtkEnSightGoldBinaryReader.cxx (nonexistent) @@ -1,13 +0,0 @@ ---- 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 Property changes on: head/math/vtk8/files/patch-IO_EnSight_vtkEnSightGoldBinaryReader.cxx ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/vtk8/files/patch-ThirdParty_libproj4_vtklibproj4_CMakeLists.txt =================================================================== --- head/math/vtk8/files/patch-ThirdParty_libproj4_vtklibproj4_CMakeLists.txt (revision 533085) +++ head/math/vtk8/files/patch-ThirdParty_libproj4_vtklibproj4_CMakeLists.txt (nonexistent) @@ -1,16 +0,0 @@ ---- 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. Property changes on: head/math/vtk8/files/patch-ThirdParty_libproj4_vtklibproj4_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/vtk8/files/patch-Wrapping_Tcl_CMakeLists.txt =================================================================== --- head/math/vtk8/files/patch-Wrapping_Tcl_CMakeLists.txt (revision 533085) +++ head/math/vtk8/files/patch-Wrapping_Tcl_CMakeLists.txt (nonexistent) @@ -1,11 +0,0 @@ ---- 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]") Property changes on: head/math/vtk8/files/patch-Wrapping_Tcl_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/vtk8/files/patch-GUISupport_Qt_CMakeLists.txt =================================================================== --- head/math/vtk8/files/patch-GUISupport_Qt_CMakeLists.txt (revision 533085) +++ head/math/vtk8/files/patch-GUISupport_Qt_CMakeLists.txt (revision 533086) @@ -1,31 +1,28 @@ ---- GUISupport/Qt/CMakeLists.txt.orig 2018-05-11 14:34:24 UTC +--- GUISupport/Qt/CMakeLists.txt.orig 2019-01-30 17:15:13 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_ +@@ -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 Index: head/math/vtk8/files/patch-ThirdParty_libproj_vtklibproj_src_pj__mutex.c =================================================================== --- head/math/vtk8/files/patch-ThirdParty_libproj_vtklibproj_src_pj__mutex.c (nonexistent) +++ head/math/vtk8/files/patch-ThirdParty_libproj_vtklibproj_src_pj__mutex.c (revision 533086) @@ -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); Property changes on: head/math/vtk8/files/patch-ThirdParty_libproj_vtklibproj_src_pj__mutex.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/vtk8/files/patch-ThirdParty_verdict_vtkverdict_CMakeLists.txt =================================================================== --- head/math/vtk8/files/patch-ThirdParty_verdict_vtkverdict_CMakeLists.txt (revision 533085) +++ head/math/vtk8/files/patch-ThirdParty_verdict_vtkverdict_CMakeLists.txt (revision 533086) @@ -1,25 +1,25 @@ ---- ThirdParty/verdict/vtkverdict/CMakeLists.txt.orig 2017-08-30 20:55:05 UTC +--- ThirdParty/verdict/vtkverdict/CMakeLists.txt.orig 2019-01-30 17:15:13 UTC +++ ThirdParty/verdict/vtkverdict/CMakeLists.txt -@@ -123,14 +123,14 @@ endif () +@@ -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 Index: head/science/avogadrolibs/Makefile =================================================================== --- head/science/avogadrolibs/Makefile (revision 533085) +++ head/science/avogadrolibs/Makefile (revision 533086) @@ -1,70 +1,70 @@ # $FreeBSD$ PORTNAME= avogadrolibs DISTVERSION= 1.93.0 CATEGORIES= science PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ PATCHFILES= cf9d82575796d5fcabb153bdebde26843d81d83e.patch:-p1 \ ea813f683cdd9865994c0ba94a24325e04b9f8fb.patch:-p1 \ MAINTAINER= yuri@FreeBSD.org COMMENT= Avogadro2 libraries for chemical editor and visualization applications LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/include/mmtf.hpp:science/mmtf-cpp USES= cmake compiler:c++11-lang eigen:3,build,run # eigen needs to be 'run' because it is written into cmake files USE_GITHUB= yes GH_ACCOUNT= OpenChemistry USE_LDCONFIG= yes CMAKE_ON= BUILD_SHARED_LIBS OPTIONS_DEFINE= HDF5 LIBARCHIVE LIBMSYM MOLEQUEUE OPENGL QT5 SPGLIB VTK -OPTIONS_DEFAULT= LIBARCHIVE LIBMSYM MOLEQUEUE OPENGL QT5 SPGLIB +OPTIONS_DEFAULT= LIBARCHIVE LIBMSYM MOLEQUEUE OPENGL QT5 SPGLIB VTK OPTIONS_SUB= yes HDF5_CMAKE_BOOL= USE_HDF5 HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 \ libsz.so:science/szip LIBARCHIVE_DESC= Enable optional Libarchive features LIBARCHIVE_CMAKE_BOOL= USE_LIBARCHIVE LIBARCHIVE_USES= libarchive LIBARCHIVE_IMPLIES= QT5 LIBMSYM_DESC= Enable optional features using libmsym LIBMSYM_CMAKE_BOOL= USE_LIBMSYM LIBMSYM_LIB_DEPENDS= libmsym.so:science/libmsym MOLEQUEUE_DESC= Enable the MoleQueue dependent functionality MOLEQUEUE_CMAKE_BOOL= USE_MOLEQUEUE MOLEQUEUE_LIB_DEPENDS= libMoleQueueClient.so:misc/molequeue MOLEQUEUE_IMPLIES= QT5 OPENGL_CMAKE_BOOL= USE_OPENGL OPENGL_USES= gl OPENGL_USE= GL=gl,glew,glu QT5_CMAKE_BOOL= USE_QT QT5_USES= qt:5 QT5_USE= QT=core,concurrent,gui,network,widgets,buildtools_build,qmake_build QT5_IMPLIES= OPENGL SPGLIB_DESC= Enable optional features using spglib SPGLIB_CMAKE_BOOL= USE_SPGLIB SPGLIB_LIB_DEPENDS= libsymspg.so:science/spglib VTK_DESC= Enable libraries that use VTK VTK_CMAKE_BOOL= USE_VTK -VTK_LIB_DEPENDS= libvtksys-8.1.so.1:math/vtk8 +VTK_LIB_DEPENDS= libvtksys-8.2.so:math/vtk8 VTK_IMPLIES= QT5 VTK_BROKEN= Needs https://github.com/psavery/genXrdPattern, etc post-install: @${RM} -r ${STAGEDIR}${PREFIX}/share/doc .include Index: head/science/liggghts/Makefile =================================================================== --- head/science/liggghts/Makefile (revision 533085) +++ head/science/liggghts/Makefile (revision 533086) @@ -1,41 +1,42 @@ # $FreeBSD$ PORTNAME= liggghts -DISTVERSION= 3.8.0 -PORTREVISION= 6 +DISTVERSION= 3.8.0-26 +PORTREVISION= 1 +DISTVERSIONSUFFIX= -g6e873439 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org COMMENT= Discrete element method particle simulation software LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/../LICENSE BUILD_DEPENDS= gsed:textproc/gsed LIB_DEPENDS= libexpat.so:textproc/expat2 \ libfreetype.so:print/freetype2 \ libmpi.so:net/openmpi \ libpng.so:graphics/png \ libtiff.so:graphics/tiff \ - libvtkViewsCore-8.1.so:math/vtk8 + libvtkViewsCore-8.2.so:math/vtk8 USES= compiler:c++17-lang cmake fortran jpeg qt:5 xorg USE_GITHUB= yes GH_ACCOUNT= CFDEMproject GH_PROJECT= ${PORTNAME:tu}-PUBLIC USE_XORG= ice sm x11 xext xt USE_QT= core gui sql widgets qmake_build buildtools_build USE_LDCONFIG= yes CMAKE_ARGS= -DMPI_C_COMPILER:FILEPATH="${LOCALBASE}/mpi/openmpi/bin/mpicc" \ -DMPI_CXX_COMPILER:FILEPATH="${LOCALBASE}/mpi/openmpi/bin/mpicxx" \ - -DVTK_DIR:FILEPATH="${LOCALBASE}/lib/cmake/vtk-8.1" + -DVTK_DIR:FILEPATH="${LOCALBASE}/lib/cmake/vtk-8.2" WRKSRC_SUBDIR= src CFLAGS+= -fPIC CXXFLAGS+= -fPIC BINARY_ALIAS= sed=gsed .include Index: head/science/liggghts/distinfo =================================================================== --- head/science/liggghts/distinfo (revision 533085) +++ head/science/liggghts/distinfo (revision 533086) @@ -1,3 +1,3 @@ -TIMESTAMP = 1541105259 -SHA256 (CFDEMproject-LIGGGHTS-PUBLIC-3.8.0_GH0.tar.gz) = 9cb2e6596f584463ac2f80e3ff7b9588b7e3638c44324635b6329df87b90ab03 -SIZE (CFDEMproject-LIGGGHTS-PUBLIC-3.8.0_GH0.tar.gz) = 35989481 +TIMESTAMP = 1587928829 +SHA256 (CFDEMproject-LIGGGHTS-PUBLIC-3.8.0-26-g6e873439_GH0.tar.gz) = ac2f9100d31c6a9dc92a7b30057e0e36a3505f437e33ac56055c67f864a09262 +SIZE (CFDEMproject-LIGGGHTS-PUBLIC-3.8.0-26-g6e873439_GH0.tar.gz) = 36209540