summaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
Diffstat (limited to 'Mk')
-rw-r--r--Mk/Uses/autoreconf.mk4
-rw-r--r--Mk/Uses/cargo.mk2
-rw-r--r--Mk/Uses/gettext-runtime.mk6
-rw-r--r--Mk/Uses/gettext-tools.mk4
-rw-r--r--Mk/Uses/go.mk28
-rw-r--r--Mk/Uses/kde.mk2
-rw-r--r--Mk/Uses/pyqt.mk22
-rw-r--r--Mk/Uses/qt.mk8
-rw-r--r--Mk/Uses/samba.mk8
-rw-r--r--Mk/bsd.default-versions.mk2
-rw-r--r--Mk/bsd.gecko.mk2
11 files changed, 53 insertions, 35 deletions
diff --git a/Mk/Uses/autoreconf.mk b/Mk/Uses/autoreconf.mk
index 781f58dc20b5..608027f599ff 100644
--- a/Mk/Uses/autoreconf.mk
+++ b/Mk/Uses/autoreconf.mk
@@ -89,10 +89,10 @@ _AUTORECONF= 2.69
BUILD_DEPENDS+= autoconf2.69>=2.69:devel/autoconf2.69
. else
_AUTORECONF= 2.72
-BUILD_DEPENDS+= autoconf>=${_AUTORECONF}:devel/autoconf
+BUILD_DEPENDS+= autoconf>=2.72_1:devel/autoconf
. endif
-BUILD_DEPENDS+= automake>=1.17:devel/automake
+BUILD_DEPENDS+= automake>=1.18.1:devel/automake
. if defined(libtool_ARGS) && empty(libtool_ARGS:Mbuild)
BUILD_DEPENDS+= libtoolize:devel/libtool
diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk
index a92ba1e13c3b..f8d45da664a4 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.91.0:lang/${RUST_DEFAULT}
+BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.92.0:lang/${RUST_DEFAULT}
. elif ${CARGO_BUILDDEP:tl} == "any-version"
BUILD_DEPENDS+= ${RUST_DEFAULT}>=0:lang/${RUST_DEFAULT}
. endif
diff --git a/Mk/Uses/gettext-runtime.mk b/Mk/Uses/gettext-runtime.mk
index 1d0f0b8900b9..1dd435df643e 100644
--- a/Mk/Uses/gettext-runtime.mk
+++ b/Mk/Uses/gettext-runtime.mk
@@ -14,14 +14,14 @@ gettext-runtime_ARGS= lib
. endif
. if ${gettext-runtime_ARGS:Mlib}
-BUILD_DEPENDS+= gettext-runtime>=0.22_1:devel/gettext-runtime
+BUILD_DEPENDS+= gettext-runtime>=0.26:devel/gettext-runtime
LIB_DEPENDS+= libintl.so:devel/gettext-runtime
. endif
. if ${gettext-runtime_ARGS:Mbuild}
-BUILD_DEPENDS+= gettext-runtime>=0.22_1:devel/gettext-runtime
+BUILD_DEPENDS+= gettext-runtime>=0.26:devel/gettext-runtime
. endif
. if ${gettext-runtime_ARGS:Mrun}
-RUN_DEPENDS+= gettext-runtime>=0.22_1:devel/gettext-runtime
+RUN_DEPENDS+= gettext-runtime>=0.26:devel/gettext-runtime
. endif
.endif
diff --git a/Mk/Uses/gettext-tools.mk b/Mk/Uses/gettext-tools.mk
index 948a505ed8b9..a59241b30ffc 100644
--- a/Mk/Uses/gettext-tools.mk
+++ b/Mk/Uses/gettext-tools.mk
@@ -14,10 +14,10 @@ gettext-tools_ARGS= build
. endif
. if ${gettext-tools_ARGS:Mbuild}
-BUILD_DEPENDS+= msgfmt:devel/gettext-tools
+BUILD_DEPENDS+= gettext-tools>=0.26:devel/gettext-tools
. endif
. if ${gettext-tools_ARGS:Mrun}
-RUN_DEPENDS+= msgfmt:devel/gettext-tools
+RUN_DEPENDS+= gettext-tools>=0.26:devel/gettext-tools
. endif
.endif
diff --git a/Mk/Uses/go.mk b/Mk/Uses/go.mk
index 872546e6fd01..3d34f15508cd 100644
--- a/Mk/Uses/go.mk
+++ b/Mk/Uses/go.mk
@@ -3,10 +3,11 @@
#
# Feature: go
# Usage: USES=go
-# Valid ARGS: (none), N.NN, N.NN-devel, modules, no_targets, run
+# Valid ARGS: (none), N.NN+, N.NN, modules, no_targets, run
#
# (none) Setup GOPATH and build in GOPATH mode using default Go version.
-# N.NN Specify Go version
+# N.NN+ Specify minimum Go version
+# N.NN Specify exact Go version (should be avoided)
# modules If the upstream uses Go modules, this can be set to build
# in modules-aware mode.
# no_targets Indicates that Go is needed at build time as a part of
@@ -83,19 +84,30 @@ _INCLUDE_USES_GO_MK= yes
# When adding a version, please keep the comment in
# Mk/bsd.default-versions.mk in sync.
-GO_VALID_VERSIONS= 1.20 1.21 1.22 1.23 1.24 1.25 1.26-devel
+GO_VALID_VERSIONS= 1.20 1.21 1.22 1.23 1.24 1.25
# Check arguments sanity
-. if !empty(go_ARGS:N[1-9].[0-9][0-9]:N*-devel:Nmodules:Nno_targets:Nrun)
-IGNORE= USES=go has invalid arguments: ${go_ARGS:N[1-9].[0-9][0-9]:N*-devel:Nmodules:Nno_targets:Nrun}
+. if !empty(go_ARGS:N[1-9].[0-9][0-9]+:N[1-9].[0-9][0-9]:Nmodules:Nno_targets:Nrun)
+IGNORE= USES=go has invalid arguments: ${go_ARGS:N[1-9].[0-9][0-9]+:N[1-9].[0-9][0-9]:Nmodules:Nno_targets:Nrun}
. endif
# Parse Go version
-GO_VERSION= ${go_ARGS:Nmodules:Nno_targets:Nrun:C/^$/${GO_DEFAULT}/}
-. if empty(GO_VALID_VERSIONS:M${GO_VERSION})
+. if !empty(go_ARGS:M*+)
+GO_MIN_VERSION= ${go_ARGS:M*+:S/+//}
+. for version in ${GO_VALID_VERSIONS:[-1..1]}
+. if empty(GO_VERSION)
+. if ${version} == ${GO_DEFAULT} || ${version} == ${GO_MIN_VERSION}
+GO_VERSION:= ${version}
+. endif
+. endif
+. endfor
+. else
+GO_VERSION:= ${go_ARGS:Nmodules:Nno_targets:Nrun:C/^$/${GO_DEFAULT}/}
+. if empty(GO_VALID_VERSIONS:M${GO_VERSION})
IGNORE?= USES=go has invalid version number: ${GO_VERSION}
+. endif
. endif
-GO_SUFFIX= ${GO_VERSION:S/.//:C/.*-devel/-devel/}
+GO_SUFFIX= ${GO_VERSION:S/.//}
GO_PORT= lang/go${GO_SUFFIX}
# Settable variables
diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk
index d2a6265461c7..9072b81d1d13 100644
--- a/Mk/Uses/kde.mk
+++ b/Mk/Uses/kde.mk
@@ -99,7 +99,7 @@ KDE_FRAMEWORKS5_VERSION?= 5.116.0
KDE_FRAMEWORKS5_BRANCH?= stable
# Current KDE Frameworks (Qt6 based).
-KDE_FRAMEWORKS6_VERSION?= 6.20.0
+KDE_FRAMEWORKS6_VERSION?= 6.21.0
KDE_FRAMEWORKS6_BRANCH?= stable
# Current KDE applications. Update _${PORTNAME}_PROJECT_VERSION for the following ports:
diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk
index 54fff0299196..880221be3b56 100644
--- a/Mk/Uses/pyqt.mk
+++ b/Mk/Uses/pyqt.mk
@@ -108,12 +108,12 @@ MASTER_SITES_PYQTWEBENGINE= ${MASTER_SITES_PYQT${_PYQT_VERSION}WEBENGINE}
# below, should have a suitable epoch appended to the version.
# Qt version-agnostic components
-PYQTBUILDER_VERSION= 1.19.0
+PYQTBUILDER_VERSION= 1.19.1
QSCI2_VERSION= 2.14.1
-SIP_VERSION= 6.13.1 # ,1
+SIP_VERSION= 6.15.1 # ,1
# Qt 5 components
-PYQT5SIP_VERSION= 12.17.0
+PYQT5SIP_VERSION= 12.17.2
PYQT5_VERSION= 5.15.11
PYQT53D_VERSION= 5.15.7
PYQT5CHARTS_VERSION= 5.15.7
@@ -122,14 +122,14 @@ PYQT5NETWORKAUTH_VERSION= 5.15.6
PYQT5WEBENGINE_VERSION= 5.15.7
# Qt 6 components
-PYQT6SIP_VERSION= 13.10.2
-PYQT6_VERSION= 6.9.1
-PYQT63D_VERSION= 6.9.0
-PYQT6CHARTS_VERSION= 6.9.0
-PYQT6DATAVIS3D_VERSION= 6.9.0
-PYQT6GRAPHS_VERSION= 6.9.0
-PYQT6NETWORKAUTH_VERSION= 6.9.0
-PYQT6WEBENGINE_VERSION= 6.9.0
+PYQT6SIP_VERSION= 13.10.3
+PYQT6_VERSION= 6.10.1
+PYQT63D_VERSION= 6.10.0
+PYQT6CHARTS_VERSION= 6.10.0
+PYQT6DATAVIS3D_VERSION= 6.10.0
+PYQT6GRAPHS_VERSION= 6.10.0
+PYQT6NETWORKAUTH_VERSION= 6.10.0
+PYQT6WEBENGINE_VERSION= 6.10.0
# Qt version-agnostic components
PYQTBUILDER_DISTNAME= pyqt_builder-${PYQTBUILDER_VERSION}
diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk
index db50d8de38ac..dfd593589aba 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.18
-QT6_VERSION?= 6.9.3
-PYSIDE6_VERSION?= 6.9.3
+QT6_VERSION?= 6.10.1
+PYSIDE6_VERSION?= 6.10.1
# Support for intermediate Qt6 releases. This partially defines
# _QT6_MASTER_SITE_SUBDIR and would probably be better in qt-dist.mk,
@@ -257,7 +257,7 @@ qt-languageserver_PORT= devel/${_QT_RELNAME}-languageserver
qt-languageserver_PATH= ${LOCALBASE}/${QT_LIBDIR_REL}/libQt6LanguageServer.a
qt-lottie_PORT= graphics/${_QT_RELNAME}-lottie
-qt-lottie_LIB= libQt${_QT_LIBVER}Bodymovin.so
+qt-lottie_LIB= libQt${_QT_LIBVER}Lottie.so
qt-linguist_PORT= devel/${_QT_RELNAME}-linguist
qt-linguist_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/linguist
@@ -407,7 +407,7 @@ qt-virtualkeyboard_PORT= x11-toolkits/${_QT_RELNAME}-virtualkeyboard
qt-virtualkeyboard_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/platforminputcontexts/libqtvirtualkeyboardplugin.so
qt-wayland_PORT= graphics/${_QT_RELNAME}-wayland
-qt-wayland_LIB= libQt${_QT_LIBVER}WaylandClient.so
+qt-wayland_LIB= libQt${_QT_LIBVER}WaylandCompositor.so
qt-webchannel_PORT= www/${_QT_RELNAME}-webchannel
qt-webchannel_LIB= libQt${_QT_LIBVER}WebChannel.so
diff --git a/Mk/Uses/samba.mk b/Mk/Uses/samba.mk
index f9fcddfd04e6..c9e5094fb289 100644
--- a/Mk/Uses/samba.mk
+++ b/Mk/Uses/samba.mk
@@ -18,7 +18,9 @@ samba_ARGS= build run
IGNORE= USES=samba has invalid arguments: ${samba_ARGS:Nbuild:Nenv:Nlib:Nself:Nrun}
. endif
-. if ${SAMBA_DEFAULT} != 4.16 && ${SAMBA_DEFAULT} != 4.19 && ${SAMBA_DEFAULT} != 4.20 && ${SAMBA_DEFAULT} != 4.22
+_SAMBA_VALID_VERSIONS= 4.16 4.19 4.20 4.22 4.23
+
+. if ${_SAMBA_VALID_VERSIONS:M${SAMBA_DEFAULT}} == ""
IGNORE= Invalid version of samba: ${SAMBA_DEFAULT}
. endif
@@ -58,6 +60,10 @@ SAMBA_PORT_422= net/samba422
SAMBA_TALLOC_PORT_422= devel/talloc243
SAMBA_TDB_PORT_422= databases/tdb1413
SAMBA_TEVENT_PORT_422= devel/tevent017
+SAMBA_PORT_423= net/samba423
+SAMBA_TALLOC_PORT_423= devel/talloc243
+SAMBA_TDB_PORT_423= databases/tdb1
+SAMBA_TEVENT_PORT_423= devel/tevent017
SAMBA_PORT= ${SAMBA_PORT_${SAMBA_SUFFIX}}
# Only define SAMBA_LDB_PORT if SAMBA_LDB_PORT_${SAMBA_SUFFIX} is set. Samba
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 0a2adc2a359c..fd13e512b8cb 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -148,7 +148,7 @@ PYTHON2_DEFAULT?= 2.7
RUBY_DEFAULT?= 3.3
# Possible values: rust, rust-nightly
RUST_DEFAULT?= rust
-# Possible values: 4.16, 4.19, 4.20, 4.22
+# Possible values: 4.16, 4.19, 4.20, 4.22, 4.23
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!
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index e193f2e71858..7e69f5c27b25 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.29.1:devel/rust-cbindgen \
- ${RUST_DEFAULT}>=1.91.0:lang/${RUST_DEFAULT}
+ ${RUST_DEFAULT}>=1.92.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
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-21 11:59:55 +0000