diff --git a/cad/openscad-devel/Makefile b/cad/openscad-devel/Makefile index 7fc601667b62..06e0fe6d5afb 100644 --- a/cad/openscad-devel/Makefile +++ b/cad/openscad-devel/Makefile @@ -1,67 +1,67 @@ PORTNAME= openscad PORTVERSION= ${GIT_SRC_DATE} -PORTREVISION= 1 +#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 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 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 bdc80ab4ca5b..bc5297f9d217 100644 --- a/cad/openscad-devel/Makefile.git_rev +++ b/cad/openscad-devel/Makefile.git_rev @@ -1,8 +1,8 @@ -GIT_SRC_HASH= 72c9919d63116f8e711f3566ae34e9eb63a2d6e6 -GIT_SRC_DATE= 2025.05.08 +GIT_SRC_HASH= 3880cb3214ca5ab89553093781a075d15722863d +GIT_SRC_DATE= 2025.07.02 GIT_MCAD_HASH= 1ea402208c3127ffb443931e9bb1681c191dacca GIT_CLIPPER2_HASH= 6901921c4be75126d1de60bfd24bd86a61319fd0 GIT_OPENCSG_HASH= 313018fbf997f484f66cb4a320bbd2abf79a4fc1 -GIT_MANIFOLD_HASH= 7c8fbe186aa1ac5eb73f12c28bdef093ee4d11c9 +GIT_MANIFOLD_HASH= 2f4741e0b1de44d6d461b869e481351335340b44 GIT_MIMALLOC_HASH= 4cebb48062196625b91c79311f3ff4b22f493d47 GIT_SANITIZERSCMAKE_HASH= c3dc841af4dbf44669e65b82cb68a575864326bd diff --git a/cad/openscad-devel/distinfo b/cad/openscad-devel/distinfo index 64a4d036f3e6..c6f093111af7 100644 --- a/cad/openscad-devel/distinfo +++ b/cad/openscad-devel/distinfo @@ -1,15 +1,15 @@ -TIMESTAMP = 1746869038 -SHA256 (openscad-openscad-2025.05.08-72c9919d63116f8e711f3566ae34e9eb63a2d6e6_GH0.tar.gz) = 10436542006d598beb34a7bbfbb88101c81e2102efb7c884b3a7831c7b7865cb -SIZE (openscad-openscad-2025.05.08-72c9919d63116f8e711f3566ae34e9eb63a2d6e6_GH0.tar.gz) = 24478576 +TIMESTAMP = 1752134053 +SHA256 (openscad-openscad-2025.07.02-3880cb3214ca5ab89553093781a075d15722863d_GH0.tar.gz) = b71e6c7b9ae11311a03e00fc2e8bf0c61be10a3b7bd2526c564aaabb41a41630 +SIZE (openscad-openscad-2025.07.02-3880cb3214ca5ab89553093781a075d15722863d_GH0.tar.gz) = 24541446 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 (elalish-manifold-2f4741e0b1de44d6d461b869e481351335340b44_GH0.tar.gz) = 1dc8aa37aa4a1c8278ce7dfe4fc8096c2fa3c382910a5b8a62c1586921b8b334 +SIZE (elalish-manifold-2f4741e0b1de44d6d461b869e481351335340b44_GH0.tar.gz) = 29613734 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 SHA256 (openscad-MCAD-1ea402208c3127ffb443931e9bb1681c191dacca_GH0.tar.gz) = 3d04077d369814638c3f018fecc39439011a47f545026f43c1a465bce1773f57 SIZE (openscad-MCAD-1ea402208c3127ffb443931e9bb1681c191dacca_GH0.tar.gz) = 56943