Bug 280227 - devel/ocaml-opam: update to 2.2.0
Summary: devel/ocaml-opam: update to 2.2.0
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Zsolt Udvari
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2024-07-11 16:50 UTC by kit-ty-kate
Modified: 2024-10-20 18:06 UTC (History)
3 users (show)

See Also:
bugzilla: maintainer-feedback? (hannes)


Attachments
opam-2.2.0.patch (4.15 KB, patch)
2024-07-11 16:50 UTC, kit-ty-kate
no flags Details | Diff
Update devel/ocaml-opam to 2.2.1 (4.67 KB, patch)
2024-10-15 19:22 UTC, Hannes Mehnert
hannes: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description kit-ty-kate 2024-07-11 16:50:03 UTC
Created attachment 251978 [details]
opam-2.2.0.patch
Comment 1 Hannes Mehnert 2024-07-13 12:37:00 UTC
[maintainer here]: Thanks, this looks fine. Since I'm on vacation (without computer) until August 5th, it qould be great if someone could test this patch, esp. with 32 bit, arm 7, and with ccache (since some patches addressing these platforms/scenarios have been removed here).

Best, Hannes
Comment 2 Zsolt Udvari freebsd_committer freebsd_triage 2024-08-08 11:00:59 UTC
(In reply to Hannes Mehnert from comment #1)
Hannes, could you please test now? Thanks!
Comment 3 Zsolt Udvari freebsd_committer freebsd_triage 2024-10-08 07:49:11 UTC
Friendly ping.
Comment 4 Hannes Mehnert 2024-10-15 19:22:59 UTC
Created attachment 254270 [details]
Update devel/ocaml-opam to 2.2.1

This updates the devel/ocaml-opam port to 2.2.1.
Comment 5 Hannes Mehnert 2024-10-15 19:26:59 UTC
Dear everybody,

sorry it took me so long. I started multiple times and got stuck.

I just attached a patch which updated devel/ocaml-opam to 2.2.1.

The changes in detail:
- the patch patching the OCaml compiler is kept -- it enables arm32 (armv7) and powerpc support on FreeBSD (I renamed the file to reflect its intention, hope that works nicely when applying the uploaded patch)
- the Makefile is adjusted to use --with-vendored-deps for configure, and drop the (cold-)lib-ext target that is not needed anymore
- the pkg-plist is updated to reflect what opam 2.2.1 provides.

This patch has been tested locally on my laptop, with portlint being mostly happy, and also in my poudriere (on an amd64 machine).

Happy to hear if you run into issues with the above patch, but it is good to be merged into the ports tree.
Comment 6 kit-ty-kate 2024-10-15 19:45:13 UTC
looks good to me too
Comment 7 Zsolt Udvari freebsd_committer freebsd_triage 2024-10-20 18:06:27 UTC
Committed, thanks!
Comment 8 commit-hook freebsd_committer freebsd_triage 2024-10-20 18:06:44 UTC
A commit in branch main references this bug:

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

commit 54b36d688589b38aefdf684bbcb0e7eee658ac09
Author:     Hannes Mehnert <hannes@mehnert.org>
AuthorDate: 2024-10-20 18:01:51 +0000
Commit:     Zsolt Udvari <uzsolt@FreeBSD.org>
CommitDate: 2024-10-20 18:05:24 +0000

    devel/ocaml-opam: Update to 2.2.1

    Makefile is adjusted to use --with-vendored-deps for configure, and drop
    the (cold-)lib-ext target that is not needed anymore.
    Determine ARCH by bsd.port.pre.mk.
    Add LICENSE_FILE.

    Changelog: https://github.com/ocaml/opam/releases/tag/2.2.1

    PR:             280227
    Approved by:    submitter is maintainer

 devel/ocaml-opam/Makefile                          | 37 +++++++++++-----------
 devel/ocaml-opam/distinfo                          |  6 ++--
 .../files/patch-shell_bootstrap-ocaml.sh           |  4 +--
 ...-src__ext_ocaml-patches_0001-arm-powerpc.patch} |  8 ++---
 devel/ocaml-opam/pkg-plist                         | 13 +++++---
 5 files changed, 35 insertions(+), 33 deletions(-)