freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

java/openjdk: Fix pkgsuffix for jre builds

Browse Source 
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
This commit is contained in:
Harald Eilertsen
2026-03-28 11:07:15 +01:00
parent ad4817eeb4
commit ad618043f3
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/openjdk25/Makefile
+2 -2
View File
@@ -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]}}
java/openjdk26/Makefile
+2 -1
View File
@@ -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]}}