From: Ian Darwin Subject: Re: unbreak cad/openscad for current version of boost. To: ports@openbsd.org Date: Fri, 21 Nov 2025 13:16:19 -0500 On 11/21/25 1:01 PM, Theo Buehler wrote: > On Fri, Nov 21, 2025 at 12:57:09PM -0500, Ian Darwin wrote: >> Tested on amd64 only. > There's a pending update by afresh1 which is only blocked by some > imports if I understand correctly. I haven't followed the details, > but maybe it would be preferable not to interfere and help the > update get in? Whatever. I needed it today so I made it work. My trivial patch is on the mailing list in case anybody else needs it before Andrew's gets into the tree. Unless somebody wants to OK this as-is. The patch file can be deleted if no longer needed when all the other imports get in. > >> Index: Makefile >> =================================================================== >> RCS file: /cvs/ports/cad/openscad/Makefile,v >> diff -u -p -r1.56 Makefile >> --- Makefile 28 Apr 2025 07:19:19 -0000 1.56 >> +++ Makefile 21 Nov 2025 17:55:36 -0000 >> @@ -1,10 +1,9 @@ >> -BROKEN = update to git snapshot to build with 1.87 >> COMMENT = the programmer's solid 3D CAD modeller >> BROKEN-sparc64= SIGILL on src/cgalutils.cc with CGAL-4.6.3 >> >> V = 2021.01 >> DISTNAME = openscad-${V} >> -REVISION = 12 >> +REVISION = 13 >> >> CATEGORIES = cad >> >> Index: patches/patch-src_filemodule_cc >> =================================================================== >> RCS file: patches/patch-src_filemodule_cc >> diff -N patches/patch-src_filemodule_cc >> --- /dev/null 1 Jan 1970 00:00:00 -0000 >> +++ patches/patch-src_filemodule_cc 21 Nov 2025 17:55:36 -0000 >> @@ -0,0 +1,12 @@ >> +Index: src/filemodule.cc >> +--- src/FileModule.cc.orig Fri Nov 21 10:07:49 2025 >> ++++ src/FileModule.cc Fri Nov 21 10:09:46 2025 >> +@@ -65,7 +65,7 @@ >> + auto ext = fs::path(path).extension().generic_string(); >> + >> + if (boost::iequals(ext, ".otf") || boost::iequals(ext, ".ttf")) { >> +- if (fs::is_regular(path)) { >> ++ if (fs::is_regular_file(path)) { >> + FontCache::instance()->register_font_file(path); >> + } else { >> + LOG(message_group::Error,Location::NONE,"","Can't read font with path '%1$s'",path); >>