diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk
index 3bad60eb7233..e6390afee67f 100644
--- a/Mk/Uses/linux.mk
+++ b/Mk/Uses/linux.mk
@@ -1,385 +1,386 @@
 # Ports Linux compatibility framework
 #
 # Feature:	linux:args
 # Usage:	USES=linux or USES=linux:args
 # Valid args:	c7	Depend on CentOS 7 packages (default)
 #		rl9	Depend on Rocky Linux 9 packages
 # Additional variables:
 # USE_LINUX	List of Linux packages to depend on.
 # USE_LINUX_RPM	When defined, additional variables and targets useful to Linux
 #		infrastructure ports are made available.  Possible values:
 #		yes	Set default LIB_DISTNAMES.
 #		nolib	Set default BIN_DISTNAMES.
 #		noarch	Set default SHARE_DISTNAMES.
 # Additional variables when USE_LINUX_RPM is defined:
 # BIN_DISTNAMES		List of architecture dependent distnames.
 # LIB_DISTNAMES		List of distnames with additional 32 bit version.
 # SHARE_DISTNAMES	List of architecture independent distnames.
 # SRC_DISTFILES		List of source distfiles that need to be distributed
 #			with binary packages to comply with some licenses.
 #
 # MAINTAINER: emulation@FreeBSD.org
 
 .ifndef _INCLUDE_USES_LINUX_MK
 _INCLUDE_USES_LINUX_MK=	yes
 _USES_POST+=		linux
 
 .  if empty(linux_ARGS)
 .    if exists(${LINUXBASE}/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7)
 linux_ARGS=		c7
 .    elif exists(${LINUXBASE}/etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9)
 linux_ARGS=		rl9
 .    else
 linux_ARGS=		${LINUX_DEFAULT}
 .    endif
 .  endif
 
 .  if ${linux_ARGS} == c7
 LINUX_DIST_VER?=	7.9.2009
 .  elif ${linux_ARGS} == rl9
 LINUX_DIST_VER?=	9.5
 .  else
 ERROR+=			"Invalid Linux distribution: ${linux_ARGS}"
 .  endif
 
 .  ifndef ONLY_FOR_ARCHS
 .    if ${linux_ARGS} == rl9
 ONLY_FOR_ARCHS=		aarch64 amd64
 ONLY_FOR_ARCHS_REASON=	Rocky Linux compatibility is only available on aarch64 and amd64
 .    else
 ONLY_FOR_ARCHS=		aarch64 amd64 i386
 ONLY_FOR_ARCHS_REASON=	CentOS Linux compatibility is only available on aarch64, amd64 and i386
 .    endif
 .  endif
 
 _linux_${linux_ARGS}_alsa-lib-devel=	linux-${linux_ARGS}-alsa-lib-devel>0:audio/linux-${linux_ARGS}-alsa-lib-devel
 _linux_${linux_ARGS}_alsa-plugins-oss=	linux-${linux_ARGS}-alsa-plugins-oss>0:audio/linux-${linux_ARGS}-alsa-plugins-oss
 _linux_${linux_ARGS}_alsa-plugins-pulseaudio=linux-${linux_ARGS}-alsa-plugins-pulseaudio>0:audio/linux-${linux_ARGS}-alsa-plugins-pulseaudio
 _linux_${linux_ARGS}_alsalib=		linux-${linux_ARGS}-alsa-lib>0:audio/linux-${linux_ARGS}-alsa-lib
 _linux_rl9_aom=				linux-rl9-aom-libs>0:multimedia/linux-rl9-aom
 _linux_${linux_ARGS}_at-spi2-atk=	linux-${linux_ARGS}-at-spi2-atk>0:accessibility/linux-${linux_ARGS}-at-spi2-atk
 _linux_${linux_ARGS}_at-spi2-core=	linux-${linux_ARGS}-at-spi2-core>0:accessibility/linux-${linux_ARGS}-at-spi2-core
 _linux_${linux_ARGS}_atk=		linux-${linux_ARGS}-atk>0:accessibility/linux-${linux_ARGS}-atk
 _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_${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
 _linux_${linux_ARGS}_cups-libs=		linux-${linux_ARGS}-cups-libs>0:print/linux-${linux_ARGS}-cups-libs
 _linux_${linux_ARGS}_curl=		linux-${linux_ARGS}-curl>0:ftp/linux-${linux_ARGS}-curl
 _linux_${linux_ARGS}_cyrus-sasl2=	linux-${linux_ARGS}-cyrus-sasl-lib>0:security/linux-${linux_ARGS}-cyrus-sasl2
 _linux_${linux_ARGS}_dbuslibs=		linux-${linux_ARGS}-dbus-libs>0:devel/linux-${linux_ARGS}-dbus-libs
 _linux_${linux_ARGS}_devtools=		linux-${linux_ARGS}-devtools>0:devel/linux-${linux_ARGS}-devtools
 _linux_c7_dosfstools=			linux-c7-dosfstools>0:filesystems/linux-c7-dosfstools
 _linux_${linux_ARGS}_dri=		linux-${linux_ARGS}-dri>0:graphics/linux-${linux_ARGS}-dri
 _linux_${linux_ARGS}_elfutils-libelf=	linux-${linux_ARGS}-elfutils-libelf>0:devel/linux-${linux_ARGS}-elfutils-libelf
 _linux_${linux_ARGS}_elfutils-libs=	linux-${linux_ARGS}-elfutils-libs>0:devel/linux-${linux_ARGS}-elfutils-libs
 _linux_c7_expat-devel=			linux-c7-expat-devel>0:textproc/linux-c7-expat-devel
 _linux_${linux_ARGS}_expat=		linux-${linux_ARGS}-expat>0:textproc/linux-${linux_ARGS}-expat
 _linux_rl9_ffmpeg-libs=			linux-rl9-ffmpeg-libs>0:multimedia/linux-rl9-ffmpeg
 _linux_${linux_ARGS}_flac=		linux-${linux_ARGS}-flac-libs>0:audio/linux-${linux_ARGS}-flac
 _linux_${linux_ARGS}_fontconfig=	linux-${linux_ARGS}-fontconfig>0:x11-fonts/linux-${linux_ARGS}-fontconfig
 _linux_${linux_ARGS}_freetype=		linux-${linux_ARGS}-freetype>0:print/linux-${linux_ARGS}-freetype
 _linux_${linux_ARGS}_fribidi=		linux-${linux_ARGS}-fribidi>0:converters/linux-${linux_ARGS}-fribidi
 _linux_${linux_ARGS}_gdkpixbuf2=	linux-${linux_ARGS}-gdk-pixbuf2>0:graphics/linux-${linux_ARGS}-gdk-pixbuf2
 _linux_rl9_gnupg=			linux-rl9-gnupg2>0:security/linux-rl9-gnupg
 _linux_${linux_ARGS}_gnutls=		linux-${linux_ARGS}-gnutls>0:security/linux-${linux_ARGS}-gnutls
 _linux_rl9_graphene=			linux-rl9-graphene>0:graphics/linux-rl9-graphene
 _linux_${linux_ARGS}_graphite2=		linux-${linux_ARGS}-graphite2>0:graphics/linux-${linux_ARGS}-graphite2
 _linux_${linux_ARGS}_gsm=		linux-${linux_ARGS}-gsm>0:audio/linux-${linux_ARGS}-gsm
 _linux_rl9_gstreamer1=			linux-rl9-gstreamer1>0:multimedia/linux-rl9-gstreamer1
 _linux_rl9_gstreamer1-libav=		linux-rl9-gstreamer1-plugin-libav>0:multimedia/linux-rl9-gstreamer1-libav
 _linux_${linux_ARGS}_gtk2=		linux-${linux_ARGS}-gtk2>0:x11-toolkits/linux-${linux_ARGS}-gtk2
 _linux_${linux_ARGS}_gtk3=		linux-${linux_ARGS}-gtk3>0:x11-toolkits/linux-${linux_ARGS}-gtk3
 _linux_${linux_ARGS}_harfbuzz=		linux-${linux_ARGS}-harfbuzz>0:print/linux-${linux_ARGS}-harfbuzz
 _linux_rl9_highway=			linux-rl9-highway>0:devel/linux-rl9-highway
 _linux_${linux_ARGS}_icu=		linux-${linux_ARGS}-icu>0:devel/linux-${linux_ARGS}-icu
 _linux_${linux_ARGS}_imageformats-libs=	linux-${linux_ARGS}-imageformats-libs>0:graphics/linux-${linux_ARGS}-imageformats-libs
 _linux_c7_libaio=			linux-c7-libaio>0:devel/linux-c7-libaio
 _linux_rl9_libassuan=			linux-rl9-libassuan>0:security/linux-rl9-libassuan
 _linux_${linux_ARGS}_libasyncns=	linux-${linux_ARGS}-libasyncns>0:dns/linux-${linux_ARGS}-libasyncns
 _linux_c7_libaudiofile=			linux-c7-audiofile>0:audio/linux-c7-audiofile
 _linux_c7_libcroco=			linux-c7-libcroco>0:textproc/linux-c7-libcroco
 _linux_${linux_ARGS}_libdrm=		linux-${linux_ARGS}-libdrm>0:graphics/linux-${linux_ARGS}-libdrm
 _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}_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_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_${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_${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
 _linux_rl9_libstemmer=			linux-rl9-libstemmer>=0:textproc/linux-rl9-libstemmer
 _linux_${linux_ARGS}_libtasn1=		linux-${linux_ARGS}-libtasn1>0:security/linux-${linux_ARGS}-libtasn1
 _linux_${linux_ARGS}_libthai=		linux-${linux_ARGS}-libthai>0:devel/linux-${linux_ARGS}-libthai
 _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_${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
 _linux_rl9_libvdpau=			linux-rl9-libvdpau>0:multimedia/linux-rl9-libvdpau
 _linux_${linux_ARGS}_libvorbis=		linux-${linux_ARGS}-libvorbis>0:audio/linux-${linux_ARGS}-libvorbis
 _linux_rl9_libvpx=			linux-rl9-libvpx>0:multimedia/linux-rl9-libvpx
 _linux_${linux_ARGS}_libxkbcommon=	linux-${linux_ARGS}-libxkbcommon>0:x11/linux-${linux_ARGS}-libxkbcommon
 _linux_${linux_ARGS}_libxml2=		linux-${linux_ARGS}-libxml2>0:textproc/linux-${linux_ARGS}-libxml2
 _linux_${linux_ARGS}_libxslt=		linux-${linux_ARGS}-libxslt>0:textproc/linux-${linux_ARGS}-libxslt
 _linux_rl9_lld=				linux-rl9-llvm>0:devel/linux-rl9-lld
 _linux_rl9_lldb=			linux-rl9-llvm>0:devel/linux-rl9-lldb
 _linux_rl9_llvm=			linux-rl9-llvm>0:devel/linux-rl9-llvm
 _linux_c7_lttng-ust=			linux-c7-lttng-ust>0:sysutils/linux-c7-lttng-ust
 _linux_${linux_ARGS}_lz4=		linux-${linux_ARGS}-lz4>0:archivers/linux-${linux_ARGS}-lz4
 _linux_c7_make=				linux-c7-make>0:devel/linux-c7-make
 _linux_${linux_ARGS}_nettle=		linux-${linux_ARGS}-nettle>0:security/linux-${linux_ARGS}-nettle
 _linux_${linux_ARGS}_nspr=		linux-${linux_ARGS}-nspr>0:devel/linux-${linux_ARGS}-nspr
 _linux_${linux_ARGS}_nss=		linux-${linux_ARGS}-nss>0:security/linux-${linux_ARGS}-nss
 _linux_rl9_npth=			linux-rl9-npth>0:devel/linux-rl9-npth
 _linux_c7_numactl-libs=			linux-c7-numactl-libs>0:sysutils/linux-c7-numactl-libs
 _linux_rl9_ocl-icd=			linux-rl9-ocl-icd>0:devel/linux-rl9-ocl-icd
 _linux_${linux_ARGS}_openal-soft=	linux-${linux_ARGS}-openal-soft>0:audio/linux-${linux_ARGS}-openal-soft
 _linux_${linux_ARGS}_openldap=		linux-${linux_ARGS}-openldap>0:net/linux-${linux_ARGS}-openldap
 _linux_c7_openmotif=			linux-c7-motif>0:x11-toolkits/linux-c7-openmotif
 _linux_c7_openssl-devel=		linux-c7-openssl-devel>0:security/linux-c7-openssl-devel
 _linux_c7_openssl=			${_linux_c7_base}
 _linux_rl9_opus=			linux-rl9-opus>0:audio/linux-rl9-opus
 _linux_rl9_orc=				linux-rl9-orc>0:devel/linux-rl9-orc
 _linux_${linux_ARGS}_p11-kit=		linux-${linux_ARGS}-p11-kit>0:security/linux-${linux_ARGS}-p11-kit
 _linux_${linux_ARGS}_pango=		linux-${linux_ARGS}-pango>0:x11-toolkits/linux-${linux_ARGS}-pango
 _linux_${linux_ARGS}_pixman=		linux-${linux_ARGS}-pixman>0:x11/linux-${linux_ARGS}-pixman
 _linux_${linux_ARGS}_pulseaudio-libs=	linux-${linux_ARGS}-pulseaudio-libs>0:audio/linux-${linux_ARGS}-pulseaudio-libs
 _linux_rl9_pulseaudio-utils=		linux-rl9-pulseaudio-utils>0:audio/linux-rl9-pulseaudio-utils
 _linux_rl9_python3=			linux-rl9-python39>0:lang/linux-rl9-python3
 _linux_c7_qt=				linux-c7-qt>0:devel/linux-c7-qt
 _linux_c7_qt-x11=			linux-c7-qt-x11>0:x11-toolkits/linux-c7-qt-x11
 _linux_c7_qtwebkit=			linux-c7-qtwebkit>0:www/linux-c7-qtwebkit
 _linux_rl9_qt3d=			linux-rl9-qt5-qt3d>0:graphics/linux-rl9-qt5-qt3d
 _linux_rl9_qtbase=			linux-rl9-qt5-qtbase>0:devel/linux-rl9-qt5-qtbase
 _linux_rl9_qtconnectivity=		linux-rl9-qt5-qtconnectivity>0:comms/linux-rl9-qt5-qtconnectivity
 _linux_rl9_qtdeclarative=		linux-rl9-qt5-qtdeclarative>0:x11-toolkits/linux-rl9-qt5-qtdeclarative
 _linux_rl9_qtgraphicaleffects=		linux-rl9-qt5-qtgraphicaleffects>0:graphics/linux-rl9-qt5-qtgraphicaleffects
 _linux_rl9_qtimageformats=		linux-rl9-qt5-qtimageformats>0:graphics/linux-rl9-qt5-qtimageformats
 _linux_rl9_qtmultimedia=		linux-rl9-qt5-qtmultimedia>0:multimedia/linux-rl9-qt5-qtmultimedia
 _linux_rl9_qtquickcontrols=		linux-rl9-qt5-qtquickcontrols>0:x11-toolkits/linux-rl9-qt5-qtquickcontrols
 _linux_rl9_qtscript=			linux-rl9-qt5-qtscript>0:devel/linux-rl9-qt5-qtscript
 _linux_rl9_qtsensors=			linux-rl9-qt5-qtsensors>0:comms/linux-rl9-qt5-qtsensors
 _linux_rl9_qtserialbus=			linux-rl9-qt5-qtserialbus>0:comms/linux-rl9-qt5-qtserialbus
 _linux_rl9_qtserialport=		linux-rl9-qt5-qtserialport>0:comms/linux-rl9-qt5-qtserialport
 _linux_rl9_qtsvg=			linux-rl9-qt5-qtsvg>0:graphics/linux-rl9-qt5-qtsvg
 _linux_rl9_qttools=			linux-rl9-qt5-qttools>0:devel/linux-rl9-qt5-qttools
 _linux_rl9_qtwayland=			linux-rl9-qt5-qtwayland>0:graphics/linux-rl9-qt5-qtwayland
 _linux_rl9_qtwebchannel=		linux-rl9-qt5-qtwebchannel>0:www/linux-rl9-qt5-qtwebchannel
 _linux_rl9_qtwebsockets=		linux-rl9-qt5-qtwebsockets>0:www/linux-rl9-qt5-qtwebsockets
 _linux_rl9_qtx11extras=			linux-rl9-qt5-qtx11extras>0:x11/linux-rl9-qt5-qtx11extras
 _linux_rl9_qtxmlpatterns=		linux-rl9-qt5-qtxmlpatterns>0:textproc/linux-rl9-qt5-qtxmlpatterns
 _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}_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
 _linux_rl9_tcl86=			linux-rl9-tcl86>0:lang/linux-rl9-tcl86
 _linux_${linux_ARGS}_tcp_wrappers-libs=	linux-${linux_ARGS}-tcp_wrappers-libs>0:net/linux-${linux_ARGS}-tcp_wrappers-libs
 _linux_c7_tk85=				linux-c7-tk85>0:x11-toolkits/linux-c7-tk85
 _linux_rl9_tk86=			linux-rl9-tk86>0:x11-toolkits/linux-rl9-tk86
 _linux_${linux_ARGS}_trousers=		linux-${linux_ARGS}-trousers>0:security/linux-${linux_ARGS}-trousers
 _linux_c7_userspace-rcu=		linux-c7-userspace-rcu>0:sysutils/linux-c7-userspace-rcu
 _linux_rl9_vmaf=			linux-rl9-vmaf>0:multimedia/linux-rl9-vmaf
 _linux_rl9_vulkan=			linux-rl9-vulkan-loader>0:graphics/linux-rl9-vulkan
 _linux_${linux_ARGS}_wayland=		linux-${linux_ARGS}-wayland>0:graphics/linux-${linux_ARGS}-wayland
 _linux_rl9_wget=			linux-rl9-wget>0:ftp/linux-rl9-wget
 _linux_${linux_ARGS}_xcb-util=		linux-${linux_ARGS}-xcb-util>0:x11/linux-${linux_ARGS}-xcb-util
 _linux_${linux_ARGS}_xorglibs=		linux-${linux_ARGS}-xorg-libs>=7.7:x11/linux-${linux_ARGS}-xorg-libs
 _linux_c7_zlib-devel=			linux-c7-zlib-devel>0:devel/linux-c7-zlib-devel
 # special node for linux_libusb
 _linux_${linux_ARGS}_libusb=		linux_libusb-${linux_ARGS}>0:devel/linux_libusb@${linux_ARGS}
 
 USE_LINUX?=		base
 .  for i in ${USE_LINUX}
 _i_args:=		${i:C/^[^:]*:?//:S/,/ /g}
 .    if ${_i_args:Mpatch}
 PATCH_DEPENDS+=		${_linux_${linux_ARGS}_${i:C/:.*//}}
 .    endif
 .    if ${_i_args:Mbuild}
 BUILD_DEPENDS+=		${_linux_${linux_ARGS}_${i:C/:.*//}}
 .    endif
 .    if ${_i_args:Mrun} || empty(_i_args)
 RUN_DEPENDS+=		${_linux_${linux_ARGS}_${i:C/:.*//}}
 .    endif
 .    if !defined(_linux_${linux_ARGS}_${i:C/:.*//})
 DEV_ERROR+=		"USE_LINUX=${i}: package does not exist"
 .    endif
 .  endfor
 
 .  ifdef USE_LINUX_RPM
 
 .    if ${linux_ARGS} == c7
 .      ifndef MASTER_SITES
 MASTER_SITES=		${MASTER_SITE_CENTOS_LINUX}
 MASTER_SITE_SUBDIR=	altarch/${LINUX_DIST_VER}/os/aarch64/Packages/:DEFAULT,aarch64 \
 			altarch/${LINUX_DIST_VER}/updates/aarch64/Packages/:DEFAULT,aarch64 \
 			centos/${LINUX_DIST_VER}/os/x86_64/Packages/:DEFAULT,amd64 \
 			centos/${LINUX_DIST_VER}/updates/x86_64/Packages/:DEFAULT,amd64 \
 			altarch/${LINUX_DIST_VER}/os/i386/Packages/:DEFAULT,i386 \
 			altarch/${LINUX_DIST_VER}/updates/i386/Packages/:DEFAULT,i386 \
 			centos/${LINUX_DIST_VER}/os/Source/SPackages/:SOURCE \
 			centos/${LINUX_DIST_VER}/updates/Source/SPackages/:SOURCE
 .      endif
 DIST_SUBDIR?=		centos
 DEPRECATED=		CentOS Linux 7 reached end of life (EOL) on June 30, 2024
 .    elif ${linux_ARGS} == rl9
 .      ifndef MASTER_SITES
 MASTER_SITES=		${MASTER_SITE_ROCKY_LINUX}
 MASTER_SITE_SUBDIR=	${LINUX_DIST_VER}/BaseOS/aarch64/os/Packages/:DEFAULT,aarch64 \
 			${LINUX_DIST_VER}/AppStream/aarch64/os/Packages/:DEFAULT,aarch64 \
 			${LINUX_DIST_VER}/BaseOS/x86_64/os/Packages/:DEFAULT,amd64 \
 			${LINUX_DIST_VER}/AppStream/x86_64/os/Packages/:DEFAULT,amd64 \
 			${LINUX_DIST_VER}/BaseOS/source/tree/Packages/:SOURCE \
 			${LINUX_DIST_VER}/AppStream/source/tree/Packages/:SOURCE
 .      endif
 DIST_SUBDIR?=		rocky
 .    endif # ${linux_ARGS} == *
 
 PKGNAMEPREFIX?=		linux-${linux_ARGS}-
 EXTRACT_SUFX?=		.rpm
 EXTRACT_SUFX_aarch64?=	.aarch64${EXTRACT_SUFX}
 EXTRACT_SUFX_amd64?=	.x86_64${EXTRACT_SUFX}
 EXTRACT_SUFX_i386?=	.i686${EXTRACT_SUFX}
 EXTRACT_SUFX_noarch?=	.noarch${EXTRACT_SUFX}
 SRC_SUFX?=		.src${EXTRACT_SUFX}
 
 NO_BUILD=		yes
 NO_WRKSUBDIR=		yes
 USE_LINUX_PREFIX=	yes
 
 .  endif # USE_LINUX_RPM
 
 .endif # ! _INCLUDE_USES_LINUX_MK
 
 .ifdef _POSTMKINCLUDED && ! _INCLUDE_USES_LINUX_POST_MK
 _INCLUDE_USES_LINUX_POST_MK=	yes
 
 .  ifdef USE_LINUX_RPM
 
 .    if ${USE_LINUX_RPM} == noarch
 NO_ARCH=		yes
 SHARE_DISTNAMES?=	${DISTNAME}
 .    elif ${USE_LINUX_RPM} == nolib
 BIN_DISTNAMES?=		${DISTNAME}
 .    else
 LIB_DISTNAMES?=		${DISTNAME}
 .    endif
 .    if ${linux_ARGS} == rl9
 .      if !empty(SHARE_DISTNAMES)
 SHARE_DISTNAMES:=	${SHARE_DISTNAMES:@i@${i:C/^([A-Za-z0-9]).*/\1/:tl}/${i}@}
 .      endif
 .      if !empty(BIN_DISTNAMES)
 BIN_DISTNAMES:=		${BIN_DISTNAMES:@i@${i:C/^([A-Za-z0-9]).*/\1/:tl}/${i}@}
 .      endif
 .      if !empty(LIB_DISTNAMES)
 LIB_DISTNAMES:=		${LIB_DISTNAMES:@i@${i:C/^([A-Za-z0-9]).*/\1/:tl}/${i}@}
 .      endif
 .    endif
 .    if !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:Maarch64)) \
  && empty(NOT_FOR_ARCHS:Maarch64)
 DISTFILES_aarch64?=	${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_aarch64}:aarch64/} \
 			${BIN_DISTNAMES:S/$/${EXTRACT_SUFX_aarch64}:aarch64/} \
 			${SHARE_DISTNAMES:S/$/${EXTRACT_SUFX_noarch}/} \
 			${LIB_DISTNAMES_aarch64:S/$/${EXTRACT_SUFX_aarch64}:aarch64/}
 .    endif
 .    if !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:Mamd64)) \
  && empty(NOT_FOR_ARCHS:Mamd64)
 .      ifndef DISTFILES_amd64
 .        if ${linux_ARGS} == c7
 DISTFILES_amd64=	${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_i386}:amd64,i386/} \
 			${LIB_DISTNAMES_i386:S/$/${EXTRACT_SUFX_i386}:amd64,i386/}
 .        endif
 .        if  !empty(WANT_LINUX32)
 DISTFILES_amd64+=	${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_i386}:amd64/}
 .        endif
 DISTFILES_amd64+=	${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_amd64}:amd64/} \
 			${LIB_DISTNAMES_amd64:S/$/${EXTRACT_SUFX_amd64}:amd64/} \
 			${BIN_DISTNAMES:S/$/${EXTRACT_SUFX_amd64}:amd64/} \
 			${SHARE_DISTNAMES:S/$/${EXTRACT_SUFX_noarch}/}
 .      endif
 .    endif
 .    if !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:Mi386)) \
  && empty(NOT_FOR_ARCHS:Mi386)
 DISTFILES_i386?=	${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_i386}:amd64,i386/} \
 			${LIB_DISTNAMES_i386:S/$/${EXTRACT_SUFX_i386}:amd64,i386/} \
 			${BIN_DISTNAMES:S/$/${EXTRACT_SUFX_i386}:i386/} \
 			${SHARE_DISTNAMES:S/$/${EXTRACT_SUFX_noarch}/}
 .    endif
 SRC_DISTFILES?=		${DISTNAME}${SRC_SUFX}:SOURCE
 .    if ${linux_ARGS} == rl9
 SRC_DISTFILES:=		${SRC_DISTFILES:@i@${i:C/^([A-Za-z0-9]).*/\1/:tl}/${i}@}
 .    endif
 
 .    ifdef USE_LINUX_RPM_BAD_PERMS
 EXTRACT_DEPENDS+=	rpm2archive:archivers/rpm4
 EXTRACT_CMD=		rpm2archive
 EXTRACT_BEFORE_ARGS=	- <
 EXTRACT_AFTER_ARGS=	| ${TAR} xf - --no-same-owner --no-same-permissions
 .    endif
 
 .    if ${USE_LINUX_RPM} != noarch
 PLIST?=			${PKGDIR}/pkg-plist.${ARCH}
 .    endif
 
 .    if !target(do-install)
 do-install:
 	(cd ${WRKSRC} && \
 		${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} && \
 		${FIND} ${d} | ${CPIO} -dumpl --quiet usr && ${RM} -r ${d})
 .      endfor
 	[ ! -e ${STAGEDIR}${PREFIX}/usr/share/icons -o \
 		-L ${STAGEDIR}${PREFIX}/usr/share/icons ] || \
 		(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
 
 .  ifdef DISTNAME_aarch64
 DISTFILES_aarch64?=	${DISTNAME_aarch64}${EXTRACT_SUFX}
 .  endif
 .  ifdef DISTNAME_amd64
 DISTFILES_amd64?=	${DISTNAME_amd64}${EXTRACT_SUFX}
 .  endif
 .  ifdef DISTNAME_i386
 DISTFILES_i386?=	${DISTNAME_i386}${EXTRACT_SUFX}
 .  endif
 
 .  ifndef DISTFILES
 .    ifdef DISTFILES_aarch64 || DISTFILES_amd64 || DISTFILES_i386
 .      if make(makesum)
 _ALL_DISTFILES=		${DISTFILES_aarch64} ${DISTFILES_amd64} ${DISTFILES_i386}
 DISTFILES=		${_ALL_DISTFILES:O:u}
 .      else
 DISTFILES=		${DISTFILES_${ARCH}}
 .      endif
 EXTRACT_ONLY?=		${DISTFILES_${ARCH}:C/:[^:]+$//}
 .    endif
 .  endif
 .  if !empty(SRC_DISTFILES) && (make(makesum) || defined(PACKAGE_BUILDING))
 DISTFILES+=		${SRC_DISTFILES}
 .  endif
 
 .endif # _POSTMKINCLUDED && ! _INCLUDE_USES_LINUX_POST_MK
diff --git a/astro/google-earth-pro/Makefile b/astro/google-earth-pro/Makefile
index 4e963b272b3a..654b04a6e8c6 100644
--- a/astro/google-earth-pro/Makefile
+++ b/astro/google-earth-pro/Makefile
@@ -1,52 +1,52 @@
 #
 # See versions at:
 # https://support.google.com/earth/answer/168344
 
 PORTNAME=	google-earth-pro
 DISTVERSION=	7.3.6.10201
 DISTVERSIONSUFFIX=	-0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro deskutils geography
 MASTER_SITES=	http://dl.google.com/linux/earth/rpm/stable/x86_64/
 DISTFILES_amd64=	${PORTNAME}-stable-${DISTVERSION}${DISTVERSIONSUFFIX}.x86_64.rpm
 
 MAINTAINER=	jhay@FreeBSD.org
 COMMENT=	Virtual globe, map and geographical information program
 WWW=		https://www.google.com/earth/
 
 LICENSE=	GEARTH
 LICENSE_NAME=	Google Earth
 LICENSE_TEXT=	Google Earth Terms are available at: \
 	https://www.google.com/help/terms_maps/ \
 	https://about.google/brand-resource-center/products-and-services/geo-guidelines/#google-earth
 LICENSE_PERMS=	no-dist-mirror no-pkg-mirror auto-accept
 
 ONLY_FOR_ARCHS=	amd64
 
 USES=		desktop-file-utils linux:rl9
 USE_LINUX=	dbuslibs dri gstreamer1 libxml2 sqlite3 xorglibs
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 PLIST_SUB=	LINUXBASE=${LINUXBASE}
 SUB_FILES=	google-earth-pro
 SUB_LIST=	LINUXBASE=${LINUXBASE}
 
 post-patch:
 	@${SED} -i '' 's/^Exec=[^[:space:]]*/Exec=google-earth-pro/' \
 		${WRKSRC}/opt/google/earth/pro/google-earth-pro.desktop
 	@${LN} -sf googleearth ${WRKSRC}/opt/google/earth/pro/google-earth-pro
 
 do-install:
 .for s in 16 22 24 32 48 64 128 256
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps
 	${INSTALL_DATA} ${WRKSRC}/opt/google/earth/pro/product_logo_${s}.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/google-earth-pro.png
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/opt/google/earth/pro/google-earth-pro.desktop \
 		${STAGEDIR}${DESKTOPDIR}
 	${MKDIR} ${STAGEDIR}${LINUXBASE}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} opt ${STAGEDIR}${LINUXBASE})
 	${INSTALL_SCRIPT} ${WRKDIR}/google-earth-pro ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/emulators/linux-rl9/Makefile b/emulators/linux-rl9/Makefile
