diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile index a65be094f4eb..9b6a1c68a209 100644 --- a/cad/openscad/Makefile +++ b/cad/openscad/Makefile @@ -1,70 +1,74 @@ PORTNAME= openscad PORTVERSION= ${GIT_SRC_DATE} -PORTREVISION= 5 +PORTREVISION= 1 CATEGORIES= cad #PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ #PATCHFILES+= cc49ad8dac24.patch:-p1 LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING MAINTAINER= mr@FreeBSD.org COMMENT= Programmer's solid 3D CAD modeller #' WWW= https://www.openscad.org/ BUILD_DEPENDS= cgal>0:math/cgal \ evdev-proto>0:devel/evdev-proto \ ${LOCALBASE}/include/glm/glm.hpp:math/glm \ ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} LIB_DEPENDS= libzip.so:archivers/libzip \ libhidapi.so:comms/hidapi \ libboost_regex.so:devel/boost-libs \ libqscintilla2_qt6.so:devel/qscintilla2@qt6 \ libopencsg.so:graphics/opencsg \ libgmp.so:math/gmp \ libmpfr.so:math/mpfr \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libfontconfig.so:x11-fonts/fontconfig \ libdouble-conversion.so:devel/double-conversion \ - libtbb.so:devel/onetbb + libtbb.so:devel/onetbb \ + lib3mf.so:cad/lib3mf -CONFLICTS= openscad-devel +CONFLICTS= openscad USES= bison cmake compiler:c++17-lang cpe desktop-file-utils eigen:3 gettext \ gl gnome pkgconfig python qt:6 shared-mime-info xorg USE_GITHUB= yes USE_GL= gl glu glew USE_GNOME= cairo glib20 libxml2 USE_QT= base 5compat multimedia svg tools USE_XORG= x11 GH_ACCOUNT= microsoft:mimalloc elalish:manifold arsenm:sanitizerscmake \ openscad:opencsg AngusJohnson:clipper2 GH_PROJECT= MCAD:mcad mimalloc:mimalloc manifold:manifold sanitizers-cmake:sanitizerscmake \ OpenCSG:opencsg Clipper2:clipper2 GH_TAGNAME= ${GIT_SRC_HASH} ${GIT_MCAD_HASH}:mcad \ ${GIT_CLIPPER2_HASH}:clipper2 ${GIT_OPENCSG_HASH}:opencsg \ ${GIT_MANIFOLD_HASH}:manifold ${GIT_MIMALLOC_HASH}:mimalloc \ ${GIT_SANITIZERSCMAKE_HASH}:sanitizerscmake GH_SUBDIR= libraries/MCAD:mcad submodules/mimalloc:mimalloc submodules/manifold:manifold \ submodules/sanitizers-cmake:sanitizerscmake submodules/OpenCSG:opencsg \ submodules/Clipper2:clipper2 # Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport) CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -Wl,--as-needed -L${LOCALBASE}/lib CMAKE_ARGS+= -DUSE_QT6="ON" -DUSE_MIMALLOC="OFF" -DENABLE_CGAL="ON" -DUSE_BUILTIN_OPENCSG="ON" -DENABLE_GLX="ON" -DCMAKE_BUILD_TYPE=Debug .include "Makefile.git_rev" .include post-patch: @${REINPLACE_CMD} -e '/find_package/s| system||' \ ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} -e 's|bash|/bin/sh|; s|python3 |${PYTHON_CMD} |' \ + ${WRKSRC}/scripts/translation-update.sh + do-install: ${CMAKE_BIN} --install ${BUILD_WRKSRC} --prefix ${STAGEDIR}${PREFIX} .include diff --git a/cad/openscad/Makefile.git_rev b/cad/openscad/Makefile.git_rev index bdc80ab4ca5b..447853af4a8b 100644 --- a/cad/openscad/Makefile.git_rev +++ b/cad/openscad/Makefile.git_rev @@ -1,8 +1,8 @@ -GIT_SRC_HASH= 72c9919d63116f8e711f3566ae34e9eb63a2d6e6 -GIT_SRC_DATE= 2025.05.08 +GIT_SRC_HASH= 3da45dd566ef5710138d33e80758cfa068bd0304 +GIT_SRC_DATE= 2026.08.23 GIT_MCAD_HASH= 1ea402208c3127ffb443931e9bb1681c191dacca -GIT_CLIPPER2_HASH= 6901921c4be75126d1de60bfd24bd86a61319fd0 -GIT_OPENCSG_HASH= 313018fbf997f484f66cb4a320bbd2abf79a4fc1 -GIT_MANIFOLD_HASH= 7c8fbe186aa1ac5eb73f12c28bdef093ee4d11c9 -GIT_MIMALLOC_HASH= 4cebb48062196625b91c79311f3ff4b22f493d47 -GIT_SANITIZERSCMAKE_HASH= c3dc841af4dbf44669e65b82cb68a575864326bd +GIT_CLIPPER2_HASH= c7f820f6a03fa91f189b866d27bf40dfe47abaa6 +GIT_OPENCSG_HASH= 9bf122715213dca05e70993dd8672fe3aa36c518 +GIT_MANIFOLD_HASH= 11235e6b8ebea2dbed8aec4285685aafd3d95667 +GIT_MIMALLOC_HASH= 30b2d9d89099bee08e9f67a1ffb3e12e7ba45227 +GIT_SANITIZERSCMAKE_HASH= bcb1fc68616e9645ca5acea2992412606373ab04 diff --git a/cad/openscad/distinfo b/cad/openscad/distinfo index 304a3e7aea1d..2a62db36e3c3 100644 --- a/cad/openscad/distinfo +++ b/cad/openscad/distinfo @@ -1,15 +1,15 @@ -TIMESTAMP = 1746869177 -SHA256 (openscad-openscad-2025.05.08-72c9919d63116f8e711f3566ae34e9eb63a2d6e6_GH0.tar.gz) = 10436542006d598beb34a7bbfbb88101c81e2102efb7c884b3a7831c7b7865cb -SIZE (openscad-openscad-2025.05.08-72c9919d63116f8e711f3566ae34e9eb63a2d6e6_GH0.tar.gz) = 24478576 -SHA256 (microsoft-mimalloc-4cebb48062196625b91c79311f3ff4b22f493d47_GH0.tar.gz) = 1811a777b83ffa9cb5c2f3c1b2f41b48bd72b6f044812d7ba2c2bacf5e1b8e2c -SIZE (microsoft-mimalloc-4cebb48062196625b91c79311f3ff4b22f493d47_GH0.tar.gz) = 1133506 -SHA256 (elalish-manifold-7c8fbe186aa1ac5eb73f12c28bdef093ee4d11c9_GH0.tar.gz) = 5418524300e37c2edb0de81a2393cd768f631a5de02f68936bc5c42988271813 -SIZE (elalish-manifold-7c8fbe186aa1ac5eb73f12c28bdef093ee4d11c9_GH0.tar.gz) = 29614163 -SHA256 (arsenm-sanitizers-cmake-c3dc841af4dbf44669e65b82cb68a575864326bd_GH0.tar.gz) = 19d511a3a4ddc872c89ab62c070dd8d1fcc733e6ea4655f5876a60237cd556ba -SIZE (arsenm-sanitizers-cmake-c3dc841af4dbf44669e65b82cb68a575864326bd_GH0.tar.gz) = 7433 -SHA256 (openscad-OpenCSG-313018fbf997f484f66cb4a320bbd2abf79a4fc1_GH0.tar.gz) = e6da517ab86422ed822e09c71e1ca6a673149fbbac50e7f3cb94f2daa3f7999d -SIZE (openscad-OpenCSG-313018fbf997f484f66cb4a320bbd2abf79a4fc1_GH0.tar.gz) = 302671 -SHA256 (AngusJohnson-Clipper2-6901921c4be75126d1de60bfd24bd86a61319fd0_GH0.tar.gz) = d4ba8b5a927caab6e2b3d07d9becd5bf3775489494fd84251e7d288e3b43ae4b -SIZE (AngusJohnson-Clipper2-6901921c4be75126d1de60bfd24bd86a61319fd0_GH0.tar.gz) = 621021 +TIMESTAMP = 1788525801 +SHA256 (openscad-openscad-2026.08.23-3da45dd566ef5710138d33e80758cfa068bd0304_GH0.tar.gz) = 4dfc4d5dfc480280b70311f3d996d5cd806486926337e8f0125b4d655a98535f +SIZE (openscad-openscad-2026.08.23-3da45dd566ef5710138d33e80758cfa068bd0304_GH0.tar.gz) = 25438368 +SHA256 (microsoft-mimalloc-30b2d9d89099bee08e9f67a1ffb3e12e7ba45227_GH0.tar.gz) = 7ced84a659a95454ce08b725af56331164e6b8673310e5a9a5c612576145456f +SIZE (microsoft-mimalloc-30b2d9d89099bee08e9f67a1ffb3e12e7ba45227_GH0.tar.gz) = 1411187 +SHA256 (elalish-manifold-11235e6b8ebea2dbed8aec4285685aafd3d95667_GH0.tar.gz) = 4fa8ba091b4b905fe19f9acd550484640426c5f10ccc0e0100143aa89fa8f5b9 +SIZE (elalish-manifold-11235e6b8ebea2dbed8aec4285685aafd3d95667_GH0.tar.gz) = 30976213 +SHA256 (arsenm-sanitizers-cmake-bcb1fc68616e9645ca5acea2992412606373ab04_GH0.tar.gz) = 98f25152be7305263189e1167c7b65a79328b335d1cf4861f592318a36d031ae +SIZE (arsenm-sanitizers-cmake-bcb1fc68616e9645ca5acea2992412606373ab04_GH0.tar.gz) = 7491 +SHA256 (openscad-OpenCSG-9bf122715213dca05e70993dd8672fe3aa36c518_GH0.tar.gz) = d0139ed0e0934f51d4748e0dab19e7147cac5efc35f6d3bfa844a19fbb3bfd14 +SIZE (openscad-OpenCSG-9bf122715213dca05e70993dd8672fe3aa36c518_GH0.tar.gz) = 303449 +SHA256 (AngusJohnson-Clipper2-c7f820f6a03fa91f189b866d27bf40dfe47abaa6_GH0.tar.gz) = 399e712bd653a85e1507fbb02de8032d264e235a8e62e7028cee91f0490418b6 +SIZE (AngusJohnson-Clipper2-c7f820f6a03fa91f189b866d27bf40dfe47abaa6_GH0.tar.gz) = 716242 SHA256 (openscad-MCAD-1ea402208c3127ffb443931e9bb1681c191dacca_GH0.tar.gz) = 3d04077d369814638c3f018fecc39439011a47f545026f43c1a465bce1773f57 SIZE (openscad-MCAD-1ea402208c3127ffb443931e9bb1681c191dacca_GH0.tar.gz) = 56943 diff --git a/cad/openscad/pkg-plist b/cad/openscad/pkg-plist index 06a67e72729e..a75fb2b6838a 100644 --- a/cad/openscad/pkg-plist +++ b/cad/openscad/pkg-plist @@ -1,196 +1,197 @@ bin/openscad share/applications/openscad.desktop share/icons/hicolor/128x128/apps/openscad.png share/icons/hicolor/256x256/apps/openscad.png share/icons/hicolor/48x48/apps/openscad.png share/icons/hicolor/512x512/apps/openscad.png share/icons/hicolor/64x64/apps/openscad.png share/man/man1/openscad.1.gz share/metainfo/org.openscad.OpenSCAD.appdata.xml share/mime/packages/openscad.xml %%DATADIR%%/color-schemes/editor/dark-background.json %%DATADIR%%/color-schemes/editor/high-contrast-dark.json %%DATADIR%%/color-schemes/editor/high-contrast-light.json %%DATADIR%%/color-schemes/editor/light-background.json %%DATADIR%%/color-schemes/editor/monokai.json %%DATADIR%%/color-schemes/editor/solarized-dark.json %%DATADIR%%/color-schemes/editor/solarized-light.json %%DATADIR%%/color-schemes/editor/tomorrow-night.json %%DATADIR%%/color-schemes/editor/tomorrow.json %%DATADIR%%/color-schemes/editor/visualstudio.json %%DATADIR%%/color-schemes/editor/xcode.json %%DATADIR%%/color-schemes/readme.txt %%DATADIR%%/color-schemes/render/beforedawn.json %%DATADIR%%/color-schemes/render/clearsky.json %%DATADIR%%/color-schemes/render/daylight-gem.json %%DATADIR%%/color-schemes/render/deepocean.json %%DATADIR%%/color-schemes/render/metallic.json %%DATADIR%%/color-schemes/render/monotone.json %%DATADIR%%/color-schemes/render/nature.json %%DATADIR%%/color-schemes/render/nocturnal-gem.json %%DATADIR%%/color-schemes/render/solarized.json %%DATADIR%%/color-schemes/render/starnight.json %%DATADIR%%/color-schemes/render/sunset.json %%DATADIR%%/color-schemes/render/tomorrow-night.json %%DATADIR%%/color-schemes/render/tomorrow.json %%DATADIR%%/examples/Advanced/GEB.scad %%DATADIR%%/examples/Advanced/animation.scad %%DATADIR%%/examples/Advanced/assert.scad %%DATADIR%%/examples/Advanced/children.scad %%DATADIR%%/examples/Advanced/children_indexed.scad %%DATADIR%%/examples/Advanced/example-dir.json %%DATADIR%%/examples/Advanced/module_recursion.scad %%DATADIR%%/examples/Advanced/offset.scad %%DATADIR%%/examples/Advanced/surface_image.png %%DATADIR%%/examples/Advanced/surface_image.scad %%DATADIR%%/examples/Basics/CSG-modules.scad %%DATADIR%%/examples/Basics/CSG.scad %%DATADIR%%/examples/Basics/LetterBlock.scad %%DATADIR%%/examples/Basics/example-dir.json %%DATADIR%%/examples/Basics/hull.scad %%DATADIR%%/examples/Basics/linear_extrude.scad %%DATADIR%%/examples/Basics/logo.scad %%DATADIR%%/examples/Basics/logo_and_text.scad %%DATADIR%%/examples/Basics/projection.scad %%DATADIR%%/examples/Basics/projection.stl %%DATADIR%%/examples/Basics/roof.scad %%DATADIR%%/examples/Basics/rotate_extrude.scad %%DATADIR%%/examples/Basics/text_on_cube.scad %%DATADIR%%/examples/COPYING-CC0.txt %%DATADIR%%/examples/Functions/echo.scad %%DATADIR%%/examples/Functions/example-dir.json %%DATADIR%%/examples/Functions/functions.scad %%DATADIR%%/examples/Functions/list_comprehensions.scad %%DATADIR%%/examples/Functions/polygon_areas.scad %%DATADIR%%/examples/Functions/recursion.scad %%DATADIR%%/examples/Old/example001.scad %%DATADIR%%/examples/Old/example002.scad %%DATADIR%%/examples/Old/example003.scad %%DATADIR%%/examples/Old/example004.scad %%DATADIR%%/examples/Old/example005.scad %%DATADIR%%/examples/Old/example006.scad %%DATADIR%%/examples/Old/example007.dxf %%DATADIR%%/examples/Old/example007.scad %%DATADIR%%/examples/Old/example008.dxf %%DATADIR%%/examples/Old/example008.scad %%DATADIR%%/examples/Old/example009.dxf %%DATADIR%%/examples/Old/example009.scad %%DATADIR%%/examples/Old/example010.dat %%DATADIR%%/examples/Old/example010.scad %%DATADIR%%/examples/Old/example011.scad %%DATADIR%%/examples/Old/example012.scad %%DATADIR%%/examples/Old/example012.stl %%DATADIR%%/examples/Old/example013.dxf %%DATADIR%%/examples/Old/example013.scad %%DATADIR%%/examples/Old/example014.scad %%DATADIR%%/examples/Old/example015.scad %%DATADIR%%/examples/Old/example016.scad %%DATADIR%%/examples/Old/example016.stl %%DATADIR%%/examples/Old/example017.scad %%DATADIR%%/examples/Old/example018.scad %%DATADIR%%/examples/Old/example019.scad %%DATADIR%%/examples/Old/example020.scad %%DATADIR%%/examples/Old/example021.scad %%DATADIR%%/examples/Old/example022.scad %%DATADIR%%/examples/Old/example023.scad %%DATADIR%%/examples/Old/example024.scad %%DATADIR%%/examples/Parametric/candleStand.json %%DATADIR%%/examples/Parametric/candleStand.scad %%DATADIR%%/examples/Parametric/example-dir.json %%DATADIR%%/examples/Parametric/sign.json %%DATADIR%%/examples/Parametric/sign.scad %%DATADIR%%/fonts/05-osx-fonts.conf %%DATADIR%%/fonts/10-liberation.conf %%DATADIR%%/fonts/Liberation-2.00.1/AUTHORS %%DATADIR%%/fonts/Liberation-2.00.1/ChangeLog %%DATADIR%%/fonts/Liberation-2.00.1/LICENSE %%DATADIR%%/fonts/Liberation-2.00.1/README %%DATADIR%%/fonts/Liberation-2.00.1/TODO %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationMono-Bold.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationMono-BoldItalic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationMono-Italic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationMono-Regular.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSans-Bold.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSans-BoldItalic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSans-Italic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSans-Regular.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSerif-Bold.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSerif-BoldItalic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSerif-Italic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSerif-Regular.ttf %%DATADIR%%/libraries/MCAD/2Dshapes.scad %%DATADIR%%/libraries/MCAD/3d_triangle.scad %%DATADIR%%/libraries/MCAD/README.markdown %%DATADIR%%/libraries/MCAD/TODO %%DATADIR%%/libraries/MCAD/__init__.py %%DATADIR%%/libraries/MCAD/array.scad %%DATADIR%%/libraries/MCAD/bearing.scad %%DATADIR%%/libraries/MCAD/bitmap/README %%DATADIR%%/libraries/MCAD/bitmap/alphabet_block.scad %%DATADIR%%/libraries/MCAD/bitmap/bitmap.scad %%DATADIR%%/libraries/MCAD/bitmap/height_map.scad %%DATADIR%%/libraries/MCAD/bitmap/letter_necklace.scad %%DATADIR%%/libraries/MCAD/bitmap/name_tag.scad %%DATADIR%%/libraries/MCAD/bitmap/test_name_tag.scad %%DATADIR%%/libraries/MCAD/boxes.scad %%DATADIR%%/libraries/MCAD/constants.scad %%DATADIR%%/libraries/MCAD/curves.scad %%DATADIR%%/libraries/MCAD/fonts.scad %%DATADIR%%/libraries/MCAD/gears.scad %%DATADIR%%/libraries/MCAD/gridbeam.scad %%DATADIR%%/libraries/MCAD/hardware.scad %%DATADIR%%/libraries/MCAD/involute_gears.scad %%DATADIR%%/libraries/MCAD/layouts.scad %%DATADIR%%/libraries/MCAD/lego_compatibility.scad %%DATADIR%%/libraries/MCAD/lgpl-2.1.txt %%DATADIR%%/libraries/MCAD/libtriangles.scad %%DATADIR%%/libraries/MCAD/linear_bearing.scad %%DATADIR%%/libraries/MCAD/materials.scad %%DATADIR%%/libraries/MCAD/math.scad %%DATADIR%%/libraries/MCAD/metric_fastners.scad %%DATADIR%%/libraries/MCAD/motors.scad %%DATADIR%%/libraries/MCAD/multiply.scad %%DATADIR%%/libraries/MCAD/nuts_and_bolts.scad %%DATADIR%%/libraries/MCAD/openscad_testing.py %%DATADIR%%/libraries/MCAD/openscad_utils.py %%DATADIR%%/libraries/MCAD/polyholes.scad %%DATADIR%%/libraries/MCAD/profiles.scad %%DATADIR%%/libraries/MCAD/regular_shapes.scad %%DATADIR%%/libraries/MCAD/screw.scad %%DATADIR%%/libraries/MCAD/servos.scad %%DATADIR%%/libraries/MCAD/shapes.scad %%DATADIR%%/libraries/MCAD/stepper.scad %%DATADIR%%/libraries/MCAD/teardrop.scad %%DATADIR%%/libraries/MCAD/test_docs.py %%DATADIR%%/libraries/MCAD/test_mcad.py %%DATADIR%%/libraries/MCAD/transformations.scad %%DATADIR%%/libraries/MCAD/triangles.scad %%DATADIR%%/libraries/MCAD/trochoids.scad %%DATADIR%%/libraries/MCAD/units.scad %%DATADIR%%/libraries/MCAD/unregular_shapes.scad %%DATADIR%%/libraries/MCAD/utilities.scad %%DATADIR%%/locale/cs/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/de/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/es/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/fr/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/hy/LC_MESSAGES/openscad.mo +%%DATADIR%%/locale/it/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/ka/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/pl/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/pt_BR/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/ru/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/tr/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/uk/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/zh_CN/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/zh_TW/LC_MESSAGES/openscad.mo %%DATADIR%%/shaders/MouseSelector.frag %%DATADIR%%/shaders/MouseSelector.vert %%DATADIR%%/shaders/OpenCSG.vert %%DATADIR%%/shaders/ViewEdges.frag %%DATADIR%%/shaders/ViewEdges.vert %%DATADIR%%/templates/CC0.json %%DATADIR%%/templates/difference.json %%DATADIR%%/templates/for.json %%DATADIR%%/templates/function.json %%DATADIR%%/templates/module.json %%DATADIR%%/templates/rotate.json %%DATADIR%%/templates/translate.json