cad/openscad-devel: Update to 2022.05.20

Use the version as of 2022.05.20

3 files changed, 86 insertions, 20 deletions

diff --git a/cad/openscad-devel/Makefile b/cad/openscad-devel/Makefile
index 3289d2d38fc5..677d409d2b2f 100644
--- a/cad/openscad-devel/Makefile
+++ b/cad/openscad-devel/Makefile
@@ -1,13 +1,13 @@
 # Created by: Michael Reifenberger <mr@FreeBSD.org>
 
 PORTNAME=	openscad
-PORTVERSION=	2021.02.09
-PORTREVISION=	12
+PORTVERSION=	2022.05.20
+#PORTREVISION=	1
 CATEGORIES=	cad
 PKGNAMESUFFIX=	-devel
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	cc49ad8dac24.patch:-p1
+#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 #'
@@ -30,21 +30,24 @@ LIB_DEPENDS=	libzip.so:archivers/libzip \
 
 CONFLICTS=	openscad
 
-USES=		bison compiler:c++14-lang cpe desktop-file-utils eigen:3 gettext \
-		gl gnome pkgconfig qmake qt:5 shared-mime-info xorg
+USES=		bison cmake compiler:c++14-lang cpe desktop-file-utils eigen:3 gettext \
+		gl gnome pkgconfig qt:5 shared-mime-info xorg
 USE_GITHUB=	yes
 USE_GL=		gl glu glew
-USE_GNOME=	glib20 libxml2
+USE_GNOME=	cairo glib20 libxml2
 USE_QT=		buildtools_build core concurrent_build dbus gui multimedia widgets
 USE_XORG=	x11
-GH_TAGNAME=	63a7c77740030c63d646eb0684ba6947eecb0db7
-QMAKE_ARGS=	CONFIG+="experimental" VERSION=${PORTVERSION}
+GH_ACCOUNT=	microsoft:mimalloc
+GH_PROJECT=	MCAD:mcad mimalloc:mimalloc
+GH_TAGNAME=	6aae7963498675dfb5bedaaef2cb8e56bdcddcab bd0a7ba3f042bfbced5ca1894b236cea08904e26:mcad v2.0.3:mimalloc
+GH_SUBDIR=	libraries/MCAD:mcad submodules/mimalloc:mimalloc
+#QMAKE_ARGS=	CONFIG+="experimental" VERSION=${PORTVERSION}
 # Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport)
-LDFLAGS+=	-Wl,--as-needed
+LDFLAGS+=	-Wl,--as-needed -L${LOCALBASE}/lib
 
-post-patch:
-	@${REINPLACE_CMD} 's/-libusb//' ${WRKSRC}/features/hidapi.prf
-	@${REINPLACE_CMD} -e 's,share/man,man,' \
-		${WRKSRC}/openscad.pro
+#post-patch:
+#	@${REINPLACE_CMD} 's/-libusb//' ${WRKSRC}/features/hidapi.prf
+#	@${REINPLACE_CMD} -e 's,share/man,man,' \
+#		${WRKSRC}/openscad.pro
 
 .include <bsd.port.mk>
diff --git a/cad/openscad-devel/distinfo b/cad/openscad-devel/distinfo
index ded771b81d20..effab3f636bd 100644
--- a/cad/openscad-devel/distinfo
+++ b/cad/openscad-devel/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1612905122
-SHA256 (openscad-openscad-2021.02.09-63a7c77740030c63d646eb0684ba6947eecb0db7_GH0.tar.gz) = 18342253697115d16a6d81ff9b05d8128cf8aac3138ac4d339fb722869113e4d
-SIZE (openscad-openscad-2021.02.09-63a7c77740030c63d646eb0684ba6947eecb0db7_GH0.tar.gz) = 15687873
-SHA256 (cc49ad8dac24.patch) = 43cebd358d152f7a6dc1fc27294c67c4938b207d6a06f26fd60117e3a3c71412
-SIZE (cc49ad8dac24.patch) = 1610
+TIMESTAMP = 1653125562
+SHA256 (openscad-openscad-2022.05.20-6aae7963498675dfb5bedaaef2cb8e56bdcddcab_GH0.tar.gz) = 9ae2eec9680a1bf7f9d3e8ee85cc48acef5abb674053ab74f4665187c7187a23
+SIZE (openscad-openscad-2022.05.20-6aae7963498675dfb5bedaaef2cb8e56bdcddcab_GH0.tar.gz) = 23042608
+SHA256 (microsoft-mimalloc-v2.0.3_GH0.tar.gz) = 5af497f360879bf9d07a5146961d275a25f4177fbe21ee6c437db604422acd60
+SIZE (microsoft-mimalloc-v2.0.3_GH0.tar.gz) = 917461
+SHA256 (openscad-MCAD-bd0a7ba3f042bfbced5ca1894b236cea08904e26_GH0.tar.gz) = 1f7003bf1bdfe9c7e5898eb5e82c54834b156569e79da97d906f3bbcf7c5549c
+SIZE (openscad-MCAD-bd0a7ba3f042bfbced5ca1894b236cea08904e26_GH0.tar.gz) = 58895
diff --git a/cad/openscad-devel/pkg-plist b/cad/openscad-devel/pkg-plist
index 51e407c2a8d5..065134fa7276 100644
--- a/cad/openscad-devel/pkg-plist
+++ b/cad/openscad-devel/pkg-plist
@@ -9,6 +9,8 @@ share/icons/hicolor/64x64/apps/openscad.png
 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
@@ -16,8 +18,10 @@ share/mime/packages/openscad.xml
 %%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/deepocean.json
 %%DATADIR%%/color-schemes/render/metallic.json
 %%DATADIR%%/color-schemes/render/monotone.json
@@ -44,6 +48,7 @@ share/mime/packages/openscad.xml
 %%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
@@ -107,6 +112,57 @@ share/mime/packages/openscad.xml
 %%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
@@ -114,13 +170,18 @@ share/mime/packages/openscad.xml
 %%DATADIR%%/locale/hy/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
-@dir %%DATADIR%%/libraries/MCAD