index e4753974da0c..fb0e780a6c3c 100644
--- a/emulators/linux-rl9/Makefile
+++ b/emulators/linux-rl9/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	linux-rl9
 PORTVERSION=	${LINUX_DIST_VER}
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	emulators linux
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Meta-port for all things Rocky Linux ${LINUX_DIST_VER}
 WWW=		https://rockylinux.org
 
 LICENSE=	BSD2CLAUSE
 
 USES=		linux:rl9 metaport
 USE_LINUX=	alsalib alsa-lib-devel alsa-plugins-oss alsa-plugins-pulseaudio \
 		at-spi2-atk at-spi2-core atk avahi-libs \
 		ca-certificates cairo cairo-gobject cups-libs curl cyrus-sasl2 \
 		dbuslibs devtools dri elfutils-libelf elfutils-libs expat \
 		ffmpeg-libs flac fontconfig freetype fribidi gdkpixbuf2 gnupg gnutls \
 		graphite2 gsm gstreamer1 gstreamer1-libav gtk2 gtk3 harfbuzz icu \
 		imageformats-libs libassuan libasyncns libdrm libepoxy libevent \
 		libgcrypt libglvnd libgpg-error libksba libnghttp2 libogg \
 		libpciaccess librsvg2 libsecret libsigc++20 \
 		libsndfile libssh libstemmer libtasn1 libthai libtheora libtool-ltdl \
 		libtracker-sparql libusb libv4l libva libvdpau \
 		libvorbis libvpx libxkbcommon libxml2 libxslt llvm \
 		lz4 nettle npth nspr nss ocl-icd openal-soft openldap opus orc \
 		p11-kit pango pixman pulseaudio-libs pulseaudio-utils python3 \
 		qt3d qtbase qtconnectivity qtdeclarative qtgraphicaleffects qtimageformats \
 		qtmultimedia qtquickcontrols qtscript qtsensors qtserialbus qtserialport \
 		qtsvg qttools qtwayland qtwebchannel qtwebsockets qtx11extras qtxmlpatterns \
 		sdl12 sdl12-extralibs sdl20 sdl20-extralibs \
 		sqlite3 strace systemd-libs tcp_wrappers-libs vulkan \
 		wayland wget xcb-util xorglibs
 
 .include <bsd.port.options.mk>
 
 .include <bsd.port.mk>
