diff --git a/cad/openscad-devel/Makefile b/cad/openscad-devel/Makefile index 61fe24a7350d..0dc0bc577220 100644 --- a/cad/openscad-devel/Makefile +++ b/cad/openscad-devel/Makefile @@ -1,60 +1,60 @@ PORTNAME= openscad -PORTVERSION= 2022.12.20 -PORTREVISION= 2 +PORTVERSION= 2024.10.11 #PORTREVISION= 1 CATEGORIES= cad PKGNAMESUFFIX= -devel #PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ #PATCHFILES+= cc49ad8dac24.patch:-p1 MAINTAINER= mr@FreeBSD.org COMMENT= Programmer's solid 3D CAD modeller #' WWW= https://www.openscad.org/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= cgal>0:math/cgal \ - evdev-proto>0:devel/evdev-proto + evdev-proto>0:devel/evdev-proto \ + ${LOCALBASE}/include/glm/glm.hpp:math/glm \ + ${LOCALBASE}/include/clipper2/clipper.h:cad/Clipper2 \ + ${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_qt5.so:devel/qscintilla2-qt5 \ 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 + libdouble-conversion.so:devel/double-conversion \ + libasound_module_pcm_oss.so:audio/alsa-plugins \ + libtbb.so:devel/onetbb CONFLICTS= openscad USES= bison cmake compiler:c++14-lang cpe desktop-file-utils eigen:3 gettext \ - gl gnome pkgconfig qt:5 shared-mime-info xorg + gl gnome pkgconfig python qt:5 shared-mime-info xorg USE_GITHUB= yes USE_GL= gl glu glew USE_GNOME= cairo glib20 libxml2 -USE_QT= buildtools:build core concurrent:build dbus gui multimedia qmake:build svg widgets +USE_QT= buildtools:build core concurrent:build dbus gui multimedia qmake svg widgets USE_XORG= x11 -GH_ACCOUNT= microsoft:mimalloc -GH_PROJECT= MCAD:mcad mimalloc:mimalloc -GH_TAGNAME= b621fa6d3d2d2d795b30d1b6aade6ff1b3c8ba29 bd0a7ba3f042bfbced5ca1894b236cea08904e26:mcad v2.0.3:mimalloc -GH_SUBDIR= libraries/MCAD:mcad submodules/mimalloc:mimalloc -#QMAKE_ARGS= CONFIG+="experimental" VERSION=${PORTVERSION} +GH_ACCOUNT= microsoft:mimalloc elalish:manifold arsenm:sanitizerscmake openscad:opencsg +GH_PROJECT= MCAD:mcad mimalloc:mimalloc manifold:manifold sanitizers-cmake:sanitizerscmake OpenCSG:opencsg +GH_TAGNAME= 19a4d67 bd0a7ba3f042bfbced5ca1894b236cea08904e26:mcad \ + fe61be8:mimalloc 22c6605:manifold c3dc841:sanitizerscmake 059a173:opencsg +GH_SUBDIR= libraries/MCAD:mcad submodules/mimalloc:mimalloc submodules/manifold:manifold \ + submodules/sanitizers-cmake:sanitizerscmake submodules/OpenCSG:opencsg # Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport) CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -Wl,--as-needed -L${LOCALBASE}/lib .include -#post-patch: -# @${REINPLACE_CMD} 's/-libusb//' ${WRKSRC}/features/hidapi.prf -# @${REINPLACE_CMD} -e 's,share/man,man,' \ -# ${WRKSRC}/openscad.pro - do-install: ${CMAKE_BIN} --install ${BUILD_WRKSRC} --prefix ${STAGEDIR}${PREFIX} .include diff --git a/cad/openscad-devel/distinfo b/cad/openscad-devel/distinfo index c4aa207495cb..39bc26ab97c4 100644 --- a/cad/openscad-devel/distinfo +++ b/cad/openscad-devel/distinfo @@ -1,7 +1,13 @@ -TIMESTAMP = 1671651024 -SHA256 (openscad-openscad-2022.12.20-b621fa6d3d2d2d795b30d1b6aade6ff1b3c8ba29_GH0.tar.gz) = 8c2877a623a1ce0411d0ba5999b11cd5ebfc61fc7ea8589eafa9fa6158b8f8a2 -SIZE (openscad-openscad-2022.12.20-b621fa6d3d2d2d795b30d1b6aade6ff1b3c8ba29_GH0.tar.gz) = 23121605 -SHA256 (microsoft-mimalloc-v2.0.3_GH0.tar.gz) = 5af497f360879bf9d07a5146961d275a25f4177fbe21ee6c437db604422acd60 -SIZE (microsoft-mimalloc-v2.0.3_GH0.tar.gz) = 917461 +TIMESTAMP = 1728663723 +SHA256 (openscad-openscad-2024.10.11-19a4d67_GH0.tar.gz) = ad9389d3657c9283ef27d03bea25b324bde2b3c87686a65939a6876b39ce58b6 +SIZE (openscad-openscad-2024.10.11-19a4d67_GH0.tar.gz) = 25286240 +SHA256 (microsoft-mimalloc-fe61be8_GH0.tar.gz) = 3669f0f83e3d904cbef5625be2105cb8438428de2e152740220a7acead1b8800 +SIZE (microsoft-mimalloc-fe61be8_GH0.tar.gz) = 1127821 +SHA256 (elalish-manifold-22c6605_GH0.tar.gz) = 896655257392ba1e4976e5e5aca5b75f5755b2822ce636a454b11ef04c358b8a +SIZE (elalish-manifold-22c6605_GH0.tar.gz) = 28752916 +SHA256 (arsenm-sanitizers-cmake-c3dc841_GH0.tar.gz) = bc5cddf6451c3edecc75bf605e7976cb47208d31021db6f5bf99c579efc01f5a +SIZE (arsenm-sanitizers-cmake-c3dc841_GH0.tar.gz) = 7436 +SHA256 (openscad-OpenCSG-059a173_GH0.tar.gz) = d84ec6f6b4857a5563701018673378d630b95702f2706b2a5eb2ab0c64e32da5 +SIZE (openscad-OpenCSG-059a173_GH0.tar.gz) = 299886 SHA256 (openscad-MCAD-bd0a7ba3f042bfbced5ca1894b236cea08904e26_GH0.tar.gz) = 1f7003bf1bdfe9c7e5898eb5e82c54834b156569e79da97d906f3bbcf7c5549c SIZE (openscad-MCAD-bd0a7ba3f042bfbced5ca1894b236cea08904e26_GH0.tar.gz) = 58895 diff --git a/cad/openscad-devel/files/patch-src_handle__dep.cc b/cad/openscad-devel/files/patch-src_handle__dep.cc deleted file mode 100644 index 6c23311f11e6..000000000000 --- a/cad/openscad-devel/files/patch-src_handle__dep.cc +++ /dev/null @@ -1,8 +0,0 @@ ---- src/handle_dep.cc.orig 2021-10-23 10:18:49 UTC -+++ src/handle_dep.cc -@@ -1,3 +1,5 @@ -+#include -+#include - #include "handle_dep.h" - #include "printutils.h" - #include diff --git a/cad/openscad-devel/pkg-plist b/cad/openscad-devel/pkg-plist index 280f72d3d666..ffee6166f86d 100644 --- a/cad/openscad-devel/pkg-plist +++ b/cad/openscad-devel/pkg-plist @@ -1,188 +1,191 @@ 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/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/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/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/sign.json %%DATADIR%%/examples/Parametric/sign.scad %%DATADIR%%/examples/examples.json %%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/ka/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/pl/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/Preview.frag %%DATADIR%%/shaders/Preview.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