Framework: sync with upstream

Taken from: FreeBSD

Author: fichtner

MOVED

@@ -1443,7 +1443,6 @@ databases/mysql55-server||2022-06-30|Has expired: Upstream support ended on Dece
 databases/mysql55-client||2022-06-30|Has expired: Upstream support ended on December 2018
 multimedia/schroedinger||2022-06-30|Has expired: Abandoned legacy video codec, upstream is dead and last release was back in 2012
 emulators/kcemu||2022-06-30|Has expired: Depends on expired multimedia/schroedinger
-multimedia/ccextractor||2022-06-30|Has expired: Depends on expired multimedia/schroedinger
 security/libgringotts||2022-06-30|Has expired: Abandonware, upstream dead and last release in 2008
 deskutils/osmo||2022-06-30|Has expired: Depends on expired security/libgringotts
 devel/itext||2022-06-30|Has expired: Outdated version and deprecated by upstream
@@ -4494,7 +4493,6 @@ games/hedgewars-server||2025-06-04|Depends on expired lang/ghc810, does not buil
 lang/ghc810||2025-06-04|Old version, unsupported upstream
 audio/mp3check||2025-06-06|Has expired: Depends on expired audio/id3tool
 audio/id3tool||2025-06-06|Has expired: Can't read ID3v2 tags which have been around for 20+ years and discontinued in 2005 feature-wise according to readme file
-science/py-pysal||2025-06-06|Has expired: Depends on expired math/py-spvcm
 textproc/xincluder||2025-06-06|Has expired: Depends on expiring java/jdom
 math/py-spvcm||2025-06-06|Has expired: Upstream repository has been archived on Jul 9, 2024
 sysutils/screen50|sysutils/screen|2025-06-09|Replace the screen metaport with screen50, renaming screen50 to screen
@@ -4834,3 +4832,31 @@ devel/rubygem-multi_json114|devel/rubygem-multi_json-gitlab|2025-10-25|Use devel
 devel/pycomposefile|devel/py-pycomposefile|2025-10-27|Rename to add py- prefix. Move devel/pycomposefile to devel/py-pycomposefile
 devel/rubygem-fugit111|devel/rubygem-fugit|2025-10-27|Remove obsoleted port. Use devel/rubygem-fugit instead
 science/py-hiphive|science/py-hiPhive|2025-10-28|Spelling changed into camel case on PYPI and GH
+games/burrtools|games/burr-tools|2025-10-31|Harmonise with upstream repository name
+databases/mongodb60|databases/mongodb70|2025-11-01|Has expired: EOL starting August 2025, see https://www.mongodb.com/legal/support-policy/lifecycles, please use databases/mongodb70
+www/phpmustache||2025-11-01|Has expired: Installation mode changed from systemwide to per-application with Composer
+dns/fpdns||2025-11-01|Has expired: Upstream repository has been archived on Sep 19, 2024
+databases/py-pycql||2025-11-01|Has expired: Upstream repository has been archived on Aug 31, 2021
+devel/py-types-ujson||2025-11-01|Has expired: No longer required by devel/py-ujson >= 5.11
+devel/pysvn||2025-11-01|Has expired: Fails to build
+cad/impact||2025-11-01|Has expired: Does not work as intended
+emulators/citra-qt5||2025-11-01|Has expired: project has been discontinued and build fails with FFmpeg >7
+emulators/citra||2025-11-01|Has expired: project has been discontinued and build fails with FFmpeg >7
+games/renpy||2025-11-01|Has expired: Uses deprecated version of python
+security/rhonabwy||2025-11-01|Has expired: Upstream repository has been archived on Nov 11, 2024
+devel/electron35||2025-11-01|Has expired: EOLed upstream, switch to newer version
+lang/python39||2025-11-01|Has expired: Upgrade to a newer Python version. 3.9 is in maintenance status and gets security fixes only. End-of-Life: 2025-10. See https://devguide.python.org/versions/
+devel/py-pyjq|textproc/py-jq|2025-11-01|Removed: Depended on expired Python version 3.9 and does not build with newer Python
+devel/py-ctags||2025-11-01|Removed: Depended on expired Python version 3.9 and does not build with newer Python
+net-im/tdlib-purple||2025-11-01|Remove broken port
+databases/foundationdb71-client||2025-11-01|Remove broken port
+databases/foundationdb71-server||2025-11-01|Remove broken port
+databases/foundationdb73-client||2025-11-01|Remove broken port
+databases/foundationdb73-server||2025-11-01|Remove broken port
+databases/erlfdb||2025-11-01|Depends on removed port databases/foundationdb71-client
+www/mitmproxy||2025-11-02|Remove broken port
+net-im/signald|net-im/signal-cli|2025-11-02|Has expired: this project is no longer actively maintained. Use signal-cli instead
+net-im/libsignal-client|net-im/libsignal|2025-11-05|Renamed to match upstream name
+games/openlierox||2025-11-06|Remove broken port
+net/glusterfs||2025-11-06|Remove broken port
+games/pokerth||2025-11-06|Remove broken port

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.5.0
+KDE_PLASMA6_VERSION?=		6.5.2
 KDE_PLASMA6_BRANCH?=		stable
 
 # Legacy KDE frameworks (Qt5 based).
