From 9bd18faa1cb4b93efcaf694c21e1601d78bc5d4c Mon Sep 17 00:00:00 2001 From: Yuri Victorovich Date: Fri, 21 Oct 2022 12:22:35 -0700 Subject: [PATCH] Revert "deskutils/just: Update 1.5.0 -> 1.6.0" This reverts commit 9f02903fc610e0ee6355d351d75c201b213e0abe. --- cad/appcsxcad/Makefile | 7 +- cad/csxcad/Makefile | 7 +- cad/opencascade/Makefile | 9 ++- cad/qcsxcad/Makefile | 7 +- deskutils/just/Makefile | 38 ++++----- deskutils/just/distinfo | 78 +++++++++---------- devel/py-spyder/Makefile | 76 ++---------------- graphics/cloudcompare/Makefile | 5 +- graphics/f3d/Makefile | 13 +--- graphics/mirtk/Makefile | 5 +- graphics/opencv/Makefile | 5 +- graphics/pcl-pointclouds/Makefile | 7 +- graphics/py-mayavi/Makefile | 2 - graphics/py-pyvista/Makefile | 2 - math/vtk9/Makefile | 13 +--- math/vtk9/distinfo | 6 +- ...Party_exodusII_vtkexodusII_src_ex__utils.c | 12 +++ ...rdParty_libproj_vtklibproj_src_pj__mutex.c | 11 +++ science/elmerfem/Makefile | 6 +- science/liggghts/Makefile | 7 +- science/openems/Makefile | 7 +- science/paraview/Makefile | 1 - 22 files changed, 131 insertions(+), 193 deletions(-) create mode 100644 math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__utils.c create mode 100644 math/vtk9/files/patch-ThirdParty_libproj_vtklibproj_src_pj__mutex.c diff --git a/cad/appcsxcad/Makefile b/cad/appcsxcad/Makefile index 391abcce44475..eeacd1ff5ed40 100644 --- a/cad/appcsxcad/Makefile +++ b/cad/appcsxcad/Makefile @@ -2,7 +2,7 @@ PORTNAME= appcsxcad DISTVERSIONPREFIX= v DISTVERSION= 0.2.2-9 DISTVERSIONSUFFIX= -g97ba30e -PORTREVISION= 3 +PORTREVISION= 2 CATEGORIES= cad MAINTAINER= yuri@FreeBSD.org @@ -20,7 +20,7 @@ LIB_DEPENDS= libCSXCAD.so:cad/csxcad \ libQCSXCAD.so:cad/qcsxcad \ libsz.so:science/libaec \ libtiff.so:graphics/tiff \ - libvtkCommonCore-${VTK_VER}.so:math/vtk9 + libvtkCommonCore-9.1.so:math/vtk9 USES= cmake jpeg pkgconfig qt:5 xorg USE_QT= core gui sql widgets xml buildtools:build qmake:build @@ -31,7 +31,7 @@ USE_GITHUB= yes GH_ACCOUNT= thliebig GH_PROJECT= AppCSXCAD -CMAKE_ARGS= -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER} +CMAKE_ARGS= -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.1 PLIST_FILES= bin/AppCSXCAD @@ -40,5 +40,4 @@ post-install: # an example of file that AppCSXCAD opens (zipped): http://openems.de/forum/download/file.php?id=418&sid=6daebbb2df72b415fa2ec7031ffa6ca9 -.include <../../math/vtk9/Makefile.version> .include diff --git a/cad/csxcad/Makefile b/cad/csxcad/Makefile index 55b3091b7edf7..4c2563b0c1730 100644 --- a/cad/csxcad/Makefile +++ b/cad/csxcad/Makefile @@ -2,7 +2,7 @@ PORTNAME= csxcad DISTVERSIONPREFIX= v DISTVERSION= 0.6.2-109 DISTVERSIONSUFFIX= -gcd9decb -PORTREVISION= 3 +PORTREVISION= 2 CATEGORIES= cad MAINTAINER= yuri@FreeBSD.org @@ -22,7 +22,7 @@ LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libsz.so:science/libaec \ libtiff.so:graphics/tiff \ libtinyxml.so:textproc/tinyxml \ - libvtkCommonCore-${VTK_VER}.so:math/vtk9 + libvtkCommonCore-9.1.so:math/vtk9 USES= cmake jpeg pkgconfig USE_LDCONFIG= yes @@ -32,7 +32,6 @@ GH_ACCOUNT= thliebig GH_PROJECT= ${PORTNAME:tu} CMAKE_ARGS= -DFPARSER_ROOT_DIR=${LOCALBASE} \ - -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER} + -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.1 -.include <../../math/vtk9/Makefile.version> .include diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile index d10b1d6a1967e..0ff44d1e1b946 100644 --- a/cad/opencascade/Makefile +++ b/cad/opencascade/Makefile @@ -1,6 +1,6 @@ PORTNAME= opencascade PORTVERSION= 7.6.0 -PORTREVISION= 9 +PORTREVISION= 8 CATEGORIES= cad science MASTER_SITES= LOCAL/thierry @@ -20,7 +20,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libexpat.so:textproc/expat2 \ libpng16.so:graphics/png \ - libvtksys-${VTK_VER}.so:math/vtk${VTK_VER:R} + libvtksys-${VTKVER}.so:math/vtk${VTKVER:R} RUN_DEPENDS= bash:shells/bash # Check ${WRKSRC}/dox/overview/overview.md @@ -40,6 +40,8 @@ SHEBANG_FILES= adm/templates/*.sh \ gendoc ENVSH= adm/templates/env.sh +VTKVER= 9.1 + OPTIONS_DEFINE= DOCS DOXYGEN FFMPEG VIS VIS_DESC= Build Visualizazion module (requires OpenGL, freetype, ftgl) OPTIONS_DEFAULT=FFMPEG VIS @@ -60,7 +62,7 @@ CMAKE_ARGS+= -DINSTALL_DIR=${OCCROOT} \ -DUSE_TBB:BOOL=OFF \ -DUSE_RAPIDJSON:BOOL=ON \ -DUSE_VTK:BOOL=ON \ - -D3RDPARTY_VTK_INCLUDE_DIR:PATH=${LOCALBASE}/include/vtk-${VTK_VER} + -D3RDPARTY_VTK_INCLUDE_DIR:PATH=${LOCALBASE}/include/vtk-${VTKVER} CONFIGURE_ENV+= DESTDIR=${STAGEDIR} .if defined(MAINTAINER_MODE) @@ -179,5 +181,4 @@ regression-test: install DRAWEXE -f ${FILESDIR}/regtest " .endif -.include <../../math/vtk9/Makefile.version> .include diff --git a/cad/qcsxcad/Makefile b/cad/qcsxcad/Makefile index 2ac32b0d67bcc..8fc5665071782 100644 --- a/cad/qcsxcad/Makefile +++ b/cad/qcsxcad/Makefile @@ -1,7 +1,7 @@ PORTNAME= qcsxcad DISTVERSIONPREFIX= v DISTVERSION= 0.6.2-9 -PORTREVISION= 2 +PORTREVISION= 1 DISTVERSIONSUFFIX= -g3f09a8b CATEGORIES= cad @@ -18,7 +18,7 @@ LIB_DEPENDS= libCSXCAD.so:cad/csxcad \ libpng16.so:graphics/png \ libtiff.so:graphics/tiff \ libtinyxml.so:textproc/tinyxml \ - libvtkCommonCore-${VTK_VER}.so:math/vtk9 + libvtkCommonCore-9.1.so:math/vtk9 USES= cmake gl jpeg pkgconfig qt:5 xorg USE_QT= core gui opengl sql widgets xml buildtools:build qmake:build @@ -30,7 +30,6 @@ USE_GITHUB= yes GH_ACCOUNT= thliebig GH_PROJECT= ${PORTNAME:tu} -CMAKE_ARGS= -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER} +CMAKE_ARGS= -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.1 -.include <../../math/vtk9/Makefile.version> .include diff --git a/deskutils/just/Makefile b/deskutils/just/Makefile index d0f8cd0fc099f..8b945d8243508 100644 --- a/deskutils/just/Makefile +++ b/deskutils/just/Makefile @@ -1,5 +1,5 @@ PORTNAME= just -DISTVERSION= 1.6.0 +DISTVERSION= 1.5.0 CATEGORIES= deskutils MAINTAINER= yuri@FreeBSD.org @@ -26,16 +26,16 @@ CARGO_CRATES= aho-corasick-0.7.19 \ cpufeatures-0.2.5 \ cradle-0.2.2 \ crypto-common-0.1.6 \ - ctor-0.1.26 \ + ctor-0.1.23 \ ctrlc-3.2.3 \ derivative-2.2.0 \ diff-0.1.13 \ - digest-0.10.5 \ + digest-0.10.3 \ doc-comment-0.3.3 \ dotenv-0.15.0 \ edit-distance-2.1.0 \ either-1.8.0 \ - env_logger-0.9.1 \ + env_logger-0.9.0 \ executable-path-1.0.0 \ fastrand-1.8.0 \ generic-array-0.14.6 \ @@ -46,20 +46,20 @@ CARGO_CRATES= aho-corasick-0.7.19 \ hermit-abi-0.1.19 \ humantime-2.1.0 \ instant-0.1.12 \ - itoa-1.0.4 \ + itoa-1.0.3 \ lazy_static-1.4.0 \ lexiclean-0.0.1 \ - libc-0.2.135 \ + libc-0.2.132 \ linked-hash-map-0.5.6 \ log-0.4.17 \ memchr-2.5.0 \ nix-0.25.0 \ - once_cell-1.15.0 \ + once_cell-1.14.0 \ output_vt100-0.1.3 \ pretty_assertions-1.3.0 \ proc-macro-error-1.0.4 \ proc-macro-error-attr-1.0.4 \ - proc-macro2-1.0.47 \ + proc-macro2-1.0.43 \ pulldown-cmark-0.9.2 \ pulldown-cmark-to-cmark-10.0.4 \ quote-1.0.21 \ @@ -70,19 +70,19 @@ CARGO_CRATES= aho-corasick-0.7.19 \ remove_dir_all-0.5.3 \ rustversion-1.0.9 \ ryu-1.0.11 \ - serde-1.0.145 \ - serde_derive-1.0.145 \ - serde_json-1.0.87 \ - sha2-0.10.6 \ + serde-1.0.144 \ + serde_derive-1.0.144 \ + serde_json-1.0.85 \ + sha2-0.10.5 \ similar-2.2.0 \ - snafu-0.7.2 \ - snafu-derive-0.7.2 \ + snafu-0.7.1 \ + snafu-derive-0.7.1 \ strsim-0.8.0 \ structopt-0.3.26 \ structopt-derive-0.4.18 \ strum-0.24.1 \ strum_macros-0.24.3 \ - syn-1.0.102 \ + syn-1.0.99 \ target-2.0.0 \ tempfile-3.3.0 \ temptree-0.2.0 \ @@ -92,10 +92,10 @@ CARGO_CRATES= aho-corasick-0.7.19 \ typed-arena-2.0.1 \ typenum-1.15.0 \ unicase-2.6.0 \ - unicode-ident-1.0.5 \ - unicode-segmentation-1.10.0 \ - unicode-width-0.1.10 \ - uuid-1.2.1 \ + unicode-ident-1.0.3 \ + unicode-segmentation-1.9.0 \ + unicode-width-0.1.9 \ + uuid-1.1.2 \ vec_map-0.8.2 \ version_check-0.9.4 \ wasi-0.11.0+wasi-snapshot-preview1 \ diff --git a/deskutils/just/distinfo b/deskutils/just/distinfo index ac3d350601365..c92d149044951 100644 --- a/deskutils/just/distinfo +++ b/deskutils/just/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1666374646 +TIMESTAMP = 1663480034 SHA256 (rust/crates/aho-corasick-0.7.19.crate) = b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e SIZE (rust/crates/aho-corasick-0.7.19.crate) = 113070 SHA256 (rust/crates/ansi_term-0.12.1.crate) = d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2 @@ -25,16 +25,16 @@ SHA256 (rust/crates/cradle-0.2.2.crate) = 7096122c1023d53de7298f322590170540ad3e SIZE (rust/crates/cradle-0.2.2.crate) = 30309 SHA256 (rust/crates/crypto-common-0.1.6.crate) = 1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3 SIZE (rust/crates/crypto-common-0.1.6.crate) = 8760 -SHA256 (rust/crates/ctor-0.1.26.crate) = 6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096 -SIZE (rust/crates/ctor-0.1.26.crate) = 10803 +SHA256 (rust/crates/ctor-0.1.23.crate) = cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb +SIZE (rust/crates/ctor-0.1.23.crate) = 10581 SHA256 (rust/crates/ctrlc-3.2.3.crate) = 1d91974fbbe88ec1df0c24a4f00f99583667a7e2e6272b2b92d294d81e462173 SIZE (rust/crates/ctrlc-3.2.3.crate) = 12853 SHA256 (rust/crates/derivative-2.2.0.crate) = fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b SIZE (rust/crates/derivative-2.2.0.crate) = 48076 SHA256 (rust/crates/diff-0.1.13.crate) = 56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8 SIZE (rust/crates/diff-0.1.13.crate) = 46216 -SHA256 (rust/crates/digest-0.10.5.crate) = adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c -SIZE (rust/crates/digest-0.10.5.crate) = 19503 +SHA256 (rust/crates/digest-0.10.3.crate) = f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506 +SIZE (rust/crates/digest-0.10.3.crate) = 18990 SHA256 (rust/crates/doc-comment-0.3.3.crate) = fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10 SIZE (rust/crates/doc-comment-0.3.3.crate) = 4123 SHA256 (rust/crates/dotenv-0.15.0.crate) = 77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f @@ -43,8 +43,8 @@ SHA256 (rust/crates/edit-distance-2.1.0.crate) = bbbaaaf38131deb9ca518a274a45bfd SIZE (rust/crates/edit-distance-2.1.0.crate) = 7288 SHA256 (rust/crates/either-1.8.0.crate) = 90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797 SIZE (rust/crates/either-1.8.0.crate) = 15992 -SHA256 (rust/crates/env_logger-0.9.1.crate) = c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272 -SIZE (rust/crates/env_logger-0.9.1.crate) = 33425 +SHA256 (rust/crates/env_logger-0.9.0.crate) = 0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3 +SIZE (rust/crates/env_logger-0.9.0.crate) = 33573 SHA256 (rust/crates/executable-path-1.0.0.crate) = 3ebc5a6d89e3c90b84e8f33c8737933dda8f1c106b5415900b38b9d433841478 SIZE (rust/crates/executable-path-1.0.0.crate) = 3897 SHA256 (rust/crates/fastrand-1.8.0.crate) = a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499 @@ -65,14 +65,14 @@ SHA256 (rust/crates/humantime-2.1.0.crate) = 9a3a5bfb195931eeb336b2a7b4d761daec8 SIZE (rust/crates/humantime-2.1.0.crate) = 16749 SHA256 (rust/crates/instant-0.1.12.crate) = 7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c SIZE (rust/crates/instant-0.1.12.crate) = 6128 -SHA256 (rust/crates/itoa-1.0.4.crate) = 4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc -SIZE (rust/crates/itoa-1.0.4.crate) = 10601 +SHA256 (rust/crates/itoa-1.0.3.crate) = 6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754 +SIZE (rust/crates/itoa-1.0.3.crate) = 10481 SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646 SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443 SHA256 (rust/crates/lexiclean-0.0.1.crate) = 441225017b106b9f902e97947a6d31e44ebcf274b91bdbfb51e5c477fcd468e5 SIZE (rust/crates/lexiclean-0.0.1.crate) = 5362 -SHA256 (rust/crates/libc-0.2.135.crate) = 68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c -SIZE (rust/crates/libc-0.2.135.crate) = 604591 +SHA256 (rust/crates/libc-0.2.132.crate) = 8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5 +SIZE (rust/crates/libc-0.2.132.crate) = 595317 SHA256 (rust/crates/linked-hash-map-0.5.6.crate) = 0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f SIZE (rust/crates/linked-hash-map-0.5.6.crate) = 15049 SHA256 (rust/crates/log-0.4.17.crate) = abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e @@ -81,8 +81,8 @@ SHA256 (rust/crates/memchr-2.5.0.crate) = 2dffe52ecf27772e601905b7522cb4ef790d2c SIZE (rust/crates/memchr-2.5.0.crate) = 65812 SHA256 (rust/crates/nix-0.25.0.crate) = e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb SIZE (rust/crates/nix-0.25.0.crate) = 269825 -SHA256 (rust/crates/once_cell-1.15.0.crate) = e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1 -SIZE (rust/crates/once_cell-1.15.0.crate) = 31460 +SHA256 (rust/crates/once_cell-1.14.0.crate) = 2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0 +SIZE (rust/crates/once_cell-1.14.0.crate) = 31614 SHA256 (rust/crates/output_vt100-0.1.3.crate) = 628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66 SIZE (rust/crates/output_vt100-0.1.3.crate) = 4473 SHA256 (rust/crates/pretty_assertions-1.3.0.crate) = a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755 @@ -91,8 +91,8 @@ SHA256 (rust/crates/proc-macro-error-1.0.4.crate) = da25490ff9892aab3fcf7c36f08c SIZE (rust/crates/proc-macro-error-1.0.4.crate) = 25293 SHA256 (rust/crates/proc-macro-error-attr-1.0.4.crate) = a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869 SIZE (rust/crates/proc-macro-error-attr-1.0.4.crate) = 7971 -SHA256 (rust/crates/proc-macro2-1.0.47.crate) = 5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725 -SIZE (rust/crates/proc-macro2-1.0.47.crate) = 41955 +SHA256 (rust/crates/proc-macro2-1.0.43.crate) = 0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab +SIZE (rust/crates/proc-macro2-1.0.43.crate) = 41512 SHA256 (rust/crates/pulldown-cmark-0.9.2.crate) = 2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63 SIZE (rust/crates/pulldown-cmark-0.9.2.crate) = 115824 SHA256 (rust/crates/pulldown-cmark-to-cmark-10.0.4.crate) = 0194e6e1966c23cc5fd988714f85b18d548d773e81965413555d96569931833d @@ -113,20 +113,20 @@ SHA256 (rust/crates/rustversion-1.0.9.crate) = 97477e48b4cf8603ad5f7aaf897467cf4 SIZE (rust/crates/rustversion-1.0.9.crate) = 17425 SHA256 (rust/crates/ryu-1.0.11.crate) = 4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09 SIZE (rust/crates/ryu-1.0.11.crate) = 47007 -SHA256 (rust/crates/serde-1.0.145.crate) = 728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b -SIZE (rust/crates/serde-1.0.145.crate) = 76568 -SHA256 (rust/crates/serde_derive-1.0.145.crate) = 81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c -SIZE (rust/crates/serde_derive-1.0.145.crate) = 54860 -SHA256 (rust/crates/serde_json-1.0.87.crate) = 6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45 -SIZE (rust/crates/serde_json-1.0.87.crate) = 144383 -SHA256 (rust/crates/sha2-0.10.6.crate) = 82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0 -SIZE (rust/crates/sha2-0.10.6.crate) = 20558 +SHA256 (rust/crates/serde-1.0.144.crate) = 0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860 +SIZE (rust/crates/serde-1.0.144.crate) = 76387 +SHA256 (rust/crates/serde_derive-1.0.144.crate) = 94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00 +SIZE (rust/crates/serde_derive-1.0.144.crate) = 54867 +SHA256 (rust/crates/serde_json-1.0.85.crate) = e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44 +SIZE (rust/crates/serde_json-1.0.85.crate) = 144635 +SHA256 (rust/crates/sha2-0.10.5.crate) = cf9db03534dff993187064c4e0c05a5708d2a9728ace9a8959b77bedf415dac5 +SIZE (rust/crates/sha2-0.10.5.crate) = 20325 SHA256 (rust/crates/similar-2.2.0.crate) = 62ac7f900db32bf3fd12e0117dd3dc4da74bc52ebaac97f39668446d89694803 SIZE (rust/crates/similar-2.2.0.crate) = 50996 -SHA256 (rust/crates/snafu-0.7.2.crate) = dd726aec4ebad65756394ff89a9b9598793d4e30121cd71690244c1e497b3aee -SIZE (rust/crates/snafu-0.7.2.crate) = 62694 -SHA256 (rust/crates/snafu-derive-0.7.2.crate) = 712529e9b0b014eabaa345b38e06032767e3dc393e8b017e853b1d7247094e74 -SIZE (rust/crates/snafu-derive-0.7.2.crate) = 28016 +SHA256 (rust/crates/snafu-0.7.1.crate) = 5177903bf45656592d9eb5c0e22f408fc023aae51dbe2088889b71633ba451f2 +SIZE (rust/crates/snafu-0.7.1.crate) = 54759 +SHA256 (rust/crates/snafu-derive-0.7.1.crate) = 410b26ed97440d90ced3e2488c868d56a86e2064f5d7d6f417909b286afe25e5 +SIZE (rust/crates/snafu-derive-0.7.1.crate) = 23824 SHA256 (rust/crates/strsim-0.8.0.crate) = 8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a SIZE (rust/crates/strsim-0.8.0.crate) = 9309 SHA256 (rust/crates/structopt-0.3.26.crate) = 0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10 @@ -137,8 +137,8 @@ SHA256 (rust/crates/strum-0.24.1.crate) = 063e6045c0e62079840579a7e47a355ae92f60 SIZE (rust/crates/strum-0.24.1.crate) = 5636 SHA256 (rust/crates/strum_macros-0.24.3.crate) = 1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59 SIZE (rust/crates/strum_macros-0.24.3.crate) = 20696 -SHA256 (rust/crates/syn-1.0.102.crate) = 3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1 -SIZE (rust/crates/syn-1.0.102.crate) = 235699 +SHA256 (rust/crates/syn-1.0.99.crate) = 58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13 +SIZE (rust/crates/syn-1.0.99.crate) = 236084 SHA256 (rust/crates/target-2.0.0.crate) = ba852e71502340e2eaf2fa51f9b3ec6aa25750da1aa65771491c69d67789b05c SIZE (rust/crates/target-2.0.0.crate) = 6761 SHA256 (rust/crates/tempfile-3.3.0.crate) = 5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4 @@ -157,14 +157,14 @@ SHA256 (rust/crates/typenum-1.15.0.crate) = dcf81ac59edc17cc8697ff311e8f5ef2d99f SIZE (rust/crates/typenum-1.15.0.crate) = 40741 SHA256 (rust/crates/unicase-2.6.0.crate) = 50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6 SIZE (rust/crates/unicase-2.6.0.crate) = 23478 -SHA256 (rust/crates/unicode-ident-1.0.5.crate) = 6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3 -SIZE (rust/crates/unicode-ident-1.0.5.crate) = 35455 -SHA256 (rust/crates/unicode-segmentation-1.10.0.crate) = 0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a -SIZE (rust/crates/unicode-segmentation-1.10.0.crate) = 93893 -SHA256 (rust/crates/unicode-width-0.1.10.crate) = c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b -SIZE (rust/crates/unicode-width-0.1.10.crate) = 18968 -SHA256 (rust/crates/uuid-1.2.1.crate) = feb41e78f93363bb2df8b0e86a2ca30eed7806ea16ea0c790d757cf93f79be83 -SIZE (rust/crates/uuid-1.2.1.crate) = 53789 +SHA256 (rust/crates/unicode-ident-1.0.3.crate) = c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf +SIZE (rust/crates/unicode-ident-1.0.3.crate) = 35031 +SHA256 (rust/crates/unicode-segmentation-1.9.0.crate) = 7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99 +SIZE (rust/crates/unicode-segmentation-1.9.0.crate) = 93241 +SHA256 (rust/crates/unicode-width-0.1.9.crate) = 3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973 +SIZE (rust/crates/unicode-width-0.1.9.crate) = 16745 +SHA256 (rust/crates/uuid-1.1.2.crate) = dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f +SIZE (rust/crates/uuid-1.1.2.crate) = 49511 SHA256 (rust/crates/vec_map-0.8.2.crate) = f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191 SIZE (rust/crates/vec_map-0.8.2.crate) = 14466 SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f @@ -185,5 +185,5 @@ SHA256 (rust/crates/yaml-rust-0.4.5.crate) = 56c1936c4cc7a1c9ab21a1ebb602eb942ba SIZE (rust/crates/yaml-rust-0.4.5.crate) = 47783 SHA256 (rust/crates/yansi-0.5.1.crate) = 09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec SIZE (rust/crates/yansi-0.5.1.crate) = 16525 -SHA256 (casey-just-1.6.0_GH0.tar.gz) = d33e656843bc280795373249f5f23f2d6c87aee9dd970058a1c6257b2843bd9d -SIZE (casey-just-1.6.0_GH0.tar.gz) = 630424 +SHA256 (casey-just-1.5.0_GH0.tar.gz) = 278d25b9df17ca3cf4fba2947b0dd7b51105b4a3a4fe230b4ea8a29432620725 +SIZE (casey-just-1.5.0_GH0.tar.gz) = 626619 diff --git a/devel/py-spyder/Makefile b/devel/py-spyder/Makefile index cc9de677f1ede..a16c10fcdd6ad 100644 --- a/devel/py-spyder/Makefile +++ b/devel/py-spyder/Makefile @@ -7,85 +7,22 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Scientific PYthon Development EnviRonment, an alternative to IDLE -WWW= https://www.spyder-ide.org/ +WWW= https://github.com/spyder-ide/spyder/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}QtAwesome>0:x11-fonts/py-QtAwesome@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}QtPy>=1.3.1:devel/py-QtPy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cloudpickle>=0.3.1:devel/py-cloudpickle@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jedi>=0.9.0:devel/py-jedi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nbconvert>=4.0:devel/py-nbconvert@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pep8>=0.6:devel/pep8@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycodestyle>=2.3:devel/py-pycodestyle@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}qtconsole>=4.3.0:devel/py-qtconsole@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numpydoc>0:textproc/py-numpydoc@${PY_FLAVOR} \ - - ${PYTHON_PKGNAMEPREFIX}parso>=0.7.0:textproc/py-parso@${PY_FLAVOR} - ${PYTHON_PKGNAMEPREFIX}pexpect>=4.4.0:misc/py-pexpect@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pickleshare>=0.4:databases/py-pickleshare@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}psutil>=5.3:sysutils/py-psutil@${PY_FLAVOR} - ${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments@${PY_FLAVOR} - pylint${PYTHON_PKGNAMESUFFIX}>=2.5.0:devel/pylint@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pylint-venv>=2.1.1:devel/py-pylint-venv@${PY_FLAVOR} - ${PYTHON_PKGNAMEPREFIX}python-lsp-server>=1.5.0:textproc/py-python-lsp-server@${PY_FLAVOR} - ${PYTHON_PKGNAMEPREFIX}pyxdg>=0.26:devel/py-pyxdg@${PY_FLAVOR} - ${PYTHON_PKGNAMEPREFIX}pyzmq>=22.1.0:net/py-pyzmq@${PY_FLAVOR} - ${PYTHON_PKGNAMEPREFIX}QDarkStyle>=3.0.2:textproc/py-QDarkStyle@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}qstylizer>=0.1.10:devel/py-qstylizer@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}QtAwesome>=1.0.2:x11-fonts/py-QtAwesome@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}qtconsole>=5.3.2:devel/py-qtconsole@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}QtPy>=2.1.0:py-QtPy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}rtree>=0.9.7:devel/py-rtree@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}spyder-kernels>=2.3.3:devel/py-spyder-kernels@${PY_FLAVOR} - ${PYTHON_PKGNAMEPREFIX}textdistance>=4.2.0:textproc/py-textdistance@${PY_FLAVOR} - ${PYTHON_PKGNAMEPREFIX}three-merge>=0.1.1:textproc/py-three-merge@${PY_FLAVOR} - ${PYTHON_PKGNAMEPREFIX}watchdog>=0.10.3:devel/py-watchdog@${PY_FLAVOR} - -install_requires = [ - 'applaunchservices>=0.3.0;platform_system=="Darwin"', - 'atomicwrites>=1.2.0', - 'chardet>=2.0.0', - 'cloudpickle>=0.5.0', - 'cookiecutter>=1.6.0', - 'diff-match-patch>=20181111', - 'intervaltree>=3.0.2', - 'ipython>=7.31.1,<8.0.0', - 'jedi>=0.17.2,<0.19.0', - 'jellyfish>=0.7', - 'jsonschema>=3.2.0', - 'keyring>=17.0.0', - 'nbconvert>=4.0', - 'numpydoc>=0.6.0', - # Required to get SSH connections to remote kernels - 'paramiko>=2.4.0;platform_system=="Windows"', - 'parso>=0.7.0,<0.9.0', - 'pexpect>=4.4.0', - 'pickleshare>=0.4', - 'psutil>=5.3', - 'pygments>=2.0', - 'pylint>=2.5.0,<3.0', - 'pylint-venv>=2.1.1', - 'python-lsp-black>=1.2.0', - 'pyls-spyder>=0.4.0', - 'pyqt5<5.16', - 'pyqtwebengine<5.16', - 'python-lsp-server[all]>=1.5.0,<1.6.0', - 'pyxdg>=0.26;platform_system=="Linux"', - 'pyzmq>=22.1.0', - 'qdarkstyle>=3.0.2,<3.1.0', - 'qstylizer>=0.1.10', - 'qtawesome>=1.0.2', - 'qtconsole>=5.3.2,<5.4.0', - 'qtpy>=2.1.0', - 'rtree>=0.9.7', - 'setuptools>=49.6.0', - 'sphinx>=0.6.6', - 'spyder-kernels>=2.3.3,<2.4.0', - 'textdistance>=4.2.0', - 'three-merge>=0.1.1', - 'watchdog>=0.10.3' -] + pylint${PYTHON_PKGNAMESUFFIX}>=0.25:devel/pylint@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}parso>=0.1.1:textproc/py-parso@${PY_FLAVOR} USES= desktop-file-utils python:3.7+ pyqt:5 USE_GITHUB= yes @@ -116,10 +53,13 @@ SYMPY_DESC= Symbolic mathematics in the IPython Console DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} IPYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=6.0:devel/ipython@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.1.11:net/py-pyzmq@${PY_FLAVOR} MATPLOT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.0:math/py-matplotlib@${PY_FLAVOR} NUMPY_RUN_DEPENDS= ${PYNUMPY} PANDAS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pandas>=0.13.1:math/py-pandas@${PY_FLAVOR} +PSUTIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=0.3:sysutils/py-psutil@${PY_FLAVOR} PYFLAKES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.5:devel/py-pyflakes@${PY_FLAVOR} +PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${PY_FLAVOR} ROPE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rope>=0.9.2:devel/py-rope@${PY_FLAVOR} SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} SPHINX_RUN_DEPENDS= ${DOCS_BUILD_DEPENDS} diff --git a/graphics/cloudcompare/Makefile b/graphics/cloudcompare/Makefile index 2b9a317fa4581..ca1d9e58fc2d3 100644 --- a/graphics/cloudcompare/Makefile +++ b/graphics/cloudcompare/Makefile @@ -1,7 +1,7 @@ PORTNAME= cloudcompare DISTVERSIONPREFIX= v DISTVERSION= 2.12.4 -PORTREVISION= 2 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= nc@FreeBSD.org @@ -75,7 +75,7 @@ PLUGINS_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libfreetype.so:print/freetype2 \ libpng.so:graphics/png \ libtiff.so:graphics/tiff \ - libvtkCommonCore-${VTK_VER}.so:math/vtk9 + libvtkCommonCore-9.1.so:math/vtk9 PLUGINS_IMPLIES= SHAPELIB pre-configure: @@ -88,5 +88,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/snap/gui/cloudcompare.desktop ${STAGEDIR}${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/snap/gui/cloudcompare.png ${STAGEDIR}${PREFIX}/share/pixmaps -.include <../../math/vtk9/Makefile.version> .include diff --git a/graphics/f3d/Makefile b/graphics/f3d/Makefile index 23ed496ec648e..e760e0d066a74 100644 --- a/graphics/f3d/Makefile +++ b/graphics/f3d/Makefile @@ -1,7 +1,7 @@ PORTNAME= f3d DISTVERSIONPREFIX= v DISTVERSION= 1.3.1 -PORTREVISION= 2 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org @@ -11,16 +11,12 @@ WWW= https://f3d-app.github.io/f3d/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreeimage.so:graphics/freeimage \ - libfreetype.so:print/freetype2 \ +LIB_DEPENDS= libfreetype.so:print/freetype2 \ libhdf5.so:science/hdf5 \ - libImath-3_1.so:math/Imath \ libnetcdf.so:science/netcdf \ - libvtkCommonMisc-${VTK_VER}.so:math/vtk9 + libvtkCommonMisc-9.1.so:math/vtk9 -USES= cmake:testing compiler:c++17-lang desktop-file-utils gl tcl tk xorg +USES= cmake:testing compiler:c++17-lang desktop-file-utils gl xorg USE_GL= gl glu USE_XORG= ice sm x11 xt @@ -61,5 +57,4 @@ RAYTRACING_BROKEN= Requires VTK::RenderingRayTracing enabled in VTK post-install: @${RM} -r ${STAGEDIR}${DOCSDIR} -.include <../../math/vtk9/Makefile.version> .include diff --git a/graphics/mirtk/Makefile b/graphics/mirtk/Makefile index 25c6178157cc4..95ab382b3636c 100644 --- a/graphics/mirtk/Makefile +++ b/graphics/mirtk/Makefile @@ -1,7 +1,7 @@ PORTNAME= mirtk DISTVERSIONPREFIX= v DISTVERSION= 2.0.0-178 -PORTREVISION= 3 +PORTREVISION= 2 DISTVERSIONSUFFIX= -g973ce2f CATEGORIES= graphics @@ -31,8 +31,7 @@ TBB_LIB_DEPENDS= libtbb.so:devel/onetbb VTK_DESC= Build with the VTK toolkit VTK_CMAKE_BOOL= WITH_VTK -VTK_LIB_DEPENDS= libvtkCommonCore-${VTK_VER}.so:math/vtk9 \ +VTK_LIB_DEPENDS= libvtkCommonCore-9.1.so:math/vtk9 \ libexpat.so:textproc/expat2 -.include <../../math/vtk9/Makefile.version> .include diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 79709f353204f..db1706d1ce2cd 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -1,6 +1,6 @@ PORTNAME= opencv DISTVERSION= 4.6.0 -PORTREVISION= 3 +PORTREVISION= 2 CATEGORIES= graphics MAINTAINER= desktop@FreeBSD.org @@ -124,7 +124,7 @@ GTK3_CMAKE_BOOL= WITH_GTK VTK_DESC= Include VTK library support (build opencv_viz module) VTK_CMAKE_BOOL= WITH_VTK -VTK_LIB_DEPENDS= libvtkCommonCore-${VTK_VER}.so:math/vtk9 +VTK_LIB_DEPENDS= libvtkCommonCore-9.1.so:math/vtk9 VTK_USES= qt:5 VTK_USE= QT=buildtools:build,qmake:build ### @@ -235,5 +235,4 @@ post-patch: ${REINPLACE_CMD} -e 's|/usr/lib/atlas-base|${LOCALBASE}/lib|g' ${WRKSRC}/cmake/OpenCVFindAtlas.cmake ${REINPLACE_CMD} -e 's|/usr/include/atlas|${LOCALBASE}/include|g' ${WRKSRC}/cmake/OpenCVFindAtlas.cmake -.include <../../math/vtk9/Makefile.version> .include diff --git a/graphics/pcl-pointclouds/Makefile b/graphics/pcl-pointclouds/Makefile index d3823f726cb70..00511605899e6 100644 --- a/graphics/pcl-pointclouds/Makefile +++ b/graphics/pcl-pointclouds/Makefile @@ -1,6 +1,6 @@ PORTNAME= pcl DISTVERSION= 1.12.1 -PORTREVISION= 5 +PORTREVISION= 4 CATEGORIES= graphics math MASTER_SITES= https://github.com/PointCloudLibrary/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/ PKGNAMESUFFIX= -pointclouds @@ -81,8 +81,7 @@ VTK_DESC= Build VTK visualizations VTK_USES= gl qt:5 VTK_USE= GL=gl,glu QT=core,gui,opengl,widgets,buildtools:build,qmake:build VTK_CMAKE_BOOL= WITH_VTK -VTK_CMAKE_ON= -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER} -VTK_LIB_DEPENDS= libvtkCommonCore-${VTK_VER}.so:math/vtk9 +VTK_CMAKE_ON= -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.1 +VTK_LIB_DEPENDS= libvtkCommonCore-9.1.so:math/vtk9 -.include <../../math/vtk9/Makefile.version> .include diff --git a/graphics/py-mayavi/Makefile b/graphics/py-mayavi/Makefile index 326216d58b0e7..fbe45d655bd80 100644 --- a/graphics/py-mayavi/Makefile +++ b/graphics/py-mayavi/Makefile @@ -1,6 +1,5 @@ PORTNAME= mayavi DISTVERSION= 4.8.0 -PORTREVISION= 1 CATEGORIES= graphics science python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -53,5 +52,4 @@ fix-plist: do-test: @${SETENV} ${TEST_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} ${PYTHON_CMD} ${WRKSRC}/examples/mayavi/interactive/coil_design_application.py -.include <../../math/vtk9/Makefile.version> .include diff --git a/graphics/py-pyvista/Makefile b/graphics/py-pyvista/Makefile index 2c8087cb93a1f..a21b438873dae 100644 --- a/graphics/py-pyvista/Makefile +++ b/graphics/py-pyvista/Makefile @@ -1,6 +1,5 @@ PORTNAME= pyvista DISTVERSION= 0.34.2 -PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -24,5 +23,4 @@ USE_PYTHON= distutils autoplist NO_ARCH= yes -.include <../../math/vtk9/Makefile.version> .include diff --git a/math/vtk9/Makefile b/math/vtk9/Makefile index 22b9dd53cffea..bfd29082a0a78 100644 --- a/math/vtk9/Makefile +++ b/math/vtk9/Makefile @@ -1,5 +1,6 @@ PORTNAME= vtk -DISTVERSION= 9.2.2 +DISTVERSION= 9.1.0 +PORTREVISION= 8 CATEGORIES= math graphics MASTER_SITES= https://vtk.org/files/release/${VTK_SHORT_VER}/ PKGNAMESUFFIX= 9 @@ -44,8 +45,8 @@ DOCSDIR= ${PREFIX}/share/doc/vtk-${VTK_SHORT_VER} DATADIR= ${PREFIX}/share/vtk-${VTK_SHORT_VER} # Options -OPTIONS_DEFINE= DESIGNER DOCS MPI OSMESA PYTHON QT6 EXAMPLES -OPTIONS_DEFAULT= MPI PYTHON QT6 # vtk python binding is needed by other packages, and is unfortunately is unseparable. It is a candidate to be a subpackage. +OPTIONS_DEFINE= DESIGNER DOCS MPI OSMESA PYTHON QT5 EXAMPLES +OPTIONS_DEFAULT= MPI PYTHON QT5 # vtk python binding is needed by other packages, and is unfortunately is unseparable. It is a candidate to be a subpackage. OSMESA_DESC= Use Mesa for off-screen rendering DESIGNER_DESC= Build the Qt Designer plugin OPTIONS_SUB= yes @@ -71,12 +72,6 @@ QT5_CMAKE_ON= -DCMAKE_PREFIX_PATH:STRING=${LOCALBASE}/lib/qt5 \ -DVTK_GROUP_ENABLE_Qt:STRING=YES \ -DVTK_MODULE_ENABLE_VTK_GUISupportQt:STRING=YES -#QT6_USES= qt:6 -#QT6_USE= QT=base,declarative,tools:build -#QT6_CMAKE_ON= -DCMAKE_PREFIX_PATH:STRING=${LOCALBASE}/lib/qt5 \ -# -DVTK_GROUP_ENABLE_Qt:STRING=YES \ -# -DVTK_MODULE_ENABLE_VTK_GUISupportQt:STRING=YES - DESIGNER_CMAKE_BOOL= QT_DESIGNER_PLUGIN DESIGNER_USE= QT=designer DESIGNER_IMPLIES= QT5 diff --git a/math/vtk9/distinfo b/math/vtk9/distinfo index 8985e4d4b042e..cfc8330ff50ab 100644 --- a/math/vtk9/distinfo +++ b/math/vtk9/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1665288935 -SHA256 (VTK-9.2.2.tar.gz) = 1c5b0a2be71fac96ff4831af69e350f7a0ea3168981f790c000709dcf9121075 -SIZE (VTK-9.2.2.tar.gz) = 53801737 +TIMESTAMP = 1637434253 +SHA256 (VTK-9.1.0.tar.gz) = 8fed42f4f8f1eb8083107b68eaa9ad71da07110161a3116ad807f43e5ca5ce96 +SIZE (VTK-9.1.0.tar.gz) = 47871165 diff --git a/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__utils.c b/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__utils.c new file mode 100644 index 0000000000000..e52da58e38789 --- /dev/null +++ b/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__utils.c @@ -0,0 +1,12 @@ +--- ThirdParty/exodusII/vtkexodusII/src/ex_utils.c.orig 2022-06-22 15:58:58.543731000 +0200 ++++ ThirdParty/exodusII/vtkexodusII/src/ex_utils.c 2022-06-22 16:00:28.263448000 +0200 +@@ -1770,7 +1770,9 @@ + */ + + /* const int NC_SZIP_EC = 4; */ /* Selects entropy coding method for szip. */ ++#if !defined(NC_SZIP_NN) + const int NC_SZIP_NN = 32; /* Selects nearest neighbor coding method for szip. */ ++#endif + /* Even and between 4 and 32; typical values are 8, 10, 16, 32 */ + const int SZIP_PIXELS_PER_BLOCK = + file->compression_level == 0 ? 32 : file->compression_level; diff --git a/math/vtk9/files/patch-ThirdParty_libproj_vtklibproj_src_pj__mutex.c b/math/vtk9/files/patch-ThirdParty_libproj_vtklibproj_src_pj__mutex.c new file mode 100644 index 0000000000000..bd453a0dc9ca5 --- /dev/null +++ b/math/vtk9/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); diff --git a/science/elmerfem/Makefile b/science/elmerfem/Makefile index 206be890e9215..30a7b9adef4a7 100644 --- a/science/elmerfem/Makefile +++ b/science/elmerfem/Makefile @@ -1,7 +1,7 @@ PORTNAME= elmerfem DISTVERSIONPREFIX= release- DISTVERSION= 9.0 -PORTREVISION= 4 +PORTREVISION= 3 CATEGORIES= science MAINTAINER= henrik@gulbra.net @@ -61,7 +61,7 @@ OCC_LIB_DEPENDS= libexpat.so:textproc/expat2 \ libpython${_PYVERSION}.so:lang/python${PYTHON_SUFFIX} \ libtiff.so:graphics/tiff \ libTKernel.so:cad/opencascade \ - libvtksys-${VTK_VER}.so:math/vtk9 + libvtksys-9.1.so:math/vtk9 OCC_USES= python OCC_CMAKE_BOOL= WITH_OCC OCC_CMAKE_ON= -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.0 \ @@ -73,7 +73,6 @@ _QT5_LIBS= buildtools:build concurrent core declarative gui location \ network opengl printsupport qmake:build script sensors \ sql svg webchannel webkit widgets xml -.include <../../math/vtk9/Makefile.version> .include .if ${ARCH} == "amd64" @@ -116,5 +115,4 @@ post-install: do-test: @cd ${TEST_WRKSRC} && ctest -C ${CMAKE_BUILD_TYPE} ${_MAKE_JOBS} -.include <../../math/vtk9/Makefile.version> .include diff --git a/science/liggghts/Makefile b/science/liggghts/Makefile index 7967b24645b76..67dbf51aa74bd 100644 --- a/science/liggghts/Makefile +++ b/science/liggghts/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \ libnetcdf.so:science/netcdf \ libpng.so:graphics/png \ libtiff.so:graphics/tiff \ - libvtkViewsCore-${VTK_VER}.so:math/vtk9 + libvtkViewsCore-9.1.so:math/vtk9 USES= compiler:c++17-lang cmake fortran gl jpeg python qt:5 xorg USE_XORG= ice sm x11 xext xt @@ -30,16 +30,15 @@ USE_GITHUB= yes GH_ACCOUNT= CFDEMproject GH_PROJECT= ${PORTNAME:tu}-PUBLIC -CMAKE_ARGS= -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER} \ +CMAKE_ARGS= -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.1 \ -DPython3_EXECUTABLE=${PYTHON_CMD} WRKSRC_SUBDIR= src CFLAGS+= -fPIC CXXFLAGS+= -fPIC \ - -I${LOCALBASE}/include/vtk-${VTK_VER} + -I${LOCALBASE}/include/vtk-9.1 BINARY_ALIAS= sed=gsed -.include <../../math/vtk9/Makefile.version> .include diff --git a/science/openems/Makefile b/science/openems/Makefile index 605c2e1807497..3d297459af5dd 100644 --- a/science/openems/Makefile +++ b/science/openems/Makefile @@ -2,7 +2,7 @@ PORTNAME= openems DISTVERSIONPREFIX= v DISTVERSION= 0.0.35-76 DISTVERSIONSUFFIX= -gd4448fa -PORTREVISION= 3 +PORTREVISION= 2 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org @@ -24,7 +24,7 @@ LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libsz.so:science/libaec \ libtiff.so:graphics/tiff \ libtinyxml.so:textproc/tinyxml \ - libvtkCommonCore-${VTK_VER}.so:math/vtk9 + libvtkCommonCore-9.1.so:math/vtk9 USES= cmake jpeg pkgconfig USE_LDCONFIG= yes @@ -33,7 +33,7 @@ USE_GITHUB= yes GH_ACCOUNT= thliebig GH_PROJECT= openEMS -CMAKE_ARGS= -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER} \ +CMAKE_ARGS= -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.1 \ -DLOCALBASE=${LOCALBASE} CXXFLAGS+= -I${LOCALBASE}/include/fparser # fparser.pc probably returns a wrong value @@ -43,5 +43,4 @@ DATADIR= ${PREFIX}/share/openEMS post-install: @${REINPLACE_CMD} -i '' -e 's|#!/bin/bash|#!/bin/sh|' ${STAGEDIR}${PREFIX}/bin/openEMS.sh -.include <../../math/vtk9/Makefile.version> .include diff --git a/science/paraview/Makefile b/science/paraview/Makefile index 04b6abc6a5c8e..962bd7d1c951c 100644 --- a/science/paraview/Makefile +++ b/science/paraview/Makefile @@ -162,5 +162,4 @@ post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/Examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} -.include <../../math/vtk9/Makefile.version> .include