diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1186,7 +1186,7 @@ . endif _EXPORTED_VARS+= OSVERSION -. if ${OPSYS} == FreeBSD && (${OSVERSION} < 1204000 || (${OSVERSION} >= 1300000 && ${OSVERSION} < 1301000)) +. if ${OPSYS} == FreeBSD && (${OSVERSION} < 1204000 || (${OSVERSION} >= 1300000 && ${OSVERSION} < 1302000)) _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/comms/ebusd/files/patch-src_lib_ebus_datatype.cpp b/comms/ebusd/files/patch-src_lib_ebus_datatype.cpp deleted file mode 100644 --- a/comms/ebusd/files/patch-src_lib_ebus_datatype.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/lib/ebus/datatype.cpp.orig 2023-06-07 06:49:34 UTC -+++ src/lib/ebus/datatype.cpp -@@ -22,6 +22,7 @@ - - #include "lib/ebus/datatype.h" - #include -+#include // Only required for FreeBSD 13.1, later versions seems to be fine without that - #include - #include - #include diff --git a/devel/bbparse/Makefile b/devel/bbparse/Makefile --- a/devel/bbparse/Makefile +++ b/devel/bbparse/Makefile @@ -10,6 +10,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +IGNORE_FreeBSD_12=does not build ONLY_FOR_ARCHS= amd64 powerpc64 powerpc64le USE_GITHUB= yes @@ -27,12 +28,6 @@ PLIST_FILES+= man/man3/${l}.3.gz .endfor -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300076 -IGNORE= builds only on FreeBSD 13-head with minimum revision 356414 -.endif - do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib ${MKDIR} ${STAGEDIR}${PREFIX}/include diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -333,8 +333,6 @@ .include .if ${OPSYS} == FreeBSD && ( \ - (${OSVERSION} >= 1300525 && ${OSVERSION} < 1301000) || \ - (${OSVERSION} >= 1301500 && ${OSVERSION} < 1301502) || \ (${OSVERSION} >= 1400051 && ${OSVERSION} < 1400057)) BROKEN= please update FreeBSD base system first to fix an ABI incompatibility .endif diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -203,7 +203,6 @@ .include .if ${OPSYS} == FreeBSD && ( \ - (${OSVERSION} >= 1301500 && ${OSVERSION} < 1301502) || \ (${OSVERSION} >= 1400051 && ${OSVERSION} < 1400057)) BROKEN= please update FreeBSD base system first to fix an ABI incompatibility .endif diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -233,7 +233,6 @@ .include .if ${OPSYS} == FreeBSD && ( \ - (${OSVERSION} >= 1301500 && ${OSVERSION} < 1301502) || \ (${OSVERSION} >= 1400051 && ${OSVERSION} < 1400057)) BROKEN= please update FreeBSD base system first to fix an ABI incompatibility .endif diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -202,8 +202,7 @@ # 2) llvm15 in FreeBSD miscompiles virtualbox 6.1 causing errors: PR#270189. # Force llvm from ports. .if ${OPSYS} == FreeBSD && \ - (${OSVERSION} < 1203502 || ${OSVERSION} >= 1300000 && ${OSVERSION} < 1300109 || \ - ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 || ${OSVERSION} >= 1400079) + (${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 || ${OSVERSION} >= 1400079) # USES must be before .include , but CHOSEN_COMPILER_TYPE must be after. # This is a workaround with possibility to define different llvm via VBOX_LLVM_VER in make.conf. #USES+= llvm:min=11,max=14 diff --git a/lang/gcc11-devel/files/patch-libphobos_libdruntime_core_sys_freebsd_config.d b/lang/gcc11-devel/files/patch-libphobos_libdruntime_core_sys_freebsd_config.d --- a/lang/gcc11-devel/files/patch-libphobos_libdruntime_core_sys_freebsd_config.d +++ b/lang/gcc11-devel/files/patch-libphobos_libdruntime_core_sys_freebsd_config.d @@ -7,7 +7,7 @@ - version (FreeBSD_13) enum __FreeBSD_version = 1300000; -else version (FreeBSD_12) enum __FreeBSD_version = 1202000; + version (FreeBSD_14) enum __FreeBSD_version = 1400000; -+else version (FreeBSD_13) enum __FreeBSD_version = 1301000; ++else version (FreeBSD_13) enum __FreeBSD_version = 1302000; +else version (FreeBSD_12) enum __FreeBSD_version = 1204000; else version (FreeBSD_11) enum __FreeBSD_version = 1104000; else version (FreeBSD_10) enum __FreeBSD_version = 1004000; diff --git a/lang/gcc11/files/patch-libphobos_libdruntime_core_sys_freebsd_config.d b/lang/gcc11/files/patch-libphobos_libdruntime_core_sys_freebsd_config.d --- a/lang/gcc11/files/patch-libphobos_libdruntime_core_sys_freebsd_config.d +++ b/lang/gcc11/files/patch-libphobos_libdruntime_core_sys_freebsd_config.d @@ -7,7 +7,7 @@ - version (FreeBSD_13) enum __FreeBSD_version = 1300000; -else version (FreeBSD_12) enum __FreeBSD_version = 1202000; + version (FreeBSD_14) enum __FreeBSD_version = 1400000; -+else version (FreeBSD_13) enum __FreeBSD_version = 1301000; ++else version (FreeBSD_13) enum __FreeBSD_version = 1302000; +else version (FreeBSD_12) enum __FreeBSD_version = 1204000; else version (FreeBSD_11) enum __FreeBSD_version = 1104000; else version (FreeBSD_10) enum __FreeBSD_version = 1004000; diff --git a/net/samba416/Makefile b/net/samba416/Makefile --- a/net/samba416/Makefile +++ b/net/samba416/Makefile @@ -12,6 +12,8 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING +IGNORE_FreeBSD_12= only runs on FreeBSD 13.1 and above due use of O_EMPTY_PATH + USES= cpe CONFLICTS_INSTALL?= samba4* @@ -409,10 +411,6 @@ ############################################################################## .include ############################################################################## -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300076 -IGNORE=runs only on FreeBSD 13.1 and above due use of O_EMPTY_PATH -.endif - .if !defined(WANT_EXP_MODULES) || empty(WANT_EXP_MODULES) WANT_EXP_MODULES= vfs_cacheprime .endif diff --git a/net/tcplog_dumper/Makefile b/net/tcplog_dumper/Makefile --- a/net/tcplog_dumper/Makefile +++ b/net/tcplog_dumper/Makefile @@ -13,6 +13,7 @@ ONLY_FOR_ARCHS= aarch64 amd64 mips64 mips64el mips64elhf mips64hf powerpc64 powerpc64le riscv64 riscv64sf ONLY_FOR_ARCHS_REASON= only 64-bit platforms are supported +IGNORE_FreeBSD_12=does not build USE_GITHUB= yes GH_ACCOUNT= Netflix @@ -22,12 +23,6 @@ PLIST_FILES= sbin/tcplog_dumper \ man/man1/tcplog_dumper.1.gz -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300076 -IGNORE= builds only on FreeBSD 13-head with minimum revision 356414 -.endif - do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/sbin ${INSTALL_PROGRAM} ${WRKSRC}/tcplog_dumper ${STAGEDIR}${PREFIX}/sbin diff --git a/net/tcprtt/Makefile b/net/tcprtt/Makefile --- a/net/tcprtt/Makefile +++ b/net/tcprtt/Makefile @@ -7,18 +7,13 @@ LICENSE= BSD2CLAUSE +IGNORE_FreeBSD_12=requires kernel OSVERSION 1300062 or above USE_GITHUB= yes GH_ACCOUNT= KlaraSystems GH_TAGNAME= 1c857b8bd6e071290d118c96c051fbdf7db40129 PLIST_FILES= bin/tcprtt man/man8/${PORTNAME}.8.gz -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300062 -IGNORE= requires kernel OSVERSION 1300062 or above -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tcprtt ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/tcprtt.8 ${STAGEDIR}${PREFIX}/man/man8 diff --git a/sysutils/nfs-over-tls/Makefile b/sysutils/nfs-over-tls/Makefile --- a/sysutils/nfs-over-tls/Makefile +++ b/sysutils/nfs-over-tls/Makefile @@ -9,19 +9,15 @@ LICENSE= BSD2CLAUSE +IGNORE_FreeBSD_12=requires FreeBSD 13 or later with in-kernel TLS support \ + and OpenSSL with KTLS enabled + LIB_DEPENDS= libssl.so:security/openssl USES= kmod ssl -.include - -.if ${OSVERSION} < 1300133 -IGNORE= requires FreeBSD 13 or later with in-kernel TLS support \ - and OpenSSL with KTLS enabled -.endif - .if exists(/usr/sbin/rpc.tlsclntd) IGNORE= already included in the base system .endif -.include +.include