Created attachment 254202 [details] Patch to update the port Maintainer here. This updates the CalculiX solver to 2.22. (PR 282050 updates the pre- and post-processor). Tested on FreeBSD 14.1-RELEASE-p5 GENERIC amd64. Seems to work fine. This version still uses the default SPOOLES solver. Privately I've gotten an older version of the faster PASTIX solver to work without CUDA, but this requires a lot of patching since this is not mature yet; work on integrating the current PASTIX version to work with calculix-ccx is ongoing. Also, I had to build several libraries with settings different from the default in FreeBSD (mainly 64-bit integers). So I've built and linked them as static libraries. I'm not sure how to do that in a port, plus I lack the hardware to test this outside amd64.
Your patch doesn't apply. Could you please check?
(In reply to Zsolt Udvari from comment #1) Using `patch -p1 < patchfile` works for me.
(In reply to rsmith from comment #2) Indeed. I tried with 'git apply'.
(In reply to Zsolt Udvari from comment #3) Ah, that explains it. Since I tend to track the quarterly ports branch, I downloaded the port from HEAD and used plain diff to create the patch. (The same goes for #282050.) Is this something I should explicitly mention next time?
(In reply to rsmith from comment #4) No problem. IMHO it's a good idea to mention it. About port: as I see there is a `test' directory. Is it possible to test the port? See https://docs.freebsd.org/en/books/porters-handbook/book/#make-test The DISTFILES+= and EXTRACT_ONLY+= (DOCS and EXAMPLES options) can replace with DISTFILES_DOCS=... and EXTRACT_ONLY_DOCS=... (see https://docs.freebsd.org/en/books/porters-handbook/book/#options-variables). After it can remove `.include <bsd.port.options.mk>'. And doesn't need DIST_SOURCES Please add LICENSE_FILE, as I see the ${WRKSRC}/src/gpl-2.0.txt (https://docs.freebsd.org/en/books/porters-handbook/book/#licenses-license). There isn't gcc lower than 10 in ports tree, so the GCC_DEFAULT>=10 check can remove too.
(In reply to Zsolt Udvari from comment #5) Thanks for the pointers. I've changed the options and am working on getting the tests running.
Created attachment 254367 [details] Updated patch fixing options and adding tests. New patch to address the points raised by Zsolt Udvari.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=cc850c375bdb357aecd25b6708cf236c08504745 commit cc850c375bdb357aecd25b6708cf236c08504745 Author: rsmith <rsmith@xs4all.nl> AuthorDate: 2024-10-20 18:47:16 +0000 Commit: Zsolt Udvari <uzsolt@FreeBSD.org> CommitDate: 2024-10-21 05:06:25 +0000 cad/calculix-ccx: Update to 2.22 Use {DOCS,EXAMPLES}_DISTFILES instead of testing PORT_OPTIONS. Add do-test target. Add LICENSE_FILE. PR: 282051 Approved by: submitter is maintainer cad/calculix-ccx/Makefile | 48 +++--- cad/calculix-ccx/distinfo | 18 +-- cad/calculix-ccx/files/patch-CalculiX.h | 2 +- cad/calculix-ccx/files/patch-Makefile | 12 +- cad/calculix-ccx/files/patch-compare (new) | 115 ++++++++++++++ cad/calculix-ccx/files/patch-datcheck.pl (new) | 17 ++ cad/calculix-ccx/files/patch-date.pl | 4 +- cad/calculix-ccx/files/patch-frdcheck.pl (new) | 17 ++ cad/calculix-ccx/pkg-plist | 211 ++++++++++++++++++------- 9 files changed, 340 insertions(+), 104 deletions(-)
Committed, thanks!
(In reply to Zsolt Udvari from comment #9) Thank you for the assistance! Is there any chance you could pick up #282050 as well? That is the update for the pre-/post-processor that goes with this port.
(In reply to rsmith from comment #10) Yes, I saw it and as I see this port is required by calculix.