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

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
---
 java/openjdk25/Makefile | 4 ++--
 java/openjdk26/Makefile | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/java/openjdk25/Makefile b/java/openjdk25/Makefile
index f73808b82620..9d63d7ae0e6d 100644
--- a/java/openjdk25/Makefile
+++ b/java/openjdk25/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	openjdk
 DISTVERSIONPREFIX=	jdk-
 DISTVERSION=	${JDK_FULL_VERSION:S/.0.0//}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
 MASTER_SITES=	LOCAL/openjdk:boot
@@ -29,7 +29,7 @@ ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64 powerpc64le
 FLAVORS=	jdk jre headless jre_headless
 
 headless_PKGNAMESUFFIX=	${JDK_MAJOR_VERSION}-headless
-jre_PKGNAMESUFFIX=	-jre
+jre_PKGNAMESUFFIX=	${JDK_MAJOR_VERSION}-jre
 jre_headless_PKGNAMESUFFIX=	${JDK_MAJOR_VERSION}-jre-headless
 
 FLAVOR?=	${BUILD_JRE:?jre:${FLAVORS:[1]}}
diff --git a/java/openjdk26/Makefile b/java/openjdk26/Makefile
index cfa7e4d5f5ce..2f43478ef699 100644
--- a/java/openjdk26/Makefile
+++ b/java/openjdk26/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	openjdk
 DISTVERSIONPREFIX=	jdk-
 DISTVERSION=	${JDK_FULL_VERSION:S/.0.0//}
+PORTREVISION=	1
 CATEGORIES=	java devel
 PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
 MASTER_SITES=	LOCAL/openjdk:boot
@@ -28,7 +29,7 @@ ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64 powerpc64le
 FLAVORS=	jdk jre headless jre_headless
 
 headless_PKGNAMESUFFIX=	${JDK_MAJOR_VERSION}-headless
-jre_PKGNAMESUFFIX=	-jre
+jre_PKGNAMESUFFIX=	${JDK_MAJOR_VERSION}-jre
 jre_headless_PKGNAMESUFFIX=	${JDK_MAJOR_VERSION}-jre-headless
 
 FLAVOR?=	${BUILD_JRE:?jre:${FLAVORS:[1]}}