@@ -104,8 +104,8 @@ 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.08.2
-KDE_APPLICATIONS6_SHLIB_VER?=	6.5.2
+KDE_APPLICATIONS6_VERSION?=	25.08.3
+KDE_APPLICATIONS6_SHLIB_VER?=	6.5.3
 # 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

Mk/Uses/meson.mk

@@ -2,6 +2,10 @@
 #
 # Feature:		meson
 # Usage:		USES=meson
+# Valid ARGS:		muon
+#
+# muon			use muon instead of meson, intended for bootstrapping
+#			dependencies that python uses
 #
 # The following files are bundled in source tar files.
 # meson.build		- Instructions for meson like autoconf configure,
@@ -19,19 +23,32 @@
 .if !defined(_INCLUDE_USES_MESON_MK)
 _INCLUDE_USES_MESON_MK=	yes
 
+_valid_ARGS=		muon
+
 # Sanity check
-.  if !empty(meson_ARGS)
-IGNORE=	Incorrect 'USES+= meson:${meson_ARGS}'. meson takes no arguments
+.  for _arg in ${meson_ARGS}
+.    if empty(_valid_ARGS:M${_arg})
+IGNORE=	'USES+= meson:${meson_ARGS}' usage: argument [${_arg}] is not recognized
+.    endif
+.  endfor
+
+.  if !empty(meson_ARGS:Mmuon)
+BUILD_DEPENDS+=	muon:devel/muon
+.  else
+BUILD_DEPENDS+=	meson:devel/meson
 .  endif
 
-BUILD_DEPENDS+=		meson:devel/meson
-
 # meson uses ninja
 .include "${USESDIR}/ninja.mk"
 
 # meson might have issues with non-unicode locales
 USE_LOCALE?=	en_US.UTF-8
 
+# Enable muon's meson compatibility mode
+.  if !empty(meson_ARGS:Mmuon)
+CONFIGURE_ARGS+=	meson
+.  endif
+
 CONFIGURE_ARGS+=	--prefix ${PREFIX} \
 			--localstatedir /var \
 			--infodir ${INFO_PATH}
@@ -62,8 +79,21 @@ CONFIGURE_ARGS+=	--buildtype release \
 			--strip
 .  endif
 
+.  for _bool in true false enabled disabled
+.    if defined(MESON_${_bool:tu})
+.      for _meson_arg in ${MESON_${_bool:tu}}
+MESON_ARGS+=		-D${_meson_arg}=${_bool}
+.      endfor
+.    endif
+.  endfor
+
 HAS_CONFIGURE=		yes
+.  if !empty(meson_ARGS:Mmuon)
+CONFIGURE_CMD=		muon
+.  else
 CONFIGURE_CMD=		meson
+.  endif
+
 # Pull in manual set settings and from options
 CONFIGURE_ARGS+=	${MESON_ARGS}
 

Mk/Uses/python.mk

@@ -17,19 +17,19 @@
 #		Examples:
 #
 #			USES=python:2.7		# Supports Python 2.7 Only
