Re: git: ad618043f3d2 - main - java/openjdk: Fix pkgsuffix for jre builds

On Sat, 2026-03-28 at 10:26, Harald Eilertsen <haraldei@FreeBSD.org> wrote:

> The branch main has been updated by haraldei:

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

> commit ad618043f3d2146896fadaa62c7a63e8ddd649cb
> Author:     Harald Eilertsen <haraldei@FreeBSD.org>
> AuthorDate: 2026-03-28 10:07:15 +0000
> Commit:     Harald Eilertsen <haraldei@FreeBSD.org>
> CommitDate: 2026-03-28 10:25:18 +0000

>     java/openjdk: Fix pkgsuffix for jre builds

>     java/openjdk25 and openjdk26 would use the same pkgsuffix when building
>     the jre FLAVOR, making the package names clash.

>     Reported by:    Antoine Brodin <antoine@freebsd.org>
>     Reviewed by:    fuz
>     Approved by:    fuz
>     Sponsored by:   The FreeBSD Foundation
>     Differential Revision:  https://reviews.freebsd.org/D56123

I believe users with openjdk-jre-[25|26] installed won't get the new
packages via a pkg upgrade.  Maybe we want something like this in
UPDATING:

20260328:
  AFFECTS: users of java/openjdk25 and java/openjdk26 with the jre flavor
  AUTHOR: haraldei@FreeBSD.org

  The openjdk-jre packages for versions 25 and 26 have been renamed.  Users with
  the old package names installed must run the following /bin/sh script with
  superuser privileges before upgrading.

  jre=$(pkg query -g %n-%v "*openjdk-jre-25*" "*openjdk-jre-26*")
  if echo "$jre" | grep -q "\-25"; then
      on=$(pkg query -g %n "*openjdk-jre-25*")
      nn="openjdk25-jre"
  elif echo "$jre" | grep -q "\-26"; then
      on=$(pkg query -g %n "*openjdk-jre-26*")
      nn="openjdk26-jre"
  fi
  if [ -n "$nn" ]; then
      pkg set -yn "$on":"$nn"
  fi