I won't have time to do much with this in the next week or so, but
getexecpath lets us get rid of the script and libexec dance (which it
seems I forgot to cvs rm).
If folks could give it a try so I could commit for release, I'd
appreciate it. (that means you bmercer!)
Comments, tests, OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/cad/openscad/Makefile,v
diff -u -p -r1.63 Makefile
--- Makefile 17 Sep 2026 23:39:16 -0000 1.63
+++ Makefile 21 Sep 2026 01:31:37 -0000
@@ -1,6 +1,6 @@
COMMENT = programmers solid 3D CAD modeller
-V = 2026.06.21
+V = 2026.09.17
DISTNAME = openscad-${V}
CATEGORIES = cad
@@ -12,7 +12,7 @@ PERMIT_PACKAGE = Yes
GH_ACCOUNT = openscad
GH_PROJECT = openscad
-GH_COMMIT = fb3d125fc17debb48080cd3551e944fcb8d97701
+GH_COMMIT = 033ddb6f6aafa7f3042b6ff2b7f60c5ecf59f926
MCAD_COMMIT = 1ea402208c3127ffb443931e9bb1681c191dacca
SITES.mcad = https://github.com/${GH_ACCOUNT}/MCAD/archive/
@@ -82,12 +82,6 @@ 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
@@ -111,7 +105,7 @@ PORTHOME = ${WRKDIR}
TEST_IS_INTERACTIVE = X11
# Tests need the shaders somewhere they can be found
-#SHAREDIRS = color-schemes examples fonts libraries locale shaders templates
+#SHAREDIRS = color-schemes examples fonts libraries locale shaders templates
SHAREDIRS = color-schemes locale shaders
pre-test:
@@ -123,7 +117,6 @@ post-extract:
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>
Index: distinfo
===================================================================
RCS file: /cvs/ports/cad/openscad/distinfo,v
diff -u -p -r1.10 distinfo
--- distinfo 11 Jul 2026 19:19:44 -0000 1.10
+++ distinfo 21 Sep 2026 01:31:37 -0000
@@ -1,4 +1,4 @@
SHA256 (MCAD-1ea40220.tar.gz) = PQQHfTaYFGOMPwGP7MOUOQEaR/VFAm9DwaRlvOF3P1c=
-SHA256 (openscad-2026.06.21-fb3d125f.tar.gz) =
I6qVF/HgTFC6GL+odttHnAtiwI8CJIAF9N1lmk/zwm4=
+SHA256 (openscad-2026.09.17-033ddb6f.tar.gz) =
LVDsvFCPoJUIAfSTHVc7X6LGNgjnx8axwS+r8Nj1MJc=
SIZE (MCAD-1ea40220.tar.gz) = 56943
-SIZE (openscad-2026.06.21-fb3d125f.tar.gz) = 25409018
+SIZE (openscad-2026.09.17-033ddb6f.tar.gz) = 25374287
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/cad/openscad/pkg/PLIST,v
diff -u -p -r1.15 PLIST
--- pkg/PLIST 29 Nov 2025 23:44:44 -0000 1.15
+++ pkg/PLIST 21 Sep 2026 01:31:37 -0000
@@ -1,5 +1,4 @@
-bin/openscad
-@bin libexec/openscad
+@bin bin/openscad
@man man/man1/openscad.1
share/applications/openscad.desktop
share/icons/hicolor/128x128/apps/openscad.png
@@ -18,6 +17,8 @@ share/openscad/color-schemes/editor/high
share/openscad/color-schemes/editor/high-contrast-light.json
share/openscad/color-schemes/editor/light-background.json
share/openscad/color-schemes/editor/monokai.json
+share/openscad/color-schemes/editor/nord-dark.json
+share/openscad/color-schemes/editor/nord-light.json
share/openscad/color-schemes/editor/solarized-dark.json
share/openscad/color-schemes/editor/solarized-light.json
share/openscad/color-schemes/editor/tomorrow-night.json
@@ -34,6 +35,8 @@ share/openscad/color-schemes/render/meta
share/openscad/color-schemes/render/monotone.json
share/openscad/color-schemes/render/nature.json
share/openscad/color-schemes/render/nocturnal-gem.json
+share/openscad/color-schemes/render/nord-dark.json
+share/openscad/color-schemes/render/nord-light.json
share/openscad/color-schemes/render/solarized.json
share/openscad/color-schemes/render/starnight.json
share/openscad/color-schemes/render/sunset.json
@@ -229,6 +232,9 @@ share/openscad/locale/pt_BR/LC_MESSAGES/
share/openscad/locale/ru/
share/openscad/locale/ru/LC_MESSAGES/
share/openscad/locale/ru/LC_MESSAGES/openscad.mo
+share/openscad/locale/sv/
+share/openscad/locale/sv/LC_MESSAGES/
+share/openscad/locale/sv/LC_MESSAGES/openscad.mo
share/openscad/locale/tr/
share/openscad/locale/tr/LC_MESSAGES/
share/openscad/locale/tr/LC_MESSAGES/openscad.mo