-#			USES=python:3.9+	# Supports Python 3.9 or later
-#			USES=python:3.9-3.10	# Supports Python 3.9 to 3.10
-#			USES=python:-3.9	# Supports Python up to 3.9
-#			USES=python		# Supports 3.9+
+#			USES=python:3.11+	# Supports Python 3.11 or later
+#			USES=python:3.11-3.12	# Supports Python 3.11 to 3.12
+#			USES=python:-3.11	# Supports Python up to 3.11
+#			USES=python		# Supports 3.10+
 #
 # NOTE:	<version-spec> should be as specific as possible, matching the versions
 #	upstream declares support for, without being incorrect. In particular,
-#	USES=python *without* a <version-spec> means 3.9+,
+#	USES=python *without* a <version-spec> means 3.11+,
 #	including unreleased versions, which is probably incorrect.
 #
 #	Not specifying a <version-spec> should only be used when a more specific
 #	<version-spec> cannot be specified due to syntax limitations, for
-#	example: 2.7,3.9-3.10, but even in this case, X.Y+ (2.7+), or -X.Y (-3.9)
+#	example: 2.7,3.11-3.12, but even in this case, X.Y+ (2.7+), or -X.Y (-3.11)
 #	is preferred and likely more correct.
 #
 # patch		Python is needed at patch time. Adds dependency to PATCH_DEPENDS.
@@ -50,7 +50,7 @@
 # Exported variables:
 #
 # PYTHON_VERSION	- The chosen Python interpreter including the version,
-#			  e.g. python2.7, python3.9, etc.
+#			  e.g. python2.7, python3.11, etc.
 #
 # Variables, which can be set by the port:
 #
@@ -227,10 +227,10 @@
 # PYTHON_PORTSDIR	- The port directory of the chosen Python interpreter
 #
 # PYTHON_REL		- The release number of the chosen Python interpreter
-#			  without dots, e.g. 20706, 30901, ...
+#			  without dots, e.g. 20706, 31114, ...
 #
 # PYTHON_SUFFIX		- The major-minor release number of the chosen Python
-#			  interpreter without dots, e.g. 27, 38, ...
+#			  interpreter without dots, e.g. 27, 310, ...
 #			  Used for prefixes and suffixes.
 #
 # PYTHON_BASESUFFIX	- PYTHON_SUFFIX without the threaded ABI flag.
@@ -252,7 +252,7 @@
 #			  interpreter, e.g. 2, 3, ...
 #
 # PYTHON_VER		- The major-minor release version of the chosen Python
-#			  interpreter, e.g. 2.7, 3.9, ...
+#			  interpreter, e.g. 2.7, 3.12, ...
 #
 # PYTHON_BASEVER	- PYTHON_VER without the threaded ABI flag.
 #
@@ -341,7 +341,7 @@ 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.
-_PYTHON_VERSIONS=		3.11 3.12 3.10 3.9 2.7 # preferred first
+_PYTHON_VERSIONS=		3.11 3.12 3.13 3.13t 3.14 3.10 2.7 # preferred first
 _PYTHON_PORTBRANCH=		3.11		# ${_PYTHON_VERSIONS:[1]}
 _PYTHON_BASECMD=		${LOCALBASE}/bin/python
 _PYTHON_RELPORTDIR=		lang/python
@@ -444,13 +444,13 @@ DEV_WARNING+=		"lang/python27 reached End of Life and will be removed somewhere
 .  elif ${_PYTHON_ARGS} == 2
 DEV_ERROR+=		"USES=python:2 is no longer supported, use USES=python:2.7"
 .  elif ${_PYTHON_ARGS} == 3
-DEV_ERROR+=		"USES=python:3 is no longer supported, use USES=python:3.9+ or an appropriate version range"
+DEV_ERROR+=		"USES=python:3 is no longer supported, use USES=python:3.11+ or an appropriate version range"
 .  endif  # ${_PYTHON_ARGS} == 2.7
 
 _PYTHON_VERSION:=	${PYTHON_DEFAULT}
 
 .  if empty(_PYTHON_ARGS)
-_PYTHON_ARGS=	3.9+
+_PYTHON_ARGS=	3.10+
 .  endif
 
 # Validate Python version whether it meets the version restriction.
