diff options
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/display.mk | 4 | ||||
| -rw-r--r-- | Mk/Uses/php.mk | 2 | ||||
| -rw-r--r-- | Mk/Uses/qt.mk | 4 | ||||
| -rw-r--r-- | Mk/Uses/ruby.mk | 2 | ||||
| -rw-r--r-- | Mk/bsd.default-versions.mk | 2 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 3 |
6 files changed, 10 insertions, 7 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/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/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 diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 865224a95bc4..95ddfa318c14 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -130,7 +130,7 @@ _PERL5_FROM_BIN!= ${LOCALBASE}/bin/perl -e 'printf "%vd\n", $$^V;' _EXPORTED_VARS+= _PERL5_FROM_BIN PERL5_DEFAULT:= ${_PERL5_FROM_BIN:R} . endif -# Possible values: 13, 14, 15, 16, 17 +# Possible values: 13, 14, 15, 16, 17, 18 PGSQL_DEFAULT?= 17 # Possible values: 8.1, 8.2, 8.3, 8.4, 8.5 PHP_DEFAULT?= 8.3 diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 96824b8641e2..6c780d5628ff 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1081,7 +1081,7 @@ LD+= --sysroot=${CROSS_SYSROOT} STRIP_CMD= ${CROSS_BINUTILS_PREFIX}strip # only bmake support the below STRIPBIN= ${STRIP_CMD} -.export.env STRIPBIN +.export-env STRIPBIN .endif # @@ -1773,6 +1773,7 @@ CFLAGS:= ${CFLAGS:C/ $//} . if defined(_CPUCFLAGS) . if !empty(_CPUCFLAGS) CFLAGS:= ${CFLAGS:C/${_CPUCFLAGS}//} +CXXFLAGS:= ${CXXFLAGS:C/${_CPUCFLAGS}//} . endif . endif . endif |