diff --git a/mail/linux-r7-organizer-pro/Makefile b/mail/linux-r7-organizer-pro/Makefile
index 62af598438a6..25bfeea3c372 100644
--- a/mail/linux-r7-organizer-pro/Makefile
+++ b/mail/linux-r7-organizer-pro/Makefile
@@ -1,45 +1,46 @@
 PORTNAME=	r7-organizer-pro
 PORTVERSION=	3.1.6
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-1
 CATEGORIES=	mail linux russian
 MASTER_SITES=	https://download.r7-office.ru/organizer/centos/
 PKGNAMEPREFIX=	linux-
 DISTNAME=	r7organizer_pro-${PORTVERSION}${DISTVERSIONSUFFIX}
 EXTRACT_SUFX=	.x86_64.rpm
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Russian office mail, tasks and contacts organizer (PRO version)
 WWW=		https://r7-office.ru/organizer
 
 LICENSE=	commercial
 LICENSE_NAME=	commercial
 LICENSE_TEXT=	Commercial software with 30 days trial period
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
 ONLY_FOR_ARCHS=	amd64
 
 USES=		desktop-file-utils linux:rl9 shared-mime-info
 
 USE_LINUX=	gtk3 sqlite3 alsalib
 
 CONFLICTS_INSTALL=	linux-r7-organizer
 
 NO_BUILD=	yes
 PLIST_SUB=	LINUXBASE=${LINUXBASE}
 STRIP=
 
 post-patch:
 	${REINPLACE_CMD} -i '' 's|/opt/r7-office/organizer/|${PREFIX}/bin/|' ${WRKDIR}/opt/r7-office/organizer/r7-organizer.desktop
 	${REINPLACE_CMD} -i '' 's|P7|Р7|' ${WRKDIR}/opt/r7-office/organizer/r7-organizer.desktop
 
 do-install:
 	cd ${WRKDIR}/opt && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share
 	${RM} ${STAGEDIR}${PREFIX}/share/r7-office/organizer/r7organizer*
 	${INSTALL_PROGRAM} -C ${WRKDIR}/opt/r7-office/organizer/r7organizer ${STAGEDIR}${PREFIX}/share/r7-office/organizer/r7organizer
 	${INSTALL_PROGRAM} -C ${WRKDIR}/opt/r7-office/organizer/r7organizer-bin ${STAGEDIR}${PREFIX}/share/r7-office/organizer/r7organizer-bin
 	${RLN} ${STAGEDIR}${PREFIX}/share/r7-office/organizer/r7organizer ${STAGEDIR}${PREFIX}/bin/
 	${MV} ${STAGEDIR}${PREFIX}/share/r7-office/organizer/r7-organizer.desktop ${STAGEDIR}${PREFIX}/share/applications
 	${RLN} ${STAGEDIR}${PREFIX}/share/r7-office/organizer/chrome/icons/default/default256.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/r7-organizer.png
 
 .include <bsd.port.mk>
