diff --git a/cad/openscad-devel/Makefile b/cad/openscad-devel/Makefile index d3a76ff51b9c..6d46c17b91da 100644 --- a/cad/openscad-devel/Makefile +++ b/cad/openscad-devel/Makefile @@ -1,75 +1,75 @@ PORTNAME= openscad PORTVERSION= ${GIT_SRC_DATE} -PORTREVISION= 2 +#PORTREVISION= 1 CATEGORIES= cad PKGNAMESUFFIX= -devel #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 \ lib3mf.so:cad/lib3mf 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-devel/Makefile.git_rev b/cad/openscad-devel/Makefile.git_rev index 52a60c1743d9..667bd292f536 100644 --- a/cad/openscad-devel/Makefile.git_rev +++ b/cad/openscad-devel/Makefile.git_rev @@ -1,8 +1,8 @@ -GIT_SRC_HASH= cc559f7aab12b1e44a531ca2180b7d9c1c40ac34 -GIT_SRC_DATE= 2026.03.16 +GIT_SRC_HASH= fb3d125fc17debb48080cd3551e944fcb8d97701 +GIT_SRC_DATE= 2026.06.21 GIT_MCAD_HASH= 1ea402208c3127ffb443931e9bb1681c191dacca GIT_CLIPPER2_HASH= c7f820f6a03fa91f189b866d27bf40dfe47abaa6 -GIT_OPENCSG_HASH= 313018fbf997f484f66cb4a320bbd2abf79a4fc1 -GIT_MANIFOLD_HASH= cf01c7bee2c93a6b5747b428a6d91cc69fcd5bf5 -GIT_MIMALLOC_HASH= 4cebb48062196625b91c79311f3ff4b22f493d47 +GIT_OPENCSG_HASH= 9bf122715213dca05e70993dd8672fe3aa36c518 +GIT_MANIFOLD_HASH= cc8a7f66d7d5a560da94346258c5b546af27811e +GIT_MIMALLOC_HASH= 30b2d9d89099bee08e9f67a1ffb3e12e7ba45227 GIT_SANITIZERSCMAKE_HASH= bcb1fc68616e9645ca5acea2992412606373ab04 diff --git a/cad/openscad-devel/distinfo b/cad/openscad-devel/distinfo index b722abed62d4..ef3f1d1a7c0a 100644 --- a/cad/openscad-devel/distinfo +++ b/cad/openscad-devel/distinfo @@ -1,15 +1,15 @@ -TIMESTAMP = 1773852723 -SHA256 (openscad-openscad-2026.03.16-cc559f7aab12b1e44a531ca2180b7d9c1c40ac34_GH0.tar.gz) = 35aed43e786939f13a70db555f2a0ef810dbca59be02b4caa8d6674887846081 -SIZE (openscad-openscad-2026.03.16-cc559f7aab12b1e44a531ca2180b7d9c1c40ac34_GH0.tar.gz) = 25338204 -SHA256 (microsoft-mimalloc-4cebb48062196625b91c79311f3ff4b22f493d47_GH0.tar.gz) = 1811a777b83ffa9cb5c2f3c1b2f41b48bd72b6f044812d7ba2c2bacf5e1b8e2c -SIZE (microsoft-mimalloc-4cebb48062196625b91c79311f3ff4b22f493d47_GH0.tar.gz) = 1133506 -SHA256 (elalish-manifold-cf01c7bee2c93a6b5747b428a6d91cc69fcd5bf5_GH0.tar.gz) = 14ef78420812557a079917e635fc2119dc9eb6669439dd1f8b80bb48dd95f6f7 -SIZE (elalish-manifold-cf01c7bee2c93a6b5747b428a6d91cc69fcd5bf5_GH0.tar.gz) = 30747678 +TIMESTAMP = 1782406081 +SHA256 (openscad-openscad-2026.06.21-fb3d125fc17debb48080cd3551e944fcb8d97701_GH0.tar.gz) = 23aa9517f1e04c50ba18bfa876db479c0b62c08f02248005f4dd659a4ff3c26e +SIZE (openscad-openscad-2026.06.21-fb3d125fc17debb48080cd3551e944fcb8d97701_GH0.tar.gz) = 25409018 +SHA256 (microsoft-mimalloc-30b2d9d89099bee08e9f67a1ffb3e12e7ba45227_GH0.tar.gz) = 7ced84a659a95454ce08b725af56331164e6b8673310e5a9a5c612576145456f +SIZE (microsoft-mimalloc-30b2d9d89099bee08e9f67a1ffb3e12e7ba45227_GH0.tar.gz) = 1411187 +SHA256 (elalish-manifold-cc8a7f66d7d5a560da94346258c5b546af27811e_GH0.tar.gz) = fd9cc0df1d839e1a889d872f3dd4c3957624815251ef69e57f866d5c4d421aca +SIZE (elalish-manifold-cc8a7f66d7d5a560da94346258c5b546af27811e_GH0.tar.gz) = 30976703 SHA256 (arsenm-sanitizers-cmake-bcb1fc68616e9645ca5acea2992412606373ab04_GH0.tar.gz) = 98f25152be7305263189e1167c7b65a79328b335d1cf4861f592318a36d031ae SIZE (arsenm-sanitizers-cmake-bcb1fc68616e9645ca5acea2992412606373ab04_GH0.tar.gz) = 7491 -SHA256 (openscad-OpenCSG-313018fbf997f484f66cb4a320bbd2abf79a4fc1_GH0.tar.gz) = e6da517ab86422ed822e09c71e1ca6a673149fbbac50e7f3cb94f2daa3f7999d -SIZE (openscad-OpenCSG-313018fbf997f484f66cb4a320bbd2abf79a4fc1_GH0.tar.gz) = 302671 +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