diff options
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/cargo.mk | 2 | ||||
| -rw-r--r-- | Mk/Uses/php.mk | 2 | ||||
| -rw-r--r-- | Mk/Uses/qt.mk | 4 | ||||
| -rw-r--r-- | Mk/Uses/ssl.mk | 4 | ||||
| -rw-r--r-- | Mk/bsd.default-versions.mk | 3 | ||||
| -rw-r--r-- | Mk/bsd.gecko.mk | 2 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 2 |
7 files changed, 10 insertions, 9 deletions
diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk index 2ba0738a03a0..c4ef05268ef6 100644 --- a/Mk/Uses/cargo.mk +++ b/Mk/Uses/cargo.mk @@ -109,7 +109,7 @@ WRKSRC_crate_${_crate}= ${WRKDIR}/${_wrksrc} CARGO_BUILDDEP?= yes . if ${CARGO_BUILDDEP:tl} == "yes" -BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.89.0:lang/${RUST_DEFAULT} +BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.90.0:lang/${RUST_DEFAULT} . elif ${CARGO_BUILDDEP:tl} == "any-version" BUILD_DEPENDS+= ${RUST_DEFAULT}>=0:lang/${RUST_DEFAULT} . endif diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk index c1f8a0061abd..3f2c1f3da1f2 100644 --- a/Mk/Uses/php.mk +++ b/Mk/Uses/php.mk @@ -180,7 +180,7 @@ PHP_VER= ${FLAVOR:S/^php//} # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. . if ${PHP_VER} == 85 -PHP_EXT_DIR= 20240925 +PHP_EXT_DIR= 20250925 PHP_EXT_INC= hash json opcache openssl pcre random spl . elif ${PHP_VER} == 84 PHP_EXT_DIR= 20240924 diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk index 88984a936848..edc8cbd555bb 100644 --- a/Mk/Uses/qt.mk +++ b/Mk/Uses/qt.mk @@ -23,8 +23,8 @@ _QT_MK_INCLUDED= qt.mk # Qt versions currently supported by the framework. _QT_SUPPORTED?= 5 6 QT5_VERSION?= 5.15.17 -QT6_VERSION?= 6.9.2 -PYSIDE6_VERSION?= 6.9.2 +QT6_VERSION?= 6.9.3 +PYSIDE6_VERSION?= 6.9.3 # Support for intermediate Qt6 releases. This partially defines # _QT6_MASTER_SITE_SUBDIR and would probably be better in qt-dist.mk, diff --git a/Mk/Uses/ssl.mk b/Mk/Uses/ssl.mk index f8a459eb87e7..cdc434e2aa61 100644 --- a/Mk/Uses/ssl.mk +++ b/Mk/Uses/ssl.mk @@ -10,8 +10,8 @@ # # When updating this, please also update the same list in bsd.default-versions.mk # and the checks for USES=ssl in qa.sh! -# Variants being base, openssl, openssl111, openssl31, openssl32, -# openssl33, libressl, and libressl-devel. +# Variants being base, openssl, openssl111, openssl33, openssl34, openssl35, +# openssl36, libressl, and libressl-devel. # # The Makefile sets these variables: # OPENSSLBASE - "/usr" or ${LOCALBASE} diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index c81b7f5f8429..865224a95bc4 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -152,7 +152,8 @@ RUST_DEFAULT?= rust SAMBA_DEFAULT?= 4.16 # When updating this, please also update the same list in ssl.mk and the checks # for USES=ssl in qa.sh! -# Possible values: base, openssl, openssl111, openssl31, openssl32, openssl33, libressl, libressl-devel +# Possible values: base, openssl, openssl111, openssl33, openssl34, openssl35, +# openssl36, libressl, libressl-devel . if !defined(SSL_DEFAULT) # If no preference was set, check for an installed base version # but give an installed port preference over it. diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 5f8bffc8e3d1..59c6721fb7bd 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -77,7 +77,7 @@ ELF_FEATURES+= +wxneeded:dist/bin/${MOZILLA} +wxneeded:dist/bin/${MOZILLA}-bin BUNDLE_LIBS= yes BUILD_DEPENDS+= rust-cbindgen>=0.28.0:devel/rust-cbindgen \ - ${RUST_DEFAULT}>=1.89.0:lang/${RUST_DEFAULT} + ${RUST_DEFAULT}>=1.90.0:lang/${RUST_DEFAULT} LIB_DEPENDS+= libdrm.so:graphics/libdrm RUN_DEPENDS+= ${LOCALBASE}/lib/libpci.so:devel/libpci LIB_DEPENDS+= libepoll-shim.so:devel/libepoll-shim diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 96824b8641e2..eee8bfb7c45f 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1081,7 +1081,7 @@ LD+= --sysroot=${CROSS_SYSROOT} STRIP_CMD= ${CROSS_BINUTILS_PREFIX}strip # only bmake support the below STRIPBIN= ${STRIP_CMD} -.export.env STRIPBIN +.export-env STRIPBIN .endif # |