===================================================================
RCS file: /cvs/mystuff-openscad/cad/openscad/Makefile,v
retrieving revision 1.2
retrieving revision 1.5
diff -u -r1.2 -r1.5
--- mystuff-openscad/cad/openscad/Makefile	2025/09/23 02:31:21	1.2
+++ mystuff-openscad/cad/openscad/Makefile	2025/09/24 02:08:44	1.5
@@ -1,21 +1,28 @@
+COMMENT =		the programmers solid 3D CAD modeller
 
-V =		2025.09.12
-DISTNAME =	openscad-${V}
+V =			2025.09.12
+DISTNAME =		openscad-${V}
 
-COMMENT =	programmers solid 3D CAD modeller
+CATEGORIES =		cad
+
+HOMEPAGE =		https://www.openscad.org/
+
+# AGPL-3.0
+PERMIT_PACKAGE =	Yes
+
 GH_ACCOUNT =	openscad
 GH_PROJECT =	openscad
 GH_COMMIT =	d38a6251a3c95f7455ba3b368a9dd045483e5b5b
 
-CATEGORIES =	cad
-
-HOMEPAGE =	https://openscad.org/
-
 MCAD_COMMIT =	1ea402208c3127ffb443931e9bb1681c191dacca
 SITES.mcad =	https://github.com/${GH_ACCOUNT}/MCAD/archive/
 
 DISTFILES.mcad =	MCAD-${MCAD_COMMIT:C/(........).*/\1/}{${MCAD_COMMIT}}${EXTRACT_SUFX}
 
+MODULES =		devel/cmake \
+			lang/python \
+			x11/qt5
+
 WANTLIB += ${COMPILER_LIBCXX} 3mf EGL GL GLEW GLU Qt5Concurrent
 WANTLIB += Qt5Core Qt5DBus Qt5Gamepad Qt5Gui Qt5Multimedia Qt5Network
 WANTLIB += Qt5OpenGL Qt5Svg Qt5Widgets boost_program_options-mt
@@ -23,60 +30,58 @@
 WANTLIB += freetype glib-2.0 gmp gmpxx harfbuzz intl m manifold
 WANTLIB += mpfr opencsg qscintilla2_qt5 tbb xml2 zip
 
-# AGPL-3.0
-PERMIT_PACKAGE =	Yes
+# Match devel/boost
+COMPILER =		base-clang ports-gcc
 
-MODULES =	devel/cmake \
-		lang/python \
-		x11/qt5
+BUILD_DEPENDS =		cad/clipper2 \
+			devel/bison \
+			devel/gettext,-tools \
+			devel/sanitizers-cmake \
+			graphics/glslang \
+			graphics/vulkan-tools \
+			math/cgal \
+			math/eigen3 \
+			shells/bash
 
-# Must match devel/boost
-COMPILER =	base-clang ports-gcc
+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
 
-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
+RUN_DEPENDS =		devel/desktop-file-utils \
+			misc/shared-mime-info \
+			net/curl \
+			x11/gtk+4,-guic
 
-BUILD_DEPENDS =	cad/clipper2 \
-		devel/bison \
-		devel/gettext,-tools \
-		devel/sanitizers-cmake \
-		graphics/glslang \
-		graphics/vulkan-tools \
-		math/cgal \
-		math/eigen3 \
-		shells/bash
 
-TEST_DEPENDS =	graphics/ImageMagick
-
-RUN_DEPENDS =	devel/desktop-file-utils \
-		misc/shared-mime-info \
-		net/curl \
-		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}
 
+# Make about say the "right" thing
+CONFIGURE_ARGS +=	-DOPENSCAD_VERSION=${V}
+
 # Don't use the included stuff, use ours
 CONFIGURE_ARGS +=	-DUSE_BUILTIN_CLIPPER2=OFF \
 			-DUSE_BUILTIN_MANIFOLD=OFF
 
+# It might be faster, but at what cost?
 #LIB_DEPENDS +=	devel/mimalloc
 CONFIGURE_ARGS +=	-DUSE_MIMALLOC=OFF