Page MenuHomeFreeBSD
Files F145410318

D54683.diff
No OneTemporary
Actions

D54683.diff
View Options

diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile
--- a/java/openjdk11/Makefile
+++ b/java/openjdk11/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
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@@ -53,7 +56,9 @@
LOG=cmdlines \
MAKEFLAGS=""
-JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:C/armv.*/arm/:S/i386/x86/:S/powerpc/ppc/}
+JDK_ARCH= ${ARCH:S/amd64/x86_64/:C/armv.*/arm/:S/i386/x86/:S/powerpc/ppc/}
+BOOTSTRAPJDKFILE= openjdk11-11.0.29+7.1.${JDK_ARCH}.tar.xz
+JDK_OSARCH= bsd-${JDK_ARCH}
JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-normal-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE}
.if defined(BUILD_JRE)
JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jre
@@ -61,6 +66,7 @@
JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jdk
.endif
INSTALLDIR= ${PREFIX}/${PKGBASE}
+BOOTSTRAPJDKDIR= ${WRKDIR}/boot-jdk
NOPRECIOUSMAKEVARS= yes
@@ -137,22 +143,6 @@
MASTER_SITES+= https://codeload.github.com/OpenPrinting/cups/tar.gz/v${CUPS_INC_VER}?dummy=/:cups
.endif
-BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk11 \
- ${LOCALBASE}/bootstrap-openjdk11
-
-# 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}/bootstrap-openjdk11
-BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk11
-.endif
-
.if ${ARCH} == powerpc
CONFIGURE_ARGS+= --with-jvm-variants=zero
JDK_BUILD_JVM= zero
diff --git a/java/openjdk11/distinfo b/java/openjdk11/distinfo
--- a/java/openjdk11/distinfo
+++ b/java/openjdk11/distinfo
@@ -1,5 +1,17 @@
-TIMESTAMP = 1762095114
+TIMESTAMP = 1766160087
SHA256 (OpenPrinting-cups-v2.4.2_GH0.tar.gz) = 7095b2977bb728ded5566a5c802866062840d6541fd027836865949a407c3682
SIZE (OpenPrinting-cups-v2.4.2_GH0.tar.gz) = 8173207
+SHA256 (openjdk11-11.0.29+7.1.aarch64.tar.xz) = df27efa3322ca41c141a0c187d2ecf14f7c6771ae0f71e2afd95c6a6e223a55e
+SIZE (openjdk11-11.0.29+7.1.aarch64.tar.xz) = 165129192
+SHA256 (openjdk11-11.0.29+7.1.ppc.tar.xz) = 9ded362b39d83fb32b3a77c44ccbfdaa2d2eca8238c9e9242c8f8c87859474dc
+SIZE (openjdk11-11.0.29+7.1.ppc.tar.xz) = 142771612
+SHA256 (openjdk11-11.0.29+7.1.ppc64.tar.xz) = 775f34a13fbb1b15f44d44cea14f9abc968a3f396d79861d16470077c43ccf08
+SIZE (openjdk11-11.0.29+7.1.ppc64.tar.xz) = 152254408
+SHA256 (openjdk11-11.0.29+7.1.ppc64le.tar.xz) = b4cb2cf067d42be62c90a47ee7e39ec91a20f25cd5d1eaa24d8ee6ad6aed4d9d
+SIZE (openjdk11-11.0.29+7.1.ppc64le.tar.xz) = 152360424
+SHA256 (openjdk11-11.0.29+7.1.x86.tar.xz) = 1a0778af2a89fc3a00a67b0d0144f97d8b59cae5730901da475fef45e492014d
+SIZE (openjdk11-11.0.29+7.1.x86.tar.xz) = 152081036
+SHA256 (openjdk11-11.0.29+7.1.x86_64.tar.xz) = 59abad77c35f271dc6f2082e6f666028ac4b013e80ec1e9d16efb8d291859c62
+SIZE (openjdk11-11.0.29+7.1.x86_64.tar.xz) = 167421264
SHA256 (battleblow-jdk11u-jdk-11.0.29+7-1_GH0.tar.gz) = ed1fed0a7d6571e5bff9a07272872258451643ba6741c002a8f58bdfd8fc9803
SIZE (battleblow-jdk11u-jdk-11.0.29+7-1_GH0.tar.gz) = 116785204
diff --git a/java/openjdk17/Makefile b/java/openjdk17/Makefile
--- a/java/openjdk17/Makefile
+++ b/java/openjdk17/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= openjdk17-17.0.17+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
@@ -121,21 +127,6 @@
MAKE_JOBS_NUMBER_LIMIT= 3
.endif
-BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk17 ${LOCALBASE}/bootstrap-openjdk17
-
-# 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}/bootstrap-openjdk17
-BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk17
-.endif
-
JDK_BUILD_JVM= server
MAKE_ENV+= --with-toolchain-type=${COMPILER_TYPE}
diff --git a/java/openjdk17/distinfo b/java/openjdk17/distinfo
--- a/java/openjdk17/distinfo
+++ b/java/openjdk17/distinfo
@@ -1,3 +1,13 @@
-TIMESTAMP = 1762108077
+TIMESTAMP = 1766161758
+SHA256 (openjdk17-17.0.17+10.1.aarch64.tar.xz) = 15285f7a33da05352ad12e6ae3a5725759ab0ce3aef809f91ca7f06d72c00e1e
+SIZE (openjdk17-17.0.17+10.1.aarch64.tar.xz) = 160197680
+SHA256 (openjdk17-17.0.17+10.1.ppc64.tar.xz) = e4f222b0639315d5048e9a84a4063417421e4fef1568445a282edec247dfaadd
+SIZE (openjdk17-17.0.17+10.1.ppc64.tar.xz) = 158892048
+SHA256 (openjdk17-17.0.17+10.1.ppc64le.tar.xz) = d64ebe83f85509cb58cbe1c55a66a6ca4fa20dbead8267b96cfccd3d6e9b76fb
+SIZE (openjdk17-17.0.17+10.1.ppc64le.tar.xz) = 159761048
+SHA256 (openjdk17-17.0.17+10.1.x86.tar.xz) = 3c99a629188105c62765c6a48ff86cbc2e8a86d2a3b5e990a56d1ec1377b1f6c
+SIZE (openjdk17-17.0.17+10.1.x86.tar.xz) = 156124440
+SHA256 (openjdk17-17.0.17+10.1.x86_64.tar.xz) = 7f3097c84becab1ea66a78504b8c86a8df8cbc76c652b161166a2879f06e8a7f
+SIZE (openjdk17-17.0.17+10.1.x86_64.tar.xz) = 161722892
SHA256 (battleblow-jdk17u-jdk-17.0.17+10-1_GH0.tar.gz) = 99bd33ce8cc618576e8693b9af1bb48059cb5011286009d46a0fabd2d8d36ba8
SIZE (battleblow-jdk17u-jdk-17.0.17+10-1_GH0.tar.gz) = 108082578
diff --git a/java/openjdk20/Makefile b/java/openjdk20/Makefile
--- a/java/openjdk20/Makefile
+++ b/java/openjdk20/Makefile
@@ -1,9 +1,11 @@
PORTNAME= openjdk
DISTVERSIONPREFIX= jdk-
DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
-PORTREVISION= 3
+PORTREVISION= 4
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= openjdk20-20.0.2+9.1_3.${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}/openjdk20 ${LOCALBASE}/openjdk19
-
-# 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}/openjdk19
-BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/openjdk19
-.endif
-
JDK_BUILD_JVM= server
MAKE_ENV+= --with-toolchain-type=${COMPILER_TYPE}
diff --git a/java/openjdk20/distinfo b/java/openjdk20/distinfo
--- a/java/openjdk20/distinfo
+++ b/java/openjdk20/distinfo
@@ -1,3 +1,13 @@
-TIMESTAMP = 1696177744
+TIMESTAMP = 1766157633
+SHA256 (openjdk20-20.0.2+9.1_3.aarch64.tar.xz) = 4f2cbd343d102ce64e074f6cdba2576314e4333034d73cde0fe862c60f116850
+SIZE (openjdk20-20.0.2+9.1_3.aarch64.tar.xz) = 165170468
+SHA256 (openjdk20-20.0.2+9.1_3.ppc64.tar.xz) = d4bb08c5d5cd14fd46a5d008d0abc06fa81e197738fdf85da285e547bf3fff7d
+SIZE (openjdk20-20.0.2+9.1_3.ppc64.tar.xz) = 164279232
+SHA256 (openjdk20-20.0.2+9.1_3.ppc64le.tar.xz) = fa1443a9a5b5c111ff6e47ae5cc310cde307b740ed84ee7dfcd3f5dfecb64e7c
+SIZE (openjdk20-20.0.2+9.1_3.ppc64le.tar.xz) = 165194700
+SHA256 (openjdk20-20.0.2+9.1_3.x86.tar.xz) = e282998ba34489b30563d49d19dca155c8b982cb400af0eaa71f683cb4506faf
+SIZE (openjdk20-20.0.2+9.1_3.x86.tar.xz) = 161116020
+SHA256 (openjdk20-20.0.2+9.1_3.x86_64.tar.xz) = a9f76e7f51497ea06ca83076c879d38c5586464be83bdac6585495b6ce0b5c9f
+SIZE (openjdk20-20.0.2+9.1_3.x86_64.tar.xz) = 167203788
SHA256 (battleblow-jdk20u-jdk-20.0.2+9-1_GH0.tar.gz) = 61b32462e53841dd8641e6b21de91bae9a141ed58a41972f6a6cfba45ac8c4a2
SIZE (battleblow-jdk20u-jdk-20.0.2+9-1_GH0.tar.gz) = 109736899
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@@ -1,8 +1,10 @@
PORTNAME= openjdk
PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION}
+PORTREVISION= 1
CATEGORIES= java devel
-MASTER_SITES= LOCAL/jkim:jtreg
+MASTER_SITES= LOCAL/jkim:jtreg LOCAL/openjdk:boot
PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION}
+DISTFILES= ${BOOTSTRAPJDKFILE}:boot
MAINTAINER= java@FreeBSD.org
COMMENT?= Java Development Kit ${JDK_MAJOR_VERSION}
@@ -47,8 +49,15 @@
JRE_IMAGEDIR= ${JDK_BUILDDIR}/images/j2re-image
.endif
JDK_JVMDIR= lib/${ARCH:C/armv.*/arm/:S/powerpc/ppc/}
-JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:C/armv.*/arm/:S/i386/x86/:S/powerpc/ppc/}
+JDK_ARCH= ${ARCH:S/amd64/x86_64/:C/armv.*/arm/:S/i386/x86/:S/powerpc/ppc/}
+.if ${JDK_ARCH} == arm
+BOOTSTRAPJDKFILE= openjdk8-8.462.08.1.${JDK_ARCH}.tar.xz
+.else
+BOOTSTRAPJDKFILE= openjdk8-8.472.08.1.${JDK_ARCH}.tar.xz
+.endif
+JDK_OSARCH= bsd-${JDK_ARCH}
INSTALLDIR= ${PREFIX}/${PKGBASE}
+BOOTSTRAPJDKDIR= ${WRKDIR}/boot-jdk
NOPRECIOUSMAKEVARS= yes
@@ -165,23 +174,6 @@
.include <bsd.port.pre.mk>
-BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk8 \
- ${LOCALBASE}/openjdk7 \
- ${LOCALBASE}/bootstrap-openjdk8
-
-# 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}/bootstrap-openjdk8
-BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk8
-.endif
-
.if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc
# XXX We must limit max heap size for 32-bit targets.
CONFIGURE_ARGS+= --with-boot-jdk-jvmargs="-Xmx768m"
diff --git a/java/openjdk8/distinfo b/java/openjdk8/distinfo
--- a/java/openjdk8/distinfo
+++ b/java/openjdk8/distinfo
@@ -1,5 +1,19 @@
-TIMESTAMP = 1762059364
+TIMESTAMP = 1766160854
SHA256 (jtreg4.1-b08.tar.gz) = a9fbfac903313c12687e60978c4688c20189cdf873560125917d6ad53d55b30c
SIZE (jtreg4.1-b08.tar.gz) = 683425
+SHA256 (openjdk8-8.462.08.1.arm.tar.xz) = bee3ef7f467dad25a2879cc6b4cb518acd2e739699f3348d3eb51b6836e19eab
+SIZE (openjdk8-8.462.08.1.arm.tar.xz) = 80861932
+SHA256 (openjdk8-8.472.08.1.aarch64.tar.xz) = 39e92a99f99c0e7a838a1549ce14b7635ed9474824e43931786b0c06d73b492d
+SIZE (openjdk8-8.472.08.1.aarch64.tar.xz) = 84370460
+SHA256 (openjdk8-8.472.08.1.ppc.tar.xz) = 16803e3517c283490f8234e97d9dc5e155929b1c7b62f7884cdc52c653153931
+SIZE (openjdk8-8.472.08.1.ppc.tar.xz) = 80859160
+SHA256 (openjdk8-8.472.08.1.ppc64.tar.xz) = 0d4f8d0b43451750ad006a5c7ec8331b11d65a61e9d27169701aa13e19f62b04
+SIZE (openjdk8-8.472.08.1.ppc64.tar.xz) = 84078252
+SHA256 (openjdk8-8.472.08.1.ppc64le.tar.xz) = 7f76bcdc4435e7848916f9f4c524b4e50cf4e5bf359d4edac5287135840bac2f
+SIZE (openjdk8-8.472.08.1.ppc64le.tar.xz) = 84482048
+SHA256 (openjdk8-8.472.08.1.x86.tar.xz) = 50bcb1a2fb071a7ffa292f0cb42f69771237ddb7807a78131f769c65ff594c9d
+SIZE (openjdk8-8.472.08.1.x86.tar.xz) = 84218196
+SHA256 (openjdk8-8.472.08.1.x86_64.tar.xz) = 363f745ef308605b659105620bcdae5c2a5852ad0297c740f8ed6a527da1a12a
+SIZE (openjdk8-8.472.08.1.x86_64.tar.xz) = 84943072
SHA256 (battleblow-jdk8u-8.472.08.1-jdk8u472-b08.1_GH0.tar.gz) = a39ab04eed5289ff6934b87f5d981e6f005358cf22b2869a35dff77200c2707a
SIZE (battleblow-jdk8u-8.472.08.1-jdk8u472-b08.1_GH0.tar.gz) = 93406190

File Metadata

Mime Type
text/plain
Expires
Fri, Feb 20, 11:59 AM (8 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28898874
Default Alt Text
D54683.diff (12 KB)

Event Timeline