summaryrefslogtreecommitdiff
path: root/Mk/Uses
diff options
context:
space:
mode:
Diffstat (limited to 'Mk/Uses')
-rw-r--r--Mk/Uses/cargo.mk2
-rw-r--r--Mk/Uses/emacs.mk10
-rw-r--r--Mk/Uses/go.mk2
-rw-r--r--Mk/Uses/kde.mk11
-rw-r--r--Mk/Uses/llvm.mk2
-rw-r--r--Mk/Uses/mysql.mk2
-rw-r--r--Mk/Uses/pear.mk4
-rw-r--r--Mk/Uses/python.mk16
-rw-r--r--Mk/Uses/qt.mk4
-rw-r--r--Mk/Uses/zig.mk102
10 files changed, 122 insertions, 33 deletions
diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk
index f5325f39afdb..bfa6442c29f8 100644
--- a/Mk/Uses/cargo.mk
+++ b/Mk/Uses/cargo.mk
@@ -128,7 +128,7 @@ CARGO_ENV+= \
CARGO_TARGET_DIR=${CARGO_TARGET_DIR} \
RUSTC=${RUSTC} \
RUSTDOC=${RUSTDOC} \
- RUSTFLAGS="${RUSTFLAGS} ${LDFLAGS:C/.+/-C link-arg=&/}"
+ RUSTFLAGS="${RUSTFLAGS} ${LDFLAGS:C/.+/-C link-args=&/}"
. if ${ARCH} != powerpc64le
CARGO_ENV+= RUST_BACKTRACE=1
diff --git a/Mk/Uses/emacs.mk b/Mk/Uses/emacs.mk
index c278e3447935..462657c4183a 100644
--- a/Mk/Uses/emacs.mk
+++ b/Mk/Uses/emacs.mk
@@ -35,15 +35,15 @@
# will be generated as part of the package.
#
# Variables, which can be read by ports:
-# EMACS_CMD: Emacs command with full path (e.g. /usr/local/bin/emacs-30.1)
+# EMACS_CMD: Emacs command with full path (e.g. /usr/local/bin/emacs-30.2)
# EMACS_FLAVOR: Used for dependencies (e.g. BUILD_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>0:devel/dash@${EMACS_FLAVOR})
# EMACS_LIBDIR: Emacs Library directory without ${PREFIX} (e.g. share/emacs)
-# EMACS_LIBDIR_WITH_VER: Library directory without ${PREFIX} including version (e.g. share/emacs/30.1)
+# EMACS_LIBDIR_WITH_VER: Library directory without ${PREFIX} including version (e.g. share/emacs/30.2)
# EMACS_MAJOR_VER: Emacs major version (e.g. 30)
# EMACS_PKGNAMESUFFIX: PKGNAMESUFFIX to distinguish Emacs flavors
# EMACS_SITE_LISPDIR: Emacs site-lisp directory without ${PREFIX} (e.g. share/emacs/site-lisp)
-# EMACS_VER: Emacs version (e.g. 30.1)
-# EMACS_VERSION_SITE_LISPDIR: Include version (e.g. share/emacs/30.1/site-lisp)
+# EMACS_VER: Emacs version (e.g. 30.2)
+# EMACS_VERSION_SITE_LISPDIR: Include version (e.g. share/emacs/30.2/site-lisp)
#-------------------------------------------------------------------------------
#
# MAINTAINER: emacs@FreeBSD.org
@@ -109,7 +109,7 @@ EMACS_FLAVOR= full
EMACS_VER= 31.0.50
EMACS_PORTDIR= editors/emacs-devel
. else
-EMACS_VER= 30.1
+EMACS_VER= 30.2
EMACS_PORTDIR= editors/emacs
. endif
diff --git a/Mk/Uses/go.mk b/Mk/Uses/go.mk
index f56114da9973..5bb8b245644c 100644
--- a/Mk/Uses/go.mk
+++ b/Mk/Uses/go.mk
@@ -70,7 +70,7 @@ _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-devel
+GO_VALID_VERSIONS= 1.20 1.21 1.22 1.23 1.24 1.25 1.26-devel
# Check arguments sanity
. if !empty(go_ARGS:N[1-9].[0-9][0-9]:N*-devel:Nmodules:Nno_targets:Nrun)
diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk
index 0a9a9e70a8b4..f178591a11d1 100644
--- a/Mk/Uses/kde.mk
+++ b/Mk/Uses/kde.mk
@@ -99,13 +99,13 @@ KDE_FRAMEWORKS5_VERSION?= 5.116.0
KDE_FRAMEWORKS5_BRANCH?= stable
# Current KDE Frameworks (Qt6 based).
-KDE_FRAMEWORKS6_VERSION?= 6.16.0
+KDE_FRAMEWORKS6_VERSION?= 6.17.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.3
-KDE_APPLICATIONS6_SHLIB_VER?= 6.4.3
+KDE_APPLICATIONS6_VERSION?= 25.08.0
+KDE_APPLICATIONS6_SHLIB_VER?= 6.5.0
# 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
@@ -332,7 +332,7 @@ _USE_PLASMA_ALL= ${_USE_PLASMA${_KDE_VERSION}_ALL}
# List of frequently used components of the KDE Gears distribution.
_USE_GEAR5_ALL= libkdcraw
-_USE_GEAR6_ALL= baloo-widgets kate kosm kpublictransport \
+_USE_GEAR6_ALL= baloo-widgets kosm kpublictransport \
libkcddb libkcompactdisc libkdcraw \
libkdegames libkeduvocdocument libkexiv2 \
libksane marble okular
@@ -962,9 +962,6 @@ kde-akonadi_LIB= libKPim${_KDE_VERSION}AkonadiPrivate.so
kde-baloo-widgets_PORT= sysutils/baloo-widgets
kde-baloo-widgets_LIB= libKF${_KDE_VERSION}BalooWidgets.so
-kde-kate_PORT= editors/kate
-kde-kate_PATH= ${QT_PLUGINDIR}/ktexteditor/katebacktracebrowserplugin.so
-
kde-libkcddb_PORT= audio/libkcddb
kde-libkcddb_LIB= libKCddb${_KDE_VERSION}.so
diff --git a/Mk/Uses/llvm.mk b/Mk/Uses/llvm.mk
index d6108a998882..38e04295b970 100644
--- a/Mk/Uses/llvm.mk
+++ b/Mk/Uses/llvm.mk
@@ -37,7 +37,7 @@
.if !defined(_INCLUDE_USES_LLVM_MK)
_INCLUDE_USES_LLVM_MK= YES
-_LLVM_MK_VALID_VERSIONS= 11 12 13 14 15 16 17 18 19 20
+_LLVM_MK_VALID_VERSIONS= 11 12 13 14 15 16 17 18 19 20 21
_LLVM_MK_VALID_CONSTRAINTS= min max
_LLVM_MK_VALID_MODES= build run lib
_LLVM_MK_VALID_EXPORTS= export noexport
diff --git a/Mk/Uses/mysql.mk b/Mk/Uses/mysql.mk
index fa63b6cf465c..8062734165a7 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 118
+. for v in 106 1011 114 118
MYSQL${v}m_LIBVER= 3
. endfor
diff --git a/Mk/Uses/pear.mk b/Mk/Uses/pear.mk
index 0496dded11b9..cbea5a6fe5f7 100644
--- a/Mk/Uses/pear.mk
+++ b/Mk/Uses/pear.mk
@@ -22,8 +22,8 @@ IGNORE= Incorrect 'USES+= pear:${pear_ARGS}' usage: argument [${arg}] is not rec
. endif
. endfor
-_pear_IGNORE_WITH_PHP=
-IGNORE_WITH_PHP?= ${_pear_IGNORE_WITH_PHP}
+_pear_IGNORE_WITH_PHP=81
+IGNORE_WITH_PHP+= ${_pear_IGNORE_WITH_PHP}
php_ARGS+= flavors
.include "${USESDIR}/php.mk"
diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
index 79047db2fff1..c96b633f1254 100644
--- a/Mk/Uses/python.mk
+++ b/Mk/Uses/python.mk
@@ -144,8 +144,6 @@
#
# pytest - Run tests with latest pytest (devel/py-pytest)
#
-# pytest4 - Run tests with pytest 4.x (devel/py-pytest4)
-#
# unittest - Run tests with unittest
#
# unittest2 - Run tests with unittest2 (devel/py-unittest2)
@@ -371,7 +369,6 @@ _VALID_PYTHON_FEATURES= allflavors \
pep517 \
py3kplist \
pytest \
- pytest4 \
pythonprefix \
unittest \
unittest2
@@ -389,9 +386,6 @@ IGNORE= uses unknown USE_PYTHON features: ${_INVALID_PYTHON_FEATURES}
. for var in ${USE_PYTHON}
_PYTHON_FEATURE_${var:C/=.*$//:tu}= ${var:C/.*=//:S/,/ /g}
. endfor
-. if defined(_PYTHON_FEATURE_PYTEST) && defined(_PYTHON_FEATURE_PYTEST4)
-IGNORE= uses either USE_PYTHON=pytest or USE_PYTHON=pytest4, not both of them
-. endif
# distutils automatically generates flavors depending on the supported
# versions.
@@ -781,10 +775,6 @@ TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}nose2>=0:devel/py-nose2@${PY_FLAVOR}
# pytest support
. if defined(_PYTHON_FEATURE_PYTEST)
TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pytest>=7,1:devel/py-pytest@${PY_FLAVOR}
-. elif defined(_PYTHON_FEATURE_PYTEST4)
-TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pytest4>=4.6,1:devel/py-pytest4@${PY_FLAVOR}
-. endif
-. if defined(_PYTHON_FEATURE_PYTEST) || defined(_PYTHON_FEATURE_PYTEST4)
PYTEST_BROKEN_TESTS?= # empty
PYTEST_IGNORED_TESTS?= # empty
_PYTEST_SKIPPED_TESTS?= # empty
@@ -797,7 +787,7 @@ _PYTEST_SKIPPED_TESTS+= ${PYTEST_IGNORED_TESTS}
. endif
. endif # !defined(PYTEST_ENABLE_ALL_TESTS)
_PYTEST_FILTER_EXPRESSION= ${_PYTEST_SKIPPED_TESTS:C/^(.)/and not \1/:tW:C/^and //}
-. endif # defined(_PYTHON_FEATURE_PYTEST) || defined(_PYTHON_FEATURE_PYTEST4)
+. endif # defined(_PYTHON_FEATURE_PYTEST)
# unittest2 support
. if defined(_PYTHON_FEATURE_UNITTEST2)
@@ -1031,12 +1021,12 @@ do-test:
. endif
. endif # defined(_PYTHON_FEATURE_NOSE2)
-. if defined(_PYTHON_FEATURE_PYTEST) || defined(_PYTHON_FEATURE_PYTEST4)
+. if defined(_PYTHON_FEATURE_PYTEST)
. if !target(do-test)
do-test:
cd ${TEST_WRKSRC} && ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -k '${_PYTEST_FILTER_EXPRESSION}' -rs -v -o addopts= ${TEST_ARGS:NDESTDIR=*}
. endif
-. endif # defined(_PYTHON_FEATURE_PYTEST) || defined(_PYTHON_FEATURE_PYTEST4)
+. endif # defined(_PYTHON_FEATURE_PYTEST)
. if defined(_PYTHON_FEATURE_UNITTEST)
. if !target(do-test)
diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk
index 905e7793a780..88984a936848 100644
--- a/Mk/Uses/qt.mk
+++ b/Mk/Uses/qt.mk
@@ -23,8 +23,8 @@ _QT_MK_INCLUDED= qt.mk
# Qt versions currently supported by the framework.
_QT_SUPPORTED?= 5 6
QT5_VERSION?= 5.15.17
-QT6_VERSION?= 6.9.1
-PYSIDE6_VERSION?= 6.9.1
+QT6_VERSION?= 6.9.2
+PYSIDE6_VERSION?= 6.9.2
# Support for intermediate Qt6 releases. This partially defines
# _QT6_MASTER_SITE_SUBDIR and would probably be better in qt-dist.mk,
diff --git a/Mk/Uses/zig.mk b/Mk/Uses/zig.mk
new file mode 100644
index 000000000000..5727a812fede
--- /dev/null
+++ b/Mk/Uses/zig.mk
@@ -0,0 +1,102 @@
+# Provide support for building Zig software.
+#
+# Feature: zig
+# Usage: USES=zig
+
+# Variables, which can be set by the port:
+#
+# ZIG_TUPLE List of Zig dependencies required to build the port.
+# Each item is triplet of an arbitrary name, an URL without
+# scheme part (https://) and a directory name where the
+# expects this dependency to be placed.
+# This knob can be generated by running make make-zig-tuple
+# You might need to run this multiple time until all
+# transitive dependencies get pulled in.
+#
+# MAINTAINER: ports@FreeBSD.org
+
+.if !defined(_INCLUDE_USES_ZIG_MK)
+_INCLUDE_USES_ZIG_MK= yes
+
+. if !empty(zig_ARGS)
+IGNORE= USES=zig does not accept arguments
+. endif
+
+.sinclude "${MASTERDIR}/Makefile.zig"
+
+ZIG_CMD?= zig
+ZIG_PORT?= lang/zig
+ZIG_DEPSDIR= ${WRKDIR}/zig-packages
+ZIG_TMPDEPSDIR= ${WRKDIR}/zig-packages-tmp
+
+ZIG_CPUTYPE_DEFAULT= ${ARCH:S/amd64/x86_64/}
+ZIG_CPUTYPE?= ${CPUTYPE:U${ZIG_CPUTYPE_DEFAULT}}
+
+_ZIG2TUPLE_CMD= zig2tuple
+
+BUILD_DEPENDS+= ${ZIG_CMD}:${ZIG_PORT}
+
+DIST_SUBDIR?= zig
+
+. for z in ${ZIG_TUPLE}
+. for group url dir in ${z:S/:/ /g:tw}
+MASTER_SITES+= https://${url:H}/:${group}
+DISTFILES+= ${url:T}:${group}
+. endfor
+. endfor
+
+_USES_extract= 299:zig-pre-extract
+
+# Generates ZIG_TUPLE= ... line ready to be pasted into the port based on
+# build.zig.zon files found in ${WRKSRC}
+make-zig-tuple: check-zig2tuple
+ @${ECHO_MSG} "===> Processing build.zig.zon files"
+ ${_ZIG2TUPLE_CMD} ${WRKDIR}
+
+check-zig2tuple:
+ @if ! type ${_ZIG2TUPLE_CMD} > /dev/null 2>&1; then \
+ ${ECHO_MSG} "===> zig2tuple executable not found, install \"ports-mgmt/zig2tuple\""; exit 1; \
+ fi
+
+# Main targets implementation.
+
+zig-pre-extract:
+ @${ECHO_CMD} "===> Extracting zig dependencies"
+# We don't know the name of the directory that is contained in the archive,
+# but we need to rename it into the last component of the tuple
+# To solve this we extract into an empty directory and then do
+# mv * /path/where/we/want/it
+ @${MKDIR} ${ZIG_DEPSDIR} ${ZIG_TMPDEPSDIR}
+. for z in ${ZIG_TUPLE}
+. for group url dir in ${z:S/:/ /g:tw}
+ ${MAKE} -C ${.CURDIR} do-extract EXTRACT_ONLY=${url:T} WRKDIR=${ZIG_TMPDEPSDIR}
+ ${MV} ${ZIG_TMPDEPSDIR}/* ${ZIG_DEPSDIR}/${dir}
+. endfor
+. endfor
+ @${RMDIR} ${ZIG_TMPDEPSDIR}
+
+ZIG_ENV+= DESTDIR=${STAGEDIR}
+ZIG_ARGS+= --prefix ${PREFIX} --system ${ZIG_DEPSDIR} --verbose \
+ -Dcpu=${ZIG_CPUTYPE} \
+ ${"${WITH_DEBUG}" != "":?:--release=fast} \
+ ${"${WITH_DEBUG}" != "":?-Doptimize=Debug:-Doptimize=ReleaseSmall} \
+ ${ZIG_ARGS_${FLAVOR}}
+DO_MAKE_BUILD?= ${SETENVI} ${WRK_ENV} ${ZIG_ENV} ${ZIG_CMD} build \
+ ${_MAKE_JOBS} ${ZIG_ARGS}
+. if !target(do-build)
+do-build:
+ @${DO_NADA}
+. endif
+
+. if !target(do-install)
+do-install:
+ @(cd ${BUILD_WRKSRC}; if ! ${DO_MAKE_BUILD}; then \
+ if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \
+ ${ECHO_MSG} "===> Compilation failed unexpectedly."; \
+ (${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") | ${FMT_80} ; \
+ fi; \
+ ${FALSE}; \
+ fi)
+. endif
+
+.endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-30 19:23:18 +0000