===================================================================
RCS file: /cvs/mystuff-openscad/cad/openscad/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mystuff-openscad/cad/openscad/Makefile	2025/10/05 03:49:17	1.11
+++ mystuff-openscad/cad/openscad/Makefile	2025/10/15 22:02:21	1.12
@@ -21,15 +21,15 @@
 
 MODULES =		devel/cmake \
 			lang/python \
-			x11/qt5
+			x11/qt6
 
-WANTLIB += ${COMPILER_LIBCXX} 3mf Clipper2 EGL GL GLEW GLU Qt5Concurrent
-WANTLIB += Qt5Core Qt5DBus Qt5Gamepad Qt5Gui Qt5Multimedia Qt5Network
-WANTLIB += Qt5OpenGL Qt5Svg Qt5Widgets boost_atomic-mt boost_filesystem-mt
-WANTLIB += boost_program_options-mt boost_regex-mt boost_system-mt
-WANTLIB += c cairo double-conversion fontconfig freetype glib-2.0
-WANTLIB += gmp gmpxx harfbuzz intl m manifold mpfr opencsg qscintilla2_qt5
-WANTLIB += 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
@@ -55,13 +55,13 @@
 			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 \
@@ -83,6 +83,9 @@
 # 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