diff --git a/mail/linux-r7-organizer/Makefile b/mail/linux-r7-organizer/Makefile
index 169d6cc50608..b5e87bed2fc9 100644
--- a/mail/linux-r7-organizer/Makefile
+++ b/mail/linux-r7-organizer/Makefile
@@ -1,44 +1,45 @@
 PORTNAME=	r7-organizer
 PORTVERSION=	3.1.2
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-1
 CATEGORIES=	mail linux russian
 MASTER_SITES=	https://download.r7-office.ru/organizer/centos/
 PKGNAMEPREFIX=	linux-
 DISTNAME=	r7organizer-${PORTVERSION}${DISTVERSIONSUFFIX}
 EXTRACT_SUFX=	.x86_64.rpm
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Russian office mail, tasks and contacts organizer (BASIC version)
 WWW=		https://r7-office.ru/organizer
 
 LICENSE=	commercial
 LICENSE_NAME=	commercial
 LICENSE_TEXT=	Commercial software with 30 days trial period
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
 ONLY_FOR_ARCHS=	amd64
 
 USES=		desktop-file-utils linux:rl9 shared-mime-info
 
 USE_LINUX=	gtk3 sqlite3 alsalib
 
 CONFLICTS_INSTALL=	linux-r7-organizer-pro
 
 NO_BUILD=	yes
 PLIST_SUB=	LINUXBASE=${LINUXBASE}
 STRIP=
 
 post-patch:
 	${REINPLACE_CMD} -i '' 's|/opt/r7-office/organizer/|${PREFIX}/bin/|' ${WRKDIR}/opt/r7-office/organizer/r7-organizer.desktop
 	${REINPLACE_CMD} -i '' 's|P7|Р7|' ${WRKDIR}/opt/r7-office/organizer/r7-organizer.desktop
 
 do-install:
 	cd ${WRKDIR}/opt && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share
 	${RM} ${STAGEDIR}${PREFIX}/share/r7-office/organizer/r7organizer
 	${INSTALL_PROGRAM} -C ${WRKDIR}/opt/r7-office/organizer/r7organizer ${STAGEDIR}${PREFIX}/share/r7-office/organizer/r7organizer
 	${RLN} ${STAGEDIR}${PREFIX}/share/r7-office/organizer/r7organizer ${STAGEDIR}${PREFIX}/bin/
 	${MV} ${STAGEDIR}${PREFIX}/share/r7-office/organizer/r7-organizer.desktop ${STAGEDIR}${PREFIX}/share/applications
 	${RLN} ${STAGEDIR}${PREFIX}/share/r7-office/organizer/chrome/icons/default/default256.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/r7-organizer.png
 
 .include <bsd.port.mk>
