===================================================================
RCS file: /cvs/mystuff-openscad/cad/openscad/Makefile,v
retrieving revision 1.8
retrieving revision 1.18
diff -u -r1.8 -r1.18
--- mystuff-openscad/cad/openscad/Makefile	2025/10/02 02:32:26	1.8
+++ mystuff-openscad/cad/openscad/Makefile	2025/11/29 01:28:49	1.18
@@ -1,6 +1,6 @@
-COMMENT =		the programmers solid 3D CAD modeller
+COMMENT =		programmers solid 3D CAD modeller
 
-V =			2025.09.12
+V =			2025.10.14
 DISTNAME =		openscad-${V}
 
 CATEGORIES =		cad
@@ -12,7 +12,7 @@
 
 GH_ACCOUNT =	openscad
 GH_PROJECT =	openscad
-GH_COMMIT =	d38a6251a3c95f7455ba3b368a9dd045483e5b5b
+GH_COMMIT =	b0f18e9b4d61288b2cd6c659135f7e77def179e0
 
 MCAD_COMMIT =	1ea402208c3127ffb443931e9bb1681c191dacca
 SITES.mcad =	https://github.com/${GH_ACCOUNT}/MCAD/archive/
@@ -21,45 +21,51 @@
 
 MODULES =		devel/cmake \
 			lang/python \
-			x11/qt5
+			x11/qt6
 
-WANTLIB += ${COMPILER_LIBCXX} 3mf EGL GL GLEW GLU Qt5Concurrent
-WANTLIB += Qt5Core Qt5DBus Qt5Gamepad Qt5Gui Qt5Multimedia Qt5Network
-WANTLIB += Qt5OpenGL Qt5Svg Qt5Widgets boost_program_options-mt
-WANTLIB += boost_regex-mt c cairo double-conversion fontconfig
-WANTLIB += freetype glib-2.0 gmp gmpxx harfbuzz intl m manifold
-WANTLIB += mpfr opencsg qscintilla2_qt5 tbb xml2 zip
+WANTLIB += ${COMPILER_LIBCXX} 3mf Clipper2 EGL GL GLEW GLU Qt6Concurrent
+WANTLIB += Qt6Core Qt6Core5Compat Qt6DBus Qt6Gui Qt6Multimedia
+WANTLIB += Qt6Network Qt6OpenGL Qt6OpenGLWidgets Qt6Svg Qt6Widgets
+WANTLIB += boost_atomic-mt boost_filesystem-mt boost_program_options-mt
+WANTLIB += boost_regex-mt boost_system-mt c cairo double-conversion
+WANTLIB += fontconfig freetype glib-2.0 gmp gmpxx harfbuzz intl
+WANTLIB += m manifold mpfr opencsg qscintilla2_qt6 tbb xml2 zip
 
 # Match devel/boost
 COMPILER =		base-clang ports-gcc
 
-BUILD_DEPENDS =		cad/clipper2 \
-			devel/bison \
+BUILD_DEPENDS =		devel/bison \
 			devel/gettext,-tools \
 			devel/sanitizers-cmake \
 			graphics/glslang \
+			graphics/ImageMagick \
+			graphics/shaderc \
 			graphics/vulkan-tools \
 			math/cgal \
 			math/eigen3 \
-			shells/bash
+			shells/bash \
+			x11/xkbcommon
 
+TEST_DEPENDS =		graphics/py-Pillow
+
 LIB_DEPENDS =		archivers/libzip \
+			cad/clipper2 \
+			cad/lib3mf \
 			cad/manifold \
 			devel/boost \
 			devel/gettext \
 			devel/glib2 \
 			devel/gmp \
 			devel/gmp,-cxx \
-			devel/lib3mf \
 			devel/mpfr \
 			devel/tbb \
-			editors/qscintilla \
+			editors/qscintilla,qt6 \
 			graphics/glew \
 			graphics/opencsg \
-			x11/qt5/qtbase \
-			x11/qt5/qtgamepad \
-			x11/qt5/qtmultimedia \
-			x11/qt5/qtsvg
+			x11/qt6/qt5compat \
+			x11/qt6/qtbase \
+			x11/qt6/qtmultimedia \
+			x11/qt6/qtsvg
 
 RUN_DEPENDS =		devel/desktop-file-utils \
 			misc/shared-mime-info \
@@ -67,42 +73,43 @@
 			x11/gtk+4,-guic
 
 
-# I didn't test fully, but it does complain
 BUILD_DEPENDS +=	${RUN_DEPENDS}
 
-TEST_DEPENDS =		graphics/ImageMagick
+DEBUG_PACKAGES =	${BUILD_PACKAGES}
 
-# The openscad script wrapper breaks debug packages
-#DEBUG_PACKAGES =	${BUILD_PACKAGES}
-
 # Make about say the "right" thing
 CONFIGURE_ARGS +=	-DOPENSCAD_VERSION=${V}
 
+# OpenSCAD uses the program_location (see patch-src_openscad_cc) to
+# figure out resource paths, but on OpenBSD that doesn't work when
+# launched from the PATH.
+# In post-install we add a shell script shim to provide the full path.
+CONFIGURE_ARGS +=	-DCMAKE_INSTALL_BINDIR=${PREFIX}/libexec
+
 # Don't use the included stuff, use ours
 CONFIGURE_ARGS +=	-DUSE_BUILTIN_CLIPPER2=OFF \
 			-DUSE_BUILTIN_MANIFOLD=OFF
 
+# Our QT6 port is more stable
+CONFIGURE_ARGS +=	-DUSE_QT6=ON
+
 # It might be faster, but at what cost?
 CONFIGURE_ARGS +=	-DUSE_MIMALLOC=OFF
 
-# We don't have Pillow
-CONFIGURE_ARGS +=	-DUSE_IMAGE_COMPARE_PY=OFF
-
 # I don't know how link in comms/libhidapi
 CONFIGURE_ARGS +=	-DENABLE_HIDAPI=OFF
 
+# We don't have SpNav. Disable in case it get's ported.
+CONFIGURE_ARGS +=	-DCMAKE_DISABLE_FIND_PACKAGE_SpNav=ON
+
+TEST_IS_INTERACTIVE =	X11
+
 post-extract:
 	rmdir ${WRKSRC}/libraries/MCAD
 	cp -a ${WRKDIR}/MCAD-${MCAD_COMMIT} ${WRKSRC}/libraries/MCAD
 
-# OpenSCAD uses the program_location (see patch-src_openscad_cc) to figure out
-# resource paths, but on OpenBSD that doesn't work when launched from the PATH
-# So, add a shell script shim to fix up argv[0] to be absolute so our patch works.
 post-install:
-	mv ${PREFIX}/bin/openscad ${PREFIX}/libexec/openscad
-	${INSTALL_SCRIPT} /dev/null ${PREFIX}/bin/openscad
-	printf "%s\n%s\n" '#!/bin/sh' 'exec ${TRUEPREFIX}/libexec/openscad "$$@"' \
-	    > ${PREFIX}/bin/openscad
+	${SUBST_PROGRAM} ${FILESDIR}/openscad ${PREFIX}/bin/openscad
 	${MODPY_COMPILEALL} ${PREFIX}/share/openscad/libraries/MCAD/
 
 .include <bsd.port.mk>