@@ -552,7 +552,7 @@ PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
 # To avoid having dependencies with @ and empty flavor:
 # _PYTHON_VERSION is either set by (first that matches):
 # - If using Python flavors, from the current Python flavor
-# - If using a version restriction (USES=python:3.9+), from the first
+# - If using a version restriction (USES=python:3.11+), from the first
 #   acceptable default Python version.
 # - From PYTHON_DEFAULT
 PY_FLAVOR=	py${_PYTHON_VERSION:S/.//}

Mk/Uses/ruby.mk

@@ -154,7 +154,7 @@ RUBY_PORTREVISION=	0
 #
 # Ruby 3.3
 #
-RUBY_DISTVERSION=	3.3.9
+RUBY_DISTVERSION=	3.3.10
 RUBY_PORTREVISION=	0
 
 

Mk/bsd.default-versions.mk

@@ -140,7 +140,7 @@ PYCRYPTOGRAPHY_DEFAULT?=	rust
 .  else
 PYCRYPTOGRAPHY_DEFAULT?=	legacy
 .  endif
-# Possible values: 3.9, 3.10, 3.11, 3.12
+# Possible values: 3.10, 3.11, 3.12, 3.13, 3.13t, 3.14
 PYTHON_DEFAULT?=	3.11
 # Possible values: 2.7
 PYTHON2_DEFAULT?=	2.7

Tools/scripts/installed-ports-by-origin.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+# Contributed by Ralf van der Enden <[email protected]>
+# Public domain.
+
+# Print a list of all installed ports by origin with flavour.
+# This is similar to pkg info -qoa, but prints a flavour if the
+# package has one.
+
+sqlite3 /var/db/pkg/local.sqlite \
+	"select origin || coalesce('@' || (
+		select t4.annotation as annotation
+		from packages t1
+		    inner join pkg_annotation t2 on t1.id = t2.package_id
+		    inner join annotation t3 on t2.tag_id = t3.annotation_id
+			and t3.annotation = 'flavor'
+		    inner join annotation t4 on t2.value_id = t4.annotation_id
+			and t2.tag_id = t3.annotation_id
+			and t3.annotation = 'flavor'
+		where t1.origin = t0.origin), '')
+	from packages t0;"

Tools/scripts/npmjs-fetch-with-dependencies.sh

