diff options
40 files changed, 74 insertions, 239 deletions
diff --git a/cad/appcsxcad/Makefile b/cad/appcsxcad/Makefile index a2ffaded6ade..96087df80292 100644 --- a/cad/appcsxcad/Makefile +++ b/cad/appcsxcad/Makefile @@ -1,6 +1,7 @@ PORTNAME= appcsxcad DISTVERSIONPREFIX= v DISTVERSION= 0.2.3 +PORTREVISION= 1 CATEGORIES= cad MAINTAINER= yuri@FreeBSD.org diff --git a/cad/csxcad/Makefile b/cad/csxcad/Makefile index 525452bcaec8..618b05eea58e 100644 --- a/cad/csxcad/Makefile +++ b/cad/csxcad/Makefile @@ -1,7 +1,7 @@ PORTNAME= csxcad DISTVERSIONPREFIX= v DISTVERSION= 0.6.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= cad MAINTAINER= yuri@FreeBSD.org diff --git a/cad/freecad/Makefile b/cad/freecad/Makefile index 0ba67b1b1140..905a09a5391f 100644 --- a/cad/freecad/Makefile +++ b/cad/freecad/Makefile @@ -1,6 +1,6 @@ PORTNAME= FreeCAD DISTVERSION= 1.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= cad MAINTAINER= cmt@FreeBSD.org @@ -61,8 +61,6 @@ USE_LDCONFIG= yes CPE_VENDOR= freecad_project -VTK_VER= 9.2 - DOS2UNIX_GLOB= *.txt *.h *.cpp *.py *.qss *.csv *.pov *.stp *.ui *.wrl *.WRL SHEBANG_FILES= src/Tools/freecad-thumbnailer @@ -103,6 +101,8 @@ CMAKE_ARGS+= -DOCC_INCLUDE_DIR="${LOCALBASE}/include/OpenCASCADE" \ CMAKE_INSTALL_PREFIX= ${PREFIX}/${PORTNAME} +CXXFLAGS+= -DGetCellLinks=GetLinks # fix for vtk-9.5.0: equivalent of this patch: https://github.com/FreeCAD/FreeCAD/issues/21731#issuecomment-2934487147 + OPTIONS_DEFINE= COLLADA COLLADA_DESC= Install pycollada for Collada files import @@ -132,4 +132,5 @@ post-install: ${INSTALL_SCRIPT} ${WRKSRC}/src/Tools/freecad-thumbnailer \ ${STAGEDIR}${PREFIX}/bin/freecad-thumbnailer +.include <../../math/vtk9/Makefile.version> .include <bsd.port.mk> diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile index 9a27fcdf5ddd..e80ff5dfbf56 100644 --- a/cad/opencascade/Makefile +++ b/cad/opencascade/Makefile @@ -1,6 +1,7 @@ PORTNAME= opencascade DISTVERSIONPREFIX= V DISTVERSION= 7_9_1 +PORTREVISION= 1 CATEGORIES= cad science DIST_SUBDIR= ${PORTNAME}-${DISTVERSION} diff --git a/cad/opencascade/files/patch-CMakeLists.txt b/cad/opencascade/files/patch-CMakeLists.txt index 3050b6fa3785..cb9a2eaeb89c 100644 --- a/cad/opencascade/files/patch-CMakeLists.txt +++ b/cad/opencascade/files/patch-CMakeLists.txt @@ -1,6 +1,15 @@ --- CMakeLists.txt.orig 2025-05-20 11:17:10 UTC +++ CMakeLists.txt -@@ -1101,7 +1101,7 @@ endif() +@@ -908,6 +908,8 @@ OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_defs_flags") + # include original list of definitions and flags + OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_defs_flags") + ++include(adm/cmake/vtk.cmake) # workaround for https://gitlab.kitware.com/vtk/vtk/-/issues/19716 ++ + foreach (OCCT_3RDPARTY_LIST ${OCCT_3RDPARTY_CMAKE_LIST}) + OCCT_INCLUDE_CMAKE_FILE (${OCCT_3RDPARTY_LIST}) + endforeach() +@@ -1101,7 +1103,7 @@ endif() endif() # validating custom.bat/sh for changes @@ -9,7 +18,7 @@ file (READ "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT) string(FIND "${CUSTOM_CONTENT}" "${ADDITIONAL_CUSTOM_CONTENT}" pos) if (pos EQUAL -1) -@@ -1340,7 +1340,7 @@ install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONF +@@ -1340,7 +1342,7 @@ install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONF endforeach() # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)") diff --git a/cad/qcsxcad/Makefile b/cad/qcsxcad/Makefile index 6a5e384ec7f4..0b75f90ab823 100644 --- a/cad/qcsxcad/Makefile +++ b/cad/qcsxcad/Makefile @@ -1,6 +1,7 @@ PORTNAME= qcsxcad DISTVERSIONPREFIX= v DISTVERSION= 0.6.3 +PORTREVISION= 1 CATEGORIES= cad MAINTAINER= yuri@FreeBSD.org diff --git a/devel/gdcm/Makefile b/devel/gdcm/Makefile index c36d8bc91fe8..0a6b9ba12d2c 100644 --- a/devel/gdcm/Makefile +++ b/devel/gdcm/Makefile @@ -1,5 +1,6 @@ PORTNAME= gdcm PORTVERSION= ${GDCM_MAJOR}.${GDCM_MINOR}.${GDCM_PATCH} +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SF/gdcm/gdcm%20${GDCM_MAJOR}.x/GDCM%20${PORTVERSION} diff --git a/graphics/cloudcompare/Makefile b/graphics/cloudcompare/Makefile index c34a5bcce56a..70c41f6cd608 100644 --- a/graphics/cloudcompare/Makefile +++ b/graphics/cloudcompare/Makefile @@ -1,7 +1,7 @@ PORTNAME= cloudcompare DISTVERSIONPREFIX= v DISTVERSION= 2.12.4 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= graphics MAINTAINER= ports@FreeBSD.org diff --git a/graphics/f3d/Makefile b/graphics/f3d/Makefile index 7f4c86116bb0..b5d60c73b92c 100644 --- a/graphics/f3d/Makefile +++ b/graphics/f3d/Makefile @@ -1,7 +1,7 @@ PORTNAME= f3d DISTVERSIONPREFIX= v DISTVERSION= 3.1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org diff --git a/graphics/f3d/pkg-plist b/graphics/f3d/pkg-plist index 9d0032765f26..9a973dfddcf4 100644 --- a/graphics/f3d/pkg-plist +++ b/graphics/f3d/pkg-plist @@ -1,5 +1,4 @@ bin/f3d -include/f3d/F3DUtils.h include/f3d/camera.h include/f3d/context.h include/f3d/engine.h @@ -14,10 +13,6 @@ include/f3d/reader.h include/f3d/scene.h include/f3d/types.h include/f3d/utils.h -include/f3d/vtkF3DFaceVaryingPointDispatcher.h -include/f3d/vtkF3DGLTFImporter.h -include/f3d/vtkF3DImporter.h -include/f3d/vtkextModule.h include/f3d/window.h lib/cmake/f3d/application-config.cmake lib/cmake/f3d/f3dConfig.cmake @@ -28,20 +23,10 @@ lib/cmake/f3d/f3dLibraryTargets.cmake lib/cmake/f3d/f3dTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/f3d/f3dTargets.cmake lib/cmake/f3d/library-config.cmake -lib/cmake/f3d_vtkext/f3d_vtkext-targets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/f3d_vtkext/f3d_vtkext-targets.cmake -lib/cmake/f3d_vtkext/f3d_vtkext-vtk-module-properties.cmake lib/libf3d.so lib/libf3d.so.3 lib/libf3d.so.3.1 lib/libvtkext.so -%%ALEMBIC%%lib/libvtkextAlembic.a -%%ASSIMP%%lib/libvtkextAssimp.a -%%DRACO%%lib/libvtkextDraco.a -lib/libvtkextNative.a -%%OCCT%%lib/libvtkextOCCT.a -lib/libvtkextPrivate.a -lib/vtk/hierarchy/f3d_vtkext/vtkext-hierarchy.txt %%ALEMBIC%%share/applications/f3d-plugin-alembic.desktop %%ASSIMP%%share/applications/f3d-plugin-assimp.desktop %%DRACO%%share/applications/f3d-plugin-draco.desktop diff --git a/graphics/mirtk/Makefile b/graphics/mirtk/Makefile index fb5967d48c4c..28b3fa763607 100644 --- a/graphics/mirtk/Makefile +++ b/graphics/mirtk/Makefile @@ -1,13 +1,14 @@ PORTNAME= mirtk DISTVERSIONPREFIX= v -DISTVERSION= 2.0.0-178 -PORTREVISION= 12 -DISTVERSIONSUFFIX= -g973ce2f +DISTVERSION= 2.0.0-179 +PORTREVISION= 1 +DISTVERSIONSUFFIX= -gef71a17 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org COMMENT= Medical Image Registration ToolKit (MIRTK) -WWW= https://mirtk.github.io/ +WWW= https://mirtk.github.io/ \ + https://github.com/BioMedIA/MIRTK LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt @@ -17,13 +18,15 @@ BUILD_DEPENDS= boost-libs>0:devel/boost-libs \ LIB_DEPENDS= libpng16.so:graphics/png USES= cmake compiler:c++11-lang eigen:3 perl5 python +USE_CXXSTD= c++14 +USE_LDCONFIG= yes + USE_GITHUB= yes GH_ACCOUNT= BioMedIA GH_PROJECT= ${PORTNAME:tu} -USE_LDCONFIG= yes OPTIONS_DEFINE= TBB VTK -OPTIONS_DEFAULT= TBB VTK +OPTIONS_DEFAULT= TBB #VTK TBB_DESC= Build with TBB TBB_CMAKE_BOOL= WITH_TBB @@ -33,6 +36,7 @@ VTK_DESC= Build with the VTK toolkit VTK_CMAKE_BOOL= WITH_VTK VTK_LIB_DEPENDS= libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R} \ libexpat.so:textproc/expat2 +VTK_BROKEN= causes compilation failure due to use of deprecated feature using std::bind1st, see https://github.com/BioMedIA/MIRTK/issues/789 .include <../../math/vtk9/Makefile.version> .include <bsd.port.mk> diff --git a/graphics/mirtk/distinfo b/graphics/mirtk/distinfo index 063e17f809ef..8c77f474687e 100644 --- a/graphics/mirtk/distinfo +++ b/graphics/mirtk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1659025897 -SHA256 (BioMedIA-MIRTK-v2.0.0-178-g973ce2f_GH0.tar.gz) = 58e2f1ab1f9f161d63faa3a044bbe31dea315897d30a1b5754a3de83176765c0 -SIZE (BioMedIA-MIRTK-v2.0.0-178-g973ce2f_GH0.tar.gz) = 2905912 +TIMESTAMP = 1750917659 +SHA256 (BioMedIA-MIRTK-v2.0.0-179-gef71a17_GH0.tar.gz) = 7f95229472dda2979bcefbb80a37942817f28a845eb10fa75462405ff02df2dd +SIZE (BioMedIA-MIRTK-v2.0.0-179-gef71a17_GH0.tar.gz) = 2905635 diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index a3c6ed6b53cb..06523cbb8145 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -1,6 +1,6 @@ PORTNAME= opencv DISTVERSION= 4.11.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MAINTAINER= desktop@FreeBSD.org diff --git a/graphics/pcl-pointclouds/Makefile b/graphics/pcl-pointclouds/Makefile index 1e5e23d47a4b..773481c48ddc 100644 --- a/graphics/pcl-pointclouds/Makefile +++ b/graphics/pcl-pointclouds/Makefile @@ -1,7 +1,7 @@ PORTNAME= pcl DISTVERSIONPREFIX= pcl- DISTVERSION= 1.15.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics math #MASTER_SITES= https://github.com/PointCloudLibrary/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/ PKGNAMESUFFIX= -pointclouds diff --git a/graphics/py-fury/Makefile b/graphics/py-fury/Makefile index 9dd95e0c9314..264aadfb5fbf 100644 --- a/graphics/py-fury/Makefile +++ b/graphics/py-fury/Makefile @@ -1,5 +1,6 @@ PORTNAME= fury DISTVERSION= 0.12.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/py-mayavi/Makefile b/graphics/py-mayavi/Makefile index 9187f05eaa60..4231c09f8271 100644 --- a/graphics/py-mayavi/Makefile +++ b/graphics/py-mayavi/Makefile @@ -1,6 +1,6 @@ PORTNAME= mayavi DISTVERSION= 4.8.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics science python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/py-pyvista/Makefile b/graphics/py-pyvista/Makefile index 2b4540d8aa0c..80aa88554f1c 100644 --- a/graphics/py-pyvista/Makefile +++ b/graphics/py-pyvista/Makefile @@ -1,6 +1,6 @@ PORTNAME= pyvista DISTVERSION= 0.34.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/math/vtk9/Makefile b/math/vtk9/Makefile index 85979ec768e3..41087e74f8e4 100644 --- a/math/vtk9/Makefile +++ b/math/vtk9/Makefile @@ -1,6 +1,5 @@ PORTNAME= vtk -DISTVERSION= 9.2.6 -PORTREVISION= 6 +DISTVERSION= 9.5.0 CATEGORIES= math graphics MASTER_SITES= https://vtk.org/files/release/${VTK_SHORT_VER}/ PKGNAMESUFFIX= 9 diff --git a/math/vtk9/Makefile.version b/math/vtk9/Makefile.version index 66ceb4b6ed8f..0704e0637ff9 100644 --- a/math/vtk9/Makefile.version +++ b/math/vtk9/Makefile.version @@ -1,3 +1,3 @@ # this file is provided for VTK users -VTK_VER=9.2 +VTK_VER=9.5 diff --git a/math/vtk9/distinfo b/math/vtk9/distinfo index c73d546ac962..89bd22215236 100644 --- a/math/vtk9/distinfo +++ b/math/vtk9/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1687488293 -SHA256 (VTK-9.2.6.tar.gz) = 06fc8d49c4e56f498c40fcb38a563ed8d4ec31358d0101e8988f0bb4d539dd12 -SIZE (VTK-9.2.6.tar.gz) = 53810904 +TIMESTAMP = 1750828031 +SHA256 (VTK-9.5.0.tar.gz) = 04ae86246b9557c6b61afbc534a6df099244fbc8f3937f82e6bc0570953af87d +SIZE (VTK-9.5.0.tar.gz) = 50172790 diff --git a/math/vtk9/files/patch-ThirdParty_cgns_vtkcgns_src_adfh_ADFH.c b/math/vtk9/files/patch-ThirdParty_cgns_vtkcgns_src_adfh_ADFH.c deleted file mode 100644 index 908a0098eced..000000000000 --- a/math/vtk9/files/patch-ThirdParty_cgns_vtkcgns_src_adfh_ADFH.c +++ /dev/null @@ -1,13 +0,0 @@ ---- ThirdParty/cgns/vtkcgns/src/adfh/ADFH.c.orig 2022-10-02 11:37:19 UTC -+++ ThirdParty/cgns/vtkcgns/src/adfh/ADFH.c -@@ -287,6 +287,10 @@ if (mta_root == NULL){set_error(ADFH_ERR_ROOTNULL, err - #define CMP_OINFO(r,n) ((r)->fileno==(n)->fileno && \ - (r)->addr==(n)->addr && (r)->addr != HADDR_UNDEF) - -+#if H5_VERSION_GE(1,12,0) -+#undef H5L_info_t -+#define H5L_info_t H5L_info2_t -+#endif - - static herr_t gfind_by_name(hid_t, const char *, const H5L_info_t*, void *); - static herr_t find_by_name(hid_t, const char *, const H5A_info_t*, void *); diff --git a/math/vtk9/files/patch-ThirdParty_diy2_vtkdiy2_include_vtkdiy2_fmt_format.h b/math/vtk9/files/patch-ThirdParty_diy2_vtkdiy2_include_vtkdiy2_fmt_format.h deleted file mode 100644 index eb9c13efbe2f..000000000000 --- a/math/vtk9/files/patch-ThirdParty_diy2_vtkdiy2_include_vtkdiy2_fmt_format.h +++ /dev/null @@ -1,18 +0,0 @@ ---- ThirdParty/diy2/vtkdiy2/include/vtkdiy2/fmt/format.h.orig 2023-02-15 04:03:53 UTC -+++ ThirdParty/diy2/vtkdiy2/include/vtkdiy2/fmt/format.h -@@ -480,6 +480,7 @@ void buffer<T>::append(const U* begin, const U* end) { - } - } // namespace internal - -+#ifdef __cpp_char8_t - // A UTF-8 string view. - class u8string_view : public basic_string_view<char8_t> { - public: -@@ -497,6 +498,7 @@ inline u8string_view operator"" _u(const char* s, std: - } - } // namespace literals - #endif -+#endif // __cpp_char8_t - - // The number of characters to store in the basic_memory_buffer object itself - // to avoid dynamic memory allocation. diff --git a/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__put__prop.c b/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__put__prop.c deleted file mode 100644 index eb29a277f139..000000000000 --- a/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__put__prop.c +++ /dev/null @@ -1,14 +0,0 @@ -- fix build with science/netcdf 4.9.3 -- see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=284680 - ---- ThirdParty/exodusII/vtkexodusII/src/ex_put_prop.c.orig 2025-02-10 02:00:23 UTC -+++ ThirdParty/exodusII/vtkexodusII/src/ex_put_prop.c -@@ -243,7 +243,7 @@ int ex_put_prop(int exoid, ex_entity_type obj_type, ex - vals[0] = 0; /* fill value */ - /* create attribute to cause variable to fill with zeros per routine spec - */ -- if ((status = nc_put_att_longlong(exoid, propid, _FillValue, int_type, 1, vals)) != NC_NOERR) { -+ if ((status = nc_put_att_longlong(exoid, propid, NC_FillValue, int_type, 1, vals)) != NC_NOERR) { - snprintf(errmsg, MAX_ERR_LENGTH, - "ERROR: failed to create property name fill attribute in file id %d", exoid); - ex_err_fn(exoid, __func__, errmsg, status); diff --git a/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__put__prop__names.c b/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__put__prop__names.c deleted file mode 100644 index 335822e40906..000000000000 --- a/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__put__prop__names.c +++ /dev/null @@ -1,14 +0,0 @@ -- fix build with science/netcdf 4.9.3 -- see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=284680 - ---- ThirdParty/exodusII/vtkexodusII/src/ex_put_prop_names.c.orig 2025-02-10 02:01:23 UTC -+++ ThirdParty/exodusII/vtkexodusII/src/ex_put_prop_names.c -@@ -172,7 +172,7 @@ int ex_put_prop_names(int exoid, ex_entity_type obj_ty - - /* create attribute to cause variable to fill with zeros per routine spec - */ -- if ((status = nc_put_att_longlong(exoid, propid, _FillValue, int_type, 1, vals)) != NC_NOERR) { -+ if ((status = nc_put_att_longlong(exoid, propid, NC_FillValue, int_type, 1, vals)) != NC_NOERR) { - snprintf(errmsg, MAX_ERR_LENGTH, - "ERROR: failed to create property name fill attribute in file id %d", exoid); - ex_err_fn(exoid, __func__, errmsg, status); diff --git a/math/vtk9/files/patch-ThirdParty_glew_vtkglew_src_glew.c b/math/vtk9/files/patch-ThirdParty_glew_vtkglew_src_glew.c deleted file mode 100644 index 65889826bdd6..000000000000 --- a/math/vtk9/files/patch-ThirdParty_glew_vtkglew_src_glew.c +++ /dev/null @@ -1,10 +0,0 @@ ---- ThirdParty/glew/vtkglew/src/glew.c.orig 2024-02-21 22:29:42 UTC -+++ ThirdParty/glew/vtkglew/src/glew.c -@@ -38,6 +38,7 @@ - - #if defined(GLEW_OSMESA) - # define GLAPI extern -+# define APIENTRY __stdcall - # include <GL/osmesa.h> - #elif defined(GLEW_EGL) - # include <GL/eglew.h> diff --git a/math/vtk9/files/patch-ThirdParty_glew_vtkglew_src_glewinfo.c b/math/vtk9/files/patch-ThirdParty_glew_vtkglew_src_glewinfo.c deleted file mode 100644 index 0ea9659d6ec5..000000000000 --- a/math/vtk9/files/patch-ThirdParty_glew_vtkglew_src_glewinfo.c +++ /dev/null @@ -1,10 +0,0 @@ ---- ThirdParty/glew/vtkglew/src/glewinfo.c.orig 2024-02-21 22:29:54 UTC -+++ ThirdParty/glew/vtkglew/src/glewinfo.c -@@ -38,6 +38,7 @@ - #include <GL/eglew.h> - #elif defined(GLEW_OSMESA) - #define GLAPI extern -+#define APIENTRY __stdcall - #include <GL/osmesa.h> - #elif defined(_WIN32) - #include <GL/wglew.h> diff --git a/math/vtk9/files/patch-Utilities_octree_octree_octree__node.txx b/math/vtk9/files/patch-Utilities_octree_octree_octree__node.txx deleted file mode 100644 index de91955442bb..000000000000 --- a/math/vtk9/files/patch-Utilities_octree_octree_octree__node.txx +++ /dev/null @@ -1,11 +0,0 @@ ---- Utilities/octree/octree/octree_node.txx.orig 2023-02-15 04:03:53 UTC -+++ Utilities/octree/octree/octree_node.txx -@@ -207,7 +207,7 @@ const octree_node<T_, d_, A_>& octree_node<T_, d_, A_> - { - throw std::domain_error("Attempt to access children of an octree leaf node."); - } -- return this->_M_chilren[child]; -+ return this->m_children[child]; - } - - /**\brief Return a reference to a child node. diff --git a/misc/visp/Makefile b/misc/visp/Makefile index efc868f979f6..d173a26c75f2 100644 --- a/misc/visp/Makefile +++ b/misc/visp/Makefile @@ -1,12 +1,13 @@ PORTNAME= visp DISTVERSION= 3.6.0 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= misc MASTER_SITES= https://visp-doc.inria.fr/download/releases/ MAINTAINER= yuri@FreeBSD.org COMMENT= Modular library for visual tracking and visual servoing -WWW= https://visp.inria.fr/ +WWW= https://visp.inria.fr/ \ + https://github.com/lagadic/visp LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE.txt @@ -37,6 +38,8 @@ USE_LDCONFIG= yes CMAKE_OFF= WITH_QBDEVICE BUILD_EXAMPLES BUILD_TUTORIALS BUILD_TESTS BUILD_DEMOS +CXXFLAGS+= -I${LOCALBASE}/include/vtk-${VTK_VER} # https://github.com/lagadic/visp/issues/1707 + OPTIONS_DEFINE= COIN OGRE PCL ZBAR OPTIONS_DEFAULT= COIN OGRE PCL ZBAR @@ -51,10 +54,11 @@ OGRE_LIB_DEPENDS= libOgreMain.so:graphics/ogre3d19 PCL_DESC= Include Point Cloud Library support PCL_CMAKE_BOOL= USE_PCL PCL_LIB_DEPENDS= libpcl_common.so:graphics/pcl-pointclouds \ - libvtkCommonCore-9.2.so:math/vtk9 # vtk9 is incurred by pcl-pointclouds + libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R} # vtk9 is incurred by pcl-pointclouds ZBAR_DESC= Use ZBAR to read bar codes and QR codes ZBAR_CMAKE_BOOL= USE_ZBAR ZBAR_LIB_DEPENDS= libzbar.so:graphics/zbar +.include <../../math/vtk9/Makefile.version> .include <bsd.port.mk> diff --git a/misc/visp/files/patch-CMakeLists.txt b/misc/visp/files/patch-CMakeLists.txt index 893083431163..f5c75760570d 100644 --- a/misc/visp/files/patch-CMakeLists.txt +++ b/misc/visp/files/patch-CMakeLists.txt @@ -1,8 +1,17 @@ https://github.com/lagadic/visp/issues/423 ---- CMakeLists.txt.orig 2021-03-05 01:09:20 UTC +--- CMakeLists.txt.orig 2023-09-22 05:39:36 UTC +++ CMakeLists.txt -@@ -230,7 +230,7 @@ else() # UNIX +@@ -124,6 +124,8 @@ project(VISP C CXX) + + project(VISP C CXX) + ++find_package(VTK REQUIRED) # workaround for https://gitlab.kitware.com/vtk/vtk/-/issues/19716 ++ + list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") + + include(cmake/VISPUtils.cmake) +@@ -244,7 +246,7 @@ else() # UNIX vp_update(VISP_LIB_INSTALL_PATH "${CMAKE_INSTALL_LIBDIR}") endif() vp_update(VISP_BIN_INSTALL_PATH "${CMAKE_INSTALL_BINDIR}") diff --git a/science/InsightToolkit/Makefile b/science/InsightToolkit/Makefile index 75f332286234..f11586616811 100644 --- a/science/InsightToolkit/Makefile +++ b/science/InsightToolkit/Makefile @@ -1,7 +1,7 @@ PORTNAME= InsightToolkit DISTVERSIONPREFIX= v DISTVERSION= 5.3.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= science biology MASTER_SITES= https://github.com/InsightSoftwareConsortium/ITK/releases/download/v${DISTVERSION}/:data DISTFILES= InsightData-${DISTVERSION}.tar.gz:data diff --git a/science/InsightToolkit/Makefile.remote_modules b/science/InsightToolkit/Makefile.remote_modules index ed3659eabd22..ac598e13d5cf 100644 --- a/science/InsightToolkit/Makefile.remote_modules +++ b/science/InsightToolkit/Makefile.remote_modules @@ -79,7 +79,7 @@ CMAKE_ON+=Module_IOScanco CMAKE_ON+=Module_IOTransformDCMTK CMAKE_OFF+=Module_IsotropicWavelets # cmake fails: No such module: "ITKImageIO" CMAKE_ON+=Module_LabelErodeDilate -CMAKE_ON+=Module_LesionSizingToolkit +#CMAKE_ON+=Module_LesionSizingToolkit CMAKE_ON+=Module_itkMGHImageIO CMAKE_ON+=Module_MeshNoise CMAKE_ON+=Module_MeshToPolyData diff --git a/science/InsightToolkit/pkg-plist b/science/InsightToolkit/pkg-plist index b2301e5560a8..8f1a4fb86c8f 100644 --- a/science/InsightToolkit/pkg-plist +++ b/science/InsightToolkit/pkg-plist @@ -148,12 +148,10 @@ include/ITK-%%ITK_VER%%/ITKTransformExport.h include/ITK-%%ITK_VER%%/ITKVTKExport.h include/ITK-%%ITK_VER%%/ITKVideoCoreExport.h include/ITK-%%ITK_VER%%/ITKVideoIOExport.h -include/ITK-%%ITK_VER%%/ITKVtkGlueExport.h include/ITK-%%ITK_VER%%/ITKWatershedsExport.h include/ITK-%%ITK_VER%%/MinimalPathExtractionExport.h include/ITK-%%ITK_VER%%/MontageExport.h include/ITK-%%ITK_VER%%/NrrdIO.h -include/ITK-%%ITK_VER%%/QuickView.h include/ITK-%%ITK_VER%%/RTKExport.h include/ITK-%%ITK_VER%%/SimpleITKFiltersExport.h include/ITK-%%ITK_VER%%/VNLIterativeSparseSolverTraits.h @@ -413,8 +411,6 @@ include/ITK-%%ITK_VER%%/itkBinaryThinningImageFilter.h include/ITK-%%ITK_VER%%/itkBinaryThinningImageFilter.hxx include/ITK-%%ITK_VER%%/itkBinaryThinningImageFilter3D.h include/ITK-%%ITK_VER%%/itkBinaryThinningImageFilter3D.hxx -include/ITK-%%ITK_VER%%/itkBinaryThresholdFeatureGenerator.h -include/ITK-%%ITK_VER%%/itkBinaryThresholdFeatureGenerator.hxx include/ITK-%%ITK_VER%%/itkBinaryThresholdImageFilter.h include/ITK-%%ITK_VER%%/itkBinaryThresholdImageFilter.hxx include/ITK-%%ITK_VER%%/itkBinaryThresholdImageFunction.h @@ -477,14 +473,6 @@ include/ITK-%%ITK_VER%%/itkCSVNumericObjectFileWriter.hxx include/ITK-%%ITK_VER%%/itkCacheableScalarFunction.h include/ITK-%%ITK_VER%%/itkCannyEdgeDetectionImageFilter.h include/ITK-%%ITK_VER%%/itkCannyEdgeDetectionImageFilter.hxx -include/ITK-%%ITK_VER%%/itkCannyEdgeDetectionRecursiveGaussianImageFilter.h -include/ITK-%%ITK_VER%%/itkCannyEdgeDetectionRecursiveGaussianImageFilter.hxx -include/ITK-%%ITK_VER%%/itkCannyEdgesDistanceAdvectionFieldFeatureGenerator.h -include/ITK-%%ITK_VER%%/itkCannyEdgesDistanceAdvectionFieldFeatureGenerator.hxx -include/ITK-%%ITK_VER%%/itkCannyEdgesDistanceFeatureGenerator.h -include/ITK-%%ITK_VER%%/itkCannyEdgesDistanceFeatureGenerator.hxx -include/ITK-%%ITK_VER%%/itkCannyEdgesFeatureGenerator.h -include/ITK-%%ITK_VER%%/itkCannyEdgesFeatureGenerator.hxx include/ITK-%%ITK_VER%%/itkCannySegmentationLevelSetFunction.h include/ITK-%%ITK_VER%%/itkCannySegmentationLevelSetFunction.hxx include/ITK-%%ITK_VER%%/itkCannySegmentationLevelSetImageFilter.h @@ -579,8 +567,6 @@ include/ITK-%%ITK_VER%%/itkConceptChecking.h include/ITK-%%ITK_VER%%/itkConditionalConstIterator.h include/ITK-%%ITK_VER%%/itkConfidenceConnectedImageFilter.h include/ITK-%%ITK_VER%%/itkConfidenceConnectedImageFilter.hxx -include/ITK-%%ITK_VER%%/itkConfidenceConnectedSegmentationModule.h -include/ITK-%%ITK_VER%%/itkConfidenceConnectedSegmentationModule.hxx include/ITK-%%ITK_VER%%/itkConfigure.h include/ITK-%%ITK_VER%%/itkConformalFlatteningMeshFilter.h include/ITK-%%ITK_VER%%/itkConformalFlatteningMeshFilter.hxx @@ -599,8 +585,6 @@ include/ITK-%%ITK_VER%%/itkConnectedRegionsMeshFilter.h include/ITK-%%ITK_VER%%/itkConnectedRegionsMeshFilter.hxx include/ITK-%%ITK_VER%%/itkConnectedThresholdImageFilter.h include/ITK-%%ITK_VER%%/itkConnectedThresholdImageFilter.hxx -include/ITK-%%ITK_VER%%/itkConnectedThresholdSegmentationModule.h -include/ITK-%%ITK_VER%%/itkConnectedThresholdSegmentationModule.hxx include/ITK-%%ITK_VER%%/itkConstNeighborhoodIterator.h include/ITK-%%ITK_VER%%/itkConstNeighborhoodIterator.hxx include/ITK-%%ITK_VER%%/itkConstNeighborhoodIteratorWithOnlyIndex.h @@ -765,9 +749,6 @@ include/ITK-%%ITK_VER%%/itkDescoteauxEigenToMeasureImageFilter.h include/ITK-%%ITK_VER%%/itkDescoteauxEigenToMeasureImageFilter.hxx include/ITK-%%ITK_VER%%/itkDescoteauxEigenToMeasureParameterEstimationFilter.h include/ITK-%%ITK_VER%%/itkDescoteauxEigenToMeasureParameterEstimationFilter.hxx -include/ITK-%%ITK_VER%%/itkDescoteauxSheetnessFeatureGenerator.h -include/ITK-%%ITK_VER%%/itkDescoteauxSheetnessFeatureGenerator.hxx -include/ITK-%%ITK_VER%%/itkDescoteauxSheetnessImageFilter.h include/ITK-%%ITK_VER%%/itkDiffeomorphicDemonsRegistrationFilter.h include/ITK-%%ITK_VER%%/itkDiffeomorphicDemonsRegistrationFilter.hxx include/ITK-%%ITK_VER%%/itkDifferenceOfGaussiansGradientImageFilter.h @@ -927,10 +908,6 @@ include/ITK-%%ITK_VER%%/itkFastChamferDistanceImageFilter.hxx include/ITK-%%ITK_VER%%/itkFastGrowCut.h include/ITK-%%ITK_VER%%/itkFastGrowCut.hxx include/ITK-%%ITK_VER%%/itkFastIncrementalBinaryDilateImageFilter.h -include/ITK-%%ITK_VER%%/itkFastMarchingAndGeodesicActiveContourLevelSetSegmentationModule.h -include/ITK-%%ITK_VER%%/itkFastMarchingAndGeodesicActiveContourLevelSetSegmentationModule.hxx -include/ITK-%%ITK_VER%%/itkFastMarchingAndShapeDetectionLevelSetSegmentationModule.h -include/ITK-%%ITK_VER%%/itkFastMarchingAndShapeDetectionLevelSetSegmentationModule.hxx include/ITK-%%ITK_VER%%/itkFastMarchingBase.h include/ITK-%%ITK_VER%%/itkFastMarchingBase.hxx include/ITK-%%ITK_VER%%/itkFastMarchingExtensionImageFilter.h @@ -947,8 +924,6 @@ include/ITK-%%ITK_VER%%/itkFastMarchingNumberOfElementsStoppingCriterion.h include/ITK-%%ITK_VER%%/itkFastMarchingQuadEdgeMeshFilterBase.h include/ITK-%%ITK_VER%%/itkFastMarchingQuadEdgeMeshFilterBase.hxx include/ITK-%%ITK_VER%%/itkFastMarchingReachedTargetNodesStoppingCriterion.h -include/ITK-%%ITK_VER%%/itkFastMarchingSegmentationModule.h -include/ITK-%%ITK_VER%%/itkFastMarchingSegmentationModule.hxx include/ITK-%%ITK_VER%%/itkFastMarchingStoppingCriterionBase.h include/ITK-%%ITK_VER%%/itkFastMarchingThresholdStoppingCriterion.h include/ITK-%%ITK_VER%%/itkFastMarchingTraits.h @@ -960,10 +935,6 @@ include/ITK-%%ITK_VER%%/itkFastSymmetricForcesDemonsRegistrationFilter.h include/ITK-%%ITK_VER%%/itkFastSymmetricForcesDemonsRegistrationFilter.hxx include/ITK-%%ITK_VER%%/itkFastSymmetricForcesDemonsRegistrationFunction.h include/ITK-%%ITK_VER%%/itkFastSymmetricForcesDemonsRegistrationFunction.hxx -include/ITK-%%ITK_VER%%/itkFeatureAggregator.h -include/ITK-%%ITK_VER%%/itkFeatureAggregator.hxx -include/ITK-%%ITK_VER%%/itkFeatureGenerator.h -include/ITK-%%ITK_VER%%/itkFeatureGenerator.hxx include/ITK-%%ITK_VER%%/itkFileListVideoIO.h include/ITK-%%ITK_VER%%/itkFileListVideoIOFactory.h include/ITK-%%ITK_VER%%/itkFileOutputWindow.h @@ -1012,9 +983,6 @@ include/ITK-%%ITK_VER%%/itkFrameAverageVideoFilter.h include/ITK-%%ITK_VER%%/itkFrameAverageVideoFilter.hxx include/ITK-%%ITK_VER%%/itkFrameDifferenceVideoFilter.h include/ITK-%%ITK_VER%%/itkFrameDifferenceVideoFilter.hxx -include/ITK-%%ITK_VER%%/itkFrangiTubularnessFeatureGenerator.h -include/ITK-%%ITK_VER%%/itkFrangiTubularnessFeatureGenerator.hxx -include/ITK-%%ITK_VER%%/itkFrangiTubularnessImageFilter.h include/ITK-%%ITK_VER%%/itkFreeSurferAsciiMeshIO.h include/ITK-%%ITK_VER%%/itkFreeSurferAsciiMeshIOFactory.h include/ITK-%%ITK_VER%%/itkFreeSurferBinaryMeshIO.h @@ -1144,8 +1112,6 @@ include/ITK-%%ITK_VER%%/itkGeodesicActiveContourLevelSetFunction.h include/ITK-%%ITK_VER%%/itkGeodesicActiveContourLevelSetFunction.hxx include/ITK-%%ITK_VER%%/itkGeodesicActiveContourLevelSetImageFilter.h include/ITK-%%ITK_VER%%/itkGeodesicActiveContourLevelSetImageFilter.hxx -include/ITK-%%ITK_VER%%/itkGeodesicActiveContourLevelSetSegmentationModule.h -include/ITK-%%ITK_VER%%/itkGeodesicActiveContourLevelSetSegmentationModule.hxx include/ITK-%%ITK_VER%%/itkGeodesicActiveContourShapePriorLevelSetFunction.h include/ITK-%%ITK_VER%%/itkGeodesicActiveContourShapePriorLevelSetFunction.hxx include/ITK-%%ITK_VER%%/itkGeodesicActiveContourShapePriorLevelSetImageFilter.h @@ -1179,8 +1145,6 @@ include/ITK-%%ITK_VER%%/itkGradientMagnitudeImageFilter.h include/ITK-%%ITK_VER%%/itkGradientMagnitudeImageFilter.hxx include/ITK-%%ITK_VER%%/itkGradientMagnitudeRecursiveGaussianImageFilter.h include/ITK-%%ITK_VER%%/itkGradientMagnitudeRecursiveGaussianImageFilter.hxx -include/ITK-%%ITK_VER%%/itkGradientMagnitudeSigmoidFeatureGenerator.h -include/ITK-%%ITK_VER%%/itkGradientMagnitudeSigmoidFeatureGenerator.hxx include/ITK-%%ITK_VER%%/itkGradientNDAnisotropicDiffusionFunction.h include/ITK-%%ITK_VER%%/itkGradientNDAnisotropicDiffusionFunction.hxx include/ITK-%%ITK_VER%%/itkGradientRecursiveGaussianImageFilter.h @@ -1207,8 +1171,6 @@ include/ITK-%%ITK_VER%%/itkGrayscaleGeodesicErodeImageFilter.h include/ITK-%%ITK_VER%%/itkGrayscaleGeodesicErodeImageFilter.hxx include/ITK-%%ITK_VER%%/itkGrayscaleGrindPeakImageFilter.h include/ITK-%%ITK_VER%%/itkGrayscaleGrindPeakImageFilter.hxx -include/ITK-%%ITK_VER%%/itkGrayscaleImageSegmentationVolumeEstimator.h -include/ITK-%%ITK_VER%%/itkGrayscaleImageSegmentationVolumeEstimator.hxx include/ITK-%%ITK_VER%%/itkGrayscaleMorphologicalClosingImageFilter.h include/ITK-%%ITK_VER%%/itkGrayscaleMorphologicalClosingImageFilter.hxx include/ITK-%%ITK_VER%%/itkGrayscaleMorphologicalOpeningImageFilter.h @@ -1466,8 +1428,6 @@ include/ITK-%%ITK_VER%%/itkImageToSpatialObjectMetric.h include/ITK-%%ITK_VER%%/itkImageToSpatialObjectMetric.hxx include/ITK-%%ITK_VER%%/itkImageToSpatialObjectRegistrationMethod.h include/ITK-%%ITK_VER%%/itkImageToSpatialObjectRegistrationMethod.hxx -include/ITK-%%ITK_VER%%/itkImageToVTKImageFilter.h -include/ITK-%%ITK_VER%%/itkImageToVTKImageFilter.hxx include/ITK-%%ITK_VER%%/itkImageToVideoFilter.h include/ITK-%%ITK_VER%%/itkImageToVideoFilter.hxx include/ITK-%%ITK_VER%%/itkImageVectorOptimizerParametersHelper.h @@ -1532,10 +1492,6 @@ include/ITK-%%ITK_VER%%/itkIsolatedWatershedImageFilter.h include/ITK-%%ITK_VER%%/itkIsolatedWatershedImageFilter.hxx include/ITK-%%ITK_VER%%/itkIsotropicFourthOrderLevelSetImageFilter.h include/ITK-%%ITK_VER%%/itkIsotropicFourthOrderLevelSetImageFilter.hxx -include/ITK-%%ITK_VER%%/itkIsotropicResampler.h -include/ITK-%%ITK_VER%%/itkIsotropicResampler.hxx -include/ITK-%%ITK_VER%%/itkIsotropicResamplerImageFilter.h -include/ITK-%%ITK_VER%%/itkIsotropicResamplerImageFilter.hxx include/ITK-%%ITK_VER%%/itkIterateNeighborhoodOptimizer.h include/ITK-%%ITK_VER%%/itkIterationReporter.h include/ITK-%%ITK_VER%%/itkIterativeDeconvolutionImageFilter.h @@ -1686,8 +1642,6 @@ include/ITK-%%ITK_VER%%/itkLandmarkDisplacementFieldSource.h include/ITK-%%ITK_VER%%/itkLandmarkDisplacementFieldSource.hxx include/ITK-%%ITK_VER%%/itkLandmarkSpatialObject.h include/ITK-%%ITK_VER%%/itkLandmarkSpatialObject.hxx -include/ITK-%%ITK_VER%%/itkLandmarksReader.h -include/ITK-%%ITK_VER%%/itkLandmarksReader.hxx include/ITK-%%ITK_VER%%/itkLandweberDeconvolutionImageFilter.h include/ITK-%%ITK_VER%%/itkLandweberDeconvolutionImageFilter.hxx include/ITK-%%ITK_VER%%/itkLaplacianDeformationQuadEdgeMeshFilter.h @@ -1708,10 +1662,6 @@ include/ITK-%%ITK_VER%%/itkLaplacianSegmentationLevelSetImageFilter.h include/ITK-%%ITK_VER%%/itkLaplacianSegmentationLevelSetImageFilter.hxx include/ITK-%%ITK_VER%%/itkLaplacianSharpeningImageFilter.h include/ITK-%%ITK_VER%%/itkLaplacianSharpeningImageFilter.hxx -include/ITK-%%ITK_VER%%/itkLesionSegmentationImageFilter8.h -include/ITK-%%ITK_VER%%/itkLesionSegmentationImageFilter8.hxx -include/ITK-%%ITK_VER%%/itkLesionSegmentationMethod.h -include/ITK-%%ITK_VER%%/itkLesionSegmentationMethod.hxx include/ITK-%%ITK_VER%%/itkLevelSet.h include/ITK-%%ITK_VER%%/itkLevelSetBase.h include/ITK-%%ITK_VER%%/itkLevelSetBase.hxx @@ -1807,7 +1757,6 @@ include/ITK-%%ITK_VER%%/itkLinearInterpolateImageFunction.h include/ITK-%%ITK_VER%%/itkLinearInterpolateImageFunction.hxx include/ITK-%%ITK_VER%%/itkListSample.h include/ITK-%%ITK_VER%%/itkListSample.hxx -include/ITK-%%ITK_VER%%/itkLocalStructureImageFilter.h include/ITK-%%ITK_VER%%/itkLog10ImageAdaptor.h include/ITK-%%ITK_VER%%/itkLog10ImageFilter.h include/ITK-%%ITK_VER%%/itkLogGaborFreqImageSource.h @@ -1822,8 +1771,6 @@ include/ITK-%%ITK_VER%%/itkLoggerOutput.h include/ITK-%%ITK_VER%%/itkLoggerThreadWrapper.h include/ITK-%%ITK_VER%%/itkLoggerThreadWrapper.hxx include/ITK-%%ITK_VER%%/itkLogicOpsFunctors.h -include/ITK-%%ITK_VER%%/itkLungWallFeatureGenerator.h -include/ITK-%%ITK_VER%%/itkLungWallFeatureGenerator.hxx include/ITK-%%ITK_VER%%/itkMINCImageIO.h include/ITK-%%ITK_VER%%/itkMINCImageIOFactory.h include/ITK-%%ITK_VER%%/itkMINCTransformAdapter.h @@ -1896,8 +1843,6 @@ include/ITK-%%ITK_VER%%/itkMaximumDecisionRule.h include/ITK-%%ITK_VER%%/itkMaximumEntropyThresholdCalculator.h include/ITK-%%ITK_VER%%/itkMaximumEntropyThresholdCalculator.hxx include/ITK-%%ITK_VER%%/itkMaximumEntropyThresholdImageFilter.h -include/ITK-%%ITK_VER%%/itkMaximumFeatureAggregator.h -include/ITK-%%ITK_VER%%/itkMaximumFeatureAggregator.hxx include/ITK-%%ITK_VER%%/itkMaximumImageFilter.h include/ITK-%%ITK_VER%%/itkMaximumProjectionImageFilter.h include/ITK-%%ITK_VER%%/itkMaximumRatioDecisionRule.h @@ -2015,8 +1960,6 @@ include/ITK-%%ITK_VER%%/itkMinMaxCurvatureFlowImageFilter.hxx include/ITK-%%ITK_VER%%/itkMiniPipelineSeparableImageFilter.h include/ITK-%%ITK_VER%%/itkMiniPipelineSeparableImageFilter.hxx include/ITK-%%ITK_VER%%/itkMinimumDecisionRule.h -include/ITK-%%ITK_VER%%/itkMinimumFeatureAggregator.h -include/ITK-%%ITK_VER%%/itkMinimumFeatureAggregator.hxx include/ITK-%%ITK_VER%%/itkMinimumImageFilter.h include/ITK-%%ITK_VER%%/itkMinimumMaximumImageCalculator.h include/ITK-%%ITK_VER%%/itkMinimumMaximumImageCalculator.hxx @@ -2039,10 +1982,6 @@ include/ITK-%%ITK_VER%%/itkMorphologicalDistanceTransformImageFilter.h include/ITK-%%ITK_VER%%/itkMorphologicalDistanceTransformImageFilter.hxx include/ITK-%%ITK_VER%%/itkMorphologicalGradientImageFilter.h include/ITK-%%ITK_VER%%/itkMorphologicalGradientImageFilter.hxx -include/ITK-%%ITK_VER%%/itkMorphologicalOpeningFeatureGenerator.h -include/ITK-%%ITK_VER%%/itkMorphologicalOpeningFeatureGenerator.hxx -include/ITK-%%ITK_VER%%/itkMorphologicalOpenningFeatureGenerator.h -include/ITK-%%ITK_VER%%/itkMorphologicalOpenningFeatureGenerator.hxx include/ITK-%%ITK_VER%%/itkMorphologicalSharpeningImageFilter.h include/ITK-%%ITK_VER%%/itkMorphologicalSharpeningImageFilter.hxx include/ITK-%%ITK_VER%%/itkMorphologicalSignedDistanceTransformImageFilter.h @@ -2529,16 +2468,12 @@ include/ITK-%%ITK_VER%%/itkRegionBasedLevelSetFunction.hxx include/ITK-%%ITK_VER%%/itkRegionBasedLevelSetFunctionData.h include/ITK-%%ITK_VER%%/itkRegionBasedLevelSetFunctionData.hxx include/ITK-%%ITK_VER%%/itkRegionBasedLevelSetFunctionSharedData.h -include/ITK-%%ITK_VER%%/itkRegionCompetitionImageFilter.h -include/ITK-%%ITK_VER%%/itkRegionCompetitionImageFilter.hxx include/ITK-%%ITK_VER%%/itkRegionConstrainedSubsampler.h include/ITK-%%ITK_VER%%/itkRegionConstrainedSubsampler.hxx include/ITK-%%ITK_VER%%/itkRegionFromReferenceLabelMapFilter.h include/ITK-%%ITK_VER%%/itkRegionFromReferenceLabelMapFilter.hxx include/ITK-%%ITK_VER%%/itkRegionGrowImageFilter.h include/ITK-%%ITK_VER%%/itkRegionGrowImageFilter.hxx -include/ITK-%%ITK_VER%%/itkRegionGrowingSegmentationModule.h -include/ITK-%%ITK_VER%%/itkRegionGrowingSegmentationModule.hxx include/ITK-%%ITK_VER%%/itkRegionOfInterestImageFilter.h include/ITK-%%ITK_VER%%/itkRegionOfInterestImageFilter.hxx include/ITK-%%ITK_VER%%/itkRegionalMaximaImageFilter.h @@ -2619,12 +2554,6 @@ include/ITK-%%ITK_VER%%/itkSampleToHistogramFilter.h include/ITK-%%ITK_VER%%/itkSampleToHistogramFilter.hxx include/ITK-%%ITK_VER%%/itkSampleToSubsampleFilter.h include/ITK-%%ITK_VER%%/itkSampleToSubsampleFilter.hxx -include/ITK-%%ITK_VER%%/itkSatoLocalStructureFeatureGenerator.h -include/ITK-%%ITK_VER%%/itkSatoLocalStructureFeatureGenerator.hxx -include/ITK-%%ITK_VER%%/itkSatoVesselnessFeatureGenerator.h -include/ITK-%%ITK_VER%%/itkSatoVesselnessFeatureGenerator.hxx -include/ITK-%%ITK_VER%%/itkSatoVesselnessSigmoidFeatureGenerator.h -include/ITK-%%ITK_VER%%/itkSatoVesselnessSigmoidFeatureGenerator.hxx include/ITK-%%ITK_VER%%/itkScalableAffineTransform.h include/ITK-%%ITK_VER%%/itkScalableAffineTransform.hxx include/ITK-%%ITK_VER%%/itkScalarAnisotropicDiffusionFunction.h @@ -2677,11 +2606,7 @@ include/ITK-%%ITK_VER%%/itkSegmentationLevelSetFunction.h include/ITK-%%ITK_VER%%/itkSegmentationLevelSetFunction.hxx include/ITK-%%ITK_VER%%/itkSegmentationLevelSetImageFilter.h include/ITK-%%ITK_VER%%/itkSegmentationLevelSetImageFilter.hxx -include/ITK-%%ITK_VER%%/itkSegmentationModule.h -include/ITK-%%ITK_VER%%/itkSegmentationModule.hxx include/ITK-%%ITK_VER%%/itkSegmentationRegion.h -include/ITK-%%ITK_VER%%/itkSegmentationVolumeEstimator.h -include/ITK-%%ITK_VER%%/itkSegmentationVolumeEstimator.hxx include/ITK-%%ITK_VER%%/itkShanbhagThresholdCalculator.h include/ITK-%%ITK_VER%%/itkShanbhagThresholdCalculator.hxx include/ITK-%%ITK_VER%%/itkShanbhagThresholdImageFilter.h @@ -2689,8 +2614,6 @@ include/ITK-%%ITK_VER%%/itkShapeDetectionLevelSetFunction.h include/ITK-%%ITK_VER%%/itkShapeDetectionLevelSetFunction.hxx include/ITK-%%ITK_VER%%/itkShapeDetectionLevelSetImageFilter.h include/ITK-%%ITK_VER%%/itkShapeDetectionLevelSetImageFilter.hxx -include/ITK-%%ITK_VER%%/itkShapeDetectionLevelSetSegmentationModule.h -include/ITK-%%ITK_VER%%/itkShapeDetectionLevelSetSegmentationModule.hxx include/ITK-%%ITK_VER%%/itkShapeKeepNObjectsLabelMapFilter.h include/ITK-%%ITK_VER%%/itkShapeKeepNObjectsLabelMapFilter.hxx include/ITK-%%ITK_VER%%/itkShapeLabelMapFilter.h @@ -2741,8 +2664,6 @@ include/ITK-%%ITK_VER%%/itkSiddonJacobsRayCastInterpolateImageFunction.h include/ITK-%%ITK_VER%%/itkSiddonJacobsRayCastInterpolateImageFunction.hxx include/ITK-%%ITK_VER%%/itkSiemensVisionImageIO.h include/ITK-%%ITK_VER%%/itkSiemensVisionImageIOFactory.h -include/ITK-%%ITK_VER%%/itkSigmoidFeatureGenerator.h -include/ITK-%%ITK_VER%%/itkSigmoidFeatureGenerator.hxx include/ITK-%%ITK_VER%%/itkSigmoidImageFilter.h include/ITK-%%ITK_VER%%/itkSignedDanielssonDistanceMapImageFilter.h include/ITK-%%ITK_VER%%/itkSignedDanielssonDistanceMapImageFilter.hxx @@ -2775,8 +2696,6 @@ include/ITK-%%ITK_VER%%/itkSinRegularizedHeavisideStepFunction.h include/ITK-%%ITK_VER%%/itkSinRegularizedHeavisideStepFunction.hxx include/ITK-%%ITK_VER%%/itkSingleImageCostFunction.h include/ITK-%%ITK_VER%%/itkSingleImageCostFunction.hxx -include/ITK-%%ITK_VER%%/itkSinglePhaseLevelSetSegmentationModule.h -include/ITK-%%ITK_VER%%/itkSinglePhaseLevelSetSegmentationModule.hxx include/ITK-%%ITK_VER%%/itkSingleValuedCostFunction.h include/ITK-%%ITK_VER%%/itkSingleValuedCostFunctionv4.h include/ITK-%%ITK_VER%%/itkSingleValuedNonLinearOptimizer.h @@ -3105,8 +3024,6 @@ include/ITK-%%ITK_VER%%/itkVTKImageIO.h include/ITK-%%ITK_VER%%/itkVTKImageIOFactory.h include/ITK-%%ITK_VER%%/itkVTKImageImport.h include/ITK-%%ITK_VER%%/itkVTKImageImport.hxx -include/ITK-%%ITK_VER%%/itkVTKImageToImageFilter.h -include/ITK-%%ITK_VER%%/itkVTKImageToImageFilter.hxx include/ITK-%%ITK_VER%%/itkVTKPolyDataMeshIO.h include/ITK-%%ITK_VER%%/itkVTKPolyDataMeshIOFactory.h include/ITK-%%ITK_VER%%/itkVTKPolyDataReader.h @@ -3227,8 +3144,6 @@ include/ITK-%%ITK_VER%%/itkVersorTransform.hxx include/ITK-%%ITK_VER%%/itkVersorTransformOptimizer.h include/ITK-%%ITK_VER%%/itkVertexCell.h include/ITK-%%ITK_VER%%/itkVertexCell.hxx -include/ITK-%%ITK_VER%%/itkVesselEnhancingDiffusion3DImageFilter.h -include/ITK-%%ITK_VER%%/itkVesselEnhancingDiffusion3DImageFilter.hxx include/ITK-%%ITK_VER%%/itkVideoFileReader.h include/ITK-%%ITK_VER%%/itkVideoFileReader.hxx include/ITK-%%ITK_VER%%/itkVideoFileWriter.h @@ -3241,8 +3156,6 @@ include/ITK-%%ITK_VER%%/itkVideoStream.h include/ITK-%%ITK_VER%%/itkVideoStream.hxx include/ITK-%%ITK_VER%%/itkVideoToVideoFilter.h include/ITK-%%ITK_VER%%/itkVideoToVideoFilter.hxx -include/ITK-%%ITK_VER%%/itkViewImage.h -include/ITK-%%ITK_VER%%/itkViewImage.hxx include/ITK-%%ITK_VER%%/itkVnlComplexToComplex1DFFTImageFilter.h include/ITK-%%ITK_VER%%/itkVnlComplexToComplex1DFFTImageFilter.hxx include/ITK-%%ITK_VER%%/itkVnlComplexToComplexFFTImageFilter.h @@ -3276,8 +3189,6 @@ include/ITK-%%ITK_VER%%/itkVoronoiSegmentationImageFilterBase.h include/ITK-%%ITK_VER%%/itkVoronoiSegmentationImageFilterBase.hxx include/ITK-%%ITK_VER%%/itkVoronoiSegmentationRGBImageFilter.h include/ITK-%%ITK_VER%%/itkVoronoiSegmentationRGBImageFilter.hxx -include/ITK-%%ITK_VER%%/itkVotingBinaryHoleFillFloodingImageFilter.h -include/ITK-%%ITK_VER%%/itkVotingBinaryHoleFillFloodingImageFilter.hxx include/ITK-%%ITK_VER%%/itkVotingBinaryHoleFillingImageFilter.h include/ITK-%%ITK_VER%%/itkVotingBinaryHoleFillingImageFilter.hxx include/ITK-%%ITK_VER%%/itkVotingBinaryImageFilter.h @@ -3321,8 +3232,6 @@ include/ITK-%%ITK_VER%%/itkWeightedCovarianceSampleFilter.h include/ITK-%%ITK_VER%%/itkWeightedCovarianceSampleFilter.hxx include/ITK-%%ITK_VER%%/itkWeightedMeanSampleFilter.h include/ITK-%%ITK_VER%%/itkWeightedMeanSampleFilter.hxx -include/ITK-%%ITK_VER%%/itkWeightedSumFeatureAggregator.h -include/ITK-%%ITK_VER%%/itkWeightedSumFeatureAggregator.hxx include/ITK-%%ITK_VER%%/itkWhitakerSparseLevelSetImage.h include/ITK-%%ITK_VER%%/itkWhitakerSparseLevelSetImage.hxx include/ITK-%%ITK_VER%%/itkWhiteTopHatImageFilter.h @@ -3855,7 +3764,6 @@ include/ITK-%%ITK_VER%%/rtkZengBackProjectionImageFilter.hxx include/ITK-%%ITK_VER%%/rtkZengForwardProjectionImageFilter.h include/ITK-%%ITK_VER%%/rtkZengForwardProjectionImageFilter.hxx include/ITK-%%ITK_VER%%/stub.h -include/ITK-%%ITK_VER%%/vtkCaptureScreen.h include/ITK-%%ITK_VER%%/znzlib.h include/RTK/lpsolve/lp_Hash.h include/RTK/lpsolve/lp_MDO.h @@ -4045,11 +3953,9 @@ lib/cmake/ITK-%%ITK_VER%%/Modules/ITKVideoCore.cmake lib/cmake/ITK-%%ITK_VER%%/Modules/ITKVideoFiltering.cmake lib/cmake/ITK-%%ITK_VER%%/Modules/ITKVideoIO.cmake lib/cmake/ITK-%%ITK_VER%%/Modules/ITKVoronoi.cmake -lib/cmake/ITK-%%ITK_VER%%/Modules/ITKVtkGlue.cmake lib/cmake/ITK-%%ITK_VER%%/Modules/ITKWatersheds.cmake lib/cmake/ITK-%%ITK_VER%%/Modules/ITKZLIB.cmake lib/cmake/ITK-%%ITK_VER%%/Modules/LabelErodeDilate.cmake -lib/cmake/ITK-%%ITK_VER%%/Modules/LesionSizingToolkit.cmake lib/cmake/ITK-%%ITK_VER%%/Modules/MeshNoise.cmake lib/cmake/ITK-%%ITK_VER%%/Modules/MeshToPolyData.cmake lib/cmake/ITK-%%ITK_VER%%/Modules/MinimalPathExtraction.cmake @@ -4231,8 +4137,6 @@ lib/libITKVideoCore-%%ITK_VER%%.so lib/libITKVideoCore-%%ITK_VER%%.so.1 lib/libITKVideoIO-%%ITK_VER%%.so lib/libITKVideoIO-%%ITK_VER%%.so.1 -lib/libITKVtkGlue-%%ITK_VER%%.so -lib/libITKVtkGlue-%%ITK_VER%%.so.1 lib/libITKWatersheds-%%ITK_VER%%.so lib/libITKWatersheds-%%ITK_VER%%.so.1 lib/libITKgiftiio-%%ITK_VER%%.so diff --git a/science/avogadrolibs/Makefile b/science/avogadrolibs/Makefile index b6c54be01a66..96b7dc019a4f 100644 --- a/science/avogadrolibs/Makefile +++ b/science/avogadrolibs/Makefile @@ -1,5 +1,6 @@ PORTNAME= avogadrolibs DISTVERSION= 1.100.0 +PORTREVISION= 1 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org diff --git a/science/elmerfem/Makefile b/science/elmerfem/Makefile index 61d937cda3e7..6922d8d4b4eb 100644 --- a/science/elmerfem/Makefile +++ b/science/elmerfem/Makefile @@ -13,6 +13,8 @@ WWW= https://www.elmerfem.org/blog/ LICENSE= GPLv2 +BROKEN= fails to build with vtk-9.5.0, see https://github.com/ElmerCSC/elmerfem/issues/677 + LIB_DEPENDS= libblas.so:math/blas \ libhdf5.so:science/hdf5 \ libmetis.so:math/metis \ diff --git a/science/lammps/Makefile b/science/lammps/Makefile index 1bdf467a781d..ca1ee8bb2653 100644 --- a/science/lammps/Makefile +++ b/science/lammps/Makefile @@ -1,6 +1,6 @@ PORTNAME= lammps PORTVERSION= ${GH_TAGNAME:C/(stable|patch)_([0-9]{1,2})([A-Z][a-z][a-z])([0-9]{4})/\4.\3.\2/S/Jan/01/S/Feb/02/S/Mar/03/S/Apr/04/S/May/05/S/Jun/06/S/Jul/07/S/Aug/08/S/Sep/09/S/Oct/10/S/Nov/11/S/Dec/12/S/_update/./:C/\.([1-9])$/.0\1/:S/.//g} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org diff --git a/science/liggghts/Makefile b/science/liggghts/Makefile index dadf1e6ed49b..d088170996e3 100644 --- a/science/liggghts/Makefile +++ b/science/liggghts/Makefile @@ -1,6 +1,6 @@ PORTNAME= liggghts DISTVERSION= 3.8.0-58 -PORTREVISION= 6 +PORTREVISION= 7 DISTVERSIONSUFFIX= -g6e28cfe3 CATEGORIES= science diff --git a/science/mmg/Makefile b/science/mmg/Makefile index 20acba012afe..a3bf8dc89a09 100644 --- a/science/mmg/Makefile +++ b/science/mmg/Makefile @@ -1,6 +1,7 @@ PORTNAME= mmg DISTVERSIONPREFIX= v DISTVERSION= 5.7.3 +PORTREVISION= 1 CATEGORIES= science MAINTAINER= ports@FreeBSD.org diff --git a/science/openems/Makefile b/science/openems/Makefile index 4ded654ac32c..04c0f0305e74 100644 --- a/science/openems/Makefile +++ b/science/openems/Makefile @@ -1,7 +1,7 @@ PORTNAME= openems DISTVERSIONPREFIX= v DISTVERSION= 0.0.36 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org diff --git a/science/paraview/Makefile b/science/paraview/Makefile index 84dc3d063216..53ae109ad5bb 100644 --- a/science/paraview/Makefile +++ b/science/paraview/Makefile @@ -1,6 +1,6 @@ PORTNAME= paraview DISTVERSION= ${PARAVIEW_VER}.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= science graphics MASTER_SITES= http://www.paraview.org/files/v${PARAVIEW_VER}/ DISTNAME= ParaView-v${PORTVERSION} diff --git a/science/py-vedo/Makefile b/science/py-vedo/Makefile index 01c9af75b515..ca0e5d9e8df8 100644 --- a/science/py-vedo/Makefile +++ b/science/py-vedo/Makefile @@ -1,5 +1,6 @@ PORTNAME= vedo DISTVERSION= 2024.5.3 +PORTREVISION= 1 CATEGORIES= science graphics python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} |