diff options
Diffstat (limited to 'Mk/Uses')
| -rw-r--r-- | Mk/Uses/display.mk | 4 | ||||
| -rw-r--r-- | Mk/Uses/gstreamer.mk | 7 | ||||
| -rw-r--r-- | Mk/Uses/php.mk | 2 | ||||
| -rw-r--r-- | Mk/Uses/pyqt.mk | 4 | ||||
| -rw-r--r-- | Mk/Uses/python.mk | 2 | ||||
| -rw-r--r-- | Mk/Uses/qt.mk | 4 | ||||
| -rw-r--r-- | Mk/Uses/ruby.mk | 2 |
7 files changed, 14 insertions, 11 deletions
diff --git a/Mk/Uses/display.mk b/Mk/Uses/display.mk index 886d65b01ad7..e46fb10d1bba 100644 --- a/Mk/Uses/display.mk +++ b/Mk/Uses/display.mk @@ -21,7 +21,9 @@ BUILD_DEPENDS+= Xvfb:x11-servers/xorg-server@xvfb \ xkbcomp:x11/xkbcomp XVFBPORT!= port=0; while test -S /tmp/.X11-unix/X$${port} ; do port=$$(( port + 1 )) ; done ; ${ECHO_CMD} $$port +PREV_XVFBPORT!= ${ECHO_CMD} $$(( ${XVFBPORT} - 1)) XVFBPIDFILE= /tmp/.xvfb-${XVFBPORT}.pid +PREV_XVFBPIDFILE= /tmp/.xvfb-${PREV_XVFBPORT}.pid MAKE_ENV+= DISPLAY=":${XVFBPORT}" _USES_${display_ARGS}+= 290:start-display 860:stop-display @@ -29,7 +31,7 @@ start-display: daemon -p ${XVFBPIDFILE} Xvfb :${XVFBPORT} stop-display: - pkill -15 -F ${XVFBPIDFILE} + pkill -15 -F ${PREV_XVFBPIDFILE} . endif .endif diff --git a/Mk/Uses/gstreamer.mk b/Mk/Uses/gstreamer.mk index 192ca386d268..6f3489b79432 100644 --- a/Mk/Uses/gstreamer.mk +++ b/Mk/Uses/gstreamer.mk @@ -10,7 +10,8 @@ # version: 1 -- default (this may be omitted since there is # currently only one supported version) # _internal: Only intended for use by multimedia/gstreamer1 to -# define specific variables so as not depend on itself +# define specific variables like _GST1_VERSION so that +# it does not depend on itself # # MAINTAINER: multimedia@FreeBSD.org @@ -41,7 +42,7 @@ _GST_VER= ${_GST_VER_DEFAULT} # 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.6 +_GST1_VERSION= 1.26.7 _GST1_LIB_VER= 1.0 _GST1_SOVERSION= 0.${_GST1_VERSION:R:E}${${_GST1_VERSION:E} > 9:?:0}${_GST1_VERSION:E}.0 @@ -70,7 +71,7 @@ _GST1_PLUGINS_www= neon srt _GST1_PLUGINS_x11= x ximagesrc _GST1_PLUGINS_x11-toolkits= gtk pango qt5 qt6 -# == Unversioned information +#== Unversioned information # Gather all available plugins for the chosen version _GST_PLUGINS_BASE= bad core good ugly libgstreamer plugins diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk index c1f8a0061abd..3f2c1f3da1f2 100644 --- a/Mk/Uses/php.mk +++ b/Mk/Uses/php.mk @@ -180,7 +180,7 @@ PHP_VER= ${FLAVOR:S/^php//} # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. . if ${PHP_VER} == 85 -PHP_EXT_DIR= 20240925 +PHP_EXT_DIR= 20250925 PHP_EXT_INC= hash json opcache openssl pcre random spl . elif ${PHP_VER} == 84 PHP_EXT_DIR= 20240924 diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk index af659b76d8cc..54fff0299196 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.2 +PYQTBUILDER_VERSION= 1.19.0 QSCI2_VERSION= 2.14.1 -SIP_VERSION= 6.12.0 # ,1 +SIP_VERSION= 6.13.1 # ,1 # Qt 5 components PYQT5SIP_VERSION= 12.17.0 diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index c96b633f1254..3ceacc7c115d 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -870,7 +870,7 @@ PY_SETUPTOOLS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAV # Common Python modules that can be needed but only for some versions of Python. . if ${PYTHON_REL} < 31100 PY_EXCEPTIONGROUP= ${PYTHON_PKGNAMEPREFIX}exceptiongroup>=1.1.1:devel/py-exceptiongroup@${PY_FLAVOR} -PY_TOMLI= ${PYTHON_PKGNAMEPREFIX}tomli>=2.2.1<3:textproc/py-tomli@${PY_FLAVOR} +PY_TOMLI= ${PYTHON_PKGNAMEPREFIX}tomli>=2.3<3:textproc/py-tomli@${PY_FLAVOR} PY_TYPING_EXTENSIONS= ${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} . endif diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk index 88984a936848..edc8cbd555bb 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.2 -PYSIDE6_VERSION?= 6.9.2 +QT6_VERSION?= 6.9.3 +PYSIDE6_VERSION?= 6.9.3 # 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/ruby.mk b/Mk/Uses/ruby.mk index bedf7cc058be..fb4699b8086f 100644 --- a/Mk/Uses/ruby.mk +++ b/Mk/Uses/ruby.mk @@ -162,7 +162,7 @@ RUBY_PORTREVISION= 0 # # Ruby 3.4 # -RUBY_DISTVERSION= 3.4.6 +RUBY_DISTVERSION= 3.4.7 RUBY_PORTREVISION= 0 |