@@ -0,0 +1,122 @@
+#!/bin/sh
+#
+# MAINTAINER: [email protected]
+
+# This script is intended to be used in fetch targets of Node.js ports.
+# It fetches a given Node.js package from npmjs.org along with all its dependencies,
+# and creates a tarball with the package and all its dependencies.
+# It doesn't build or install the package, just fetches it and its dependencies,
+# such that the subsequent build step wouldn't require network access.
+# This script generates a package-lock.json file for reproducible builds
+# if it doesn't already exist.
+
+
+set -eu -o pipefail
+set -o pipefail
+
+export LC_ALL=C
+
+##
+## npmjs-get-latest-version.sh: retrieves the latest version of a given Node.js package as registered on https://registry.npmjs.org
+##
+
+# args and env
+
+PACKAGE_NAME="$1"
+PACKAGE_VERSION="$2"
+PACKAGE_LOCK_JSON="$3"
+PACKAGE_TARBALL_OUTPUT="$4"
+
+if [ -z "$PACKAGE_NAME" ] || [ -z "$PACKAGE_VERSION" ] || [ -z "$PACKAGE_LOCK_JSON" ] || [ -z "$PACKAGE_TARBALL_OUTPUT" ]; then
+	echo "Usage: $0 <package name> <package version> <package-lock.json> <package tarball output>"
+	echo "Example: $0 sharp 0.34.4 outdir/sharp-package-lock.json outdir/sharp-0.34.4.tar.gz"
+	exit 1
+fi
+
+PACKAGE_NAME_PURE="$(echo $PACKAGE_NAME | sed 's|.*/||')"
+
+if [ -z "$TMPDIR" ]; then
+	TMPDIR="/tmp"
+fi
+
+
+# check that packaged dependencies are installed
+
+for dep in npm jq; do
+	if ! which $dep >/dev/null 2>&1; then
+		echo "error: the '$dep' dependency is missing"
+		if [ $dep = "npm" ]; then
+			echo "... please install the 'npm' package"
+		elif [ $dep = "jq" ]; then
+			echo "... please install the 'jq' package"
+		fi
+		exit 1
+	fi
+done
+
+
+# MAIN
+
+# to full paths
+if ! echo "${PACKAGE_LOCK_JSON}" | grep -q "^/"; then
+	PACKAGE_LOCK_JSON="`pwd`/${PACKAGE_LOCK_JSON}"
+fi
+if ! echo "${PACKAGE_TARBALL_OUTPUT}" | grep -q "^/"; then
+	PACKAGE_TARBALL_OUTPUT="`pwd`/${PACKAGE_TARBALL_OUTPUT}"
+fi
+if ! echo "${TMPDIR}" | grep -q "^/"; then
+	TMPDIR="`pwd`/${TMPDIR}"
+fi
+
+# create dirs for output files
+mkdir -p "$(dirname "${PACKAGE_LOCK_JSON}")"
+mkdir -p "$(dirname "${PACKAGE_TARBALL_OUTPUT}")"
+mkdir -p "${TMPDIR}"
+
+# create build dir and change to there
+BUILD_DIR="${TMPDIR}/${PACKAGE_NAME_PURE}-${PACKAGE_VERSION}"
+rm -rf ${BUILD_DIR}
+mkdir ${BUILD_DIR}
+cd ${BUILD_DIR}
+
+# either just fetch, or regenarate package-lock.json and fetch
+if [ -f $PACKAGE_LOCK_JSON ]; then
+	# fail if package-lock.json does not contain the requested package and version
+	JSON_NAME=$(jq -r ".packages | .\"node_modules/${PACKAGE_NAME}\" .version" $PACKAGE_LOCK_JSON)
+	if [ "$JSON_NAME" != "$PACKAGE_VERSION" ]; then
+		echo "error: the existing package-lock.json ($PACKAGE_LOCK_JSON) does not contain the requested package ${PACKAGE_NAME}@${PACKAGE_VERSION}"
+		echo "       please delete the existing package-lock.json ($PACKAGE_LOCK_JSON) and re-run this script to regenerate it"
+		exit 1
+	fi
+
+	# fetch dependencies
+	echo "{\"name\":\"${PACKAGE_NAME}-installer\",\"version\":\"1.0.0\",\"dependencies\":{\"${PACKAGE_NAME}\":\"${PACKAGE_VERSION}\"}}" > package.json
+	cp $PACKAGE_LOCK_JSON package-lock.json
+	HOME=${TMPDIR} npm ci --ignore-scripts --global-style --legacy-peer-deps --omit=dev
+else
+	# info
+	echo "INFO: the file $PACKAGE_LOCK_JSON does not exist, we will attempt to generate it"
+
+	# generate package-lock.json
+	echo "{\"name\":\"${PACKAGE_NAME}-installer\",\"version\":\"1.0.0\"}" > package.json
+	npm install --package-lock-only --global-style --legacy-peer-deps ${PACKAGE_NAME}@${PACKAGE_VERSION}
+
+	# copy generated package-lock.json to the expected location
+	cp package-lock.json ${PACKAGE_LOCK_JSON}
+
+	# info
+	echo "INFO: ${PACKAGE_LOCK_JSON} did not exist and was generated"
+
+	# fetch dependencies
+	HOME=${TMPDIR} npm ci --ignore-scripts --global-style --legacy-peer-deps --omit=dev
+fi
+
+# generate tarball with all dependencies
+
+cd ${TMPDIR}
+
+find ${PACKAGE_NAME_PURE}-${PACKAGE_VERSION} -and -exec touch -h -d 1970-01-01T00:00:00Z {} \;
+find ${PACKAGE_NAME_PURE}-${PACKAGE_VERSION} -print0 | sort -z | \
+      	tar czf ${PACKAGE_TARBALL_OUTPUT} --format=bsdtar --gid 0 --uid 0 --options gzip:!timestamp --no-recursion --null -T -
+rm -rf ${PACKAGE_NAME_PURE}-${PACKAGE_VERSION}
+echo "INFO: created package tarball with dependencies at: ${PACKAGE_TARBALL_OUTPUT}"