diff --git a/security/linux-rl9-gnupg/Makefile b/security/linux-rl9-gnupg/Makefile
index 30a2a8c5a9ae..f650e1dd390d 100644
--- a/security/linux-rl9-gnupg/Makefile
+++ b/security/linux-rl9-gnupg/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	gnupg
 PORTVERSION=	2.3.3
 DISTVERSIONSUFFIX=	-4.el9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security linux
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	GNU Transport Layer Security library (Rocky Linux ${LINUX_DIST_VER})
 WWW=		https://gnutls.org/
 
 USES=		cpe linux:rl9
 CPE_VENDOR=	gnu
 USE_LINUX=	gnutls libassuan libgcrypt libgpg-error libksba npth openldap sqlite3
 USE_LINUX_RPM=	yes
 
 BIN_DISTNAMES=	${PORTNAME}2-${DISTVERSION}${DISTVERSIONSUFFIX}
 LIB_DISTNAMES=	${PORTNAME}2-smime-${DISTVERSION}${DISTVERSIONSUFFIX}
 SRC_DISTFILES=	${PORTNAME}2-${DISTVERSION}${DISTVERSIONSUFFIX}${SRC_SUFX}:SOURCE
 
 CONFLICTS=	linux-c7-${PORTNAME}
 DESCR=		${PORTSDIR}/${PKGCATEGORY}/${PORTNAME}/pkg-descr
 DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
 .include <bsd.port.mk>
