From c7d1c247d8ea8f87edd6a5012702a3cd10d99d49 Mon Sep 17 00:00:00 2001 From: Rene Ladan Date: Sat, 21 May 2022 16:50:57 +0200 Subject: cleanup: remove expired versions of OpenJDK (12 through 16) Adjust ports depending on expired versions of OpenJDK: - biology/snpeff: 12+ -> 17+ - devel/RStudio: 12 -> 11 - www/closure-compiler: 13 -> 11+ Allow java/openjdk17 to use java/openjdk17-bootstrap on i386 too, this builds just fine on 13.1-i386 Remove jdk12-doc as it is no longer relevant. Clean up Java version calculations in bsd.java.mk Reviewed by: jwb, java (glewis) Differential Revision: https://reviews.freebsd.org/D35280 --- java/openjdk14/files/patch-commit-f8a9602a0a6 | 28 --------------------------- 1 file changed, 28 deletions(-) delete mode 100644 java/openjdk14/files/patch-commit-f8a9602a0a6 (limited to 'java/openjdk14/files/patch-commit-f8a9602a0a6') diff --git a/java/openjdk14/files/patch-commit-f8a9602a0a6 b/java/openjdk14/files/patch-commit-f8a9602a0a6 deleted file mode 100644 index 3222f6ceb871..000000000000 --- a/java/openjdk14/files/patch-commit-f8a9602a0a6 +++ /dev/null @@ -1,28 +0,0 @@ -commit f8a9602a0a65cdc98eb940aac9529256ded2bf42 -Author: Yasumasa Suenaga -Date: Thu Jan 21 06:08:13 2021 +0000 - - 8260025: Missing comma in VM_Version_Ext::_family_id_amd - - Reviewed-by: dholmes, stuefe - -diff --git src/hotspot/cpu/x86/vm_version_ext_x86.cpp src/hotspot/cpu/x86/vm_version_ext_x86.cpp -index 30d9494c654..a84b37f7977 100644 ---- src/hotspot/cpu/x86/vm_version_ext_x86.cpp -+++ src/hotspot/cpu/x86/vm_version_ext_x86.cpp -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -739,7 +739,7 @@ const char* const VM_Version_Ext::_family_id_amd[ExtendedFamilyIdLength_AMD] = { - "", - "", - "Opteron/Athlon64", -- "Opteron QC/Phenom" // Barcelona et.al. -+ "Opteron QC/Phenom", // Barcelona et.al. - "", - "", - "", -- cgit v1.2.3