===================================================================
RCS file: /cvs/mystuff-openscad/cad/openscad/Makefile,v
retrieving revision 1.2
retrieving revision 1.18
diff -u -r1.2 -r1.18
--- mystuff-openscad/cad/openscad/Makefile	2025/09/23 02:31:21	1.2
+++ mystuff-openscad/cad/openscad/Makefile	2025/11/29 01:28:49	1.18
@@ -1,96 +1,115 @@
+COMMENT =		programmers solid 3D CAD modeller
 
-V =		2025.09.12
-DISTNAME =	openscad-${V}
+V =			2025.10.14
+DISTNAME =		openscad-${V}
 
-COMMENT =	programmers solid 3D CAD modeller
-GH_ACCOUNT =	openscad
-GH_PROJECT =	openscad
-GH_COMMIT =	d38a6251a3c95f7455ba3b368a9dd045483e5b5b
+CATEGORIES =		cad
 
-CATEGORIES =	cad
+HOMEPAGE =		https://www.openscad.org/
 
-HOMEPAGE =	https://openscad.org/
+# AGPL-3.0
+PERMIT_PACKAGE =	Yes
 
+GH_ACCOUNT =	openscad
+GH_PROJECT =	openscad
+GH_COMMIT =	b0f18e9b4d61288b2cd6c659135f7e77def179e0
+
 MCAD_COMMIT =	1ea402208c3127ffb443931e9bb1681c191dacca
 SITES.mcad =	https://github.com/${GH_ACCOUNT}/MCAD/archive/
 
 DISTFILES.mcad =	MCAD-${MCAD_COMMIT:C/(........).*/\1/}{${MCAD_COMMIT}}${EXTRACT_SUFX}
 
-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
+MODULES =		devel/cmake \
+			lang/python \
+			x11/qt6
 
-# AGPL-3.0
-PERMIT_PACKAGE =	Yes
+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
 
-MODULES =	devel/cmake \
-		lang/python \
-		x11/qt5
+# Match devel/boost
+COMPILER =		base-clang ports-gcc
 
-# Must match devel/boost
-COMPILER =	base-clang ports-gcc
+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 \
+			x11/xkbcommon
 
-LIB_DEPENDS =	archivers/libzip \
-		cad/manifold \
-		devel/boost \
-		devel/gettext \
-		devel/glib2 \
-		devel/gmp \
-		devel/gmp,-cxx \
-		devel/lib3mf \
-		devel/mpfr \
-		devel/tbb \
-		editors/qscintilla \
-		graphics/glew \
-		graphics/opencsg \
-		x11/qt5/qtbase \
-		x11/qt5/qtgamepad \
-		x11/qt5/qtmultimedia \
-		x11/qt5/qtsvg
+TEST_DEPENDS =		graphics/py-Pillow
 
-BUILD_DEPENDS =	cad/clipper2 \
-		devel/bison \
-		devel/gettext,-tools \
-		devel/sanitizers-cmake \
-		graphics/glslang \
-		graphics/vulkan-tools \
-		math/cgal \
-		math/eigen3 \
-		shells/bash
+LIB_DEPENDS =		archivers/libzip \
+			cad/clipper2 \
+			cad/lib3mf \
+			cad/manifold \
+			devel/boost \
+			devel/gettext \
+			devel/glib2 \
+			devel/gmp \
+			devel/gmp,-cxx \
+			devel/mpfr \
+			devel/tbb \
+			editors/qscintilla,qt6 \
+			graphics/glew \
+			graphics/opencsg \
+			x11/qt6/qt5compat \
+			x11/qt6/qtbase \
+			x11/qt6/qtmultimedia \
+			x11/qt6/qtsvg
 
-TEST_DEPENDS =	graphics/ImageMagick
+RUN_DEPENDS =		devel/desktop-file-utils \
+			misc/shared-mime-info \
+			net/curl \
+			x11/gtk+4,-guic
 
-RUN_DEPENDS =	devel/desktop-file-utils \
-		misc/shared-mime-info \
-		net/curl \
-		x11/gtk+4,-guic
 
-
 BUILD_DEPENDS +=	${RUN_DEPENDS}
 
 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
 
-#LIB_DEPENDS +=	devel/mimalloc
+# 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
 
 post-install:
+	${SUBST_PROGRAM} ${FILESDIR}/openscad ${PREFIX}/bin/openscad
 	${MODPY_COMPILEALL} ${PREFIX}/share/openscad/libraries/MCAD/
 
 .include <bsd.port.mk>