diff --git a/security/linux-rl9-nss/Makefile b/security/linux-rl9-nss/Makefile
index 3526458a769d..56c23631fcdb 100644
--- a/security/linux-rl9-nss/Makefile
+++ b/security/linux-rl9-nss/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	nss
 PORTVERSION=	3.101.0
 DISTVERSIONSUFFIX=	-10.el9_5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security linux
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Network Security Services (Rocky Linux ${LINUX_DIST_VER})
 WWW=		https://developer.mozilla.org/docs/Mozilla/Projects/NSS
 
 USES=		cpe linux:rl9
 CPE_VENDOR=	mozilla
 USE_LDCONFIG=	yes
 USE_LINUX=	nspr sqlite3
 USE_LINUX_RPM=	yes
 WANT_LINUX32=	yes
 
 LIB_DISTNAMES=	${DISTNAME} \
 		${PORTNAME}-softokn-${PORTVERSION}${DISTVERSIONSUFFIX} \
 		${PORTNAME}-softokn-freebl-${PORTVERSION}${DISTVERSIONSUFFIX} \
 		${PORTNAME}-util-${PORTVERSION}${DISTVERSIONSUFFIX}
 SRC_DISTFILES=	${DISTNAME}${SRC_SUFX}:SOURCE
 
 CONFLICTS=	linux-c7-${PORTNAME}
 DESCR=		${PORTSDIR}/${PKGCATEGORY}/${PORTNAME}/pkg-descr
 
 .include <bsd.port.mk>
