Bug 282050 - cad/calculix: update to 2.22
Summary: cad/calculix: update to 2.22
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Zsolt Udvari
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2024-10-13 12:12 UTC by rsmith
Modified: 2024-10-22 18:41 UTC (History)
1 user (show)

See Also:


Attachments
Patch to update the port. (6.70 KB, patch)
2024-10-13 12:12 UTC, rsmith
no flags Details | Diff
2nd version of the patch (9.62 KB, patch)
2024-10-22 06:56 UTC, rsmith
rsmith: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description rsmith 2024-10-13 12:12:22 UTC
Created attachment 254201 [details]
Patch to update the port.

Maintainer here.

The attached patch updates CalculiX GraphiX (the pre- and postprocessor for calculix-ccx) to the latest version 2.22.

The new version has been tested on 14.1-RELEASE-p5 and works normally.

I'll submit a separate PR for updating calculix-ccx.
Comment 1 Zsolt Udvari freebsd_committer freebsd_triage 2024-10-21 14:39:22 UTC
Suggestions:
1. You've two OPSYS == FreeBSD. Could you please merge into one?
2. You should use DISTVERSION instead of PORTVERSION. Please replace all PORTVERSION to DISTVERSION.
3. Please add LICENSE_FILE.
4. Does the "own glut" have something special? If works with graphics/freeglut would be fine (https://docs.freebsd.org/en/books/porters-handbook/book/#bundled-libs).
5. I saw in cad/calculix-cxx too: if you hardcode `firefox' as BROWSER, you should add to runtime dependencies. But I've a better idea: xdg-open. The user uses a default browser and the `xdg-open URL' opens in his/her preferred browser. What do you think? (Maybe can use in calculix-cxx too).
Comment 2 rsmith 2024-10-22 06:56:38 UTC
Created attachment 254435 [details]
2nd version of the patch

This updated patch fixes the issues raised in comment 1.

* Use OPSYS=FreeBSD once.
* Use DISTVERSION.
* License file added.
* Link with graphics/freeglut.
* Use xdg-open as BROWSER.

This patch was made with `git diff`.

The port builds, packages and works fine AFAICT.
I tested it with some analyses that were created for a previous version, and it produced the same results.
Tested on: FreeBSD 14.1-RELEASE-p5 GENERIC amd64
Comment 3 Zsolt Udvari freebsd_committer freebsd_triage 2024-10-22 18:41:14 UTC
Committed, thanks!
Comment 4 commit-hook freebsd_committer freebsd_triage 2024-10-22 18:41:34 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=aa24c57f08b0b831824961acf905cd54cba3ee45

commit aa24c57f08b0b831824961acf905cd54cba3ee45
Author:     rsmith <rsmith@xs4all.nl>
AuthorDate: 2024-10-22 18:35:59 +0000
Commit:     Zsolt Udvari <uzsolt@FreeBSD.org>
CommitDate: 2024-10-22 18:40:25 +0000

    cad/calculix: Update to 2.22

    Use xdg-open as BROWSER instead of firefox.
    Use freeglut instead of bundled library.
    Merge two OPSYS==FreeBSD into one.
    Add LICENSE_FILE.
    Switch to DISTVERSION.

    PR:             282050
    Approved by:    submitter is maintainer

 cad/calculix/Makefile                              | 28 ++++-----
 cad/calculix/distinfo                              | 18 +++---
 .../files/patch-cgx__2.20_src_Makefile (gone)      | 26 --------
 .../files/patch-cgx__2.22_src_Makefile (new)       | 70 ++++++++++++++++++++++
 .../files/patch-cgx__2.22_src_extUtil.h (new)      | 11 ++++
 cad/calculix/pkg-plist                             | 23 ++++++-
 6 files changed, 124 insertions(+), 52 deletions(-)