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

Merge remote-tracking branch 'origin/pristine'

Browse Source 
* origin/pristine: (67 commits)
  www/redmine51: upgrade to 5.1.8.
  www/redmine60: upgrade to 6.0.5.
  www/py-beautifulsoup: Update to 4.13.4
  graphics/airsaned: Drop maintainership
  graphics/linux-rl9-webp: Remove the port
  graphics/linux-rl9-openjpeg: Remove the port
  graphics/linux-rl9-tiff: Remove the port
  graphics/linux-c7-tiff: Remove the port
  graphics/linux-rl9-png: Remove the port
  graphics/linux-c7-png: Remove the port
  graphics/linux-rl9-jpeg: Remove the port
  graphics/linux-c7-jpeg: Remove the port
  graphics/linux-rl9-jbigkit: Remove the port
  graphics/linux-c7-jbigkit: Remove the port
  graphics/linux-rl9-jasper: Remove the port
  graphics/linux-c7-jasper: Remove the port
  net/linux-rl9-libproxy: Remove the port
  devel/py-maturin: Update to 1.8.3
  Mk/Uses: Improve lazarus.mk framework
  Mk/Uses: Update lazarus.mk framework
  ...
This commit is contained in:
Bastard Operator from Hell
2025-04-21 11:43:52 +02:00
parent 78cb74fb28 927e85d609
commit f09f1eb2e0
226 changed files with 17835 additions and 2527 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/openjdk11/Makefile
+2 -3
View File
@@ -1,7 +1,6 @@
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}
@@ -64,8 +63,8 @@ NOPRECIOUSMAKEVARS= yes
JDK_MAJOR_VERSION= 11
JDK_MINOR_VERSION= 0
JDK_PATCH_VERSION= 26
JDK_BUILD_NUMBER= 4
JDK_PATCH_VERSION= 27
JDK_BUILD_NUMBER= 6
BSD_JDK_VERSION= 1
JDK_BUG_URL= https://bugs.freebsd.org/bugzilla/enter_bug.cgi?product=Ports%20%26%20Packages&component=Individual%20Port(s)&short_desc=java/${PORTNAME}${JDK_MAJOR_VERSION}%3A%20
java/openjdk11/distinfo
+3 -3
View File
@@ -1,5 +1,5 @@
TIMESTAMP = 1739510711
TIMESTAMP = 1745123589
SHA256 (OpenPrinting-cups-v2.4.2_GH0.tar.gz) = 7095b2977bb728ded5566a5c802866062840d6541fd027836865949a407c3682
SIZE (OpenPrinting-cups-v2.4.2_GH0.tar.gz) = 8173207
SHA256 (battleblow-jdk11u-jdk-11.0.26+4-1_GH0.tar.gz) = d9afdf9ad1ccab4262fcb64a2578d28b4e5e39fa5f0bbd7903542115c49fb7f3
SIZE (battleblow-jdk11u-jdk-11.0.26+4-1_GH0.tar.gz) = 116707932
SHA256 (battleblow-jdk11u-jdk-11.0.27+6-1_GH0.tar.gz) = 64afcb0ad19c6a03591757d906355d0f263f8a529dea5654ba518e9399f13b1f
SIZE (battleblow-jdk11u-jdk-11.0.27+6-1_GH0.tar.gz) = 116708083
java/openjdk11/files/patch-make_hotspot_lib_CompileJvm.gmk
-11
View File
@@ -1,11 +0,0 @@
--- make/hotspot/lib/CompileJvm.gmk.orig 2024-10-04 16:07:55.502680000 +0200
+++ make/hotspot/lib/CompileJvm.gmk 2024-10-04 16:07:03.672629000 +0200
@@ -109,7 +109,7 @@ ifeq ($(call And, $(call isTargetOs, linux) $(call isT
ifeq ($(call And, $(call isTargetOs, linux) $(call isTargetCpu, arm)), true)
JVM_EXCLUDE_PATTERNS += arm_64
-else ifeq ($(call And, $(call isTargetOs, bsd) $(call isTargetCpu, bsd-arm)), true)
+else ifeq ($(call And, $(call isTargetOs, bsd) $(call isTargetCpu, arm)), true)
JVM_EXCLUDE_PATTERNS += arm_64
else ifeq ($(call And, $(call isTargetOs, linux) $(call isTargetCpu, aarch64)), true)
java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp
-21
View File
@@ -1,21 +0,0 @@
--- src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp.orig 2025-01-10 18:09:55 UTC
+++ src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp
@@ -432,18 +432,6 @@ extern "C" {
// Implementations of atomic operations not supported by processors.
// -- http://gcc.gnu.org/onlinedocs/gcc-4.2.1/gcc/Atomic-Builtins.html
-#ifndef _LP64
-extern "C" {
- long long unsigned int __sync_val_compare_and_swap_8(
- volatile void *ptr,
- long long unsigned int oldval,
- long long unsigned int newval) {
- ShouldNotCallThis();
- return 0; // silence compiler warnings
- }
-};
-#endif // !_LP64
-
#ifndef PRODUCT
void os::verify_stack_alignment() {
}
java/openjdk11/files/patch-src_hotspot_os_bsd_os__perf__bsd.cpp
-30
View File
@@ -1,30 +0,0 @@
This patch fixes the following error:
In file included from jdk11u-jdk-11.0.24-8-1/src/hotspot/os/bsd/os_perf_bsd.cpp:47:
In file included from /usr/include/sys/user.h:51:
In file included from /usr/include/vm/pmap.h:88:
In file included from /usr/include/machine/pmap.h:48:
In file included from /usr/include/sys/systm.h:46:
/usr/include/machine/cpufunc.h:185:1: error: static declaration of 'breakpoint' follows non-static declaration
185 | breakpoint(void)
| ^
/usr/ports/java/openjdk11/work/jdk11u-jdk-11.0.24-8-1/src/hotspot/share/utilities/breakpoint.hpp:31:17: note: previous declaration is here
31 | extern "C" void breakpoint();
--- src/hotspot/os/bsd/os_perf_bsd.cpp.orig 2024-11-08 11:24:38 UTC
+++ src/hotspot/os/bsd/os_perf_bsd.cpp
@@ -43,6 +43,12 @@
* with the same name.
*/
#define _MACHINE_PCB_H_
+ /*
+ * do not redefine breakpoint on armv7
+ */
+ #ifdef __arm__
+ #define _MACHINE_CPUFUNC_H_
+ #endif
#endif
#include <sys/user.h>
#endif
java/openjdk11/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_libproc.h
-25
View File
@@ -1,25 +0,0 @@
This patch fixes the following error:
In file included from /usr/ports/java/openjdk11/work/jdk11u-jdk-11.0.24-8-1/src/jdk.hotspot.agent/bsd/native/libsaproc/ps_proc.c:40:
In file included from /usr/ports/java/openjdk11/work/jdk11u-jdk-11.0.24-8-1/src/jdk.hotspot.agent/bsd/native/libsaproc/libproc_impl.h:30:
/usr/ports/java/openjdk11/work/jdk11u-jdk-11.0.24-8-1/src/jdk.hotspot.agent/bsd/native/libsaproc/libproc.h:79:13: error: cannot combine with previous 'int' declaration specifier
79 | typedef int bool;
| ^
/usr/include/stdbool.h:37:14: note: expanded from macro 'bool'
37 | #define bool _Bool
--- src/jdk.hotspot.agent/bsd/native/libsaproc/libproc.h.orig 2024-10-07 16:02:52.117023000 +0200
+++ src/jdk.hotspot.agent/bsd/native/libsaproc/libproc.h 2024-10-07 16:02:15.020023000 +0200
@@ -76,9 +76,11 @@ typedef int bool;
// This C bool type must be int for compatibility with BSD calls and
// it would be a mistake to equivalence it to C++ bool on many platforms
+#if defined(__FreeBSD__) && !defined(__bool_true_false_are_defined)
typedef int bool;
#define true 1
#define false 0
+#endif // __FreeBSD__ && !__bool_true_false_are_defined
#endif // __APPLE__
java/openjdk11/files/patch-src_jdk.pack_share_native_common-unpack_constants.h
-11
View File
@@ -1,11 +0,0 @@
--- src/jdk.pack/share/native/common-unpack/constants.h.orig 2024-07-27 15:11:22 UTC
+++ src/jdk.pack/share/native/common-unpack/constants.h
@@ -203,7 +203,7 @@ enum {
AO_HAVE_FIELD_FLAGS_HI = 1<<10,
AO_HAVE_METHOD_FLAGS_HI = 1<<11,
AO_HAVE_CODE_FLAGS_HI = 1<<12,
- AO_UNUSED_MBZ = (-1)<<13, // options bits reserved for future use.
+ AO_UNUSED_MBZ = (~0u)<<13, // options bits reserved for future use.
#define ARCHIVE_BIT_DO(F) \
F(AO_HAVE_SPECIAL_FORMATS) \
java/openjdk17/Makefile
+2 -2
View File
@@ -62,8 +62,8 @@ NOPRECIOUSMAKEVARS= yes
JDK_MAJOR_VERSION= 17
JDK_MINOR_VERSION= 0
JDK_PATCH_VERSION= 14
JDK_BUILD_NUMBER= 7
JDK_PATCH_VERSION= 15
JDK_BUILD_NUMBER= 6
BSD_JDK_VERSION= 1
JDK_BUG_URL= https://bugs.freebsd.org/bugzilla/enter_bug.cgi?product=Ports%20%26%20Packages&component=Individual%20Port(s)&short_desc=java/${PORTNAME}${JDK_MAJOR_VERSION}%3A%20
java/openjdk17/distinfo
+3 -3
View File
@@ -1,3 +1,3 @@
TIMESTAMP = 1739575592
SHA256 (battleblow-jdk17u-jdk-17.0.14+7-1_GH0.tar.gz) = c2feda8fb662bf2aade236645ee9a61d5a9c7e421a28f8b4688f781f44c7a801
SIZE (battleblow-jdk17u-jdk-17.0.14+7-1_GH0.tar.gz) = 107508631
TIMESTAMP = 1745164265
SHA256 (battleblow-jdk17u-jdk-17.0.15+6-1_GH0.tar.gz) = 243d616e60735f375a66d2ae0e4d45200d5d3695549caf7a66aa85273857e9dd
SIZE (battleblow-jdk17u-jdk-17.0.15+6-1_GH0.tar.gz) = 107603484
java/openjdk21/Makefile
+2 -2
View File
@@ -62,8 +62,8 @@ NOPRECIOUSMAKEVARS= yes
JDK_MAJOR_VERSION= 21
JDK_MINOR_VERSION= 0
JDK_PATCH_VERSION= 6
JDK_BUILD_NUMBER= 7
JDK_PATCH_VERSION= 7
JDK_BUILD_NUMBER= 6
BSD_JDK_VERSION= 1
JDK_BUG_URL= https://bugs.freebsd.org/bugzilla/enter_bug.cgi?product=Ports%20%26%20Packages&component=Individual%20Port(s)&short_desc=java/${PORTNAME}${JDK_MAJOR_VERSION}%3A%20
java/openjdk21/distinfo
+3 -3
View File
@@ -1,3 +1,3 @@
TIMESTAMP = 1739588203
SHA256 (battleblow-jdk21u-jdk-21.0.6+7-1_GH0.tar.gz) = cacd3df6889360d63d0cbfbfe289dcdbce5085b4dd67bf3b902b8199f6f84d80
SIZE (battleblow-jdk21u-jdk-21.0.6+7-1_GH0.tar.gz) = 113321436
TIMESTAMP = 1745168967
SHA256 (battleblow-jdk21u-jdk-21.0.7+6-1_GH0.tar.gz) = ea8634ed1f3bf8aa0df121fa399f4f56ccac135a14ac5c1db8dd3b378f493dfb
SIZE (battleblow-jdk21u-jdk-21.0.7+6-1_GH0.tar.gz) = 113408248
java/openjdk8/Makefile
+2 -3
View File
@@ -1,6 +1,5 @@
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
PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION}
@@ -54,8 +53,8 @@ INSTALLDIR= ${PREFIX}/${PKGBASE}
NOPRECIOUSMAKEVARS= yes
JDK_MAJOR_VERSION= 8
JDK_UPDATE_VERSION= 442
JDK_BUILD_NUMBER= 06
JDK_UPDATE_VERSION= 452
JDK_BUILD_NUMBER= 09
BSD_JDK_VERSION= 1
JTREG_VERSION= 4.1
JTREG_BUILD_NUMBER= b08
java/openjdk8/distinfo
+3 -3
View File
@@ -1,5 +1,5 @@
TIMESTAMP = 1739426500
TIMESTAMP = 1745107911
SHA256 (jtreg4.1-b08.tar.gz) = a9fbfac903313c12687e60978c4688c20189cdf873560125917d6ad53d55b30c
SIZE (jtreg4.1-b08.tar.gz) = 6834252
SHA256 (battleblow-jdk8u-8.442.06.1-jdk8u442-b06.1_GH0.tar.gz) = 6b8f7cede1262b3c9de152ff0e886fcf15692c8d8b756ba9762ed8fc09744e85
SIZE (battleblow-jdk8u-8.442.06.1-jdk8u442-b06.1_GH0.tar.gz) = 93369221
SHA256 (battleblow-jdk8u-8.452.09.1-jdk8u452-b09.1_GH0.tar.gz) = 5ece2db14895741373c63a4a50029c1558206d25c98b2ac7e730e1279f20f8a7
SIZE (battleblow-jdk8u-8.452.09.1-jdk8u452-b09.1_GH0.tar.gz) = 93400109
java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__aarch64_vm_pauth__bsd__aarch64.inline.hpp
-39
View File
@@ -1,39 +0,0 @@
--- hotspot/src/os_cpu/bsd_aarch64/vm/pauth_bsd_aarch64.inline.hpp
+++ hotspot/src/os_cpu/bsd_aarch64/vm/pauth_bsd_aarch64.inline.hpp
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2021, 2022, Arm Limited. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef OS_CPU_BSD_AARCH64_PAUTH_BSD_AARCH64_INLINE_HPP
+#define OS_CPU_BSD_AARCH64_PAUTH_BSD_AARCH64_INLINE_HPP
+
+// OS specific Support for ROP Protection in VM code.
+// For more details on PAC see pauth_aarch64.hpp.
+
+inline address pauth_strip_pointer(address ptr) {
+ // No PAC support in BSD as of yet.
+ return ptr;
+}
+
+#endif // OS_CPU_BSD_AARCH64_PAUTH_BSD_AARCH64_INLINE_HPP