diff --git a/www/linux-brave/Makefile b/www/linux-brave/Makefile
index 8aee4d83fe57..4d94cde87a90 100644
--- a/www/linux-brave/Makefile
+++ b/www/linux-brave/Makefile
@@ -1,60 +1,60 @@
 PORTNAME=	brave
 PORTVERSION=	${BRAVE_VER}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www linux
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}-browser/releases/download/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-browser-${BRAVE_VER}-${BRAVE_BUILD}${EXTRACT_SUFX_${ARCH}}
 PKGNAMEPREFIX=	linux-
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Brave web browser based on WebKit
 WWW=		https://www.brave.com
 
 RUN_DEPENDS=	update-mime-database:misc/shared-mime-info
 
 USES=		cpe desktop-file-utils gnome linux:rl9 shared-mime-info shebangfix
 USE_LINUX=	alsalib alsa-plugins-oss alsa-plugins-pulseaudio at-spi2-atk \
 		ca-certificates cairo cups-libs curl dbuslibs dri expat \
 		ffmpeg-libs gnupg gstreamer1-libav gtk3 libxkbcommon \
 		nspr nss p11-kit pango sqlite3 wget xorglibs
 ONLY_FOR_ARCHS=	aarch64 amd64
 
 SHEBANG_FILES=	opt/brave.com/brave/brave-browser
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 EXTRACT_SUFX?=		.rpm
 EXTRACT_SUFX_aarch64?=	.aarch64
 EXTRACT_SUFX_amd64?=	.x86_64
 SRC_SUFX?=		.src${EXTRACT_SUFX}
 
 REINPLACE_ARGS=	-i ""
 
 BRAVE_VER?=	1.75.180
 BRAVE_BUILD?=	1
 
 DATADIR=	${PREFIX}/share/${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS
 
 SUB_FILES=	brave-browser
 
 post-extract:
 	@${REINPLACE_CMD} -e 's|/usr/bin/brave-browser-stable|${LOCALBASE}/bin/brave-browser|' \
 		${WRKSRC}/usr/share/applications/brave-browser.desktop
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/brave-browser ${STAGEDIR}${PREFIX}/bin
 	cd ${WRKSRC}/opt/brave.com && ${CP} -r brave ${STAGEDIR}${PREFIX}/share
 	cd ${WRKSRC}/usr/share && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/share
 .for sz in 16 24 32 48 64 128 256
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${sz}x${sz}/apps
 	${CP} ${STAGEDIR}${DATADIR}/product_logo_${sz}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/${sz}x${sz}/apps/brave-browser.png
 .endfor
 	${MKDIR} ${STAGEDIR}/etc/brave/policies/managed
 	${INSTALL_DATA} ${FILESDIR}/brave.json ${STAGEDIR}/etc/brave/policies/managed
 	${INSTALL_DATA} ${FILESDIR}/webrtc.json ${STAGEDIR}/etc/brave/policies/managed
 
 .include <bsd.port.mk>
diff --git a/www/linux-chrome/Makefile b/www/linux-chrome/Makefile
index 149264e678b9..674681c5d2c8 100644
--- a/www/linux-chrome/Makefile
+++ b/www/linux-chrome/Makefile
@@ -1,59 +1,59 @@
 PORTNAME=	chrome
 PORTVERSION=	${CHROME_VER}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www linux
 MASTER_SITES=	https://dl.google.com/linux/chrome/rpm/stable/x86_64/
 DISTNAME=	google-${PORTNAME}-stable-${CHROME_VER}-${CHROME_BUILD}.x86_64
 PKGNAMEPREFIX=	linux-
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Google web browser based on WebKit
 WWW=		https://www.chromium.org/Home
 
 RUN_DEPENDS=	linux-rl9-wget>0:ftp/linux-rl9-wget \
 		linux-rl9-gnupg2>0:security/linux-rl9-gnupg \
 		update-mime-database:misc/shared-mime-info
 
 USES=		cpe desktop-file-utils gnome linux:rl9 shared-mime-info shebangfix
 USE_LINUX=	alsalib alsa-plugins-oss alsa-plugins-pulseaudio at-spi2-atk \
 		ca-certificates cairo cups-libs curl dbuslibs dri expat \
 		ffmpeg-libs gnupg gstreamer1-libav gtk3 libxkbcommon \
 		nspr nss p11-kit pango sqlite3 wget xorglibs
 ONLY_FOR_ARCHS=	amd64
 
 SHEBANG_FILES=	opt/google/chrome/google-chrome
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 EXTRACT_SUFX?=		.rpm
 EXTRACT_SUFX_aarch64?=	.aarch64${EXTRACT_SUFX}
 EXTRACT_SUFX_amd64?=	.x86_64${EXTRACT_SUFX}
 SRC_SUFX?=		.src${EXTRACT_SUFX}
 
 REINPLACE_ARGS=	-i ""
 
 CHROME_VER?=	133.0.6943.126
 CHROME_BUILD?=	1
 
 DATADIR=	${PREFIX}/share/${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS
 
 SUB_FILES=	google-chrome
 
 post-extract:
 	@${REINPLACE_CMD} -e 's|/usr/bin/google-chrome-stable|${LOCALBASE}/bin/google-chrome|' \
 		${WRKSRC}/usr/share/applications/google-chrome.desktop
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/google-chrome ${STAGEDIR}${PREFIX}/bin
 	cd ${WRKSRC}/opt/google && ${CP} -r chrome ${STAGEDIR}${PREFIX}/share
 	cd ${WRKSRC}/usr/share && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/share
 .for sz in 16 24 32 48 64 128 256
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${sz}x${sz}/apps
 	${CP} ${STAGEDIR}${DATADIR}/product_logo_${sz}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/${sz}x${sz}/apps/google-chrome.png
 .endfor
 
 .include <bsd.port.mk>