summaryrefslogtreecommitdiff
path: root/Mk/Uses
diff options
context:
space:
mode:
Diffstat (limited to 'Mk/Uses')
-rw-r--r--Mk/Uses/emacs.mk10
-rw-r--r--Mk/Uses/gnome.mk10
-rw-r--r--Mk/Uses/go.mk2
-rw-r--r--Mk/Uses/gssapi.mk17
-rw-r--r--Mk/Uses/gstreamer.mk15
-rw-r--r--Mk/Uses/kde.mk21
-rw-r--r--Mk/Uses/llvm.mk2
-rw-r--r--Mk/Uses/luajit.mk6
-rw-r--r--Mk/Uses/mysql.mk2
-rw-r--r--Mk/Uses/pathfix.mk3
-rw-r--r--Mk/Uses/pear.mk4
-rw-r--r--Mk/Uses/php.mk14
-rw-r--r--Mk/Uses/python.mk16
-rw-r--r--Mk/Uses/ruby.mk6
-rw-r--r--Mk/Uses/xorg-cat.mk7
15 files changed, 57 insertions, 78 deletions
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/gnome.mk b/Mk/Uses/gnome.mk
index 7d99d5df0bd0..59d070c747f8 100644
--- a/Mk/Uses/gnome.mk
+++ b/Mk/Uses/gnome.mk
@@ -83,8 +83,8 @@ _USE_GNOME_ALL+=dconf evolutiondataserver3 gnomecontrolcenter3 gnomedesktop3 \
_USE_GNOME_ALL+=gtk40 libadwaita gtksourceview5 gnomedesktop4 nautilus4
# C++ bindings
-_USE_GNOME_ALL+=atkmm cairomm cairomm11 gconfmm26 glibmm glibmm26 gtkmm24 \
- gtkmm30 gtkmm40 gtksourceviewmm3 libgdamm5 libxml++26 libsigc++20 \
+_USE_GNOME_ALL+=atkmm cairomm cairomm11 glibmm glibmm26 gtkmm24 \
+ gtkmm30 gtkmm40 gtksourceviewmm3 libxml++26 libsigc++20 \
libsigc++30 pangomm pangomm24
# glib-mkenums often fails with C locale
@@ -116,9 +116,6 @@ 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
-
glibmm_LIB_DEPENDS= libglibmm-2.4.so:devel/glibmm
glibmm_USE_GNOME_IMPL= libsigc++20 glib20
@@ -142,9 +139,6 @@ 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
-libgdamm5_LIB_DEPENDS= libgdamm-5.0.so:databases/libgdamm5
-libgdamm5_USE_GNOME_IMPL= libgda5 glibmm
-
libsigc++20_LIB_DEPENDS= libsigc-2.0.so:devel/libsigc++20
libsigc++30_LIB_DEPENDS= libsigc-3.0.so:devel/libsigc++30
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/gssapi.mk b/Mk/Uses/gssapi.mk
index 46eea2d10071..b419a8fe27ff 100644
--- a/Mk/Uses/gssapi.mk
+++ b/Mk/Uses/gssapi.mk
@@ -86,6 +86,18 @@ _local:= ${_A}
. if ${SSL_DEFAULT} != base
IGNORE= You are using OpenSSL from ports and have selected GSSAPI from base, please select another GSSAPI value
. endif
+. if exists(/usr/libdata/pkgconfig/mit-krb5.pc)
+ # Base has MIT KRB5 installed
+KRB5_HOME?= /usr
+GSSAPIBASEDIR= ${KRB5_HOME}
+GSSAPILIBDIR= ${GSSAPIBASEDIR}/lib
+GSSAPIINCDIR= ${GSSAPIBASEDIR}/include
+_HEADERS+= gssapi/gssapi.h gssapi/gssapi_krb5.h krb5/krb5.h
+GSSAPICPPFLAGS= -I"${GSSAPIINCDIR}"
+GSSAPILIBS= -lkrb5 -lgssapi_krb5
+GSSAPILDFLAGS=
+. else
+ # Base has Heimdal KRB5 installed
HEIMDAL_HOME= /usr
GSSAPIBASEDIR= ${HEIMDAL_HOME}
GSSAPILIBDIR= ${GSSAPIBASEDIR}/lib
@@ -94,7 +106,9 @@ _HEADERS+= gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h
GSSAPICPPFLAGS= -I"${GSSAPIINCDIR}"
GSSAPILIBS= -lkrb5 -lgssapi -lgssapi_krb5
GSSAPILDFLAGS=
+. endif
. elif ${_local} == "heimdal"
+ # Heimdal port selected
HEIMDAL_HOME?= ${LOCALBASE}
GSSAPIBASEDIR= ${HEIMDAL_HOME}
GSSAPILIBDIR= ${GSSAPIBASEDIR}/lib/heimdal
@@ -111,11 +125,12 @@ GSSAPILIBS= -lkrb5 -lgssapi
GSSAPILDFLAGS= -L"${GSSAPILIBDIR}"
_RPATH= ${GSSAPILIBDIR}
. elif ${_local} == "mit"
+ # MIT KRB5 port selected
KRB5_HOME?= ${LOCALBASE}
GSSAPIBASEDIR= ${KRB5_HOME}
GSSAPILIBDIR= ${GSSAPIBASEDIR}/lib
GSSAPIINCDIR= ${GSSAPIBASEDIR}/include
-_HEADERS+= gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h
+_HEADERS+= gssapi/gssapi.h gssapi/gssapi_krb5.h krb5/krb5.h
. if !defined(_KRB_BOOTSTRAP)
BUILD_DEPENDS+= ${_MITKRB5_DEPENDS}
RUN_DEPENDS+= ${_MITKRB5_DEPENDS}
diff --git a/Mk/Uses/gstreamer.mk b/Mk/Uses/gstreamer.mk
index 22d1c3ea73af..edc677b9f663 100644
--- a/Mk/Uses/gstreamer.mk
+++ b/Mk/Uses/gstreamer.mk
@@ -39,16 +39,9 @@ _GST_VER= ${_GST_VER_DEFAULT}
#== Component setup
-# When modifying _GST1_VERSION, be sure to also update distinfo for the
-# following ports:
-# - multimedia/gstreamer1
-# - multimedia/gstreamer1-editing-services
-# - multimedia/gstreamer1-libav
-# - multimedia/gstreamer1-plugins (via `make makesum-gst1`)
-# - multimedia/gstreamer1-rtsp-server
-# - multimedia/gstreamer1-vaapi
-# - multimedia/py-gstreamer1
-_GST1_VERSION= 1.26.2
+# When modifying _GST1_VERSION, run `make -C ${PORTSDIR}/multimedia/gstreamer1 makesum-all`
+# to update the distinfo files for the entire suite.
+_GST1_VERSION= 1.26.5
_GST1_LIB_VER= 1.0
_GST1_SOVERSION= 0.${_GST1_VERSION:R:E}${${_GST1_VERSION:E} > 9:?:0}${_GST1_VERSION:E}.0
@@ -355,7 +348,7 @@ gst-rtsp-server_IMPL= #
gst-rust_PORT= multimedia/gstreamer${_GST_VER}-plugins-rust
gst-rust_IMPL= #
-gst-rust_GST1_VERSION= 0.13.6
+gst-rust_GST1_VERSION= 0.14.0
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 f46b29b8c151..f178591a11d1 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.4.2
+KDE_PLASMA6_VERSION?= 6.4.4
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.15.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
@@ -331,8 +331,8 @@ _USE_PLASMA6_ALL= activities activities-stats activitymanagerd \
_USE_PLASMA_ALL= ${_USE_PLASMA${_KDE_VERSION}_ALL}
# List of frequently used components of the KDE Gears distribution.
-_USE_GEAR5_ALL= libkdcraw libkexiv2
-_USE_GEAR6_ALL= baloo-widgets kate kosm kpublictransport \
+_USE_GEAR5_ALL= libkdcraw
+_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
@@ -982,10 +979,8 @@ kde-libkdegames_LIB= libKDEGames${_KDE_VERSION}.so
kde-libkeduvocdocument_PORT= misc/libkeduvocdocument
kde-libkeduvocdocument_LIB= libKEduVocDocument.so
-kde-libkexiv2_PORT= graphics/libkexiv2@qt${_KDE_VERSION}
-kde-libkexiv2_LIB5= libKF${_KDE_VERSION}KExiv2.so
-kde-libkexiv2_LIB6= libKExiv2Qt${_KDE_VERSION}.so
-kde-libkexiv2_LIB= ${kde-libkexiv2_LIB${_KDE_VERSION}}
+kde-libkexiv2_PORT= graphics/libkexiv2
+kde-libkexiv2_LIB= libKExiv2Qt6.so
kde-libksane_PORT= graphics/libksane
kde-libksane_LIB= libKSaneWidgets${_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/luajit.mk b/Mk/Uses/luajit.mk
index c7a15b191209..7e62c192fd77 100644
--- a/Mk/Uses/luajit.mk
+++ b/Mk/Uses/luajit.mk
@@ -7,7 +7,7 @@
# LUAJIT_VER: The selected luajit version
# LUAJIT_INCDIR: The path to luajit's header files
# LUAJIT_LUAVER: Which luajit spec version is selected
-# (2.0 for luajit, else 2.1)
+# (always 2.1)
.if !defined(_INCLUDE_USES_LUAJIT_MK)
_INCLUDE_USES_LUAJIT_MK=yes
@@ -28,11 +28,7 @@ IGNORE= Invalid luajit default version ${LUAJIT_DEFAULT}: valid versions are ${V
IGNORE= Invalid luajit version ${LUAJIT_VER}: valid versions are ${VALID_LUAJIT_VER}
.endif
-.if ${LUAJIT_VER} == luajit
-LUAJIT_LUAVER= 2.0
-.else
LUAJIT_LUAVER= 2.1
-.endif
LIB_DEPENDS+= libluajit-5.1.so:lang/${LUAJIT_VER}
LUAJIT_INCDIR= ${LOCALBASE}/include/luajit-${LUAJIT_LUAVER}
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/pathfix.mk b/Mk/Uses/pathfix.mk
index 049224a15621..57c734f93cb3 100644
--- a/Mk/Uses/pathfix.mk
+++ b/Mk/Uses/pathfix.mk
@@ -54,8 +54,7 @@ pathfix:
s|[{]datadir[}]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
s|[(]prefix[)]/lib/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
s|[(]prefix[)]/share/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
- s|[[:<:]]lib/pkgconfig|libdata/pkgconfig|g; \
- s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g'
+ s|[[:<:]]lib/pkgconfig|libdata/pkgconfig|g'
. endfor
. endif
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/php.mk b/Mk/Uses/php.mk
index d6b59898cb5b..c1f8a0061abd 100644
--- a/Mk/Uses/php.mk
+++ b/Mk/Uses/php.mk
@@ -181,7 +181,7 @@ PHP_VER= ${FLAVOR:S/^php//}
# Mk/bsd.default-versions.mk in sync.
. if ${PHP_VER} == 85
PHP_EXT_DIR= 20240925
-PHP_EXT_INC= hash json openssl pcre random spl
+PHP_EXT_INC= hash json opcache openssl pcre random spl
. elif ${PHP_VER} == 84
PHP_EXT_DIR= 20240924
PHP_EXT_INC= hash json openssl pcre random spl
@@ -378,7 +378,7 @@ add-plist-phpext:
_USE_PHP_ALL= bcmath bitset bz2 calendar ctype curl dba dom \
enchant exif ffi fileinfo filter ftp gd gettext gmp \
hash iconv igbinary imap intl json ldap mbstring mcrypt \
- memcache memcached mysqli odbc opcache \
+ memcache memcached mysqli odbc \
openssl pcntl pcre pdo pdo_dblib pdo_firebird pdo_mysql \
pdo_odbc pdo_pgsql pdo_sqlite phar pgsql posix \
pspell radius random readline redis session shmop simplexml snmp \
@@ -386,10 +386,10 @@ _USE_PHP_ALL= bcmath bitset bz2 calendar ctype curl dba dom \
tidy tokenizer xml xmlreader xmlrpc xmlwriter xsl zephir_parser \
zip zlib
# version specific components
-_USE_PHP_VER81= ${_USE_PHP_ALL}
-_USE_PHP_VER82= ${_USE_PHP_ALL}
-_USE_PHP_VER83= ${_USE_PHP_ALL}
-_USE_PHP_VER84= ${_USE_PHP_ALL}
+_USE_PHP_VER81= ${_USE_PHP_ALL} opcache
+_USE_PHP_VER82= ${_USE_PHP_ALL} opcache
+_USE_PHP_VER83= ${_USE_PHP_ALL} opcache
+_USE_PHP_VER84= ${_USE_PHP_ALL} opcache
_USE_PHP_VER85= ${_USE_PHP_ALL}
bcmath_DEPENDS= math/php${PHP_VER}-bcmath
@@ -477,9 +477,11 @@ RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/${extension:S/:build//}.so:${${e
. endif
. else
. if ${ext:tl} != "yes" && !defined(_IGNORE_PHP_SET)
+. if empty(PHP_EXT_INC:M${extension:S/:build//})
check-makevars::
@${ECHO_CMD} "Unknown extension ${extension:S/:build//} for PHP ${PHP_VER}."
@${FALSE}
+. endif
. endif
. endif
. endfor
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/ruby.mk b/Mk/Uses/ruby.mk
index 620fff71f832..55bb74a50fd7 100644
--- a/Mk/Uses/ruby.mk
+++ b/Mk/Uses/ruby.mk
@@ -147,14 +147,14 @@ RUBY?= ${LOCALBASE}/bin/ruby${RUBY_SUFFIX}
#
# Ruby 3.2
#
-RUBY_DISTVERSION= 3.2.8
+RUBY_DISTVERSION= 3.2.9
RUBY_PORTREVISION= 0
. elif ${RUBY_VER} == 3.3
#
# Ruby 3.3
#
-RUBY_DISTVERSION= 3.3.8
+RUBY_DISTVERSION= 3.3.9
RUBY_PORTREVISION= 0
@@ -162,7 +162,7 @@ RUBY_PORTREVISION= 0
#
# Ruby 3.4
#
-RUBY_DISTVERSION= 3.4.4
+RUBY_DISTVERSION= 3.4.5
RUBY_PORTREVISION= 0
diff --git a/Mk/Uses/xorg-cat.mk b/Mk/Uses/xorg-cat.mk
index 0853fd6b3e3c..b81972b4ae5f 100644
--- a/Mk/Uses/xorg-cat.mk
+++ b/Mk/Uses/xorg-cat.mk
@@ -14,8 +14,6 @@
# * font don't install .pc file
# * lib various dependencies, install .pc file, needs
# pathfix
-# * proto install .pc file, needs pathfix, most only needed at
-# build time.
# * util no particular notes
#
# These categories has to match upstream categories. Don't invent
@@ -34,7 +32,7 @@
.if !defined(_INCLUDE_USES_XORG_CAT_MK)
_INCLUDE_USES_XORG_CAT_MK=yes
-_XORG_CATEGORIES= app data doc driver font lib proto util
+_XORG_CATEGORIES= app data doc driver font lib util
_XORG_BUILDSYSTEMS= autotools meson
_XORG_CAT= # empty
@@ -158,9 +156,6 @@ USE_LDCONFIG= yes
CONFIGURE_ARGS+=--enable-malloc0returnsnull
. endif
-. elif ${_XORG_CAT} == proto
-.include "${USESDIR}/pathfix.mk"
-
. endif # ${_XORG_CAT} == <category>
# We only need to include xorg.mk if we want USE_XORG modules
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-22 03:41:53 +0000