Page MenuHomeFreeBSD
Files F145559837

D54731.id171512.diff
No OneTemporary
Actions

D54731.id171512.diff
View Options

diff --git a/java/openjdk21/Makefile b/java/openjdk21/Makefile
--- a/java/openjdk21/Makefile
+++ b/java/openjdk21/Makefile
@@ -1,8 +1,11 @@
PORTNAME= openjdk
DISTVERSIONPREFIX= jdk-
DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
+PORTREVISION= 1
CATEGORIES= java devel
PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION}
+MASTER_SITES= LOCAL/openjdk:boot
+DISTFILES= ${BOOTSTRAPJDKFILE}:boot
MAINTAINER= java@FreeBSD.org
COMMENT?= Java Development Kit ${JDK_MAJOR_VERSION}
@@ -52,7 +55,9 @@
LOG=cmdlines \
MAKEFLAGS=""
-JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/}
+JDK_ARCH= ${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/}
+BOOTSTRAPJDKFILE= openjdk21-21.0.9+10.1.${JDK_ARCH}.tar.xz
+JDK_OSARCH= bsd-${JDK_ARCH}
JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE}
.if defined(BUILD_JRE)
JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jre
@@ -60,6 +65,7 @@
JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jdk
.endif
INSTALLDIR= ${PREFIX}/${PKGBASE}
+BOOTSTRAPJDKDIR= ${WRKDIR}/boot-jdk
NOPRECIOUSMAKEVARS= yes
@@ -115,21 +121,6 @@
.include <bsd.port.pre.mk>
-BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk21 ${LOCALBASE}/openjdk20
-
-# do we have valid native jdk installed?
-.for BJDK in ${BOOTSTRAP_JDKS}
-. if !defined(BOOTSTRAPJDKDIR) && exists(${BJDK}/bin/javac)
-BOOTSTRAPJDKDIR= ${BJDK}
-. endif
-.endfor
-
-# if no valid jdk found, set dependency
-.if !defined(BOOTSTRAPJDKDIR)
-BOOTSTRAPJDKDIR?= ${LOCALBASE}/openjdk20
-BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/openjdk20
-.endif
-
JDK_BUILD_JVM= server
MAKE_ENV+= --with-toolchain-type=${COMPILER_TYPE}
diff --git a/java/openjdk21/distinfo b/java/openjdk21/distinfo
--- a/java/openjdk21/distinfo
+++ b/java/openjdk21/distinfo
@@ -1,3 +1,13 @@
TIMESTAMP = 1770584168
+SHA256 (openjdk21-21.0.9+10.1.aarch64.tar.xz) = 052d140fea683803564374814f9feb1b0cee701d22727e8d2a6680befa8693d3
+SIZE (openjdk21-21.0.9+10.1.aarch64.tar.xz) = 169292956
+SHA256 (openjdk21-21.0.9+10.1.ppc64.tar.xz) = 64c4a6387290c5d478d1244f838996dda9679eebc8b34a167d2e9a5909ce06b8
+SIZE (openjdk21-21.0.9+10.1.ppc64.tar.xz) = 168088740
+SHA256 (openjdk21-21.0.9+10.1.ppc64le.tar.xz) = 679118e89ff636a3688d36c2df1941c4cb7173eda4702068c60d744b6bb8bcb0
+SIZE (openjdk21-21.0.9+10.1.ppc64le.tar.xz) = 169029108
+SHA256 (openjdk21-21.0.9+10.1.x86.tar.xz) = cba9629d42a7e4dc8ac62f0c4e81d5e779841d5955361fad1d030469850c0811
+SIZE (openjdk21-21.0.9+10.1.x86.tar.xz) = 165180812
+SHA256 (openjdk21-21.0.9+10.1.x86_64.tar.xz) = d62c90a58d5acf486e62ff2460708ec7d9ef8704de8e88a5a3551ef8dbae0587
+SIZE (openjdk21-21.0.9+10.1.x86_64.tar.xz) = 171175000
SHA256 (battleblow-jdk21u-jdk-21.0.10+7-1_GH0.tar.gz) = d31d9624b56c0091f5d8c8c108822b0491417b29cebfc22f896d76c6ae8c36c5
SIZE (battleblow-jdk21u-jdk-21.0.10+7-1_GH0.tar.gz) = 114068913
diff --git a/java/openjdk22/Makefile b/java/openjdk22/Makefile
--- a/java/openjdk22/Makefile
+++ b/java/openjdk22/Makefile
@@ -4,6 +4,8 @@
PORTREVISION= 3
CATEGORIES= java devel
PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION}
+MASTER_SITES= LOCAL/openjdk:boot
+DISTFILES= ${BOOTSTRAPJDKFILE}:boot
MAINTAINER= java@FreeBSD.org
COMMENT?= Java Development Kit ${JDK_MAJOR_VERSION}
@@ -56,7 +58,9 @@
LOG=cmdlines \
MAKEFLAGS=""
-JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/}
+JDK_ARCH= ${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/}
+BOOTSTRAPJDKFILE= openjdk22-22.0.2+9.1_2.${JDK_ARCH}.tar.xz
+JDK_OSARCH= bsd-${JDK_ARCH}
JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE}
.if defined(BUILD_JRE)
JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jre
@@ -64,6 +68,7 @@
JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jdk
.endif
INSTALLDIR= ${PREFIX}/${PKGBASE}
+BOOTSTRAPJDKDIR= ${WRKDIR}/boot-jdk
NOPRECIOUSMAKEVARS= yes
@@ -119,21 +124,6 @@
.include <bsd.port.pre.mk>
-BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk22 ${LOCALBASE}/openjdk21
-
-# do we have valid native jdk installed?
-.for BJDK in ${BOOTSTRAP_JDKS}
-. if !defined(BOOTSTRAPJDKDIR) && exists(${BJDK}/bin/javac)
-BOOTSTRAPJDKDIR= ${BJDK}
-. endif
-.endfor
-
-# if no valid jdk found, set dependency
-.if !defined(BOOTSTRAPJDKDIR)
-BOOTSTRAPJDKDIR?= ${LOCALBASE}/openjdk21
-BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/openjdk21
-.endif
-
JDK_BUILD_JVM= server
MAKE_ENV+= --with-toolchain-type=${COMPILER_TYPE}
diff --git a/java/openjdk22/distinfo b/java/openjdk22/distinfo
--- a/java/openjdk22/distinfo
+++ b/java/openjdk22/distinfo
@@ -1,3 +1,13 @@
TIMESTAMP = 1722138875
+SHA256 (openjdk22-22.0.2+9.1_2.aarch64.tar.xz) = 887281b7b4fe8f29d3dae1f537e91f52ceda8003aa1c7f36368885c43ae96515
+SIZE (openjdk22-22.0.2+9.1_2.aarch64.tar.xz) = 169326232
+SHA256 (openjdk22-22.0.2+9.1_2.ppc64.tar.xz) = 23873f8e3a82b94c974831a293768ce0c30c3a2ddd366c2287b72cec8975f920
+SIZE (openjdk22-22.0.2+9.1_2.ppc64.tar.xz) = 168129156
+SHA256 (openjdk22-22.0.2+9.1_2.ppc64le.tar.xz) = 5413106ff0906f1cc21d3ca88bf0919b443fc8168364f3e4b803e00757b37777
+SIZE (openjdk22-22.0.2+9.1_2.ppc64le.tar.xz) = 169066748
+SHA256 (openjdk22-22.0.2+9.1_2.x86.tar.xz) = 6c4bd9fd60d21ed0b4c9d13a72391e9a09f0f9654a5ef7cf8443a41562d9e231
+SIZE (openjdk22-22.0.2+9.1_2.x86.tar.xz) = 165259492
+SHA256 (openjdk22-22.0.2+9.1_2.x86_64.tar.xz) = 35df03be023f64176d5f3dc1ff4dfc8b70863f9ae0cd1fd4057b703a837444cf
+SIZE (openjdk22-22.0.2+9.1_2.x86_64.tar.xz) = 171246324
SHA256 (battleblow-jdk22u-jdk-22.0.2+9-1_GH0.tar.gz) = 5e2731b979cab49d5004cf0aca58c642c94c1808c48278bff6c440945874f24c
SIZE (battleblow-jdk22u-jdk-22.0.2+9-1_GH0.tar.gz) = 112154344
diff --git a/java/openjdk23/Makefile b/java/openjdk23/Makefile
--- a/java/openjdk23/Makefile
+++ b/java/openjdk23/Makefile
@@ -4,6 +4,8 @@
PORTREVISION= 2
CATEGORIES= java devel
PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION}
+MASTER_SITES= LOCAL/openjdk:boot
+DISTFILES= ${BOOTSTRAPJDKFILE}:boot
MAINTAINER= java@FreeBSD.org
COMMENT= Java Development Kit ${JDK_MAJOR_VERSION}
@@ -58,7 +60,9 @@
LOG=cmdlines \
MAKEFLAGS=""
-JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/}
+JDK_ARCH= ${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/}
+BOOTSTRAPJDKFILE= openjdk23-23.0.2+7.2_1.${JDK_ARCH}.tar.xz
+JDK_OSARCH= bsd-${JDK_ARCH}
JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE}
.if defined(BUILD_JRE)
JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jre
@@ -66,6 +70,7 @@
JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jdk
.endif
INSTALLDIR= ${PREFIX}/${PKGBASE}
+BOOTSTRAPJDKDIR= ${WRKDIR}/boot-jdk
NOPRECIOUSMAKEVARS= yes
@@ -116,21 +121,6 @@
.include <bsd.port.pre.mk>
-BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk23 ${LOCALBASE}/openjdk22
-
-# do we have valid native jdk installed?
-.for BJDK in ${BOOTSTRAP_JDKS}
-. if !defined(BOOTSTRAPJDKDIR) && exists(${BJDK}/bin/javac)
-BOOTSTRAPJDKDIR= ${BJDK}
-. endif
-.endfor
-
-# if no valid jdk found, set dependency
-.if !defined(BOOTSTRAPJDKDIR)
-BOOTSTRAPJDKDIR?= ${LOCALBASE}/openjdk22
-BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/openjdk22
-.endif
-
JDK_BUILD_JVM= server
MAKE_ENV+= --with-toolchain-type=${COMPILER_TYPE}
diff --git a/java/openjdk23/distinfo b/java/openjdk23/distinfo
--- a/java/openjdk23/distinfo
+++ b/java/openjdk23/distinfo
@@ -1,3 +1,11 @@
TIMESTAMP = 1756989931
+SHA256 (openjdk23-23.0.2+7.2_1.aarch64.tar.xz) = 73029ace8c87b24435596465ad7091b6d5e0f8b800aa753a80c5c40a7b5e2fe4
+SIZE (openjdk23-23.0.2+7.2_1.aarch64.tar.xz) = 178064508
+SHA256 (openjdk23-23.0.2+7.2_1.ppc64.tar.xz) = c4515a0d6c8cb41ef2b38bad62bd5d2a2f692a3cb90a924758654d26734f8e43
+SIZE (openjdk23-23.0.2+7.2_1.ppc64.tar.xz) = 176905048
+SHA256 (openjdk23-23.0.2+7.2_1.ppc64le.tar.xz) = 6a98d80f60463b81d69c0988ef1aaac389a6f9e965ad3f314cffe5a8a0b40977
+SIZE (openjdk23-23.0.2+7.2_1.ppc64le.tar.xz) = 177821084
+SHA256 (openjdk23-23.0.2+7.2_1.x86_64.tar.xz) = 01774b36af41f4742e217b3e3da498d1670ef5a0b0988ccb33b15ea65bf868be
+SIZE (openjdk23-23.0.2+7.2_1.x86_64.tar.xz) = 180088312
SHA256 (freebsd-openjdk-jdk-23.0.2+7-2-jdk-23.0.2+7-freebsd-2_GH0.tar.gz) = ec011f440f6e3f0eff1b67811a3a9fc5094be772f30519af2bfb914abaa6d666
SIZE (freebsd-openjdk-jdk-23.0.2+7-2-jdk-23.0.2+7-freebsd-2_GH0.tar.gz) = 117311366
diff --git a/java/openjdk24/Makefile b/java/openjdk24/Makefile
--- a/java/openjdk24/Makefile
+++ b/java/openjdk24/Makefile
@@ -4,6 +4,8 @@
PORTREVISION= 3
CATEGORIES= java devel
PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION}
+MASTER_SITES= LOCAL/openjdk:boot
+DISTFILES+= ${BOOTSTRAPJDKFILE}:boot
MAINTAINER= java@FreeBSD.org
COMMENT= Java Development Kit ${JDK_MAJOR_VERSION}
@@ -17,10 +19,11 @@
# i386 is deprecated, and will be removed in the next JDK
ONLY_FOR_ARCHS= aarch64 amd64 powerpc64 powerpc64le
-BUILD_DEPENDS= zip:archivers/zip \
- ${LOCALBASE}/include/cups/cups.h:print/cups \
+BUILD_DEPENDS= ${LOCALBASE}/include/cups/cups.h:print/cups \
bash:shells/bash \
- gsed:textproc/gsed
+ gsed:textproc/gsed \
+ zip:archivers/zip
+
LIB_DEPENDS= libasound.so:audio/alsa-lib \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
@@ -53,6 +56,7 @@
MAKEFLAGS=""
JDK_ARCH= ${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/}
+BOOTSTRAPJDKFILE= openjdk24-24.0.2+12.2_2.${JDK_ARCH}.tar.xz
JDK_OSARCH= bsd-${JDK_ARCH}
JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE}
.if defined(BUILD_JRE)
@@ -61,6 +65,7 @@
JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jdk
.endif
INSTALLDIR= ${PREFIX}/${PKGBASE}
+BOOTSTRAPJDKDIR= ${WRKDIR}/boot-jdk
NOPRECIOUSMAKEVARS= yes
@@ -112,21 +117,6 @@
.include <bsd.port.pre.mk>
-BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk24 ${LOCALBASE}/openjdk23
-
-# do we have valid native jdk installed?
-.for BJDK in ${BOOTSTRAP_JDKS}
-. if !defined(BOOTSTRAPJDKDIR) && exists(${BJDK}/bin/javac)
-BOOTSTRAPJDKDIR= ${BJDK}
-. endif
-.endfor
-
-# if no valid jdk found, set dependency
-.if !defined(BOOTSTRAPJDKDIR)
-BOOTSTRAPJDKDIR?= ${LOCALBASE}/openjdk23
-BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/openjdk23
-.endif
-
JDK_BUILD_JVM= server
MAKE_ENV+= --with-toolchain-type=${COMPILER_TYPE}
diff --git a/java/openjdk24/distinfo b/java/openjdk24/distinfo
--- a/java/openjdk24/distinfo
+++ b/java/openjdk24/distinfo
@@ -1,3 +1,11 @@
TIMESTAMP = 1756894463
+SHA256 (openjdk24-24.0.2+12.2_2.aarch64.tar.xz) = 2bb221632eb862579b2c29a397aba6af535ee3ce45194c2679eb38a071b1c0fb
+SIZE (openjdk24-24.0.2+12.2_2.aarch64.tar.xz) = 188436848
+SHA256 (openjdk24-24.0.2+12.2_2.ppc64.tar.xz) = 5ed73900d43f2a1143f064e7e05234bd0453c39e364df34d0f50c504e0c9f56e
+SIZE (openjdk24-24.0.2+12.2_2.ppc64.tar.xz) = 186222576
+SHA256 (openjdk24-24.0.2+12.2_2.ppc64le.tar.xz) = a99f482d4831e187c1a9322aa5d06dc74fd1853d64df4a4edf1b59dbde9f9e69
+SIZE (openjdk24-24.0.2+12.2_2.ppc64le.tar.xz) = 187669644
+SHA256 (openjdk24-24.0.2+12.2_2.x86_64.tar.xz) = 726aa3242648bf52d10a5e86b69a763cb919772f3c62fe6c9755ac871bc8afd3
+SIZE (openjdk24-24.0.2+12.2_2.x86_64.tar.xz) = 190267084
SHA256 (freebsd-openjdk-jdk-24.0.2+12-2-jdk-24.0.2-ga-freebsd-2_GH0.tar.gz) = 707a120215130b7d82a344f19ec801efaa70edaad38d6417fd1a47a6da58c395
SIZE (freebsd-openjdk-jdk-24.0.2+12-2-jdk-24.0.2-ga-freebsd-2_GH0.tar.gz) = 120881959
diff --git a/java/openjdk25/Makefile b/java/openjdk25/Makefile
--- a/java/openjdk25/Makefile
+++ b/java/openjdk25/Makefile
@@ -4,6 +4,8 @@
PORTREVISION= 1
CATEGORIES= java devel
PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION}
+MASTER_SITES= LOCAL/openjdk:boot
+DISTFILES= ${BOOTSTRAPJDKFILE}:boot
MAINTAINER= java@FreeBSD.org
COMMENT= ${COMMENT_${FLAVOR}} ${JDK_MAJOR_VERSION}
@@ -114,6 +116,7 @@
JDK_BUILD_TYPE= release
JDK_ARCH= ${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/}
+BOOTSTRAPJDKFILE= openjdk25-25.0.1+8.f.1.${JDK_ARCH}.tar.xz
JDK_OSARCH= bsd-${JDK_ARCH}
JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE}
.if ${FLAVOR:Mjre*}
@@ -123,6 +126,7 @@
JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jdk
.endif
INSTALLDIR= ${PREFIX}/${PKGBASE}
+BOOTSTRAPJDKDIR= ${WRKDIR}/boot-jdk
NO_CCACHE= yes
NOPRECIOUSMAKEVARS= yes
@@ -142,21 +146,6 @@
.include <bsd.port.pre.mk>
-BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk25 ${LOCALBASE}/openjdk24
-
-# do we have valid native jdk installed?
-.for BJDK in ${BOOTSTRAP_JDKS}
-. if !defined(BOOTSTRAPJDKDIR) && exists(${BJDK}/bin/javac)
-BOOTSTRAPJDKDIR= ${BJDK}
-. endif
-.endfor
-
-# if no valid jdk found, set dependency
-.if !defined(BOOTSTRAPJDKDIR)
-BOOTSTRAPJDKDIR?= ${LOCALBASE}/openjdk24
-BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/openjdk24
-.endif
-
JDK_BUILD_JVM= server
MAKE_ENV+= --with-toolchain-type=${COMPILER_TYPE}
diff --git a/java/openjdk25/distinfo b/java/openjdk25/distinfo
--- a/java/openjdk25/distinfo
+++ b/java/openjdk25/distinfo
@@ -1,3 +1,11 @@
TIMESTAMP = 1764336333
+SHA256 (openjdk25-25.0.1+8.f.1.aarch64.tar.xz) = cb1d88e0e299a0c2347dbbaa17c3650403a28e8065076cf7898478646c473b2b
+SIZE (openjdk25-25.0.1+8.f.1.aarch64.tar.xz) = 189254412
+SHA256 (openjdk25-25.0.1+8.f.1.ppc64.tar.xz) = ae3e9658208889233f374b172b06f10b36fb19061d830252384a5e98aebe7184
+SIZE (openjdk25-25.0.1+8.f.1.ppc64.tar.xz) = 186892692
+SHA256 (openjdk25-25.0.1+8.f.1.ppc64le.tar.xz) = dabfb39d05b31c41c76d6c172af3836b2a6fda9dc86111d7b5730ca780de6223
+SIZE (openjdk25-25.0.1+8.f.1.ppc64le.tar.xz) = 188302548
+SHA256 (openjdk25-25.0.1+8.f.1.x86_64.tar.xz) = 0449e5a9257d8eb7ed1518af1e4e9e546ee63e4bfaf21e1021e9ab45d2840f27
+SIZE (openjdk25-25.0.1+8.f.1.x86_64.tar.xz) = 191262784
SHA256 (freebsd-openjdk-jdk-25.0.1+8-freebsd-1_GH0.tar.gz) = 9984b61091295635b610497f9b334ff6654f466ecff018b74e123b5c1c3c5e99
SIZE (freebsd-openjdk-jdk-25.0.1+8-freebsd-1_GH0.tar.gz) = 119483711

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 22, 11:54 AM (1 h, 57 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28923531
Default Alt Text
D54731.id171512.diff (13 KB)

Event Timeline