summaryrefslogtreecommitdiff
path: root/Mk/Uses
diff options
context:
space:
mode:
Diffstat (limited to 'Mk/Uses')
-rw-r--r--Mk/Uses/cabal.mk5
-rw-r--r--Mk/Uses/cargo.mk2
-rw-r--r--Mk/Uses/fortran.mk4
-rw-r--r--Mk/Uses/gnome.mk33
-rw-r--r--Mk/Uses/go.mk3
-rw-r--r--Mk/Uses/gstreamer.mk4
-rw-r--r--Mk/Uses/kde.mk36
-rw-r--r--Mk/Uses/linux.mk18
-rw-r--r--Mk/Uses/mysql.mk2
-rw-r--r--Mk/Uses/octave.mk2
-rw-r--r--Mk/Uses/perl5.mk8
-rw-r--r--Mk/Uses/pyqt.mk34
-rw-r--r--Mk/Uses/python.mk64
-rw-r--r--Mk/Uses/qt-dist.mk20
-rw-r--r--Mk/Uses/qt.mk6
15 files changed, 139 insertions, 102 deletions
diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk
index d52d3e4bfb27..cf1ffe9874f9 100644
--- a/Mk/Uses/cabal.mk
+++ b/Mk/Uses/cabal.mk
@@ -76,11 +76,6 @@ IGNORE= USES=cabal: invalid arguments: ${arg}
IGNORE= CABAL_PROJECT: invalid value: ${CABAL_PROJECT}
. endif
-. if ${ARCH} == i386 && defined(USE_CABAL) && ${USE_CABAL:Mbasement-0.0.1[4-5]}
-# Upstream issue: https://github.com/haskell-foundation/foundation/issues/565
-BROKEN= ${USE_CABAL:Mbasement-0.0.1[4-5]} package doesn't compile on i386
-. endif
-
PKGNAMEPREFIX?= hs-
CABAL_EXECUTABLES?= ${PORTNAME}
diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk
index b49a8b80e011..19b0ac1e294e 100644
--- a/Mk/Uses/cargo.mk
+++ b/Mk/Uses/cargo.mk
@@ -97,7 +97,7 @@ WRKSRC_crate_${_crate}= ${WRKDIR}/${_wrksrc}
CARGO_BUILDDEP?= yes
. if ${CARGO_BUILDDEP:tl} == "yes"
-BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.86.0:lang/${RUST_DEFAULT}
+BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.87.0:lang/${RUST_DEFAULT}
. elif ${CARGO_BUILDDEP:tl} == "any-version"
BUILD_DEPENDS+= ${RUST_DEFAULT}>=0:lang/${RUST_DEFAULT}
. endif
diff --git a/Mk/Uses/fortran.mk b/Mk/Uses/fortran.mk
index a7dc6717dce8..207bb869c8d8 100644
--- a/Mk/Uses/fortran.mk
+++ b/Mk/Uses/fortran.mk
@@ -30,6 +30,10 @@ FCFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER}
LDFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} \
-L${LOCALBASE}/lib/gcc${_GCC_VER}
CFLAGS_F2018= -I${LOCALBASE}/include/gcc${_GCC_VER}
+# Only needed on riscv64? See PR 287211
+. if ${ARCH} == "riscv64"
+FCFLAGS+= -B${LOCALBASE}/lib/gcc${_GCC_VER}
+. endif
. else
IGNORE= USES=fortran: invalid arguments: ${fortran_ARGS}
. endif
diff --git a/Mk/Uses/gnome.mk b/Mk/Uses/gnome.mk
index 388a42bd25ca..7d99d5df0bd0 100644
--- a/Mk/Uses/gnome.mk
+++ b/Mk/Uses/gnome.mk
@@ -76,16 +76,16 @@ _USE_GNOME_ALL+= atk cairo \
_USE_GNOME_ALL+=dconf evolutiondataserver3 gnomecontrolcenter3 gnomedesktop3 \
gnomemenus3 gsound gtk30 gtkhtml4 gtksourceview3 \
gtksourceview4 libgda5 \
- libgda5-ui libgnomekbd libwnck3 metacity nautilus3 \
+ libgda5-ui libgda6 libgnomekbd libwnck3 \
pygobject3 vte3
# GNOME 40 components
-_USE_GNOME_ALL+=gtk40 libadwaita gtksourceview5
+_USE_GNOME_ALL+=gtk40 libadwaita gtksourceview5 gnomedesktop4 nautilus4
# C++ bindings
-_USE_GNOME_ALL+=atkmm cairomm gconfmm26 glibmm glibmm26 gtkmm24 \
- gtkmm30 gtksourceviewmm3 libgdamm5 libxml++26 libsigc++20 \
- libsigc++30 pangomm
+_USE_GNOME_ALL+=atkmm cairomm cairomm11 gconfmm26 glibmm glibmm26 gtkmm24 \
+ gtkmm30 gtkmm40 gtksourceviewmm3 libgdamm5 libxml++26 libsigc++20 \
+ libsigc++30 pangomm pangomm24
# glib-mkenums often fails with C locale
# https://gitlab.gnome.org/GNOME/glib/issues/1430
@@ -113,6 +113,9 @@ cairo_LIB_DEPENDS= libcairo.so:graphics/cairo
cairomm_LIB_DEPENDS= libcairomm-1.0.so:graphics/cairomm
cairomm_USE_GNOME_IMPL= cairo libsigc++20
+cairomm11_LIB_DEPENDS= libcairomm-1.16.so:graphics/cairomm11
+cairomm11_USE_GNOME_IMPL= cairo libsigc++30
+
gconfmm26_LIB_DEPENDS= libgconfmm-2.6.so:devel/gconfmm26
gconfmm26_USE_GNOME_IMPL= glibmm gconf2
@@ -133,6 +136,9 @@ gtkmm24_USE_GNOME_IMPL= glibmm cairomm atkmm pangomm gtk20
gtkmm30_LIB_DEPENDS= libgtkmm-3.0.so:x11-toolkits/gtkmm30
gtkmm30_USE_GNOME_IMPL= atkmm cairomm gdkpixbuf glibmm gtk30 pangomm
+gtkmm40_LIB_DEPENDS= libgtkmm-4.0.so:x11-toolkits/gtkmm40
+gtkmm40_USE_GNOME_IMPL= cairomm11 gdkpixbuf glibmm26 gtk40 pangomm24
+
gtksourceviewmm3_LIB_DEPENDS= libgtksourceviewmm-3.0.so:x11-toolkits/gtksourceviewmm3
gtksourceviewmm3_USE_GNOME_IMPL= gtkmm30 gtksourceview3
@@ -146,6 +152,9 @@ libsigc++30_LIB_DEPENDS= libsigc-3.0.so:devel/libsigc++30
pangomm_LIB_DEPENDS= libpangomm-1.4.so:x11-toolkits/pangomm
pangomm_USE_GNOME_IMPL= pango glibmm cairomm
+pangomm24_LIB_DEPENDS= libpangomm-2.48.so:x11-toolkits/pangomm24
+pangomm24_USE_GNOME_IMPL= pango glibmm26 cairomm11
+
gnomemimedata_BUILD_DEPENDS=${LOCALBASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:misc/gnome-mime-data
gnomemimedata_RUN_DEPENDS=${LOCALBASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:misc/gnome-mime-data
@@ -227,6 +236,9 @@ libartlgpl2_LIB_DEPENDS= libart_lgpl_2.so:graphics/libart_lgpl
gnomedesktop3_LIB_DEPENDS= libgnome-desktop-3.so:x11/gnome-desktop
gnomedesktop3_USE_GNOME_IMPL= gtk30
+gnomedesktop4_LIB_DEPENDS= libgnome-desktop-4.so:x11/gnome-desktop
+gnomedesktop4_USE_GNOME_IMPL= gtk40
+
libwnck3_LIB_DEPENDS= libwnck-3.so:x11-toolkits/libwnck3
libwnck3_USE_GNOME_IMPL=gtk30
@@ -251,14 +263,12 @@ librsvg2_RUN_DEPENDS= librsvg2>=0:graphics/librsvg2
. endif
librsvg2_USE_GNOME_IMPL=cairo gdkpixbuf
-nautilus3_LIB_DEPENDS= libnautilus-extension.so:x11-fm/nautilus
-nautilus3_USE_GNOME_IMPL=gnomedesktop3 libxml2
-
-metacity_LIB_DEPENDS= libmetacity.so:x11-wm/metacity
+nautilus4_LIB_DEPENDS= libnautilus-extension.so:x11-fm/nautilus
+nautilus4_USE_GNOME_IMPL=glib20
gnomecontrolcenter3_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-keybindings.pc:sysutils/gnome-control-center
gnomecontrolcenter3_RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-keybindings.pc:sysutils/gnome-control-center
-gnomecontrolcenter3_USE_GNOME_IMPL= gnomedesktop3
+gnomecontrolcenter3_USE_GNOME_IMPL= gnomedesktop4
libgda5_LIB_DEPENDS= libgda-5.0.so:databases/libgda5
libgda5_USE_GNOME_IMPL= glib20 libxslt
@@ -266,6 +276,9 @@ libgda5_USE_GNOME_IMPL= glib20 libxslt
libgda5-ui_LIB_DEPENDS= libgda-ui-5.0.so:databases/libgda5-ui
libgda5-ui_USE_GNOME_IMPL=glib20 libxslt libgda5
+libgda6_LIB_DEPENDS= libgda-6.0.so:databases/libgda6
+libgda6_USE_GNOME_IMPL= glib20 libxml2
+
gtksourceview2_LIB_DEPENDS= libgtksourceview-2.0.so:x11-toolkits/gtksourceview2
gtksourceview2_USE_GNOME_IMPL=gtk20 libxml2
diff --git a/Mk/Uses/go.mk b/Mk/Uses/go.mk
index 5b1e8758417f..f56114da9973 100644
--- a/Mk/Uses/go.mk
+++ b/Mk/Uses/go.mk
@@ -186,8 +186,7 @@ WRKSRC= ${WRKDIR}/${GO_MODNAME}@${GO_MODVERSION}
. endif
EXTRACT_ONLY?= ${DISTFILES:N*.mod\:*:N*.mod:C/:.*//}
DIST_SUBDIR= go/${PKGORIGIN:S,/,_,g}/${DISTNAME}
-FETCH_DEPENDS+= ${GO_CMD}:${GO_PORT} \
- ca_root_nss>0:security/ca_root_nss
+FETCH_DEPENDS+= ${GO_CMD}:${GO_PORT}
USES+= zip
. else
GO_ENV+= GO_NO_VENDOR_CHECKS=1
diff --git a/Mk/Uses/gstreamer.mk b/Mk/Uses/gstreamer.mk
index e713b7c3def0..22d1c3ea73af 100644
--- a/Mk/Uses/gstreamer.mk
+++ b/Mk/Uses/gstreamer.mk
@@ -48,7 +48,7 @@ _GST_VER= ${_GST_VER_DEFAULT}
# - multimedia/gstreamer1-rtsp-server
# - multimedia/gstreamer1-vaapi
# - multimedia/py-gstreamer1
-_GST1_VERSION= 1.26.1
+_GST1_VERSION= 1.26.2
_GST1_LIB_VER= 1.0
_GST1_SOVERSION= 0.${_GST1_VERSION:R:E}${${_GST1_VERSION:E} > 9:?:0}${_GST1_VERSION:E}.0
@@ -355,7 +355,7 @@ gst-rtsp-server_IMPL= #
gst-rust_PORT= multimedia/gstreamer${_GST_VER}-plugins-rust
gst-rust_IMPL= #
-gst-rust_GST1_VERSION= 0.13.5
+gst-rust_GST1_VERSION= 0.13.6
gst-rust_VERSION= ${gst-rust_GST${_GST_VER}_VERSION}
gst-smoothstreaming_PORT= multimedia/gstreamer${_GST_VER}-plugins-smoothstreaming
diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk
index cdeb7ff7ed77..76baa8c5faa8 100644
--- a/Mk/Uses/kde.mk
+++ b/Mk/Uses/kde.mk
@@ -91,7 +91,7 @@ KDE_PLASMA5_VERSION?= 5.27.12
KDE_PLASMA5_BRANCH?= stable
# Current KDE Plasma desktop.
-KDE_PLASMA6_VERSION?= 6.3.5
+KDE_PLASMA6_VERSION?= 6.4.0
KDE_PLASMA6_BRANCH?= stable
# Legacy KDE frameworks (Qt5 based).
@@ -99,13 +99,13 @@ KDE_FRAMEWORKS5_VERSION?= 5.116.0
KDE_FRAMEWORKS5_BRANCH?= stable
# Current KDE Frameworks (Qt6 based).
-KDE_FRAMEWORKS6_VERSION?= 6.13.0
+KDE_FRAMEWORKS6_VERSION?= 6.14.0
KDE_FRAMEWORKS6_BRANCH?= stable
# Current KDE applications. Update _${PORTNAME}_PROJECT_VERSION for the following ports:
# devel/kdevelop, games/libkdegames, games/libkmahjongg, graphics/kgraphviewer
-KDE_APPLICATIONS6_VERSION?= 25.04.1
-KDE_APPLICATIONS6_SHLIB_VER?= 6.4.1
+KDE_APPLICATIONS6_VERSION?= 25.04.2
+KDE_APPLICATIONS6_SHLIB_VER?= 6.4.2
# G as in KDE Gear, and as in "don't make the variable name longer than required".
KDE_APPLICATIONS6_SHLIB_G_VER?= ${KDE_APPLICATIONS6_VERSION}
KDE_APPLICATIONS6_BRANCH?= stable
@@ -203,6 +203,7 @@ PORTVERSION?= ${KDE_PLASMA_VERSION}
PKGNAMEPREFIX?= plasma${_KDE_VERSION}-
MASTER_SITES?= KDE/${KDE_PLASMA_BRANCH}/plasma/${KDE_PLASMA_VERSION}
DIST_SUBDIR?= KDE/plasma/${KDE_PLASMA_VERSION}
+WWW?= https://kde.org/plasma-desktop/
. if ${_KDE_VERSION:M6}
DESCR= ${.CURDIR:H:H}/x11/plasma6-plasma/pkg-descr
. endif
@@ -223,6 +224,7 @@ MASTER_SITES?= KDE/${KDE_FRAMEWORKS_BRANCH}/frameworks/${KDE_FRAMEWORKS_VERSION
. endif
DIST_SUBDIR?= KDE/frameworks/${KDE_FRAMEWORKS_VERSION}
. if ${_KDE_VERSION:M6}
+DIST_SUBDIR= KDE/frameworks/${KDE_FRAMEWORKS_VERSION:R}
DESCR= ${.CURDIR:H:H}/x11/kf6-frameworks/pkg-descr
. endif
. else
@@ -273,7 +275,7 @@ PLIST_SUB+= KDE_APPLICATIONS_VERSION="${KDE_APPLICATIONS_VERSION}" \
_USE_PORTINGAIDS_ALL= js jsembed kdelibs4support khtml mediaplayer kross
# List of components of the KDE Frameworks distribution.
-# Not ported to FreeBSD: bluez-qt modemmanagerqt networkmanagerqt
+# Not ported to FreeBSD: bluez-qt modemmanagerqt
_USE_FRAMEWORKS5_ALL= activities activities-stats apidox archive attica \
auth baloo bookmarks breeze-icons calendarcore \
codecs completion config configwidgets contacts \
@@ -299,8 +301,8 @@ _USE_FRAMEWORKS6_ALL= apidox archive attica auth baloo bookmarks \
i18n iconthemes idletime itemmodels itemviews \
jobwidgets kcmutils kdav kdeclarative kded kdesu \
kimageformats kio kirigami2 kquickcharts newstuff \
- notifications notifyconfig package parts people \
- plasma-wayland-protocols plotting prison pty purpose \
+ networkmanagerqt notifications notifyconfig package parts \
+ people plasma-wayland-protocols plotting prison pty purpose \
qqc2-desktop-style runner service solid sonnet \
statusnotifieritem svg syndication \
syntaxhighlighting texteditor texttemplate \
@@ -312,11 +314,11 @@ _USE_FRAMEWORKS_ALL= ${_USE_FRAMEWORKS${_KDE_VERSION}_ALL}
_USE_PLASMA5_ALL= libksysguard oxygen-sounds
_USE_PLASMA6_ALL= activities activities-stats activitymanagerd \
- breeze breeze-gtk decoration discover drkonqi \
+ aurorae breeze breeze-gtk decoration discover \
globalacceld infocenter kde-cli-tools \
kde-gtk-config kdeplasma-addons kgamma kmenuedit \
kpipewire kscreen kscreenlocker ksshaskpass \
- ksystemstats kwallet-pam kwin kwrited \
+ ksystemstats kwallet-pam kwin kwin-x11 kwrited \
layer-shell-qt libkscreen libksysguard libplasma \
milou ocean-sound-theme oxygen oxygen-sounds \
plasma-browser-integration plasma-desktop \
@@ -535,6 +537,9 @@ kde-layer-shell-qt_LIB= libLayerShellQtInterface.so
kde-mediaplayer_PORT= multimedia/kf${_KDE_VERSION}-kmediaplayer
kde-mediaplayer_LIB= libKF${_KDE_VERSION}MediaPlayer.so.5
+kde-networkmanagerqt_PORT= net-mgmt/kf${_KDE_VERSION}-networkmanager-qt
+kde-networkmanagerqt_LIB= libKF${_KDE_VERSION}NetworkManagerQt.so
+
kde-newstuff_PORT= devel/kf${_KDE_VERSION}-knewstuff
kde-newstuff_LIB= libKF${_KDE_VERSION}NewStuffCore.so
@@ -666,6 +671,9 @@ kde-kpipewire_LIB= libKPipeWire.so
kde-activitymanagerd_PORT= x11/plasma${_KDE_VERSION}-kactivitymanagerd
kde-activitymanagerd_LIB= libkactivitymanagerd_plugin.so
+kde-aurorae_PORT= x11-themes/plasma${_KDE_VERSION}-aurorae
+kde-aurorae_PATH= ${KDE_PREFIX}/lib/libexec/plasma-apply-aurorae
+
kde-breeze_PORT= x11-themes/plasma${_KDE_VERSION}-breeze
kde-breeze_PATH= ${KDE_PREFIX}/share/QtCurve/Breeze.qtcurve
@@ -678,9 +686,6 @@ kde-decoration_LIB= libkdecorations3.so
kde-discover_PORT= sysutils/plasma${_KDE_VERSION}-discover
kde-discover_PATH= ${KDE_PREFIX}/bin/plasma-discover
-kde-drkonqi_PORT= sysutils/plasma${_KDE_VERSION}-drkonqi
-kde-drkonqi_PATH= ${KDE_PREFIX}/lib/libexec/drkonqi
-
kde-infocenter_PORT= sysutils/plasma${_KDE_VERSION}-kinfocenter
kde-infocenter_PATH= ${KDE_PREFIX}/bin/kinfocenter
@@ -715,7 +720,10 @@ kde-kwallet-pam_PORT= security/plasma${_KDE_VERSION}-kwallet-pam
kde-kwallet-pam_PATH= ${KDE_PREFIX}/lib/pam_kwallet5.so
kde-kwin_PORT= x11-wm/plasma${_KDE_VERSION}-kwin
-kde-kwin_PATH= ${KDE_PREFIX}/bin/kwin_x11
+kde-kwin_PATH= ${KDE_PREFIX}/bin/kwin_wayland
+
+kde-kwin-x11_PORT= x11-wm/plasma${_KDE_VERSION}-kwin-x11
+kde-kwin-x11_PATH= ${KDE_PREFIX}/bin/kwin_x11
kde-kwrited_PORT= devel/plasma${_KDE_VERSION}-kwrited
kde-kwrited_PATH= ${QT_PLUGINDIR}/kf${_KDE_VERSION}/kded/kwrited.so
@@ -769,7 +777,7 @@ kde-powerdevil_PORT= sysutils/plasma${_KDE_VERSION}-powerdevil
kde-powerdevil_LIB= libpowerdevilcore.so
kde-print-manager_PORT= print/plasma${_KDE_VERSION}-print-manager
-kde-print-manager_PATH= ${KDE_PREFIX}/bin/kde-add-printer
+kde-print-manager_PATH= ${KDE_PREFIX}/bin/kde-print-queue
kde-print-manager_TYPE= run
kde-spectacle_PORT= graphics/plasma${_KDE_VERSION}-spectacle
diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk
index bf62f887899a..e6390afee67f 100644
--- a/Mk/Uses/linux.mk
+++ b/Mk/Uses/linux.mk
@@ -63,7 +63,6 @@ _linux_${linux_ARGS}_atk= linux-${linux_ARGS}-atk>0:accessibility/linux-${linux
_linux_${linux_ARGS}_avahi-libs= linux-${linux_ARGS}-avahi-libs>0:net/linux-${linux_ARGS}-avahi-libs
_linux_c7_base= linux_base-c7>=7.6.1810_7:emulators/linux_base-c7
_linux_rl9_base= linux_base-rl9>=9.2:emulators/linux_base-rl9
-_linux_rl9_brotli= linux-rl9-brotli>0:archivers/linux-rl9-brotli
_linux_${linux_ARGS}_ca-certificates= linux-${linux_ARGS}-ca-certificates>0:security/linux-${linux_ARGS}-ca-certificates
_linux_${linux_ARGS}_cairo= linux-${linux_ARGS}-cairo>0:graphics/linux-${linux_ARGS}-cairo
_linux_${linux_ARGS}_cairo-gobject= linux-${linux_ARGS}-cairo-gobject>0:graphics/linux-${linux_ARGS}-cairo-gobject
@@ -106,20 +105,16 @@ _linux_${linux_ARGS}_libdrm= linux-${linux_ARGS}-libdrm>0:graphics/linux-${linu
_linux_${linux_ARGS}_libepoxy= linux-${linux_ARGS}-libepoxy>0:graphics/linux-${linux_ARGS}-libepoxy
_linux_rl9_libevent= linux-rl9-libevent>0:devel/linux-rl9-libevent
_linux_${linux_ARGS}_libgcrypt= linux-${linux_ARGS}-libgcrypt>0:security/linux-${linux_ARGS}-libgcrypt
-_linux_${linux_ARGS}_libgfortran= linux-${linux_ARGS}-libgfortran>0:devel/linux-${linux_ARGS}-libgfortran
_linux_${linux_ARGS}_libglvnd= linux-${linux_ARGS}-libglvnd>0:graphics/linux-${linux_ARGS}-libglvnd
_linux_${linux_ARGS}_libgpg-error= linux-${linux_ARGS}-libgpg-error>0:security/linux-${linux_ARGS}-libgpg-error
-_linux_rl9_libidn2= linux-${linux_ARGS}-libidn2>0:dns/linux-rl9-libidn2
_linux_rl9_libjxl= linux-rl9-libjxl>0:graphics/linux-rl9-libjxl
_linux_rl9_libksba= linux-rl9-libksba>0:security/linux-rl9-libksba
_linux_rl9_libnghttp2= linux-rl9-libnghttp2>0:www/linux-rl9-libnghttp2
_linux_${linux_ARGS}_libogg= linux-${linux_ARGS}-libogg>0:audio/linux-${linux_ARGS}-libogg
_linux_${linux_ARGS}_libpciaccess= linux-${linux_ARGS}-libpciaccess>0:devel/linux-${linux_ARGS}-libpciaccess
-_linux_rl9_libpsl= linux-rl9-libpsl>0:dns/linux-rl9-libpsl
_linux_${linux_ARGS}_librsvg2= linux-${linux_ARGS}-librsvg2>0:graphics/linux-${linux_ARGS}-librsvg2
_linux_rl9_libsecret= linux-rl9-libsecret>0:security/linux-rl9-libsecret
_linux_${linux_ARGS}_libsigc++20= linux-${linux_ARGS}-libsigc++20>0:devel/linux-${linux_ARGS}-libsigc++20
-_linux_rl9_libsoup= linux-rl9-libsoup>0:devel/linux-rl9-libsoup
_linux_${linux_ARGS}_libsndfile= linux-${linux_ARGS}-libsndfile>0:audio/linux-${linux_ARGS}-libsndfile
_linux_rl9_libssh= linux-rl9-libssh>0:security/linux-rl9-libssh
_linux_c7_libssh2= linux-c7-libssh2>0:security/linux-c7-libssh2
@@ -129,7 +124,6 @@ _linux_${linux_ARGS}_libthai= linux-${linux_ARGS}-libthai>0:devel/linux-${linux
_linux_${linux_ARGS}_libtheora= linux-${linux_ARGS}-libtheora>0:multimedia/linux-${linux_ARGS}-libtheora
_linux_${linux_ARGS}_libtool-ltdl= linux-${linux_ARGS}-libtool-ltdl>0:devel/linux-${linux_ARGS}-libtool-ltdl
_linux_rl9_libtracker-sparql= linux-rl9-libtracker-sparql>0:databases/linux-rl9-libtracker-sparql
-_linux_rl9_libunistring= linux-rl9-libunistring>0:devel/linux-rl9-libunistring
_linux_${linux_ARGS}_libunwind= linux-${linux_ARGS}-libunwind>0:devel/linux-${linux_ARGS}-libunwind
_linux_${linux_ARGS}_libv4l= linux-${linux_ARGS}-libv4l>0:multimedia/linux-${linux_ARGS}-libv4l
_linux_rl9_libva= linux-rl9-libva>0:multimedia/linux-rl9-libva
@@ -189,14 +183,11 @@ _linux_rl9_qtxmlpatterns= linux-rl9-qt5-qtxmlpatterns>0:textproc/linux-rl9-qt5-
_linux_${linux_ARGS}_sdl12= linux-${linux_ARGS}-sdl>0:devel/linux-${linux_ARGS}-sdl12
_linux_${linux_ARGS}_sdl12-extralibs= linux-${linux_ARGS}-sdl12-extralibs>0:misc/linux-${linux_ARGS}-sdl12-extralibs
_linux_${linux_ARGS}_sdl20= linux-${linux_ARGS}-sdl20>0:devel/linux-${linux_ARGS}-sdl20
-_linux_${linux_ARGS}_sdl2gfx= linux-${linux_ARGS}-sdl2_gfx>0:graphics/linux-${linux_ARGS}-sdl2_gfx
-_linux_${linux_ARGS}_sdl2image= linux-${linux_ARGS}-sdl2_image>0:graphics/linux-${linux_ARGS}-sdl2_image
-_linux_${linux_ARGS}_sdl2mixer= linux-${linux_ARGS}-sdl2_mixer>0:audio/linux-${linux_ARGS}-sdl2_mixer
-_linux_${linux_ARGS}_sdl2ttf= linux-${linux_ARGS}-sdl2_ttf>0:graphics/linux-${linux_ARGS}-sdl2_ttf
-_linux_${linux_ARGS}_sdl2sound= linux-${linux_ARGS}-sdl2_sound>0:audio/linux-${linux_ARGS}-sdl2_sound
+_linux_${linux_ARGS}_sdl20-extralibs= linux-${linux_ARGS}-sdl20-extralibs>0:misc/linux-${linux_ARGS}-sdl20-extralibs
_linux_rl9_shaderc= linux-rl9-shaderc>0:graphics/linux-rl9-shaderc
_linux_rl9_spirv-tools= linux-rl9-spirv-tools>0:graphics/linux-rl9-spirv-tools
-_linux_${linux_ARGS}_sqlite3= linux-${linux_ARGS}-sqlite>0:databases/linux-${linux_ARGS}-sqlite3
+_linux_c7_sqlite3= linux-c7-sqlite>0:databases/linux-c7-sqlite3
+_linux_rl9_sqlite3= ${_linux_rl9_base}
_linux_${linux_ARGS}_strace= linux-${linux_ARGS}-strace>0:devel/linux-${linux_ARGS}-strace
_linux_${linux_ARGS}_systemd-libs= linux-${linux_ARGS}-systemd-libs>0:devel/linux-${linux_ARGS}-systemd-libs
_linux_c7_tcl85= linux-c7-tcl85>0:lang/linux-c7-tcl85
@@ -351,7 +342,7 @@ PLIST?= ${PKGDIR}/pkg-plist.${ARCH}
. if !target(do-install)
do-install:
(cd ${WRKSRC} && \
- ${FIND} * | ${CPIO} -dumpl --quiet ${STAGEDIR}${PREFIX})
+ ${FIND} * -not -path 'usr/lib/.build-id*' | ${CPIO} -dumpl --quiet ${STAGEDIR}${PREFIX})
. for d in bin lib lib64 sbin
[ ! -e ${STAGEDIR}${PREFIX}/${d} -o -L ${STAGEDIR}${PREFIX}/${d} ] || \
(cd ${STAGEDIR}${PREFIX} && \
@@ -362,6 +353,7 @@ do-install:
(cd ${STAGEDIR}${PREFIX}/usr/share && ${FIND} icons | \
${CPIO} -dumpl --quiet ${STAGEDIR}${LOCALBASE}/share && \
${RM} -r icons)
+ ${RMDIR} ${STAGEDIR}${PREFIX}/usr/lib ${STAGEDIR}${PREFIX}/usr/lib64 || ${TRUE}
. endif
. endif # USE_LINUX_RPM
diff --git a/Mk/Uses/mysql.mk b/Mk/Uses/mysql.mk
index d9daa2e0a9d5..fa63b6cf465c 100644
--- a/Mk/Uses/mysql.mk
+++ b/Mk/Uses/mysql.mk
@@ -63,7 +63,7 @@ MYSQL80_LIBVER= 21
MYSQL84_LIBVER= 24
MYSQL91_LIBVER= 24
-. for v in 105 106 1011 114
+. for v in 105 106 1011 114 118
MYSQL${v}m_LIBVER= 3
. endfor
diff --git a/Mk/Uses/octave.mk b/Mk/Uses/octave.mk
index 1c23ef109e65..8aca21d0a789 100644
--- a/Mk/Uses/octave.mk
+++ b/Mk/Uses/octave.mk
@@ -22,7 +22,7 @@ IGNORE= Incorrect 'USES+= octave:${octave_ARGS}' usage: argument [${arg}] is not
. endif
. endfor
-OCTAVE_VERSION= 10.1.0
+OCTAVE_VERSION= 10.2.0
. if empty(octave_ARGS:Menv)
BUILD_DEPENDS+= octave:math/octave
diff --git a/Mk/Uses/perl5.mk b/Mk/Uses/perl5.mk
index 9f34715e9eeb..61ca6a5a4668 100644
--- a/Mk/Uses/perl5.mk
+++ b/Mk/Uses/perl5.mk
@@ -42,9 +42,7 @@ USE_PERL5?= run build
# When adding a version, please keep the comment in
# Mk/bsd.default-versions.mk in sync.
-. if ${PERL5_DEFAULT} == 5.36
-.include "${PORTSDIR}/lang/perl5.36/version.mk"
-. elif ${PERL5_DEFAULT} == 5.38
+. if ${PERL5_DEFAULT} == 5.38
.include "${PORTSDIR}/lang/perl5.38/version.mk"
. elif ${PERL5_DEFAULT} == 5.40
.include "${PORTSDIR}/lang/perl5.40/version.mk"
@@ -83,10 +81,8 @@ PERL_ARCH?= mach
# Mk/bsd.default-versions.mk in sync.
. if ${PERL_LEVEL} >= 504000
PERL_PORT?= perl5.40
-. elif ${PERL_LEVEL} >= 503800
+. else # ${PERL_LEVEL} < 504000
PERL_PORT?= perl5.38
-. else # ${PERL_LEVEL} < 503800
-PERL_PORT?= perl5.36
. endif
SITE_PERL_REL?= lib/perl5/site_perl
diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk
index 5cfa88989130..af659b76d8cc 100644
--- a/Mk/Uses/pyqt.mk
+++ b/Mk/Uses/pyqt.mk
@@ -108,9 +108,9 @@ 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.18.0
+PYQTBUILDER_VERSION= 1.18.2
QSCI2_VERSION= 2.14.1
-SIP_VERSION= 6.10.0 # ,1
+SIP_VERSION= 6.12.0 # ,1
# Qt 5 components
PYQT5SIP_VERSION= 12.17.0
@@ -122,14 +122,14 @@ PYQT5NETWORKAUTH_VERSION= 5.15.6
PYQT5WEBENGINE_VERSION= 5.15.7
# Qt 6 components
-PYQT6SIP_VERSION= 13.10.0
-PYQT6_VERSION= 6.8.1
-PYQT63D_VERSION= 6.8.0
-PYQT6CHARTS_VERSION= 6.8.0
-PYQT6DATAVIS3D_VERSION= 6.8.0
-PYQT6GRAPHS_VERSION= 6.8.0
-PYQT6NETWORKAUTH_VERSION= 6.8.0
-PYQT6WEBENGINE_VERSION= 6.8.0
+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
# Qt version-agnostic components
PYQTBUILDER_DISTNAME= pyqt_builder-${PYQTBUILDER_VERSION}
@@ -147,12 +147,12 @@ PYQT5WEBENGINE_DISTNAME= PyQtWebEngine-${PYQT5WEBENGINE_VERSION}
# Qt 6 components
PYQT6SIP_DISTNAME= pyqt6_sip-${PYQT6SIP_VERSION}
PYQT6_DISTNAME= pyqt6-${PYQT6_VERSION}
-PYQT63D_DISTNAME= PyQt6_3D-${PYQT63D_VERSION}
-PYQT6CHARTS_DISTNAME= PyQt6_Charts-${PYQT6CHARTS_VERSION}
-PYQT6DATAVIS3D_DISTNAME= PyQt6_DataVisualization-${PYQT6DATAVIS3D_VERSION}
-PYQT6GRAPHS_DISTNAME= PyQt6_Graphs-${PYQT6GRAPHS_VERSION}
-PYQT6NETWORKAUTH_DISTNAME= PyQt6_NetworkAuth-${PYQT6NETWORKAUTH_VERSION}
-PYQT6WEBENGINE_DISTNAME= PyQt6_WebEngine-${PYQT6WEBENGINE_VERSION}
+PYQT63D_DISTNAME= pyqt6_3d-${PYQT63D_VERSION}
+PYQT6CHARTS_DISTNAME= pyqt6_charts-${PYQT6CHARTS_VERSION}
+PYQT6DATAVIS3D_DISTNAME= pyqt6_datavisualization-${PYQT6DATAVIS3D_VERSION}
+PYQT6GRAPHS_DISTNAME= pyqt6_graphs-${PYQT6GRAPHS_VERSION}
+PYQT6NETWORKAUTH_DISTNAME= pyqt6_networkauth-${PYQT6NETWORKAUTH_VERSION}
+PYQT6WEBENGINE_DISTNAME= pyqt6_webengine-${PYQT6WEBENGINE_VERSION}
PYQT5_DISTINFO_FILE= ${.CURDIR:H:H}/devel/${PYQT_RELNAME}/distinfo
PYQT6_DISTINFO_FILE= ${.CURDIR:H:H}/devel/${PYQT_RELNAME}/distinfo
@@ -160,7 +160,7 @@ PYQT6_DISTINFO_FILE= ${.CURDIR:H:H}/devel/${PYQT_RELNAME}/distinfo
PYQT5_LICENSE= GPLv3
PYQT6_LICENSE= GPLv3
-_USE_PYQT_ALL= pyqt5 pyqt6 3d charts datavis3d networkauth webengine
+_USE_PYQT_ALL= pyqt5 pyqt6 3d charts graphs datavis3d networkauth webengine
_USE_SIP_ALL= pysip sip
_USE_QSCINTILLA= qscintilla2
_USE_PYQTBUILDER= qtbuilder
diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
index d2b787504316..8883e2dd79bc 100644
--- a/Mk/Uses/python.mk
+++ b/Mk/Uses/python.mk
@@ -235,12 +235,29 @@
# interpreter without dots, e.g. 27, 38, ...
# Used for prefixes and suffixes.
#
+# PYTHON_BASESUFFIX - PYTHON_SUFFIX without the threaded ABI flag.
+#
+# PYTHON_TAG - Defined by PEP 3147, magic tag containing
+# implementation name and shorthand version,
+# primarily for bytecode files. Includes
+# preceding dot, e.g. .cpython-312,
+# .cpython-313, ...
+#
+# PYTHON_SOABI - Defined by PEP 3149, tag containing
+# implementation name, shorthand version
+# and ABI tags, primarily for compiled
+# extension modules. Includes preceding
+# dot, e.g. .cpython-313, .cpython-313t,
+# .cpython-313td, ...
+#
# PYTHON_MAJOR_VER - The major release version of the chosen Python
# interpreter, e.g. 2, 3, ...
#
# PYTHON_VER - The major-minor release version of the chosen Python
# interpreter, e.g. 2.7, 3.9, ...
#
+# PYTHON_BASEVER - PYTHON_VER without the threaded ABI flag.
+#
# PYTHON_ABIVER - Additional ABI flags set by the chosen Python
# interpreter, e.g. md
#
@@ -284,7 +301,9 @@
# PYTHON_PLATFORM=${PYTHON_PLATFORM}
# PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR}
# PYTHON_SUFFIX=${PYTHON_SUFFIX}
+# PYTHON_BASESUFFIX=${PYTHON_BASESUFFIX}
# PYTHON_VER=${PYTHON_VER}
+# PYTHON_BASEVER=${PYTHON_BASEVER}
# PYTHON_VERSION=${PYTHON_VERSION}
#
# where PYTHON_INCLUDEDIR, PYTHON_LIBDIR and PYTHON_SITELIBDIR have their PREFIX
@@ -319,6 +338,8 @@
.if !defined(_INCLUDE_USES_PYTHON_MK)
_INCLUDE_USES_PYTHON_MK= yes
+ZEROREGS_UNSAFE= yes
+
# What Python version and what Python interpreters are currently supported?
# When adding a version, please keep the comment in
# Mk/bsd.default-versions.mk in sync.
@@ -458,9 +479,9 @@ IGNORE= uses unknown USES=python arguments: ${_PYTHON_ARGS}
_VC= C/^([1-9]\.)([0-9])$$/\10\2/
.undef _PYTHON_VERSION_NONSUPPORTED
-. if !empty(_PYTHON_VERSION_MINIMUM) && (${_PYTHON_VERSION:${_VC}} < ${_PYTHON_VERSION_MINIMUM:${_VC}})
+. if !empty(_PYTHON_VERSION_MINIMUM) && (${_PYTHON_VERSION:${_VC}:S/t$//} < ${_PYTHON_VERSION_MINIMUM:${_VC}:S/t$//})
_PYTHON_VERSION_NONSUPPORTED= ${_PYTHON_VERSION_MINIMUM} at least
-. elif !empty(_PYTHON_VERSION_MAXIMUM) && (${_PYTHON_VERSION:${_VC}} > ${_PYTHON_VERSION_MAXIMUM:${_VC}})
+. elif !empty(_PYTHON_VERSION_MAXIMUM) && (${_PYTHON_VERSION:${_VC}:S/t$//} > ${_PYTHON_VERSION_MAXIMUM:${_VC}:S/t$//})
_PYTHON_VERSION_NONSUPPORTED= ${_PYTHON_VERSION_MAXIMUM} at most
. endif
@@ -471,9 +492,9 @@ _PYTHON_VERSION_NONSUPPORTED= ${_PYTHON_VERSION_MAXIMUM} at most
__VER= ${ver}
. if !defined(_PYTHON_VERSION) && \
!(!empty(_PYTHON_VERSION_MINIMUM) && ( \
- ${__VER:${_VC}} < ${_PYTHON_VERSION_MINIMUM:${_VC}})) && \
+ ${__VER:${_VC}:S/t$//} < ${_PYTHON_VERSION_MINIMUM:${_VC}:S/t$//})) && \
!(!empty(_PYTHON_VERSION_MAXIMUM) && ( \
- ${__VER:${_VC}} > ${_PYTHON_VERSION_MAXIMUM:${_VC}}))
+ ${__VER:${_VC}:S/t$//} > ${_PYTHON_VERSION_MAXIMUM:${_VC}:S/t$//}))
_PYTHON_VERSION= ${ver}
. endif
. endfor
@@ -488,9 +509,9 @@ IGNORE= needs an unsupported version of Python
. for ver in ${PYTHON_DEFAULT} ${PYTHON2_DEFAULT} ${_PYTHON_VERSIONS}
__VER= ${ver}
. if !(!empty(_PYTHON_VERSION_MINIMUM) && ( \
- ${__VER:${_VC}} < ${_PYTHON_VERSION_MINIMUM:${_VC}})) && \
+ ${__VER:${_VC}:S/t$//} < ${_PYTHON_VERSION_MINIMUM:${_VC}:S/t$//})) && \
!(!empty(_PYTHON_VERSION_MAXIMUM) && ( \
- ${__VER:${_VC}} > ${_PYTHON_VERSION_MAXIMUM:${_VC}}))
+ ${__VER:${_VC}:S/t$//} > ${_PYTHON_VERSION_MAXIMUM:${_VC}:S/t$//}))
. if empty(_VALID_PYTHON_VERSIONS:M${ver})
_VALID_PYTHON_VERSIONS+= ${ver}
. endif
@@ -523,7 +544,7 @@ FLAVOR= ${FLAVORS:[1]}
. endif
. endif
-. if ${FLAVOR:Mpy[23][0-9]}${FLAVOR:Mpy[23][1-9][0-9]}
+. if ${FLAVOR:Mpy[23][0-9]}${FLAVOR:Mpy[23][1-9][0-9]}${FLAVOR:Mpy31[3-9]t}
_PYTHON_VERSION= ${FLAVOR:S/py//:C/(.)/\1./}
. endif
@@ -546,7 +567,9 @@ PYTHON_VERSION= python${_PYTHON_VERSION}
# Got the correct python version, set some publicly accessible variables
PYTHON_VER= ${_PYTHON_VERSION}
+PYTHON_BASEVER= ${PYTHON_VER:S/t$//}
PYTHON_SUFFIX= ${_PYTHON_VERSION:S/.//g}
+PYTHON_BASESUFFIX= ${PYTHON_SUFFIX:S/t$//}
PYTHON_MAJOR_VER= ${PYTHON_VER:R}
PYTHON_REL= # empty
PYTHON_ABIVER= # empty
@@ -554,12 +577,11 @@ PYTHON_PORTSDIR= ${_PYTHON_RELPORTDIR}${PYTHON_SUFFIX}
# Protect partial checkouts from Mk/Scripts/functions.sh:export_ports_env().
. if !defined(_PORTS_ENV_CHECK) || exists(${PORTSDIR}/${PYTHON_PORTSDIR})
-.include "${PORTSDIR}/${PYTHON_PORTSDIR}/Makefile.version"
+.include "${PORTSDIR}/${PYTHON_PORTSDIR:S/t$//}/Makefile.version"
. endif
# Create a 5 integer version string, prefixing 0 to the minor and patch
# tokens if it's a single character. Only use the first 3 tokens of
-# PORTVERSION to support pre-release versions (rc3, alpha4, etc) of
-# any Python port (lang/pythonXY)
+# DISTVERSION to stay consistent regardless of pre-release or ABI flags
PYTHON_REL= ${PYTHON_DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/:C/\.([0-9])$/.0\1/:C/\.([0-9]\.[0-9]+)/.0\1/:S/.//g}
# Might be overridden by calling ports
@@ -571,9 +593,11 @@ PYTHON_ABIVER!= ${PYTHON_CMD}-config --abiflags
. endif
. if ${PYTHON_REL} >= 30807
-PYTHON_EXT_SUFFIX= .cpython-${PYTHON_SUFFIX}
+PYTHON_TAG= .cpython-${PYTHON_BASESUFFIX}
+PYTHON_SOABI= .cpython-${PYTHON_SUFFIX}
. else
-PYTHON_EXT_SUFFIX= # empty
+PYTHON_TAG= # empty
+PYTHON_SOABI= # empty
. endif
. if ${PYTHON_MAJOR_VER} < 3
@@ -615,7 +639,7 @@ _PYTHONPKGLIST= ${WRKDIR}/.PLIST.pymodtmp
# cryptography* support
. if ${PYCRYPTOGRAPHY_DEFAULT} == rust
-CRYPTOGRAPHY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=44.0.2,1:security/py-cryptography@${PY_FLAVOR}
+CRYPTOGRAPHY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=44.0.3,1:security/py-cryptography@${PY_FLAVOR}
. else
CRYPTOGRAPHY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography-legacy>=3.4.8_3,1:security/py-cryptography-legacy@${PY_FLAVOR}
. endif
@@ -814,7 +838,7 @@ add-plist-pymod:
# When Python version is 3.2+ we rewrite all the filenames
# of TMPPLIST that end with .py[co], so that they conform
# to PEP 3147 (see https://www.python.org/dev/peps/pep-3147/)
-PYMAGICTAG= ${PYTHON_CMD} -c 'import sys; print(sys.implementation.cache_tag)'
+_PYMAGICTAG= ${PYTHON_CMD} -c 'import sys; print(sys.implementation.cache_tag)'
_USES_stage+= 935:add-plist-python
add-plist-python:
@${AWK} '\
@@ -823,7 +847,7 @@ add-plist-python:
/^@dirrmtry / {d = substr($$0, 11); if (d in dirs) {print $$0 "/" pc}; print $$0; next} \
{print} \
' \
- pc="__pycache__" mt="$$(${PYMAGICTAG})" pyo="opt-1.pyc" \
+ pc="__pycache__" mt="$$(${_PYMAGICTAG})" pyo="opt-1.pyc" \
${TMPPLIST} > ${TMPPLIST}.pyc_tmp
@${MV} ${TMPPLIST}.pyc_tmp ${TMPPLIST}
. endif # ${PYTHON_REL} >= 30200 && defined(_PYTHON_FEATURE_PY3KPLIST)
@@ -892,8 +916,11 @@ SUB_LIST+= PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR} \
PYTHON_PLATFORM=${PYTHON_PLATFORM} \
PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR} \
PYTHON_SUFFIX=${PYTHON_SUFFIX} \
- PYTHON_EXT_SUFFIX=${PYTHON_EXT_SUFFIX} \
+ PYTHON_BASESUFFIX=${PYTHON_BASESUFFIX} \
+ PYTHON_TAG=${PYTHON_TAG} \
+ PYTHON_SOABI=${PYTHON_SOABI} \
PYTHON_VER=${PYTHON_VER} \
+ PYTHON_BASEVER=${PYTHON_BASEVER} \
PYTHON_VERSION=${PYTHON_VERSION}
# Substitutions for pkg-plist
@@ -904,8 +931,11 @@ PLIST_SUB+= PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR:S;${PREFIX}/;;} \
PYTHON_PLATFORM=${PYTHON_PLATFORM} \
PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} \
PYTHON_SUFFIX=${PYTHON_SUFFIX} \
- PYTHON_EXT_SUFFIX=${PYTHON_EXT_SUFFIX} \
+ PYTHON_BASESUFFIX=${PYTHON_BASESUFFIX} \
+ PYTHON_TAG=${PYTHON_TAG} \
+ PYTHON_SOABI=${PYTHON_SOABI} \
PYTHON_VER=${PYTHON_VER} \
+ PYTHON_BASEVER=${PYTHON_BASEVER} \
PYTHON_VERSION=${PYTHON_VERSION}
. if ${PYTHON_MAJOR_VER} < 3
SUB_LIST+= PYTHON2="" PYTHON3="@comment "
diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk
index 7fc7bebadd3d..f863d0454dc9 100644
--- a/Mk/Uses/qt-dist.mk
+++ b/Mk/Uses/qt-dist.mk
@@ -108,25 +108,25 @@ DIST_SUBDIR= KDE/Qt/${_QT_VERSION}
. if ${_QT_VER:M5}
# KDE maintains a repository with a patched Qt5 distribution.
_KDE_3d= 0
-_KDE_base= 130
+_KDE_base= 123
_KDE_charts= 0
-_KDE_connectivity= 1
+_KDE_connectivity= 2
_KDE_datavis3d= 0
-_KDE_declarative= 22
+_KDE_declarative= 21
_KDE_gamepad= 0
_KDE_graphicaleffects= 0
_KDE_imageformats= 2
_KDE_location= 7
_KDE_multimedia= 2
-_KDE_networkauth= 1
+_KDE_networkauth= 0
_KDE_quick3d= 1
_KDE_quickcontrols= 0
_KDE_quickcontrols2= 5
_KDE_quicktimeline= 0
_KDE_remoteobjects= 0
_KDE_script= 0
-_KDE_script_ORIGIN_TAG= v5.15.18-lts
-_KDE_script_VERSION= 5.15.18
+_KDE_script_ORIGIN_TAG= v5.15.19-lts
+_KDE_script_VERSION= 5.15.19
_KDE_scxml= 0
_KDE_sensors= 0
_KDE_serialbus= 0
@@ -136,14 +136,14 @@ _KDE_svg= 5
_KDE_tools= 3
_KDE_translations= 0
_KDE_virtualkeyboard= 0
-_KDE_wayland= 59
+_KDE_wayland= 57
_KDE_webchannel= 3
# We track the 5.15 branch for www/qt5-webengine to make it easier to
# stay on top of Chromium security patches.
-_KDE_webengine= 7
+_KDE_webengine= 0
_KDE_webengine_BRANCH= 5.15
-_KDE_webengine_ORIGIN_TAG= v5.15.18-lts
-_KDE_webengine_VERSION= 5.15.18
+_KDE_webengine_ORIGIN_TAG= v5.15.19-lts
+_KDE_webengine_VERSION= 5.15.19
_KDE_webglplugin= 0
_KDE_websockets= 2
_KDE_webview= 0
diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk
index 038a82dc4ab6..905e7793a780 100644
--- a/Mk/Uses/qt.mk
+++ b/Mk/Uses/qt.mk
@@ -22,9 +22,9 @@ _QT_MK_INCLUDED= qt.mk
# Qt versions currently supported by the framework.
_QT_SUPPORTED?= 5 6
-QT5_VERSION?= 5.15.16
-QT6_VERSION?= 6.8.3
-PYSIDE6_VERSION?= 6.8.3
+QT5_VERSION?= 5.15.17
+QT6_VERSION?= 6.9.1
+PYSIDE6_VERSION?= 6.9.1
# Support for intermediate Qt6 releases. This partially defines
# _QT6_MASTER_SITE_SUBDIR and would probably be better in qt-dist.mk,
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-22 05:22:57 +0000