Date: Wed, 1 Jan 2025 16:10:42 GMT From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 8777dde24650 - main - all: remove support for expired FreeBSD 13.3 Message-ID: <202501011610.501GAgjf015105@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=8777dde24650033c23cbc1ad1872035301de9c26 commit 8777dde24650033c23cbc1ad1872035301de9c26 Author: Rene Ladan <rene@FreeBSD.org> AuthorDate: 2024-12-29 17:37:17 +0000 Commit: Rene Ladan <rene@FreeBSD.org> CommitDate: 2025-01-01 16:09:59 +0000 all: remove support for expired FreeBSD 13.3 Reviewed by: bofh, brnrd, jbeich, nobutaka Approved by: portmgr (implicit) Differential Revision: https://reviews.freebsd.org/D48247 --- Mk/bsd.port.mk | 2 +- biology/atac-seq/Makefile | 2 +- devel/boost-libs/Makefile | 1 - editors/imhex-current/Makefile | 3 +-- editors/imhex/Makefile | 6 ++---- games/slump/Makefile | 2 +- net/bird2/Makefile | 2 +- net/samba419/Makefile | 4 ---- security/openssl31-quictls/Makefile | 2 +- x11-wm/hyprland/files/patch-libc++17 | 19 ------------------- x11/waybar/Makefile | 20 -------------------- x11/waybar/distinfo | 2 -- 12 files changed, 8 insertions(+), 57 deletions(-) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index b7a5791d8680..7697a9ca067e 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1164,7 +1164,7 @@ OSVERSION!= ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${SRC . endif _EXPORTED_VARS+= OSVERSION -. if ${OPSYS} == FreeBSD && (${OSVERSION} < 1303000 || (${OSVERSION} >= 1400000 && ${OSVERSION} < 1401000)) +. if ${OPSYS} == FreeBSD && (${OSVERSION} < 1303400 || (${OSVERSION} >= 1400000 && ${OSVERSION} < 1401000)) _UNSUPPORTED_SYSTEM_MESSAGE= Ports Collection support for your ${OPSYS} version has ended, and no ports\ are guaranteed to build on this system. Please upgrade to a supported release. . if defined(ALLOW_UNSUPPORTED_SYSTEM) diff --git a/biology/atac-seq/Makefile b/biology/atac-seq/Makefile index 359d4c750a03..d55ab7d3d40d 100644 --- a/biology/atac-seq/Makefile +++ b/biology/atac-seq/Makefile @@ -27,7 +27,7 @@ USES= metaport python .include <bsd.port.options.mk> -.if ${OPSYS} != FreeBSD || ${OSVERSION} >= 1302509 +.if ${OPSYS} != FreeBSD RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MACS3>0:biology/py-macs3@${PY_FLAVOR} .endif diff --git a/devel/boost-libs/Makefile b/devel/boost-libs/Makefile index bb3b744c6749..41a26bf55c0b 100644 --- a/devel/boost-libs/Makefile +++ b/devel/boost-libs/Makefile @@ -18,7 +18,6 @@ BUILD_DEPENDS+= bjam:devel/boost-jam # * OSVERSION is included in either of following ranges. # 1. 1500000 <= OSVERSION < 1500017 # 2. 1400000 <= OSVERSION < 1400509 (no longer relevant) -# 3. 1300000 <= OSVERSION < 1303502 (no longer relevant) # * Base system is built with WITH_LLVM_ASSERTIONS variable set. # So if your base system fulfills them you need to use LLVM ports to # build this port. diff --git a/editors/imhex-current/Makefile b/editors/imhex-current/Makefile index 23da3ac76b7c..d25545914688 100644 --- a/editors/imhex-current/Makefile +++ b/editors/imhex-current/Makefile @@ -140,8 +140,7 @@ post-extract: ${CP} -R ${WRKDIR}/imhex-bastion-pats-${GL_TAG_IMHEX_BASTION_PATS}/* ${WRKDIR}/.build/_deps/imhex_patterns_src/patterns/bastion ${CP} -R ${WRKDIR}/imhex-ffx-pats-${GL_TAG_IMHEX_FFX_PATS}/* ${WRKDIR}/.build/_deps/imhex_patterns_src/patterns/ffx # Before LLVM 18 import into the base system -.if ((${OSREL:R} == 15 && ${OSVERSION} < 1500018) \ - || (${OSREL:R} == 13 && ${OSVERSION} < 1303503)) +.if ${OSREL:R} == 15 && ${OSVERSION} < 1500018 ${CP} -R ${WRKSRC_jthread}/* ${WRKSRC}/lib/third_party/jthread .endif diff --git a/editors/imhex/Makefile b/editors/imhex/Makefile index d3ee4e56c385..f7daa8bea525 100644 --- a/editors/imhex/Makefile +++ b/editors/imhex/Makefile @@ -92,8 +92,7 @@ NLS_USES= gettext .include <bsd.port.pre.mk> # Before LLVM 18 import into the base system -.if ((${OSREL:R} == 15 && ${OSVERSION} < 1500018) \ - || (${OSREL:R} == 13 && ${OSVERSION} < 1303503)) +.if ${OSREL:R} == 15 && ${OSVERSION} < 1500018 EXTRA_PATCHES= ${PATCHDIR}/extra-patch-lib_external_libwolv_libs_io_include_wolv_io_file.hpp \ ${PATCHDIR}/extra-patch-plugins_windows_include_views_view__tty__console.hpp \ ${PATCHDIR}/extra-patch-lib_libimhex_include_hex_api_task.hpp \ @@ -114,8 +113,7 @@ post-extract: ${CP} -R ${WRKSRC_yara}/* ${WRKSRC}/lib/external/yara/yara ${MKDIR} ${WRKDIR}/.build/_deps/imhex_patterns_src ${CP} -R ${WRKSRC_imhex_patterns}/* ${WRKDIR}/.build/_deps/imhex_patterns_src -.if ((${OSREL:R} == 15 && ${OSVERSION} < 1500018) \ - || (${OSREL:R} == 13 && ${OSVERSION} < 1303503)) +.if ${OSREL:R} == 15 && ${OSVERSION} < 1500018 ${CP} -R ${WRKSRC_jthread}/source/*.hpp ${WRKSRC}/lib/libimhex/include ${CP} -R ${WRKSRC_jthread}/source/*.hpp ${WRKSRC}/lib/external/libwolv/libs/io/include/wolv/io .endif diff --git a/games/slump/Makefile b/games/slump/Makefile index 643eac4d3219..99ed3dc094e1 100644 --- a/games/slump/Makefile +++ b/games/slump/Makefile @@ -20,7 +20,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1302505 +.if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=int-conversion .endif diff --git a/net/bird2/Makefile b/net/bird2/Makefile index 13e4debd9c50..7a6d87747d6f 100644 --- a/net/bird2/Makefile +++ b/net/bird2/Makefile @@ -74,7 +74,7 @@ netlink_PKGNAMESUFFIX= 2-netlink rtsock_PKGNAMESUFFIX= 2 .endif -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} < 1303502 || ( ${OSVERSION} >= 1500000 && ${OSVERSION} < 1500017 )) +.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1500000 && ${OSVERSION} < 1500017) EXTRA_PATCHES= ${PATCHDIR}/extra-patch-netlink-route .endif diff --git a/net/samba419/Makefile b/net/samba419/Makefile index b2d6200b2943..c05705b4e371 100644 --- a/net/samba419/Makefile +++ b/net/samba419/Makefile @@ -412,10 +412,6 @@ UTMP_CONFIGURE_WITH= utmp ############################################################################## .include <bsd.port.options.mk> ############################################################################## -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300076 -IGNORE=runs only on FreeBSD 13.1 and above due use of O_EMPTY_PATH -.endif - .if !${PORT_OPTIONS:MADS} && ${PORT_OPTIONS:MAD_DC} IGNORE=To disable ADS option you also need to disable AD_DC option .endif diff --git a/security/openssl31-quictls/Makefile b/security/openssl31-quictls/Makefile index 627e6a3b3990..68804cb00ff3 100644 --- a/security/openssl31-quictls/Makefile +++ b/security/openssl31-quictls/Makefile @@ -74,7 +74,7 @@ GOST_DESC= GOST (Russian standard) HASHES_DESC= Hash Function Support I386_DESC= i386 (instead of i486+) IDEA_DESC= International Data Encryption Algorithm -KTLS_DESC= Use in-kernel TLS (FreeBSD >13) +KTLS_DESC= Use in-kernel TLS LEGACY_DESC= Older algorithms MAN3_DESC= Install API manpages (section 3, 7) MD2_DESC= MD2 (obsolete) (requires LEGACY) diff --git a/x11-wm/hyprland/files/patch-libc++17 b/x11-wm/hyprland/files/patch-libc++17 deleted file mode 100644 index f40126f4eebf..000000000000 --- a/x11-wm/hyprland/files/patch-libc++17 +++ /dev/null @@ -1,19 +0,0 @@ -Drop after FreeBSD 13.3 EOL around 2025-07-01 - -../src/debug/Log.cpp:13:26: error: no member named 'native_handle' in 'std::ofstream' - 13 | auto handle = logOfs.native_handle(); - | ~~~~~~ ^ - ---- src/debug/Log.cpp.orig 2024-08-18 21:21:59 UTC -+++ src/debug/Log.cpp -@@ -10,8 +10,10 @@ void Debug::init(const std::string& IS) { - void Debug::init(const std::string& IS) { - logFile = IS + (ISDEBUG ? "/hyprlandd.log" : "/hyprland.log"); - logOfs.open(logFile, std::ios::out | std::ios::app); -+#if !defined(_LIBCPP_VERSION) || _LIBCPP_VERSION >= 180100 - auto handle = logOfs.native_handle(); - fcntl(handle, F_SETFD, FD_CLOEXEC); -+#endif - } - - void Debug::close() { diff --git a/x11/waybar/Makefile b/x11/waybar/Makefile index 948d14f8fe54..007df089427f 100644 --- a/x11/waybar/Makefile +++ b/x11/waybar/Makefile @@ -176,24 +176,4 @@ pre-test: ${TOUCH} ${WRKDIR}/.meson_build_tests; \ fi -# XXX Drop after FreeBSD 13.3 EOL around 2025-07-01 (don't forget distinfo) -.if ${CXX} == c++ && exists(/usr/include/c++/v1/__chrono/concepts.h) && \ - !exists(/usr/include/c++/v1/__chrono/tzdb.h) || make(makesum) || make(fetch) -USES+= cmake:indirect -CMAKE_ARGS= -B ${WRKDIR}/libcxx_build -S ${WRKSRC_libcxx}/libcxx -CMAKE_OFF= LIBCXX_INCLUDE_BENCHMARKS -CMAKE_INSTALL_PREFIX= ${WRKDIR}/libcxx_prefix - -# XXX Move into separate port and standardize via USES -GH_TUPLE+= llvm:llvm-project:llvmorg-16.0.1:libcxx -CXXFLAGS+= -nostdinc++ -isystem${WRKDIR}/libcxx_prefix/include/c++/v1 -# Don't link against new libc++ as it's not necessary -#LDFLAGS+= -nostdlib++ -L${WRKDIR}/libcxx_prefix/lib -l:libc++.a -lcxxrt - -pre-configure: bundled-libcxx -bundled-libcxx: - @${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} - @${DO_MAKE_BUILD:NDESTDIR*} install -C ${WRKDIR}/libcxx_build -.endif # exists(/usr/include/c++/v1/__chrono/concepts.h) - .include <bsd.port.mk> diff --git a/x11/waybar/distinfo b/x11/waybar/distinfo index 05b4072751d6..67c033393572 100644 --- a/x11/waybar/distinfo +++ b/x11/waybar/distinfo @@ -1,7 +1,5 @@ TIMESTAMP = 1730730436 SHA256 (Alexays-Waybar-0.11.0_GH0.tar.gz) = 6a0e9f0f7f2eff503951958cbb16dc39041c0b67e86c35154e8507677c61be9d SIZE (Alexays-Waybar-0.11.0_GH0.tar.gz) = 317607 -SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271 -SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803 SHA256 (0d02f6877d88551ea2be0cd151c1e6354e208b1c.patch) = 7ca2c4be684ad2d51f5c278400d37f7179c4f242d84268de1b74d443568a83d5 SIZE (0d02f6877d88551ea2be0cd151c1e6354e208b1c.patch) = 5550
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501011610.501GAgjf015105>